From 960dfbc5b4bdf41fb38f68685ae3b8a7063e7ccf Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Oct 2019 06:03:42 +0000 Subject: [PATCH 1/3] ocamlPackages.doc-ock-html: remove at 1.2.1 This is now part of ocamlPackages.odoc --- .../ocaml-modules/doc-ock-html/default.nix | 22 ------------------- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/doc-ock-html/default.nix diff --git a/pkgs/development/ocaml-modules/doc-ock-html/default.nix b/pkgs/development/ocaml-modules/doc-ock-html/default.nix deleted file mode 100644 index cd2e2761b50..00000000000 --- a/pkgs/development/ocaml-modules/doc-ock-html/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, doc-ock, tyxml, xmlm }: - -buildDunePackage rec { - pname = "doc-ock-html"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "ocaml-doc"; - repo = pname; - rev = "v${version}"; - sha256 = "1y620h48qrplmcm78g7c78zibpkai4j3icwmnx95zb3r8xq8554y"; - }; - - propagatedBuildInputs = [ doc-ock tyxml xmlm ]; - - meta = { - description = "From doc-ock to HTML"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2a1c505e340..f6ec287ade5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -213,8 +213,6 @@ let doc-ock = callPackage ../development/ocaml-modules/doc-ock { }; - doc-ock-html = callPackage ../development/ocaml-modules/doc-ock-html { }; - doc-ock-xml = callPackage ../development/ocaml-modules/doc-ock-xml { }; dolmen = callPackage ../development/ocaml-modules/dolmen { }; From e33563438ec60e383e27bb933f43348265c53071 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Oct 2019 06:03:48 +0000 Subject: [PATCH 2/3] ocamlPackages.doc-ock-xml: remove at 1.2.1 This is now part of ocamlPackages.odoc --- .../ocaml-modules/doc-ock-xml/default.nix | 22 ------------------- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/doc-ock-xml/default.nix diff --git a/pkgs/development/ocaml-modules/doc-ock-xml/default.nix b/pkgs/development/ocaml-modules/doc-ock-xml/default.nix deleted file mode 100644 index cebf7707788..00000000000 --- a/pkgs/development/ocaml-modules/doc-ock-xml/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, doc-ock, menhir, xmlm }: - -buildDunePackage rec { - pname = "doc-ock-xml"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "ocaml-doc"; - repo = pname; - rev = "v${version}"; - sha256 = "1s27ri7vj9ixi5p5ixg6g6invk96807bvxbqjrr1dm8sxgl1nd20"; - }; - - propagatedBuildInputs = [ doc-ock menhir xmlm ]; - - meta = { - description = "XML printer and parser for Doc-Ock"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f6ec287ade5..d5d98aa7762 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -213,8 +213,6 @@ let doc-ock = callPackage ../development/ocaml-modules/doc-ock { }; - doc-ock-xml = callPackage ../development/ocaml-modules/doc-ock-xml { }; - dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { }; From 7c6026019e33ef1ba76b5aadddd217f82be1ad2c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Oct 2019 06:03:53 +0000 Subject: [PATCH 3/3] ocamlPackages.doc-ock: remove at 1.2.1 This is now part of ocamlPackages.odoc --- .../ocaml-modules/doc-ock/default.nix | 24 ------------------- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/doc-ock/default.nix diff --git a/pkgs/development/ocaml-modules/doc-ock/default.nix b/pkgs/development/ocaml-modules/doc-ock/default.nix deleted file mode 100644 index ff42c93e5c1..00000000000 --- a/pkgs/development/ocaml-modules/doc-ock/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, octavius, cppo }: - -buildDunePackage rec { - pname = "doc-ock"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "ocaml-doc"; - repo = pname; - rev = "v${version}"; - sha256 = "090vprm12jrl55yllk1hdzbsqyr107yjs2qnc49yahdhvnr4h5b7"; - }; - - buildInputs = [ cppo ]; - - propagatedBuildInputs = [ octavius ]; - - meta = { - description = "Extract documentation from OCaml files"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d5d98aa7762..6de437ddbd1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -211,8 +211,6 @@ let digestif = callPackage ../development/ocaml-modules/digestif { }; - doc-ock = callPackage ../development/ocaml-modules/doc-ock { }; - dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { };