From cf1f8b2d0492d21a04aa0b2832be352ea9480b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Mon, 8 Oct 2018 21:09:59 +0200 Subject: [PATCH] camlp5: remove old version 5.15 --- pkgs/development/tools/ocaml/camlp5/5.15.nix | 46 -------------------- pkgs/top-level/ocaml-packages.nix | 12 ----- 2 files changed, 58 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/camlp5/5.15.nix diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix deleted file mode 100644 index 2e03bb8025e..00000000000 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ /dev/null @@ -1,46 +0,0 @@ -{stdenv, fetchurl, ocaml, transitional ? false}: - -let - pname = "camlp5"; - webpage = http://pauillac.inria.fr/~ddr/camlp5/; - metafile = ./META; -in - -assert !stdenv.lib.versionOlder "4.00" ocaml.version; - -stdenv.mkDerivation rec { - - name = "${pname}${if transitional then "_transitional" else ""}-${version}"; - version = "5.15"; - - src = fetchurl { - url = "${webpage}/distrib/src/${pname}-${version}.tgz"; - sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq"; - }; - - buildInputs = [ ocaml ]; - - prefixKey = "-prefix "; - - preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + - " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; - - buildFlags = "world.opt"; - - postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META"; - - meta = { - description = "Preprocessor-pretty-printer for OCaml"; - longDescription = '' - Camlp5 is a preprocessor and pretty-printer for OCaml programs. - It also provides parsing and printing tools. - ''; - homepage = "${webpage}"; - license = stdenv.lib.licenses.bsd3; - branch = "5"; - platforms = ocaml.meta.platforms or []; - maintainers = [ - stdenv.lib.maintainers.z77z - ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7de4bf3fad4..429f9d3155f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -88,18 +88,6 @@ let then callPackage ../development/tools/ocaml/camlp4 { } else null; - camlp5_old_strict = - if lib.versionOlder "4.00" ocaml.version - then camlp5_6_strict - else callPackage ../development/tools/ocaml/camlp5/5.15.nix { }; - - camlp5_old_transitional = - if lib.versionOlder "4.00" ocaml.version - then camlp5_6_transitional - else callPackage ../development/tools/ocaml/camlp5/5.15.nix { - transitional = true; - }; - camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 {