Package: guix-patches;
Reported by: Julien Lepiller <julien <at> lepiller.eu>
Date: Thu, 1 Oct 2020 13:46:02 UTC
Severity: normal
Tags: patch
Done: Julien Lepiller <julien <at> lepiller.eu>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Julien Lepiller <julien <at> lepiller.eu> To: 43745 <at> debbugs.gnu.org Subject: [bug#43745] [PATCH 26/27] gnu: ocaml-4.07: Ensure build with ocaml4.7-dune. Date: Thu, 1 Oct 2020 15:41:32 +0200
* gnu/packages/ocaml.scm (ocaml4.07-gen, ocaml4.07-sedlex) (ocaml4.07-ezjsonm, ocaml4.07-uri, ocaml4.07-charinfo-width) (ocaml4.07-zed, ocaml4.07-lambda-term, ocaml4.07-utop) (ocaml4.07-ppx-inline-test, ocaml4.07-earley, ocaml4.07-merlin) (ocaml4.07-sexplib0, ocaml4.07-parsexp, ocaml4.07-sexplib) (ocaml4.07-base, ocaml4.07-stdio, ocaml4.07-ppxlib, ocaml4.07-ppx-compare) (ocaml4.07-fieldslib, ocaml4.07-variantslib, ocaml4.07-ppx-fields-conv) (ocaml4.07-ppx-sexp-conv, ocaml4.07-ppx-variants-conv) (ocaml4.07-ppx-custom-printf, ocaml4.07-bin-prot, ocaml4.07-ppx-hash) (ocaml4.07-ppx-enumerate, ocaml4.07-ppx-bench, ocaml4.07-ppx-here) (ocaml4.07-ppx-typerep, ocaml4.07-ppx-sexp-value, ocaml4.07-ppx-sexp-message) (ocaml4.07-ppx-pipebang, ocaml4.07-ppx-optional, ocaml4.07-ppx-optcomp) (ocaml4.07-ppx-let, ocaml4.07-ppx-fail, ocaml4.07-ppx-assert) (ocaml4.07-ppx-expect, ocaml4.07-ppx-js-style, ocaml4.07-ppx-typerep-conv) (ocaml4.07-ppx-base, ocaml4.07-ppx-bin-prot, ocaml4.07-ppx-jane) (ocaml4.07-splittable-random, ocaml4.07-configurator, ocaml4.07-spawn) (ocaml4.07-core, ocaml4.07-core-kernel)[arguments]: Use ocaml4.07-dune. --- gnu/packages/ocaml.scm | 147 +++++++++++++++++++++++++++-------------- 1 file changed, 98 insertions(+), 49 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1a08bc9531..d2e2e61863 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2092,7 +2092,8 @@ representation of the data.") `(#:tests? #f; no tests #:package "gen" #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-odoc" ,ocaml4.07-odoc))) (native-inputs @@ -2137,7 +2138,8 @@ and consumable.") (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) #t))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs @@ -2829,7 +2831,8 @@ writing to these structures, and they are accessed via the Bigarray module.") `(#:package "ezjsonm" #:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest)))) (propagated-inputs @@ -2867,7 +2870,8 @@ JSON.") (substitute* "lib/uri.ml" (("Re.get") "Re.Group.get"))))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit)) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv))) @@ -3195,7 +3199,8 @@ library is currently designed for Unicode Standard 3.2.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) @@ -3226,7 +3231,8 @@ function that follows the prototype of POSIX's wcwidth.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)) ("ocaml-charinfo-width" ,ocaml4.07-charinfo-width) @@ -3256,7 +3262,8 @@ connect an engine to your inputs and rendering functions to get an editor.") `(#:build-flags (list "--profile" "release") #:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-lwt" ,(package-with-ocaml4.07 ocaml-lwt)) ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) @@ -3291,7 +3298,8 @@ instead of bindings to a C library.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("cppo" ,(package-with-ocaml4.07 ocaml-cppo)))) (propagated-inputs @@ -3593,7 +3601,8 @@ syntax checking on dedukti files.") ;see home page README for further information `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -3666,7 +3675,8 @@ or quantified formulas.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Parsing library based on Earley Algorithm") (description "Earley is a parser combinator library base on Earley's algorithm. It is intended to be used in conjunction with an OCaml syntax @@ -3842,7 +3852,8 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") `(#:package "merlin" #:tests? #f ;; Errors in tests in version 3.2.2 #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Context sensitive completion for OCaml in Vim and Emacs") (description "Merlin is an editor service that provides modern IDE features for OCaml. Emacs and Vim support is provided out-of-the-box. @@ -3988,7 +3999,8 @@ exclusion algorithms are typical examples of such systems.") (arguments `(#:tests? #f ;no tests #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Library containing the definition of S-expressions and some base converters") (description "Part of Jane Street's Core library The Core suite of @@ -4014,7 +4026,8 @@ that was developed by Jane Street, the largest industrial user of OCaml.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (inputs `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))) (synopsis "S-expression parsing library") @@ -4063,7 +4076,8 @@ parsexp_io.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) ("ocaml-parsexp" ,ocaml4.07-parsexp) @@ -4101,7 +4115,8 @@ functionality for parsing and pretty-printing s-expressions.") (lambda _ (invoke "dune" "build" "@install" "--profile=release")))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Full standard library replacement for OCaml") (description @@ -4166,7 +4181,8 @@ is now @code{Ocaml_common.Ast_helper}.") (arguments `(#:tests? #f ;no tests #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It @@ -4247,7 +4263,8 @@ as part of the same ocaml-migrate-parsetree driver.") all)))) #t))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Base library and tools for ppx rewriters") (description @@ -4286,7 +4303,8 @@ OCaml AST in the OCaml syntax; ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_compare"))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") @@ -4315,7 +4333,8 @@ by making sure that you only compare comparable values.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4346,7 +4365,8 @@ of a record and create new record values.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4380,7 +4400,8 @@ standard library.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_fields_conv"))) (home-page "https://github.com/janestreet/ppx_fields_conv") (synopsis "Generation of accessor and iteration functions for ocaml records") @@ -4411,7 +4432,8 @@ new record values.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_sexp_conv"))) (home-page "https://github.com/janestreet/ppx_sexp_conv") (synopsis "Generation of S-expression conversion functions from type definitions") @@ -4441,7 +4463,8 @@ definitions.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_variants_conv"))) (home-page @@ -4473,7 +4496,8 @@ variant types.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_custom_printf"))) (home-page "https://github.com/janestreet/ppx_custom_printf") (synopsis "Printf-style format-strings for user-defined string conversion") @@ -4505,7 +4529,8 @@ string conversion.") ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "bin_prot"))) (home-page "https://github.com/janestreet/bin_prot") (synopsis "Binary protocol generator") @@ -4571,7 +4596,8 @@ storage of large amounts of data.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_hash"))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") @@ -4596,7 +4622,8 @@ hash functions from type exrpessions and definitions.") (arguments `(#:tests? #f; no test suite #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4627,7 +4654,8 @@ many values).") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-migrate-parsetree" @@ -4656,7 +4684,8 @@ many values).") ;; broken tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4685,7 +4714,8 @@ many values).") (arguments `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base))) (home-page "https://github.com/janestreet/typerep") (synopsis "Typerep is a library for runtime types") @@ -4707,7 +4737,8 @@ many values).") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -4737,7 +4768,8 @@ ocaml values.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -4771,7 +4803,8 @@ context such as function arguments.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -4800,7 +4833,8 @@ context such as function arguments.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4829,7 +4863,8 @@ else expression.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-stdio" ,ocaml4.07-stdio) @@ -4857,7 +4892,8 @@ size, the version of the compiler, ...") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4885,7 +4921,8 @@ match expressions, and if expressions.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -4914,7 +4951,8 @@ position.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) @@ -4946,7 +4984,8 @@ useful errors on failure.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) @@ -4989,7 +5028,8 @@ to denote the expected output.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -5021,7 +5061,8 @@ packages.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-typerep" ,ocaml4.07-typerep) @@ -5051,7 +5092,8 @@ from type definitions.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) @@ -5088,7 +5130,8 @@ verification tool.") ;; Cyclic dependency with ocaml-ppx-jane `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) @@ -5119,7 +5162,8 @@ functions from type definitions.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) @@ -5164,7 +5208,8 @@ driver including all standard Jane Street ppx rewriters.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) @@ -5223,7 +5268,8 @@ various Jane Street packages.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-stdio" ,ocaml4.07-stdio))) @@ -5266,7 +5312,8 @@ Configurator allows one to: (("/bin/echo") (which "echo"))) #t))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) (home-page "https://github.com/janestreet/spawn") @@ -5308,7 +5355,8 @@ thousands of times faster than fork. `(#:package "core" #:tests? #f; Require a cyclic dependency: core_extended #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-configurator" ,ocaml4.07-configurator) @@ -5347,7 +5395,8 @@ standard library that was developed by Jane Street.") ;; Cyclic dependency with ocaml-core `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) -- 2.28.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.