diff --git a/pkgs/development/ocaml-modules/base/default.nix b/pkgs/development/ocaml-modules/base/default.nix deleted file mode 100644 index f7627567f9c..00000000000 --- a/pkgs/development/ocaml-modules/base/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, ocaml, jbuilder, findlib }: - -if !stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "base is not available for OCaml ${ocaml.version}" else - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-base-0.9.0"; - - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/base-v0.9.0.tar.gz; - sha256 = "0pdpa3hflbqn978ppvv5y08cjya0k8xpf1h0kcak6bdrmnmiwlyx"; - }; - - buildInputs = [ ocaml jbuilder findlib ]; - - inherit (jbuilder) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - homepage = https://github.com/janestreet/base; - description = "Full standard library replacement for OCaml"; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix deleted file mode 100644 index 7d7e44ab9cc..00000000000 --- a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, jbuilder, findlib }: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ocaml-compiler-libs-0.9.0"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ocaml-compiler-libs-v0.9.0.tar.gz; - sha256 = "0ipi56vg227924ahi9vv926jn16br9zfipm6a3xd4xrl5pxkvzaz"; - }; - - buildInputs = [ ocaml jbuilder findlib ]; - - inherit (jbuilder) installPhase; - - meta = { - description = "OCaml compiler libraries repackaged"; - homepage = https://github.com/janestreet/ocaml-compiler-libs; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix deleted file mode 100644 index 33f1766cb4a..00000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, ocaml, jbuilder, findlib -, ocaml-compiler-libs, ocaml-migrate-parsetree -}: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_ast-0.9.0"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_ast-v0.9.0.tar.gz; - sha256 = "1hirfmxr8hkf3p39k1pqidabxxhd541d6ddfaqpgxbl51bw9ddmz"; - }; - - buildInputs = [ ocaml jbuilder findlib ]; - propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ]; - - inherit (jbuilder) installPhase; - - meta = { - description = "OCaml AST used by Jane Street ppx rewriters"; - homepage = https://github.com/janestreet/ppx_ast; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix deleted file mode 100644 index d84983ed634..00000000000 --- a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, ocaml, jbuilder, findlib }: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_traverse_builtins-0.9.0"; - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_traverse_builtins-v0.9.0.tar.gz; - sha256 = "0zmf9kybll0xn8dsj10v260l0zwjyykimqml9rl7xqyjyl1rmnx6"; - }; - - buildInputs = [ ocaml jbuilder findlib ]; - - inherit (jbuilder) installPhase; - - meta = { - description = "Builtins for Ppx_traverse"; - homepage = https://github.com/janestreet/ppx_traverse_builtins; - license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/stdio/default.nix b/pkgs/development/ocaml-modules/stdio/default.nix deleted file mode 100644 index 87382330022..00000000000 --- a/pkgs/development/ocaml-modules/stdio/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, ocaml, jbuilder, findlib, base }: - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-stdio-0.9.0"; - - src = fetchurl { - url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/stdio-v0.9.0.tar.gz; - sha256 = "008b5y03223107gfv8qawdfyjvf5g97l472i5p5v8mp512wr7kj5"; - }; - - buildInputs = [ ocaml jbuilder findlib ]; - propagatedBuildInputs = [ base ]; - - inherit (jbuilder) installPhase; - - meta = { - license = stdenv.lib.licenses.asl20; - description = "Standard IO library for OCaml"; - homepage = https://github.com/janestreet/stdio; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index af0c31dc608..b2012923adf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -48,8 +48,6 @@ let atdgen = callPackage ../development/ocaml-modules/atdgen { }; - base = callPackage ../development/ocaml-modules/base { }; - base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { }; @@ -526,8 +524,6 @@ let sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; - stdio = callPackage ../development/ocaml-modules/stdio { }; - stog = callPackage ../applications/misc/stog { }; stringext = callPackage ../development/ocaml-modules/stringext { }; @@ -596,10 +592,6 @@ let buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {}; - ocaml-compiler-libs = callPackage ../development/ocaml-modules/janestreet/ocaml-compiler-libs.nix {}; - - ppx_ast = callPackage ../development/ocaml-modules/janestreet/ppx_ast.nix {}; - ppx_core = if lib.versionOlder "4.03" ocaml.version then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {} @@ -707,8 +699,6 @@ let then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {} else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {}; - ppx_traverse_builtins = callPackage ../development/ocaml-modules/janestreet/ppx_traverse_builtins.nix {}; - # Core sublibs typerep =