From 06db050abd9985cbac0f2a96ffa91a5789482af7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 04:55:25 +0000 Subject: [PATCH 1/7] ocamlPackages.ocp-indent: remove spurious dependency to opam and fix installPhase --- pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix | 4 ++-- .../development/tools/ocaml/ocp-indent/default.nix | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix index bdc75766bbf..3951be18de3 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, ocpBuild, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; }; - nativeBuildInputs = [ ocpBuild opam ]; + nativeBuildInputs = [ ocpBuild ]; buildInputs = [ ocaml findlib cmdliner ]; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index d11278f4d29..f30c0f278f7 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocpBuild, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -8,7 +8,7 @@ assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; stdenv.mkDerivation rec { - name = "ocp-indent-${version}"; + name = "ocaml${ocaml.version}-ocp-indent-${version}"; version = "1.6.1"; src = fetchzip { @@ -16,16 +16,10 @@ stdenv.mkDerivation rec { sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; - nativeBuildInputs = [ ocpBuild opam ]; + nativeBuildInputs = [ ocpBuild ]; buildInputs = [ ocaml findlib cmdliner ]; - createFindlibDestdir = true; - - preConfigure = "patchShebangs ./install.sh"; - - postInstall = '' - mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/} - ''; + inherit (jbuilder) installPhase; meta = with stdenv.lib; { homepage = http://typerex.ocamlpro.com/ocp-indent.html; From fd018bdaddf87c3bcccdf84f9698447695aed35d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 05:19:44 +0000 Subject: [PATCH 2/7] ocamlPackages.ocp-build: remove spurious dependency to camlp4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change attribute name from “ocpBuild” to “ocp-build”. --- pkgs/development/tools/ocaml/ocaml-top/default.nix | 2 +- pkgs/development/tools/ocaml/ocp-build/default.nix | 9 ++++----- pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix | 6 +++--- pkgs/development/tools/ocaml/ocp-indent/default.nix | 6 +++--- pkgs/development/tools/ocaml/ocp-index/default.nix | 6 +++--- pkgs/top-level/ocaml-packages.nix | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 3cf70d66ddb..e7d8b163420 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ ncurses jbuilder ] - ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]); + ++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]); configurePhase = '' export TERM=xterm diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 8da0f781a8b..0ed7312660a 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }: let version = "1.99.19-beta"; in -buildOcaml { +stdenv.mkDerivation rec { - name = "ocp-build"; - inherit version; + name = "ocaml${ocaml.version}-ocp-build-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; @@ -14,7 +13,7 @@ buildOcaml { sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; }; - buildInputs = [ ocaml ]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; preConfigure = '' diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix index 3951be18de3..693ad70402f 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, ocp-build, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.6-beta"; assert versionAtLeast "0.9.8" (getVersion cmdliner); stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; }; - nativeBuildInputs = [ ocpBuild ]; + nativeBuildInputs = [ ocp-build ]; buildInputs = [ ocaml findlib cmdliner ]; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index f30c0f278f7..43898d250d9 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocpBuild, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; assert versionAtLeast (getVersion cmdliner) "1.0.0"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.6-beta"; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; - nativeBuildInputs = [ ocpBuild ]; + nativeBuildInputs = [ ocp-build ]; buildInputs = [ ocaml findlib cmdliner ]; inherit (jbuilder) installPhase; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 6b865e9709a..669d9789427 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocp-build, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: let inherit (stdenv.lib) getVersion versionAtLeast optional; in assert versionAtLeast (getVersion ocaml) "4"; -assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.13-beta"; assert versionAtLeast (getVersion ocpIndent) "1.4.2"; let @@ -26,7 +26,7 @@ stdenv.mkDerivation { sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z"; }) ]; - buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ] + buildInputs = [ ocaml findlib ocp-build opam cmdliner ncurses re libev ] ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm; propagatedBuildInputs = [ ocpIndent ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6ca593f349f..3f334d1ed17 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -494,7 +494,7 @@ let ocf = callPackage ../development/ocaml-modules/ocf { }; - ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; + ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; From 0d1b5285c91f93641f485da339de3382463c347c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 05:24:10 +0000 Subject: [PATCH 3/7] ocamlPackages.ocp-index: 1.1.5 -> 1.1.6 --- .../tools/ocaml/ocp-index/default.nix | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 669d9789427..8f6062adb06 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,39 +1,23 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocp-build, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocpIndent, cmdliner, re }: -let inherit (stdenv.lib) getVersion versionAtLeast optional; in +stdenv.mkDerivation rec { -assert versionAtLeast (getVersion ocaml) "4"; -assert versionAtLeast (getVersion ocp-build) "1.99.13-beta"; -assert versionAtLeast (getVersion ocpIndent) "1.4.2"; - -let - version = "1.1.5"; -in - -stdenv.mkDerivation { - - name = "ocp-index-${version}"; + version = "1.1.6"; + name = "ocaml${ocaml.version}-ocp-index-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd"; + sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3"; }; - patches = [ (fetchpatch { - url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff; - sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z"; - }) ]; - - buildInputs = [ ocaml findlib ocp-build opam cmdliner ncurses re libev ] - ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm; + buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ]; propagatedBuildInputs = [ ocpIndent ]; - createFindlibDestdir = true; + buildPhase = "jbuilder build -p ocp-index"; - preBuild = "export TERM=xterm"; - postInstall = "mv $out/lib/{ocp-index,ocaml/${getVersion ocaml}/site-lib/}"; + inherit (jbuilder) installPhase; meta = { homepage = http://typerex.ocamlpro.com/ocp-index.html; From db8f874da87993cc23584472433b3c98a34d7cc1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 05:28:05 +0000 Subject: [PATCH 4/7] ocamlPackages.ocp-indent: fix attribute name (from ocpIndent) --- pkgs/development/tools/ocaml/ocp-index/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 8f6062adb06..0a63ae80534 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocpIndent, cmdliner, re }: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ]; - propagatedBuildInputs = [ ocpIndent ]; + propagatedBuildInputs = [ ocp-indent ]; buildPhase = "jbuilder build -p ocp-index"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3f334d1ed17..b6817c84d81 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -496,10 +496,10 @@ let ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; - ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; - ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; + ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; + ocp-indent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; - ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; }; + ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocp-indent = ocp-indent_1_5_2; }; ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { }; From 06158033f24d7467f2361efb11f8c8bc24b87f7d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 05:58:53 +0000 Subject: [PATCH 5/7] ocamlPackages.ocp-index: use up-to-date ocp-indent --- pkgs/top-level/ocaml-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b6817c84d81..c04b7e8e2f3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -499,7 +499,7 @@ let ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; ocp-indent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; - ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocp-indent = ocp-indent_1_5_2; }; + ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { }; From ed1bbae4db882ed42e349dd7a8a84de535493108 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 06:23:36 +0000 Subject: [PATCH 6/7] ocamlPackages.ocp-indent: remove at 1.5.2 --- .../tools/ocaml/ocp-indent/1.5.2.nix | 37 ------------------- pkgs/top-level/ocaml-packages.nix | 1 - 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix deleted file mode 100644 index 693ad70402f..00000000000 --- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchzip, ocaml, findlib, ocp-build, cmdliner }: - -let inherit (stdenv.lib) getVersion versionAtLeast; in - -assert versionAtLeast (getVersion ocaml) "3.12.1"; -assert versionAtLeast (getVersion ocp-build) "1.99.6-beta"; -assert versionAtLeast "0.9.8" (getVersion cmdliner); - -stdenv.mkDerivation { - - name = "ocp-indent-1.5.2"; - - src = fetchzip { - url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz"; - sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; - }; - - nativeBuildInputs = [ ocp-build ]; - - buildInputs = [ ocaml findlib cmdliner ]; - - createFindlibDestdir = true; - - preConfigure = "patchShebangs ./install.sh"; - - postInstall = '' - mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/} - ''; - - meta = with stdenv.lib; { - homepage = http://typerex.ocamlpro.com/ocp-indent.html; - description = "A customizable tool to indent OCaml code"; - license = licenses.gpl3; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.jirkamarsik ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c04b7e8e2f3..88aa7df6372 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -497,7 +497,6 @@ let ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; - ocp-indent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; From c647ca8180326f6c8687a6b1d7fde6bda8657184 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 Jun 2018 06:24:37 +0000 Subject: [PATCH 7/7] ocamlPackages.cmdliner: remove at 0.9.8 --- .../ocaml-modules/cmdliner/0.9.nix | 34 ------------------- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/cmdliner/0.9.nix diff --git a/pkgs/development/ocaml-modules/cmdliner/0.9.nix b/pkgs/development/ocaml-modules/cmdliner/0.9.nix deleted file mode 100644 index 345d56d2170..00000000000 --- a/pkgs/development/ocaml-modules/cmdliner/0.9.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: - -let - pname = "cmdliner"; -in - -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - -stdenv.mkDerivation rec { - - name = "ocaml-${pname}-${version}"; - version = "0.9.8"; - - src = fetchurl { - url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx"; - }; - - unpackCmd = "tar xjf $src"; - nativeBuildInputs = [ ocamlbuild opaline ]; - buildInputs = [ ocaml findlib ]; - - configurePhase = "ocaml pkg/git.ml"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; - - meta = with stdenv.lib; { - homepage = http://erratique.ch/software/cmdliner; - description = "An OCaml module for the declarative definition of command line interfaces"; - license = licenses.bsd3; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 88aa7df6372..87e1cf907f5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -139,8 +139,6 @@ let cil = callPackage ../development/ocaml-modules/cil { }; - cmdliner_0_9 = callPackage ../development/ocaml-modules/cmdliner/0.9.nix { }; - cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix {