From b8d1492647898d15f3367c868e3fc70524d8920d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:02:38 +0100 Subject: gnu: Remove ocaml4.07-gsl-1. * gnu/packages/ocaml.scm (ocaml4.07-gsl-1): Remove variable. Change-Id: Ie446999c873dbf5b16ce2e4f9e2a6c33833c7d05 --- gnu/packages/ocaml.scm | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7993dbaa73..d632289871 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2146,7 +2146,7 @@ (define-public ocaml-ppx-bitstring (description "This package provides a way to write bitstrings and matching over bitsrings in Erlang style as primitives to the language."))) - + (define-public ocaml-result (package (name "ocaml-result") @@ -2189,7 +2189,7 @@ (define-public ocaml5.0-result `(#:dune ,ocaml5.0-dune-bootstrap #:ocaml ,ocaml-5.0 #:findlib ,ocaml5.0-findlib)))) - + (define-public ocaml-topkg (package (name "ocaml-topkg") @@ -2219,7 +2219,7 @@ (define-public ocaml-topkg configuration and to specify information about the package's distribution, creation and publication procedures.") (license license:isc))) - + (define-public ocaml-rresult (package (name "ocaml-rresult") @@ -3738,7 +3738,7 @@ (define-public ocaml-jsonm the JSON data format. It can process JSON text without blocking on IO and without a complete in-memory representation of the data.") (license license:isc))) - + (define-public ocaml-ocp-indent (package (name "ocaml-ocp-indent") @@ -3773,7 +3773,7 @@ (define-public ocaml-ocp-indent fault-tolerant and approximate parsing. @end itemize") (license license:lgpl2.1))) - + (define-public ocaml-ocp-index (package (name "ocaml-ocp-index") @@ -6108,7 +6108,7 @@ (define-public ocaml-yojson yojson package. The program @code{atdgen} can be used to derive OCaml-JSON serializers and deserializers from type definitions.") (license license:bsd-3))) - + (define-public ocaml-merlin-lib (package (name "ocaml-merlin-lib") @@ -6264,27 +6264,6 @@ (define-public ocaml-gsl the OCaml language.") (license license:gpl3+))) -(define-public ocaml4.07-gsl-1 - (package-with-ocaml4.07 - (package - (inherit ocaml-gsl) - (version "1.19.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mmottl/gsl-ocaml" - "/releases/download/v" - version "/gsl-ocaml-" version ".tar.gz")) - (sha256 - (base32 - "0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh")))) - (build-system ocaml-build-system) - (inputs - `(("gsl" ,gsl-static))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild))) - (arguments '()) - (propagated-inputs '())))) - (define-public cubicle (package (name "cubicle") -- cgit v1.2.3 From 3e16291043b49f544a009da93bcb3bd04503df17 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:04:45 +0100 Subject: gnu: Remove ocaml4.07-bitstring. * gnu/packages/ocaml.scm (ocaml4.07-bitstring): Remove variable. (ocaml-bitstring)[properties]: Remove variant. Change-Id: I7b5964ef9d0e2319a47409ce0e378012a2094671 --- gnu/packages/ocaml.scm | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d632289871..f47ccd8494 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2104,7 +2104,6 @@ (define-public ocaml-bitstring (lambda _ (invoke "dune" "upgrade") #t))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-bitstring)))) (home-page "https://github.com/xguerin/bitstring") (synopsis "Bitstrings and bitstring matching for OCaml") (description "Adds Erlang-style bitstrings and matching over bitstrings as @@ -2114,23 +2113,6 @@ (define-public ocaml-bitstring powerful.") (license license:isc))) -(define-public ocaml4.07-bitstring - (package-with-ocaml4.07 - (package - (inherit ocaml-bitstring) - (version "3.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://bitbucket.org/thanatonauts/bitstring/" - "get/v" version ".tar.gz")) - (file-name (string-append "ocaml-bitsring-" version ".tar.gz")) - (sha256 - (base32 - "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps")))) - (propagated-inputs - `(("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned))) - (properties '())))) - (define-public ocaml-ppx-bitstring (package (inherit ocaml-bitstring) -- cgit v1.2.3 From 76997a0ddb2d7dde8d390470f8d28f2ea3b7d6d1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:07:12 +0100 Subject: gnu: Remove ocaml4.07-base64. * gnu/packages/ocaml.scm (ocaml4.07-base64): Remove variable. (ocaml-base64)[properties]: Remove variant. Change-Id: Ibf92682e0d322e9d294c99f5532da2fe68a92f4a --- gnu/packages/ocaml.scm | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f47ccd8494..dd52189811 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4284,7 +4284,6 @@ (define-public ocaml-base64 (build-system dune-build-system) (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64)))) (home-page "https://github.com/mirage/ocaml-base64") (synopsis "Base64 encoding for OCaml") (description "Base64 is a group of similar binary-to-text encoding schemes @@ -4292,25 +4291,6 @@ (define-public ocaml-base64 radix-64 representation. It is specified in RFC 4648.") (license license:isc))) -(define-public ocaml4.07-base64 - (package-with-ocaml4.07 - (package - (inherit ocaml-base64) - (version "3.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/ocaml-base64") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml-base64" version)) - (sha256 - (base32 - "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy")))) - (arguments - ;; Tests are likely incompatible with our recent alcotest - `(#:tests? #f)) - (properties '())))) - (define-public ocamlify (package (name "ocamlify") -- cgit v1.2.3 From 1915c363744fbfc90c6eddcf70de89addaf62644 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:09:01 +0100 Subject: gnu: Remove ocaml4.07-utop. * gnu/packages/ocaml.scm (ocaml4.07-utop): Remove variable. (ocaml-utop)[properties]: Remove variant. Change-Id: I5307736534705f79e681462d07cce61cfd08699c --- gnu/packages/ocaml.scm | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index dd52189811..f320e7f760 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5523,7 +5523,6 @@ (define-public ocaml-utop ocaml-lwt-react ocaml-react ocaml-zed)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-utop)))) (home-page "https://github.com/ocaml-community/utop") (synopsis "Improved interface to the OCaml toplevel") (description "UTop is an improved toplevel for OCaml. It can run in a @@ -5531,28 +5530,6 @@ (define-public ocaml-utop sensitive completion, colors, and more.") (license license:bsd-3))) -(define-public ocaml4.07-utop - (package-with-ocaml4.07 - (package - (inherit ocaml-utop) - (version "2.4.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-community/utop") - (commit version))) - (file-name (git-file-name "ocaml4.07-utop" version)) - (sha256 - (base32 "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp")))) - (propagated-inputs - `(("ocaml-lambda-term" ,ocaml-lambda-term) - ("ocaml-lwt" ,ocaml-lwt) - ("ocaml-react" ,ocaml-react) - ("ocaml-camomile" ,ocaml-camomile) - ("ocaml-zed" ,ocaml-zed))) - (properties '())))) - (define-public ocaml-ansiterminal (package (name "ocaml-ansiterminal") -- cgit v1.2.3 From dd96805c888bc924a7bc42d39bc098c9791ab633 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:10:37 +0100 Subject: gnu: Remove ocaml4.07-cstruct. * gnu/packages/ocaml.scm (ocaml4.07-cstruct): Remove variable. (ocaml-cstruct)[properties]: Remove variant. Change-Id: I623e2947aa9a597d9ee1342f27c7ec98d171b05e --- gnu/packages/ocaml.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f320e7f760..e218d27ec7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4852,7 +4852,6 @@ (define-public ocaml-cstruct (list ocaml-bigarray-compat)) (native-inputs (list ocaml-alcotest)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-cstruct)))) (home-page "https://github.com/mirage/ocaml-cstruct") (synopsis "Access C structures via a camlp4 extension") (description "Cstruct is a library and syntax extension to make it easier @@ -4860,22 +4859,6 @@ (define-public ocaml-cstruct writing to these structures, and they are accessed via the Bigarray module.") (license license:isc))) -(define-public ocaml4.07-cstruct - (package-with-ocaml4.07 - (package - (inherit ocaml-cstruct) - (version "5.1.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/ocaml-cstruct") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml-cstruct" version)) - (sha256 - (base32 - "0jj3whs8r3jc524i9bb67rffh7y7r157hjgvws0bkxijxpjzwkbk")))) - (properties '())))) - ;; TODO again, the "parent" package already has an explicit package argument, ;; so a variant package doesn't make sense, at least these aliases help the ;; importer out so it doesn't re-import things. At least hopefully. -- cgit v1.2.3 From 2e8700052e26566b9c17563cf0a3d0979da6fbd1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:11:42 +0100 Subject: gnu: Remove ocaml4.07-batteries. * gnu/packages/ocaml.scm (ocaml4.07-batteries): Remove variable. (ocaml-batteries)[properties]: Remove variant. Change-Id: I7573033dd1a517cf4f9e456c4f8507e82065550c --- gnu/packages/ocaml.scm | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e218d27ec7..353185129f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4453,7 +4453,6 @@ (define-public ocaml-batteries (("Sys.readdir dirname") "let a = Sys.readdir dirname in Array.sort String.compare a; a")) #t))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-batteries)))) (home-page "http://batteries.forge.ocamlcore.org/") (synopsis "Development platform for the OCaml programming language") (description "Define a standard set of libraries which may be expected on @@ -4461,54 +4460,6 @@ (define-public ocaml-batteries hierarchy of modules.") (license license:lgpl2.1+))) -(define-public ocaml4.07-batteries - (package-with-ocaml4.07 - (package - (inherit ocaml-batteries) - (version "2.10.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-batteries-team/batteries-included") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml-batteries" version)) - (sha256 - (base32 - "02fxa1nkp7rpiwfp04n0sagdp9lad4dh9bvljp95xfshm1cx7y4q")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'check) ; tests are run by the build phase - (add-before 'build 'fix-nondeterminism - (lambda _ - (substitute* "setup.ml" - (("Sys.readdir dirname") - "let a = Sys.readdir dirname in Array.sort String.compare a; a")) - #t)) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((files - (map (lambda (str) - (substring str 0 (- (string-length str) 1))) - (append - (find-files "src" ".*.mliv") - (find-files "src" ".*.mlv") - (find-files "src" ".*.mlp"))))) - (apply invoke "ocamlbuild" "-no-links" "-use-ocamlfind" "-I" "num" - "-lflag" "-dllpath-all" files) - (for-each (lambda (file) - (copy-file (string-append "_build/" file) file)) - files)) - (invoke "ocamlbuild" "-no-links" "-use-ocamlfind" "-I" "num" - "-lflag" "-dllpath-all" "build/mkconf.byte") - (copy-file "_build/build/mkconf.byte" "build/mkconf.byte") - (invoke "make" "all") - #t))))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("qtest" ,ocaml-qtest))) - (properties '())))) - (define-public ocaml-pcre (package (name "ocaml-pcre") -- cgit v1.2.3 From b4a71d1d4f27cef6694e5f8c695ca9256f0bb0e1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:12:50 +0100 Subject: gnu: Remove ocaml4.07-uri. * gnu/packages/ocaml.scm (ocaml4.07-uri): Remove variable. (ocaml-uri)[properties]: Remove variant. Change-Id: I078537f7c1c10bcf319f3482ec50c252d25cb463 --- gnu/packages/ocaml.scm | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 353185129f..8a4f15edb2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4901,45 +4901,7 @@ (define-public ocaml-uri (list ocaml-stringext ocaml-angstrom)) (native-inputs (list ocaml-ounit ocaml-ppx-sexp-conv)) - (properties `((upstream-name . "uri") - (ocaml4.07-variant ,(delay ocaml4.07-uri)))) - (synopsis "RFC3986 URI/URL parsing library") - (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.") - (license license:isc))) - -(define-public ocaml4.07-uri - (package - (name "ocaml4.07-uri") - (version "2.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/ocaml-uri") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ppbav41mszpjcl0zi3fyg958cxyfs57i7kvha4ds9ydn89bjmrh")))) - (build-system dune-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'update-deprecated - (lambda _ - (substitute* "lib/uri.ml" - (("Re.get") "Re.Group.get"))))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (native-inputs - `(("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)))) - (propagated-inputs - `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) - ("ocaml-stringext" ,(package-with-ocaml4.07 ocaml-stringext)))) (properties `((upstream-name . "uri"))) - (home-page "https://github.com/mirage/ocaml-uri") (synopsis "RFC3986 URI/URL parsing library") (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.") (license license:isc))) -- cgit v1.2.3 From e63133a6cc202b9d4bd2c597317ff2ad16eb7065 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:13:53 +0100 Subject: gnu: Remove ocaml4.07-lambda-term. * gnu/packages/ocaml.scm (ocaml4.07-lambda-term): Remove variable. (ocaml-lambda-term)[properties]: Remove variant. Change-Id: I4c7a0a0833103acc39e48e74770f57a4b5df8f69 --- gnu/packages/ocaml.scm | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8a4f15edb2..3c44819f5b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5365,7 +5365,6 @@ (define-public ocaml-lambda-term ocaml-odoc ocaml-react ocaml-zed)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-lambda-term)))) (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the terminal. It provides an abstraction for keys, mouse events, colors, as well as @@ -5375,27 +5374,6 @@ (define-public ocaml-lambda-term instead of bindings to a C library.") (license license:bsd-3))) -(define-public ocaml4.07-lambda-term - (package-with-ocaml4.07 - (package - (inherit ocaml-lambda-term) - (version "2.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-community/lambda-term") - (commit version))) - (file-name (git-file-name "ocaml4.07-lambda-term" version)) - (sha256 - (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy")))) - (propagated-inputs - `(("ocaml-lwt" ,ocaml-lwt) - ("ocaml-lwt-log" ,ocaml-lwt-log) - ("ocaml-lwt-react" ,ocaml-lwt-react) - ("ocaml-zed" ,ocaml-zed))) - (properties '())))) - (define-public ocaml-utop (package (name "ocaml-utop") -- cgit v1.2.3 From fa126caee1214e7b873e8c7287a6bca8c9259c18 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:14:43 +0100 Subject: gnu: Remove ocaml4.07-splittable-random. * gnu/packages/ocaml.scm (ocaml4.07-splittable-random): Remove variable. (ocaml-splittable-random)[properties]: Remove variant. Change-Id: I30cd8ccdc296655a60e821544151e2a38d46d3ca --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3c44819f5b..7fe842550b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8121,8 +8121,7 @@ (define-public ocaml-splittable-random ocaml-ppx-bench ocaml-ppx-inline-test ocaml-ppx-sexp-message)) - (properties `((upstream-name . "splittable_random") - (ocaml-4.07-variant . ,(delay ocaml4.07-splittable-random)))) + (properties `((upstream-name . "splittable_random"))) (home-page "https://github.com/janestreet/splittable_random") (synopsis "PRNG that can be split into independent streams") (description "This package provides a splittable @@ -8134,24 +8133,6 @@ (define-public ocaml-splittable-random cryptographic-quality randomness in favor of performance.") (license license:expat))) -(define-public ocaml4.07-splittable-random - (package-with-ocaml4.07 - (package - (inherit ocaml-splittable-random) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/splittable_random-v" version ".tar.gz")) - (sha256 - (base32 - "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) - (propagated-inputs - (list ocaml-base ocaml-ppx-jane ocaml-migrate-parsetree)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-base-quickcheck (package (name "ocaml-base-quickcheck") -- cgit v1.2.3 From 5823552c19dc2fbf054b05515d092081bc40f698 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:15:26 +0100 Subject: gnu: Remove ocaml4.07-sedlex. * gnu/packages/ocaml.scm (ocaml4.07-sedlex): Remove variable. (ocaml-sedlex)[properties]: Remove variant. Change-Id: I6ce2cfac54b7bf8879fde315ea60e3932bac8a9c --- gnu/packages/ocaml.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7fe842550b..2c7711f1b7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3549,32 +3549,11 @@ (define-public ocaml-sedlex (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk")))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sedlex)))) (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) -(define-public ocaml4.07-sedlex - (package-with-ocaml4.07 - (package - (inherit ocaml-sedlex) - (name "ocaml-sedlex") - (version "2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-community/sedlex") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) - (propagated-inputs - `(("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned) - ,@(package-propagated-inputs ocaml-sedlex))) - (properties '())))) - (define-public ocaml-uchar (package (name "ocaml-uchar") -- cgit v1.2.3 From 476a16e173415662b7638883c23ae41cf5760dad Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:16:14 +0100 Subject: gnu: Remove ocaml4.07-sqlite3. * gnu/packages/ocaml.scm (ocaml4.07-sqlite3): Remove variable. (ocaml-sqlite3)[properties]: Remove variant. Change-Id: I336d685ac271e50d0bb4ed0e41d0bcee38ee4686 --- gnu/packages/ocaml.scm | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2c7711f1b7..30a5b102d6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2247,7 +2247,6 @@ (define-public ocaml-sqlite3 (base32 "1ksm0a490315sf0yy8lmva5f3bgr0jnllffanyq89431grpj6x15")))) (build-system dune-build-system) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sqlite3)))) (propagated-inputs (list dune-configurator ocaml-odoc)) (native-inputs @@ -2263,32 +2262,6 @@ (define-public ocaml-sqlite3 @code{ocaml-sqlite}.") (license license:expat))) -(define-public ocaml4.07-sqlite3 - (package-with-ocaml4.07 - (package - (inherit ocaml-sqlite3) - (version "5.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mmottl/sqlite3-ocaml") - (commit version))) - (file-name (git-file-name "ocaml-sqlite3" version)) - (sha256 - (base32 - "15mmq7ak5facpfawfrc6hjz211gli7jab52iqdsihfvh790xm55f")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'chmod - (lambda _ - (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) - #t))))) - (propagated-inputs - `(("ocaml-odoc" ,ocaml-odoc))) - (properties '())))) - (define-public ocaml-csv (package (name "ocaml-csv") -- cgit v1.2.3 From 1ff5aef15c855588deac2b3e834ee1479cc26083 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:17:16 +0100 Subject: gnu: Remove ocaml4.07-zed. * gnu/packages/ocaml.scm (ocaml4.07-zed): Remove variable. (ocaml-zed)[properties]: Remove variant. Change-Id: I13b2f5b0a3f38ca9a2f57e207487889adaad2d03 --- gnu/packages/ocaml.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 30a5b102d6..5058201eb0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5262,7 +5262,6 @@ (define-public ocaml-zed ocaml-uucp ocaml-uuseg ocaml-odoc)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed)))) (synopsis "Abstract engine for text edition in OCaml") (description "This module provides an abstract engine for text edition. It can be @@ -5274,26 +5273,6 @@ (define-public ocaml-zed capabilities, Zed provides macro recording and cursor management facilities.") (license license:bsd-3))) -(define-public ocaml4.07-zed - (package-with-ocaml4.07 - (package - (inherit ocaml-zed) - (version "2.0.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-community/zed") - (commit version))) - (file-name (git-file-name "ocaml4.07-zed" version)) - (sha256 - (base32 - "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55")))) - (propagated-inputs - `(("ocaml-charInfo-width" ,ocaml-charinfo-width) - ("ocaml-camomile" ,ocaml-camomile) - ("ocaml-react" ,ocaml-react))) - (properties '())))) - (define-public ocaml-lambda-term (package (name "ocaml-lambda-term") -- cgit v1.2.3 From dc0a6dc61b269861fc21efa78af56207f662ee13 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:18:08 +0100 Subject: gnu: Remove ocaml4.07-core. * gnu/packages/ocaml.scm (ocaml4.07-core): Remove variable. Change-Id: Ie1e593746061506133e2e344e8c5021ad77f6820 --- gnu/packages/ocaml.scm | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5058201eb0..9a437f2dc0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8271,35 +8271,6 @@ (define-public ocaml-core ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). (license license:expat))) -(define-public ocaml4.07-core - (package-with-ocaml4.07 - (package - (inherit ocaml-core) - (version "0.11.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-core" version)) - (sha256 - (base32 - "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) - (propagated-inputs - (list ocaml-base - ocaml4.07-configurator - ocaml-core-kernel - ocaml-ppx-assert - ocaml-ppx-jane - ocaml-sexplib - ocaml-spawn - ocaml-stdio - ocaml-migrate-parsetree - ocaml-ppxlib)) - ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted - ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). - (license license:asl2.0)))) - (define-public ocaml-int-repr (package (name "ocaml-int-repr") -- cgit v1.2.3 From 560a6c4962276aaba181e966b0b07e014b7f55ac Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:18:52 +0100 Subject: gnu: Remove ocaml4.07-core-kernel. * gnu/packages/ocaml.scm (ocaml4.07-core-kernel): Remove variable. (ocaml-core-kernel)[properties]: Remove variant. Change-Id: Ia3c7b3fd2f5b3712c46e091f707961bc18123296 --- gnu/packages/ocaml.scm | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9a437f2dc0..c8f53c193c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8313,8 +8313,7 @@ (define-public ocaml-core-kernel `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-core ocaml-int-repr ocaml-ppx-jane)) - (properties `((upstream-name . "core_kernel") - (ocaml4.07-variant . ,(delay ocaml4.07-core-kernel)))) + (properties `((upstream-name . "core_kernel"))) (home-page "https://github.com/janestreet/core_kernel") (synopsis "Portable standard library for OCaml") (description "Core is an alternative to the OCaml standard library. @@ -8323,46 +8322,6 @@ (define-public ocaml-core-kernel the full Core is not available, such as in Javascript.") (license license:expat))) -(define-public ocaml4.07-core-kernel - (package-with-ocaml4.07 - (package - (inherit ocaml-core-kernel) - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core_kernel") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-core-kernel" version)) - (sha256 - (base32 - "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g")))) - (propagated-inputs - (list ocaml-base - ocaml-bin-prot - ocaml4.07-configurator - ocaml-fieldslib - ocaml-jane-street-headers - ocaml-ppx-assert - ocaml-ppx-base - ocaml-ppx-hash - ocaml-ppx-inline-test - ocaml-ppx-jane - ocaml-ppx-sexp-conv - ocaml-ppx-sexp-message - ocaml-sexplib - ocaml-splittable-random - ocaml-stdio - ocaml-typerep - ocaml-variantslib - ocaml-migrate-parsetree)) - (properties '()) - (license (list - ;; this package and parts of OCaml, relicensed by janestreet - license:asl2.0 - ;; MLton and sjs - license:expat))))) - (define-public ocaml-core-unix (package (name "ocaml-core-unix") -- cgit v1.2.3 From bbd0a46127cd673f7d1d1507e33b8486a9afde3a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:19:47 +0100 Subject: gnu: Remove ocaml4.07-frontc. * gnu/packages/ocaml.scm (ocaml4.07-frontc): Remove variable. (ocaml-frontc)[properties]: Remove variant. Change-Id: I52bf626af56d05e6230365825b944240cc523cdc --- gnu/packages/ocaml.scm | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c8f53c193c..8f8758ed59 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1638,8 +1638,7 @@ (define-public ocaml-frontc (for-each make-file-writable (find-files "." "."))))))) (native-inputs (list ocaml-menhir ocaml-odoc)) - (properties `((upstream-name . "FrontC") - (ocaml4.07-variant . ,(delay ocaml4.07-frontc)))) + (properties `((upstream-name . "FrontC"))) (home-page "https://www.irit.fr/FrontC") (synopsis "C parser and lexer library") (description "FrontC is an OCAML library providing a C parser and lexer. @@ -1648,45 +1647,6 @@ (define-public ocaml-frontc GNU CC attributes. It provides also a C pretty printer as an example of use.") (license license:lgpl2.1))) -(define-public ocaml4.07-frontc - (package-with-ocaml4.07 - (package - (inherit ocaml-frontc) - (version "3.4.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/ocaml-base64") - (commit (string-append - "V_" (string-join (string-split version #\.) "_"))))) - (file-name (git-file-name "ocaml-frontc" version)) - (sha256 - (base32 - "0k7jk9hkglnkk27s62xl493jyqc017gyvwqb1lyc0ywbb001s102")))) - (build-system ocaml-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'install 'install-meta - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-output-to-file - (string-append out "/lib/ocaml/frontc/META") - (lambda _ - (display - (string-append - "description = \"Parser for the C language\" -version = \"" ,version "\" -requires = \"unix\" -archive(byte) = \"frontc.cma\" -archive(native) = \"frontc.cmxa\"")))) - (symlink (string-append out "/lib/ocaml/frontc") - (string-append out "/lib/ocaml/FrontC")))))) - #:make-flags ,#~(list (string-append "PREFIX=" #$output) - "OCAML_SITE=$(LIB_DIR)/ocaml/"))) - (properties '())))) - (define-public ocaml-qcheck (package (name "ocaml-qcheck") -- cgit v1.2.3 From 17101812a8c231d2d8d69bb2137c67cd929c6eca Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:20:28 +0100 Subject: gnu: Remove ocaml4.07-qcheck. * gnu/packages/ocaml.scm (ocaml4.07-qcheck): Remove variable. (ocaml-qcheck)[properties]: Remove variant. Change-Id: I5d658a105d626315742428a68638222da212bea6 --- gnu/packages/ocaml.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8f8758ed59..5169877b46 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1665,7 +1665,6 @@ (define-public ocaml-qcheck (list ocaml-alcotest ocaml-ounit ocaml-ppxlib)) (native-inputs (list ocamlbuild)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-qcheck)))) (home-page "https://github.com/c-cube/qcheck") (synopsis "QuickCheck inspired property-based testing for OCaml") (description "QuickCheck inspired property-based testing for OCaml. This @@ -1674,22 +1673,6 @@ (define-public ocaml-qcheck instances and printing them.") (license license:lgpl3+))) -(define-public ocaml4.07-qcheck - (package-with-ocaml4.07 - (package - (inherit ocaml-qcheck) - (version "0.12") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/c-cube/qcheck") - (commit version))) - (file-name (git-file-name "ocaml-qcheck" version)) - (sha256 - (base32 - "1llnfynhlndwyjig7wrayjnds2b3mggp5lw20dwxhn2i2lkkb22m")))) - (properties '())))) - (define-public ocaml-qtest (package (name "ocaml-qtest") -- cgit v1.2.3 From b9dcefa5703144af00eab9723dd2f4865d97d572 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:21:40 +0100 Subject: gnu: Remove ocaml4.07-jane-street-headers. * gnu/packages/ocaml.scm (ocaml4.07-jane-street-headers): Remove variable. (ocaml-jane-street-headers)[properties]: Remove variant. Change-Id: I4df9b3a74ea8100605bf730848888db4f63c1dc0 --- gnu/packages/ocaml.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5169877b46..fdb3dabb9c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5566,7 +5566,6 @@ (define-public ocaml-jane-street-headers "1r27r0bxxa0iaah5rm84lwhrmh784vfpmb6056hpv0p34rxs7r1l")) (build-system dune-build-system) (arguments '(#:tests? #f)) ; no tests - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-jane-street-headers)))) (home-page "https://github.com/janestreet/jane-street-headers") (synopsis "Jane Street C header files") (description "C header files shared between the various Jane Street @@ -8040,29 +8039,6 @@ (define-public ocaml-base-quickcheck types provided by Base.") (license license:expat))) -(define-public ocaml4.07-jane-street-headers - (package - (name "ocaml4.07-jane-street-headers") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/jane-street-headers-v" version ".tar.gz")) - (sha256 - (base32 - "0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh")))) - (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (home-page "https://github.com/janestreet/jane-street-headers") - (synopsis "Jane Street C header files") - (description "This package provides C header files shared between the -various Jane Street packages.") - (license license:asl2.0))) - (define-public ocaml4.07-configurator (package (name "ocaml4.07-configurator") -- cgit v1.2.3 From 71b29cfac94cd33c4f3a989ef2f49d9c00fbce0d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:22:38 +0100 Subject: gnu: Remove ocaml4.07-odoc. * gnu/packages/ocaml.scm (ocaml4.07-odoc): Remove variable. (ocaml-odoc)[properties]: Remove variant. Change-Id: I903ba64cfb460064531a502ca0c97e81ed4bbb82 --- gnu/packages/ocaml.scm | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fdb3dabb9c..f99135d2e3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8674,7 +8674,6 @@ (define-public ocaml-odoc ocaml-version ocaml-yojson jq)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-odoc)))) (home-page "https://github.com/ocaml/odoc") (synopsis "OCaml documentation generator") (description "Odoc is a documentation generator for OCaml. It reads @@ -8713,41 +8712,6 @@ (define-public ocaml-odoc-parser language understood by ocamldoc.") (license license:isc))) -;; version 1.5.2 requires ocaml-markdown 1.0.0 which does not compile -;; with old version of dune used in package-with-ocaml4.07 -(define-public ocaml4.07-odoc - (package-with-ocaml4.07 - (package - (inherit ocaml-odoc) - (name "ocaml-odoc") - (version "1.5.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml/odoc") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2")))) - (arguments '()) - (inputs - `(("ocaml-alcotest" ,ocaml-alcotest) - ("ocaml-markup" ,ocaml-markup) - ("ocaml-sexplib" ,ocaml-sexplib) - ("ocaml-re" ,ocaml-re) - ("ocaml-uutf" ,ocaml-uutf))) - (native-inputs - `(("ocaml-astring" ,ocaml-astring) - ("ocaml-cmdliner" ,ocaml-cmdliner) - ("ocaml-cppo" ,ocaml-cppo) - ("ocaml-fpath" ,ocaml-fpath) - ("ocaml-result" ,ocaml-result) - ("ocaml-tyxml" ,ocaml-tyxml) - ("ocaml-bisect-ppx" ,ocaml-bisect-ppx) - ("tidy-html" ,tidy-html))) - (properties '())))) - (define-public ocaml-fftw3 (package (name "ocaml-fftw3") -- cgit v1.2.3 From da9771c0f295b2e343465216e5fe18f244e40d56 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:23:23 +0100 Subject: gnu: Remove ocaml4.07-spawn. * gnu/packages/ocaml.scm (ocaml4.07-spawn): Remove variable. (ocaml-spawn)[properties]: Remove variant. Change-Id: Ib655eca9b305de23aa0cee0e29e51d9acea01094 --- gnu/packages/ocaml.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f99135d2e3..092272c08d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8092,8 +8092,6 @@ (define-public ocaml-spawn (build-system dune-build-system) (propagated-inputs (list ocaml-odoc)) (native-inputs (list ocaml-ppx-expect)) - (properties - `((ocaml4.07-variant . ,(delay ocaml4.07-spawn)))) (home-page "https://github.com/janestreet/spawn") (synopsis "Spawning sub-processes") (description @@ -8115,35 +8113,6 @@ (define-public ocaml-spawn @end itemize") (license license:asl2.0))) -(define-public ocaml4.07-spawn - (package-with-ocaml4.07 - (package - (inherit ocaml-spawn) - (version "0.13.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/spawn") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-spawn" version)) - (sha256 - (base32 - "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-tests - (lambda _ - (substitute* "test/tests.ml" - (("/bin/pwd") (which "pwd")) - (("/bin/echo") (which "echo"))) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs '()) - (properties '())))) - (define-public ocaml-core (package (name "ocaml-core") -- cgit v1.2.3 From 954108bd30483f87de15da398681114e4e76d3c6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:24:04 +0100 Subject: gnu: Remove ocaml4.07-ppx-jane. * gnu/packages/ocaml.scm (ocaml4.07-ppx-jane): Remove variable. (ocaml-ppx-jane)[properties]: Remove variant. Change-Id: Ia40acb52457f5c70221d424ec7015877b70ce614 --- gnu/packages/ocaml.scm | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 092272c08d..0d2fecb3ec 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7907,51 +7907,13 @@ (define-public ocaml-ppx-jane ocaml-ppx-typerep-conv ocaml-ppx-variants-conv ocaml-ppxlib)) - (properties `((upstream-name . "ppx_jane") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-jane)))) + (properties `((upstream-name . "ppx_jane"))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters") (description "This package installs a ppx-jane executable, which is a ppx driver including all standard Jane Street ppx rewriters.") (license license:expat))) -(define-public ocaml4.07-ppx-jane - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-jane) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_jane-v" version ".tar.gz")) - (sha256 - (base32 - "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) - (propagated-inputs - (list ocaml-ppx-assert - ocaml-ppx-base - ocaml-ppx-bench - ocaml-ppx-bin-prot - ocaml-ppx-custom-printf - ocaml-ppx-expect - ocaml-ppx-fail - ocaml-ppx-fields-conv - ocaml-ppx-here - ocaml-ppx-inline-test - ocaml-ppx-let - ocaml-ppx-optcomp - ocaml-ppx-optional - ocaml-ppx-pipebang - ocaml-ppx-sexp-message - ocaml-ppx-sexp-value - ocaml-ppx-typerep-conv - ocaml-ppx-variants-conv - ocaml-migrate-parsetree - ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-base-bigstring (package (name "ocaml-base-bigstring") -- cgit v1.2.3 From 44e4726a5eff2c0c70561e196f3e74f1a5a91789 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:55:30 +0100 Subject: gnu: Remove ocaml4.07-tyxml. * gnu/packages/ocaml.scm (ocaml4.07-tyxml): Remove variable. (ocaml-tyxml)[properties]: Remove variant. Change-Id: I2b86d01832baf4c139e2a0391a4dd344982bb160 --- gnu/packages/ocaml.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0d2fecb3ec..c96a2a24cd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8472,7 +8472,6 @@ (define-public ocaml-tyxml (native-inputs (list ocaml-alcotest)) (arguments `(#:package "tyxml")) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-tyxml)))) (home-page "https://github.com/ocsigen/tyxml/") (synopsis "TyXML is a library for building correct HTML and SVG documents") (description "TyXML provides a set of convenient combinators that uses the @@ -8484,22 +8483,6 @@ (define-public ocaml-tyxml combinators.") (license license:lgpl2.1))) -(define-public ocaml4.07-tyxml - (package-with-ocaml4.07 - (package - (inherit ocaml-tyxml) - (version "4.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocsigen/tyxml") - (commit version))) - (file-name (git-file-name "ocaml-tyxml" version)) - (sha256 - (base32 - "1hw4phyadcfgywgh5sj87i76gp56qwxzwlcpfdwjbf6ggag9clmd")))) - (properties '())))) - (define-public ocaml-bisect-ppx (package (name "ocaml-bisect-ppx") -- cgit v1.2.3 From 553c25da8240e035d9853f167c79177385a9a4ca Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:56:16 +0100 Subject: gnu: Remove ocaml4.07-ppx-typerep-conv. * gnu/packages/ocaml.scm (ocaml4.07-ppx-typerep-conv): Remove variable. (ocaml-ppx-typerep-conv)[properties]: Remove variant. Change-Id: Iacd645286f2b1819d94c44fb6545382d755906bd --- gnu/packages/ocaml.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c96a2a24cd..b6590509af 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7622,33 +7622,13 @@ (define-public ocaml-ppx-typerep-conv (base32 "1q1lzykpm83ra4l5jh4rfddhd3c96kx4s4rvx0w4b51z1qk56zam")))) (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib)) - (properties `((upstream-name . "ppx_typerep_conv") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv)))) + (properties `((upstream-name . "ppx_typerep_conv"))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations") (description "This package can automatically generate runtime types from type definitions.") (license license:expat))) -(define-public ocaml4.07-ppx-typerep-conv - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-typerep-conv) - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_typerep_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-ppx-typerep-conv" version)) - (sha256 - (base32 - "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) - (properties '()) - (propagated-inputs - (list ocaml-base ocaml-typerep ocaml-migrate-parsetree ocaml-ppxlib)) - (license license:asl2.0)))) - (define-public ocaml-ppx-string (package (name "ocaml-ppx-string") -- cgit v1.2.3 From 76968f549d4828cc8e6425b0e0ff8568c9803fe3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:57:04 +0100 Subject: gnu: Remove ocaml4.07-ppx-pipebang. * gnu/packages/ocaml.scm (ocaml4.07-ppx-pipebang): Remove variable. (ocaml-ppx-pipebang)[properties]: Remove variant. Change-Id: I3c74444122e43571c9922bf703701e20b7baf58f --- gnu/packages/ocaml.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b6590509af..f8bdff934e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7211,31 +7211,13 @@ (define-public ocaml-ppx-pipebang (build-system dune-build-system) (arguments `(#:tests? #f)); no tests (propagated-inputs (list ocaml-ppxlib)) - (properties `((upstream-name . "ppx_pipebang") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-pipebang)))) + (properties `((upstream-name . "ppx_pipebang"))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`") (description "A ppx rewriter that inlines reverse application operators @code{|>} and @code{|!}.") (license license:expat))) -(define-public ocaml4.07-ppx-pipebang - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-pipebang) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_pipebang-v" version ".tar.gz")) - (sha256 - (base32 - "1wrrzlb4kdvkkcmzi01fw25jar38r2jlnyn0i6pn4z0lq4gpm9m0")))) - (propagated-inputs (list ocaml-migrate-parsetree ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-module-timer (package (name "ocaml-ppx-module-timer") -- cgit v1.2.3 From 6446f0dfc3c4c37c72781f079ae415378f668d52 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:57:46 +0100 Subject: gnu: Remove ocaml4.07-ppx-fail. * gnu/packages/ocaml.scm (ocaml4.07-ppx-fail): Remove variable. (ocaml-ppx-fail)[properties]: Remove variant. Change-Id: Iec707f415906d109a2eb2076477c2bfecc27bcc8 --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f8bdff934e..136ab4151a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7381,32 +7381,13 @@ (define-public ocaml-ppx-fail (base32 "012p9gv7w4sk3b4x0sdmqrmr2856w8xc424waxb6vrybid7qjs95")))) (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-ppx-here ocaml-ppxlib)) - (properties `((upstream-name . "ppx_fail") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fail)))) + (properties `((upstream-name . "ppx_fail"))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths") (description "Syntax extension that makes [failwiths] always include a position.") (license license:expat))) -(define-public ocaml4.07-ppx-fail - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-fail) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_fail-v" version ".tar.gz")) - (sha256 - (base32 - "07plqsvljiwvngggfypwq55g46s5my55y45mvlmalrxyppzr03s8")))) - (propagated-inputs - (list ocaml-base ocaml-ppx-here ocaml-migrate-parsetree ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-cold (package (name "ocaml-ppx-cold") -- cgit v1.2.3 From 0dc699477e79bb7a9cc1147439dbc04f3d006520 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:58:28 +0100 Subject: gnu: Remove ocaml4.07-bisect-ppx. * gnu/packages/ocaml.scm (ocaml4.07-bisect-ppx): Remove variable. (ocaml-bisect-ppx)[properties]: Remove variant. Change-Id: I91dcdd486980885530ea2e269328ecf781aee020 --- gnu/packages/ocaml.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 136ab4151a..1dda348ade 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8446,8 +8446,7 @@ (define-public ocaml-bisect-ppx (arguments ;; Tests require ocamlformat which would lead to circular dependencies '(#:tests? #f)) - (properties `((upstream-name . "bisect_ppx") - (ocaml4.07-variant . ,(delay ocaml4.07-bisect-ppx)))) + (properties `((upstream-name . "bisect_ppx"))) (home-page "https://github.com/aantron/bisect_ppx") (synopsis "Code coverage for OCaml") (description "Bisect_ppx helps you test thoroughly. It is a small @@ -8459,32 +8458,6 @@ (define-public ocaml-bisect-ppx then run the Bisect_ppx report tool on the generated visitation files.") (license license:mpl2.0))) -(define-public ocaml4.07-bisect-ppx - (package-with-ocaml4.07 - (package - (inherit ocaml-bisect-ppx) - (version "2.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aantron/bisect_ppx") - (commit version))) - (file-name (git-file-name "ocaml-bisect-ppx" version)) - (sha256 - (base32 - "1njs8xc108rrpx5am5zhhcn6vjva7rsphm8034qp5lgyvnhfgh7q")))) - (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned) - ,@(package-propagated-inputs ocaml-bisect-ppx))) - (native-inputs - `(("ocaml-ounit2" ,ocaml-ounit2))) - (arguments - `(;; tests require git and network - #:tests? #f)) - (properties '((upstream-name . "bisect_ppx")))))) - (define-public ocaml-odoc (package (name "ocaml-odoc") -- cgit v1.2.3 From 9ba9487306843c7c959e62ab28e6197801828580 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:59:11 +0100 Subject: gnu: Remove ocaml4.07-ppx-sexp-message. * gnu/packages/ocaml.scm (ocaml4.07-ppx-sexp-message): Remove variable. (ocaml-ppx-sexp-message)[properties]: Remove variant. Change-Id: Iaee2fbecb086ddad1b15b878d8148f9101903834 --- gnu/packages/ocaml.scm | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1dda348ade..860ff4f752 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7163,8 +7163,7 @@ (define-public ocaml-ppx-sexp-message (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) - (properties `((upstream-name . "ppx_sexp_message") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-message)))) + (properties `((upstream-name . "ppx_sexp_message"))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "Ppx rewriter for easy construction of s-expressions") (description "Ppx_sexp_message aims to ease the creation of s-expressions @@ -7173,28 +7172,6 @@ (define-public ocaml-ppx-sexp-message context such as function arguments.") (license license:expat))) -(define-public ocaml4.07-ppx-sexp-message - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-sexp-message) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_message-v" version ".tar.gz")) - (sha256 - (base32 - "1yh440za0w9cvrbxbmqacir8715kdaw6sw24ys9xj80av9nqpiw7")))) - (propagated-inputs - (list ocaml-base - ocaml-ppx-here - ocaml-ppx-sexp-conv - ocaml-migrate-parsetree - ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-pipebang (package (name "ocaml-ppx-pipebang") -- cgit v1.2.3 From 3d74d84235038a8329a734918c3dd0093c4935ab Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:59:56 +0100 Subject: gnu: Remove ocaml4.07-ppx-base. * gnu/packages/ocaml.scm (ocaml4.07-ppx-base): Remove variable. (ocaml-ppx-base)[properties]: Remove variant. Change-Id: I1a079a895eb260bb6870a12f494b79869a5a350c --- gnu/packages/ocaml.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 860ff4f752..ae549473f7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7632,8 +7632,7 @@ (define-public ocaml-ppx-base ocaml-ppx-sexp-conv ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_base") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-base)))) + (properties `((upstream-name . "ppx_base"))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters") (description "Ppx_base is the set of ppx rewriters used for Base. @@ -7642,25 +7641,6 @@ (define-public ocaml-ppx-base verification tool.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-base - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-base) - (version "0.11.0") - (source - (janestreet-origin - "ppx_base" version - "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym")) - (propagated-inputs - `(("ocaml-ppx-compare" ,ocaml-ppx-compare) - ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate) - ("ocaml-ppx-hash" ,ocaml-ppx-hash) - ("ocaml-ppx-js-style" ,ocaml-ppx-js-style) - ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppxlib" ,ocaml-ppxlib))) - (properties `((upstream-name . "ppx_base")))))) - (define-public ocaml-ppx-bin-prot (package (name "ocaml-ppx-bin-prot") -- cgit v1.2.3 From 47532ebc1e9fd00fa101b8a7f76f318daf7d46b4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:00:41 +0100 Subject: gnu: Remove ocaml4.07-ppx-bin-prot. * gnu/packages/ocaml.scm (ocaml4.07-ppx-bin-prot): Remove variable. (ocaml-ppx-bin-prot)[properties]: Remove variant. Change-Id: I132d19d38cbb40c72afaa86a758ca0d4267fe645 --- gnu/packages/ocaml.scm | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ae549473f7..631b7e2bf0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7660,37 +7660,13 @@ (define-public ocaml-ppx-bin-prot `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-bin-prot ocaml-ppx-here ocaml-ppxlib)) - (properties `((upstream-name . "ppx_bin_prot") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bin-prot)))) + (properties `((upstream-name . "ppx_bin_prot"))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types") (description "Generation of binary serialization and deserialization functions from type definitions.") (license license:expat))) -(define-public ocaml4.07-ppx-bin-prot - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-bin-prot) - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_bin_prot") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-ppx-bin-prot" version)) - (sha256 - (base32 - "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz")))) - (propagated-inputs - (list ocaml-base - ocaml-bin-prot - ocaml-ppx-here - ocaml-migrate-parsetree - ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-ignore-instrumentation (package (name "ocaml-ppx-ignore-instrumentation") -- cgit v1.2.3 From d2ea723f8eda3e6e57ca75be4f57c31dec18a6fc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:01:21 +0100 Subject: gnu: Remove ocaml4.07-ppx-optional. * gnu/packages/ocaml.scm (ocaml4.07-ppx-optional): Remove variable. (ocaml-ppx-optional)[properties]: Remove variant. Change-Id: Ie6aad28146cea0f5b48be78c68e7341307234e4a --- gnu/packages/ocaml.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 631b7e2bf0..0c0a1d1765 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7257,8 +7257,7 @@ (define-public ocaml-ppx-optional (arguments `(#:tests? #f)) ; No tests (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_optional") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optional)))) + (properties `((upstream-name . "ppx_optional"))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options") (description @@ -7266,17 +7265,6 @@ (define-public ocaml-ppx-optional else expression.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optional - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-optional) - (version "0.11.0") - (source - (janestreet-origin - "ppx_optional" version - "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h")) - (properties `((upstream-name . "ppx_optional")))))) - (define-public ocaml-ppx-optcomp (package (name "ocaml-ppx-optcomp") -- cgit v1.2.3 From 5d1809a08a0bf048341aff3d6a6e4234bd607dca Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:02:03 +0100 Subject: gnu: Remove ocaml4.07-ppx-sexp-value. * gnu/packages/ocaml.scm (ocaml4.07-ppx-sexp-value): Remove variable. (ocaml-ppx-sexp-value)[properties]: Remove variant. Change-Id: Ib5b777b78c63d9cbc4812affba6f861c89ff3cce --- gnu/packages/ocaml.scm | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0c0a1d1765..d961bb7ec7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7117,36 +7117,13 @@ (define-public ocaml-ppx-sexp-value (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) - (properties `((upstream-name . "ppx_sexp_value") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-value)))) + (properties `((upstream-name . "ppx_sexp_value"))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values") (description "@samp{ppx-sexp-value} is a ppx rewriter that simplifies building s-expressions from ocaml values.") (license license:expat))) -(define-public ocaml4.07-ppx-sexp-value - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-sexp-value) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_value-v" version ".tar.gz")) - (sha256 - (base32 - "1xnalfrln6k5khsyxvxkg6v32q8fpr4cqamsjqfih29jdv486xrs")))) - (propagated-inputs - (list ocaml-base - ocaml-ppx-here - ocaml-ppx-sexp-conv - ocaml-migrate-parsetree - ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-sexp-message (package (name "ocaml-ppx-sexp-message") -- cgit v1.2.3 From bccd84ba0dd7b44242c0f7e7729717c2dac36f81 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:02:42 +0100 Subject: gnu: Remove ocaml4.07-ppx-optcomp. * gnu/packages/ocaml.scm (ocaml4.07-ppx-optcomp): Remove variable. (ocaml-ppx-optcomp)[properties]: Remove variant. Change-Id: I030cadf5a90d8386b892d2318244f997fc55283c --- gnu/packages/ocaml.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d961bb7ec7..ceb1c80506 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7260,25 +7260,13 @@ (define-public ocaml-ppx-optcomp (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-stdio ocaml-ppxlib)) - (properties `((upstream-name . "ppx_optcomp") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optcomp)))) + (properties `((upstream-name . "ppx_optcomp"))) (synopsis "Optional compilation for OCaml") (description "Ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optcomp - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-optcomp) - (version "0.11.0") - (source - (janestreet-origin - "ppx_optcomp" version - "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i")) - (properties `((upstream-name . "ppx_optcomp")))))) - (define-public ocaml-ppx-let (package (name "ocaml-ppx-let") -- cgit v1.2.3 From 5ecb3d4383b4b66248f5477e14baea217cfaea35 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:03:47 +0100 Subject: gnu: Remove ocaml4.07-ppx-tools-versioned. * gnu/packages/ocaml.scm (ocaml4.07-ppx-tools-versioned): Remove variable. Change-Id: I74f5f3f9cdc7d7be2f1d52c933e27b688a8d2558 --- gnu/packages/ocaml.scm | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ceb1c80506..ac2da9cead 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1970,32 +1970,6 @@ (define-public ocaml4.07-migrate-parsetree "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) (properties '((upstream-name . "ocaml-migrate-parsetree")))))) -(define-public ocaml4.07-ppx-tools-versioned - (package-with-ocaml4.07 - (package - (name "ocaml-ppx-tools-versioned") - (version "5.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-ppx/ppx_tools_versioned") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) - (build-system dune-build-system) - (arguments - `(#:package "ppx_tools_versioned")) - (propagated-inputs - (list ocaml-migrate-parsetree)) - (properties `((upstream-name . "ppx_tools_versioned"))) - (home-page "https://github.com/let-def/ppx_tools_versioned") - (synopsis "Variant of ppx_tools") - (description "This package is a variant of ppx_tools based on -ocaml-migrate-parsetree") - (license license:expat)))) - (define-public ocaml-linenoise (package (name "ocaml-linenoise") -- cgit v1.2.3 From b3a0e3ea37d61f1e7fc529adb6eef62ddc89338d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:04:29 +0100 Subject: gnu: Remove ocaml4.07-ppx-hash. * gnu/packages/ocaml.scm (ocaml4.07-ppx-hash): Remove variable. (ocaml-ppx-hash)[properties]: Remove variant. Change-Id: I38a4e5a4deb88398ae714b0671c9477551e7b6d9 --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ac2da9cead..bbcf97ccb0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6897,32 +6897,13 @@ (define-public ocaml-ppx-hash (propagated-inputs (list ocaml-base ocaml-ppx-compare ocaml-ppx-sexp-conv ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_hash") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-hash)))) + (properties `((upstream-name . "ppx_hash"))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") (description "This package is a collection of ppx rewriters that generate hash functions from type exrpessions and definitions.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-hash - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-hash) - (name "ocaml-ppx-hash") - (home-page "https://github.com/janestreet/ppx_hash") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) - (properties `((upstream-name . "ppx_hash")))))) - (define-public ocaml-ppx-enumerate (package (name "ocaml-ppx-enumerate") -- cgit v1.2.3 From cddf767eed7322fb94c1ff31b2ba9613b28ad2b7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:05:04 +0100 Subject: gnu: Remove ocaml4.07-ppx-js-style. * gnu/packages/ocaml.scm (ocaml4.07-ppx-js-style): Remove variable. (ocaml-ppx-js-style)[properties]: Remove variant. Change-Id: I2243b4ae20136fb3d91c578d9bb2eeea306b0bb1 --- gnu/packages/ocaml.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bbcf97ccb0..407a46d15d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7436,8 +7436,7 @@ (define-public ocaml-ppx-js-style (arguments `(#:tests? #f)) ; No tests (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-octavius ocaml-ppxlib)) - (properties `((upstream-name . "ppx_js_style") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-js-style)))) + (properties `((upstream-name . "ppx_js_style"))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") (description "This package is a no-op ppx rewriter. It is used as a @@ -7445,16 +7444,6 @@ (define-public ocaml-ppx-js-style packages.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-js-style - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-js-style) - (version "0.11.0") - (source - (janestreet-origin "ppx_js_style" version - "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")) - (properties `((upstream-name . "ppx_js_style")))))) - (define-public ocaml-ppx-typerep-conv (package (name "ocaml-ppx-typerep-conv") -- cgit v1.2.3 From 7c44828fab9f1c32eb564749d472242df63573f3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:05:39 +0100 Subject: gnu: Remove ocaml4.07-ppx-enumerate. * gnu/packages/ocaml.scm (ocaml4.07-ppx-enumerate): Remove variable. (ocaml-ppx-enumerate)[properties]: Remove variant. Change-Id: I4923573de50e9e1795562cc7b974b8da7c88a64c --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 407a46d15d..a32d64bf6b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6917,8 +6917,7 @@ (define-public ocaml-ppx-enumerate `(#:tests? #f)) ; no test suite (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_enumerate") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-enumerate)))) + (properties `((upstream-name . "ppx_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") (description "Ppx_enumerate is a ppx rewriter which generates a definition @@ -6926,24 +6925,6 @@ (define-public ocaml-ppx-enumerate many values).") (license license:asl2.0))) -(define-public ocaml4.07-ppx-enumerate - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-enumerate) - (name "ocaml-ppx-enumerate") - (version "0.11.1") - (home-page "https://github.com/janestreet/ppx_enumerate") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) - (properties `((upstream-name . "ppx_enumerate")))))) - (define-public ocaml-ppx-bench (package (name "ocaml-ppx-bench") -- cgit v1.2.3 From c56a00a90fada361e2b534f868c9b44a1da552d0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:06:18 +0100 Subject: gnu: Remove ocaml4.07-ppx-let. * gnu/packages/ocaml.scm (ocaml4.07-ppx-let): Remove variable. (ocaml-ppx-let)[properties]: Remove variant. Change-Id: Ia173d6bd784b6c1347c3ec2e3cc4e10b9537b092 --- gnu/packages/ocaml.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a32d64bf6b..6688f6c52b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7213,25 +7213,13 @@ (define-public ocaml-ppx-let (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib ocaml-ppx-here)) - (properties `((upstream-name . "ppx_let") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-let)))) + (properties `((upstream-name . "ppx_let"))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-let - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-let) - (version "0.11.0") - (source - (janestreet-origin "ppx_let" version - "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj")) - - (properties `((upstream-name . "ppx_let")))))) - (define-public ocaml-ppx-fail (package (name "ocaml-ppx-fail") -- cgit v1.2.3 From 9c52f8b8678b4d17655b8ca29f2748203f498d6f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:07:07 +0100 Subject: gnu: Remove ocaml4.07-ppx-expect. * gnu/packages/ocaml.scm (ocaml4.07-ppx-expect): Remove variable. (ocaml-ppx-expect)[properties]: Remove variant. Change-Id: Iad2ab78be171d8e0c7526c27fd0c7f77e62c6c68 --- gnu/packages/ocaml.scm | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6688f6c52b..8f811a28fc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7330,7 +7330,6 @@ (define-public ocaml-ppx-expect ocaml-migrate-parsetree ocaml-re)) (properties `((upstream-name . "ppx_expect") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)) (ocaml5.0-variant . ,(delay ocaml5.0-ppx-expect)))) (home-page "https://github.com/janestreet/ppx_expect") (synopsis "Cram like framework for OCaml") @@ -7363,30 +7362,6 @@ (define-public ocaml5.0-ppx-expect "05r7wlmrhb5biwyw6bjcpmr77srglijcbf7nm7h2hiil0d0i7bkz")))) (properties '()))))) -(define-public ocaml4.07-ppx-expect - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-expect) - (version "0.12.0") - (source - (janestreet-origin "ppx_expect" version - "1zpci8c49yn2ixchmwjx1kf9pwybv3dnn4l2dgnd6m36qnkralfk")) - (propagated-inputs - `(("ocaml-base" ,ocaml-base) - ("ocaml-ppx-assert" ,ocaml-ppx-assert) - ("ocaml-ppx-compare" ,ocaml-ppx-compare) - ("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf) - ("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv) - ("ocaml-ppx-here" ,ocaml-ppx-here) - ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) - ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv) - ("ocaml-stdio" ,ocaml-stdio) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppxlib" ,ocaml-ppxlib) - ("ocaml-re" ,ocaml-re))) - (properties `((upstream-name . "ppx_expect")))))) - (define-public ocaml-ppx-js-style (package (name "ocaml-ppx-js-style") -- cgit v1.2.3 From 711f2b10dccc0a8b95781753014a703e1c31b6b6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:07:44 +0100 Subject: gnu: Remove ocaml4.07-ppx-bench. * gnu/packages/ocaml.scm (ocaml4.07-ppx-bench): Remove variable. (ocaml-ppx-bench)[properties]: Remove variant. Change-Id: I407067f56a2e8a73ab9c311dafb2fd6dd5b583f8 --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8f811a28fc..83d1cb8777 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6943,31 +6943,12 @@ (define-public ocaml-ppx-bench ;; No tests `(#:tests? #f)) (propagated-inputs (list ocaml-ppx-inline-test ocaml-ppxlib)) - (properties `((upstream-name . "ppx_bench") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bench)))) + (properties `((upstream-name . "ppx_bench"))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") (description "Syntax extension for writing in-line benchmarks in ocaml code.") (license license:expat))) -(define-public ocaml4.07-ppx-bench - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-bench) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_bench-v" version ".tar.gz")) - (sha256 - (base32 - "0ys4pblbcjbk9dn073rqiwm7r6rc7fah03j7riklkwnb5n44andl")))) - (propagated-inputs - (list ocaml-ppx-inline-test ocaml-migrate-parsetree ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-here (package (name "ocaml-ppx-here") -- cgit v1.2.3 From 2cd18578e783e4ffba24ae65f78e419615d9746e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:08:59 +0100 Subject: gnu: Remove ocaml4.07-ppx-inline-test. * gnu/packages/ocaml.scm (ocaml4.07-ppx-inline-test): Remove variable. (ocaml-ppx-inline-test)[properties]: Remove variant. Change-Id: Ia7a74c7872b200d22fe56ec62de144534fc9e1ae --- gnu/packages/ocaml.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 83d1cb8777..96b3d86c7d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5594,40 +5594,13 @@ (define-public ocaml-ppx-inline-test ocaml-stdio ocaml-ppxlib ocaml-time-now)) - (properties `((upstream-name . "ppx_inline_test") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-inline-test)))) + (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) -(define-public ocaml4.07-ppx-inline-test - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-inline-test) - (name "ocaml-ppx-inline-test") - (version "0.12.0") - (home-page "https://github.com/janestreet/ppx_inline_test") - (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) - (propagated-inputs - `(("ocaml-base" ,ocaml-base) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-compiler-libs" ,ocaml-compiler-libs) - ("ocaml-sexplib0" ,ocaml-sexplib0) - ("ocaml-stdio" ,ocaml-stdio) - ("ocaml-ppxlib" ,ocaml-ppxlib))) - (properties `((upstream-name . "ppx_inline_test")))))) - (define-public ocaml-bindlib (package (name "ocaml-bindlib") -- cgit v1.2.3 From 1667e151ba28bed7f6d7e905ac6b0868bc1d9d17 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:09:35 +0100 Subject: gnu: Remove ocaml4.07-ppx-assert. * gnu/packages/ocaml.scm (ocaml4.07-ppx-assert): Remove variable. (ocaml-ppx-assert)[properties]: Remove variant. Change-Id: Iba0b987323b8ee3feb2330b1e5eed199856466ee --- gnu/packages/ocaml.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 96b3d86c7d..9fbb265413 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7232,31 +7232,13 @@ (define-public ocaml-ppx-assert ocaml-ppx-sexp-conv ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_assert") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-assert)))) + (properties `((upstream-name . "ppx_assert"))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") (description "This package contains assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-assert - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-assert) - (version "0.11.0") - (source - (janestreet-origin "ppx_assert" version - "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k")) - (propagated-inputs - `(("ocaml-base" ,ocaml-base) - ("ocaml-ppx-compare" ,ocaml-ppx-compare) - ("ocaml-ppx-here" ,ocaml-ppx-here) - ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppxlib" ,ocaml-ppxlib))) - (properties `((upstream-name . "ppx_assert")))))) - (define-public ocaml-ppx-expect (package (name "ocaml-ppx-expect") -- cgit v1.2.3 From 952963aba8db1a052fd86920d95be16ad56de187 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:10:37 +0100 Subject: gnu: Remove ocaml4.07-sexplib. * gnu/packages/ocaml.scm (ocaml4.07-sexplib): Remove variable. (ocaml-sexplib)[properties]: Remove variant. Change-Id: I5d682457888b57d7d68c2e3e2b28d6cd4f4f3a85 --- gnu/packages/ocaml.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9fbb265413..34bb570dd4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6070,7 +6070,6 @@ (define-public ocaml-sexplib (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-num ocaml-parsexp ocaml-sexplib0)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sexplib)))) (synopsis "Library for serializing OCaml values to and from S-expressions") (description @@ -6078,16 +6077,6 @@ (define-public ocaml-sexplib functionality for parsing and pretty-printing s-expressions.") (license license:expat))) -(define-public ocaml4.07-sexplib - (package-with-ocaml4.07 - (package - (inherit ocaml-sexplib) - (version "0.11.0") - (source - (janestreet-origin "sexplib" version - "0ksx62zsxhz8xmdrsn41n2hbc2qbyh3bxxc6946xisvgwh42h3q3")) - (properties '())))) - (define-public ocaml-sexp-pretty (package (name "ocaml-sexp-pretty") -- cgit v1.2.3 From ab51be3aba72f857363a2fca3358ef74a1e87d1f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:11:41 +0100 Subject: gnu: Remove ocaml4.07-ppx-here. * gnu/packages/ocaml.scm (ocaml4.07-ppx-here): Remove variable. (ocaml-ppx-here)[properties]: Remove variant. Change-Id: I7b54d003c6bf988eb93d6a2345296d11add14f6d --- gnu/packages/ocaml.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 34bb570dd4..c31176720b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6924,24 +6924,13 @@ (define-public ocaml-ppx-here `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_here") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-here)))) + (properties `((upstream-name . "ppx_here"))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location") (description "Part of the Jane Street's PPX rewriters collection.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-here - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-here) - (version "0.11.0") - (source - (janestreet-origin "ppx_here" version - "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5")) - (properties `((upstream-name . "ppx_here")))))) - (define-public ocaml-typerep (package (name "ocaml-typerep") -- cgit v1.2.3 From 7c8ee30ca691c4fdf57f0868fe56e2eaefe878f8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:12:57 +0100 Subject: gnu: Remove ocaml4.07-bin-prot. * gnu/packages/ocaml.scm (ocaml4.07-bin-prot): Remove variable. (ocaml-bin-prot)[properties]: Remove variant. Change-Id: I8d16ef26b58cc179bcc9d93d2e3e18116c474d25 --- gnu/packages/ocaml.scm | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c31176720b..5010377fc8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6735,8 +6735,7 @@ (define-public ocaml-bin-prot ocaml-ppx-optcomp ocaml-ppx-sexp-conv ocaml-ppx-variants-conv)) - (properties `((upstream-name . "bin_prot") - (ocaml4.07-variant . ,(delay ocaml4.07-bin-prot)))) + (properties `((upstream-name . "bin_prot"))) (home-page "https://github.com/janestreet/bin_prot") (synopsis "Binary protocol generator") (description "This library contains functionality for reading and writing @@ -6747,30 +6746,6 @@ (define-public ocaml-bin-prot storage of large amounts of data.") (license license:expat))) -(define-public ocaml4.07-bin-prot - (package-with-ocaml4.07 - (package - (inherit ocaml-bin-prot) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/bin_prot-v" version ".tar.gz")) - (sha256 - (base32 - "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) - (propagated-inputs (list ocaml-base - ocaml-ppx-compare - ocaml-ppx-custom-printf - ocaml-ppx-fields-conv - ocaml-ppx-variants-conv - ocaml-migrate-parsetree)) - (properties '()) - (license (list - license:asl2.0 - license:bsd-3))))) - (define-public ocaml-protocol-version-header (package (name "ocaml-protocol-version-header") -- cgit v1.2.3 From bffb7e524bbf9f88643af745a3d8b9a6cd6ce60f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:13:39 +0100 Subject: gnu: Remove ocaml4.07-typerep. * gnu/packages/ocaml.scm (ocaml4.07-typerep): Remove variable. (ocaml-typerep)[properties]: Remove variant. Change-Id: I6e856bd96ca7dedeb0078e662b19a1f12143c0d2 --- gnu/packages/ocaml.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5010377fc8..584e3cf35e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6922,28 +6922,11 @@ (define-public ocaml-typerep (build-system dune-build-system) (arguments `(#:tests? #f)); no tests (propagated-inputs (list ocaml-base)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-typerep)))) (home-page "https://github.com/janestreet/typerep") (synopsis "Typerep is a library for runtime types") (description "Typerep is a library for runtime types.") (license license:expat))) -(define-public ocaml4.07-typerep - (package-with-ocaml4.07 - (package - (inherit ocaml-typerep) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/typerep-v" version ".tar.gz")) - (sha256 - (base32 - "1zi7hy0prpgzqhr4lkacr04wvlvbp21jfbdfvffhrm6cd400rb5v")))) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-sexp-value (package (name "ocaml-ppx-sexp-value") -- cgit v1.2.3 From b79835b5b5c1f0b0409da749af1ef06a91a57a14 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:14:13 +0100 Subject: gnu: Remove ocaml4.07-alcotest. * gnu/packages/ocaml.scm (ocaml4.07-alcotest): Remove variable. (ocaml-alcotest)[properties]: Remove variant. Change-Id: I32402499e6c4b5b2c586e0fe8abc1aede3504fa2 --- gnu/packages/ocaml.scm | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 584e3cf35e..fdf2e9a815 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2451,7 +2451,6 @@ (define-public ocaml-alcotest ocaml-stdlib-shims ocaml-uuidm ocaml-uutf)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-alcotest)))) (home-page "https://github.com/mirage/alcotest") (synopsis "Lightweight OCaml test framework") (description "Alcotest exposes simple interface to perform unit tests. It @@ -2462,24 +2461,6 @@ (define-public ocaml-alcotest simple (yet expressive) query language to select the tests to run.") (license license:isc))) -(define-public ocaml4.07-alcotest - (package-with-ocaml4.07 - (package - (inherit ocaml-alcotest) - (version "1.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/alcotest") - (commit version))) - (file-name (git-file-name "ocaml-alcotest" version)) - (sha256 - (base32 - "1frwi185z4aadmaf0vp8xk5227nyg7nmh28ijj5l7ncjr5slvhz8")))) - (arguments - `(#:package "alcotest")) - (properties '())))) - (define-public ocaml-expect-test-helpers-core (package (name "ocaml-expect-test-helpers-core") -- cgit v1.2.3 From 43d528a532ca80193d16346b715aa7a620608d81 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:37:09 +0100 Subject: gnu: Remove ocaml4.07-ppx-custom-printf. * gnu/packages/ocaml.scm (ocaml4.07-ppx-custom-printf): Remove variable. (ocaml-ppx-custom-printf)[properties]: Remove variant. Change-Id: Icc9e85727c28f9fd4aab07c7661282aed7dd1567 --- gnu/packages/ocaml.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fdf2e9a815..2057721e7e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6676,24 +6676,12 @@ (define-public ocaml-ppx-custom-printf (propagated-inputs (list ocaml-base ocaml-ppx-sexp-conv ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_custom_printf") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-custom-printf)))) + (properties `((upstream-name . "ppx_custom_printf"))) (synopsis "Printf-style format-strings for user-defined string conversion") (description "Extensions to printf-style format-strings for user-defined string conversion.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-custom-printf - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-custom-printf) - (version "0.11.0") - (source - (janestreet-origin - "ppx_custom_printf" version - "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")) - (properties `((upstream-name . "ppx_custom_printf")))))) - (define-public ocaml-bin-prot (package (name "ocaml-bin-prot") -- cgit v1.2.3 From dee924ac2635352cd744c4d04c25a0c16736675c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:37:52 +0100 Subject: gnu: Remove ocaml4.07-ppx-variants-conv. * gnu/packages/ocaml.scm (ocaml4.07-ppx-variants-conv): Remove variable. (ocaml-ppx-variants-conv)[properties]: Remove variant. Change-Id: Ib386d87c5b1cdd031155da7c8cfdcbc763624470 --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2057721e7e..902417fb9b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6629,8 +6629,7 @@ (define-public ocaml-ppx-variants-conv (list ocaml-base ocaml-variantslib ocaml-migrate-parsetree ocaml-ppxlib)) (properties - `((upstream-name . "ppx_variants_conv") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-variants-conv)))) + `((upstream-name . "ppx_variants_conv"))) (home-page "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") @@ -6639,24 +6638,6 @@ (define-public ocaml-ppx-variants-conv variant types.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-variants-conv - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-variants-conv) - (name "ocaml-ppx-variants-conv") - (version "0.11.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) - (properties `((upstream-name . "ppx_variants_conv")))))) - (define-public ocaml-ppx-custom-printf (package (name "ocaml-ppx-custom-printf") -- cgit v1.2.3 From c0505c907302bfd72afe885fa5484fd845055c09 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:38:35 +0100 Subject: gnu: Remove ocaml4.07-ppx-compare. * gnu/packages/ocaml.scm (ocaml4.07-ppx-compare): Remove variable. (ocaml-ppx-compare)[properties]: Remove variant. Change-Id: Idac9eb2fe20e6849a791b758507211b47969aafa --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 902417fb9b..d36edf73e8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6433,8 +6433,7 @@ (define-public ocaml-ppx-compare '(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_compare") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-compare)))) + (properties `((upstream-name . "ppx_compare"))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") (description "Generation of fast comparison functions from type expressions @@ -6445,24 +6444,6 @@ (define-public ocaml-ppx-compare by making sure that you only compare comparable values.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-compare - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-compare) - (name "ocaml-ppx-compare") - (version "0.11.1") - (home-page "https://github.com/janestreet/ppx_compare") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) - (properties `((upstream-name . "ppx_compare")))))) - (define-public ocaml-fieldslib (package (name "ocaml-fieldslib") -- cgit v1.2.3 From f6cda7691f8dd221647ac4898510918c522d97f0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:39:17 +0100 Subject: gnu: Remove ocaml4.07-ppx-fields-conv. * gnu/packages/ocaml.scm (ocaml4.07-ppx-fields-conv): Remove variable. (ocaml-ppx-fields-conv)[properties]: Remove variant. Change-Id: Ie109e8ac78166e2df6cfece2fd80961a4d5cb6db --- gnu/packages/ocaml.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d36edf73e8..157d9d34bb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6530,8 +6530,7 @@ (define-public ocaml-ppx-fields-conv (propagated-inputs (list ocaml-base ocaml-fieldslib ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_fields_conv") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fields-conv)))) + (properties `((upstream-name . "ppx_fields_conv"))) (synopsis "Generation of accessor and iteration functions for ocaml records") (description "Ppx_fields_conv is a ppx rewriter that can be used to define first class values representing record fields, and additional routines, to get @@ -6539,16 +6538,6 @@ (define-public ocaml-ppx-fields-conv new record values.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-fields-conv - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-fields-conv) - (version "0.11.0") - (source (janestreet-origin - "ppx_fields_conv" version - "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")) - (properties `((upstream-name . "ppx_fields_conv")))))) - (define-public ocaml-ppx-sexp-conv (package (name "ocaml-ppx-sexp-conv") -- cgit v1.2.3 From 697328419e365f3f93a205fc54be860b5bfd4263 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:40:48 +0100 Subject: gnu: Remove ocaml4.07-ppx-sexp-conv. * gnu/packages/ocaml.scm (ocaml4.07-ppx-sexp-conv): Remove variable. (ocaml-ppx-sexp-conv)[properties]: Remove variant. Change-Id: I6471c4e4f0c7cd8d3dd04f0ea0f4ce064759b37b --- gnu/packages/ocaml.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 157d9d34bb..b5c576ac89 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6556,30 +6556,12 @@ (define-public ocaml-ppx-sexp-conv (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-ppxlib)) - (properties `((upstream-name . "ppx_sexp_conv") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-conv)))) + (properties `((upstream-name . "ppx_sexp_conv"))) (synopsis "Generation of S-expression conversion functions from type definitions") (description "This package generates S-expression conversion functions from type definitions.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-sexp-conv - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-sexp-conv) - (name "ocaml-ppx-sexp-conv") - (version "0.11.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_sexp_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) - (properties `((upstream-name . "ppx_sexp_conv")))))) - (define-public ocaml-ppx-variants-conv (package (name "ocaml-ppx-variants-conv") -- cgit v1.2.3 From c02058bef6152f48b601aeb2c8334e08358ee625 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:41:29 +0100 Subject: gnu: Remove ocaml4.07-fieldslib. * gnu/packages/ocaml.scm (ocaml4.07-fieldslib): Remove variable. (ocaml-fieldslib)[properties]: Remove variant. Change-Id: Ic915d16ee2f45a198f63896ad0ad22ac57815958 --- gnu/packages/ocaml.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b5c576ac89..9c72b93f4d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6455,8 +6455,7 @@ (define-public ocaml-fieldslib (arguments `(#:tests? #f)) ; No tests (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "fieldslib") - (ocaml4.07-variant . ,(delay ocaml4.07-fieldslib)))) + (properties `((upstream-name . "fieldslib"))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") (description "Syntax extension to define first class values representing @@ -6464,16 +6463,6 @@ (define-public ocaml-fieldslib of a record and create new record values.") (license license:asl2.0))) -(define-public ocaml4.07-fieldslib - (package-with-ocaml4.07 - (package - (inherit ocaml-fieldslib) - (version "0.11.0") - (source (janestreet-origin - "fieldslib" version - "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) - (properties `((upstream-name . "fieldslib")))))) - (define-public ocaml-variantslib (package (name "ocaml-variantslib") -- cgit v1.2.3 From dc86d672c95b6164f5501868e551886abe317782 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:42:16 +0100 Subject: gnu: Remove ocaml4.07-variantslib. * gnu/packages/ocaml.scm (ocaml4.07-variantslib): Remove variable. (ocaml-variantslib)[properties]: Remove variant. Change-Id: Ie05207ed1bb675c91e68058cd2a1ff0e63ccf532 --- gnu/packages/ocaml.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9c72b93f4d..9682f5be8a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6476,30 +6476,13 @@ (define-public ocaml-variantslib `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "variantslib") - (ocaml4.07-variant . ,(delay ocaml4.07-variantslib)))) + (properties `((upstream-name . "variantslib"))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") (description "The Core suite of libraries is an alternative to OCaml's standard library.") (license license:asl2.0))) -(define-public ocaml4.07-variantslib - (package-with-ocaml4.07 - (package - (inherit ocaml-variantslib) - (name "ocaml-variantslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/variantslib-v" version ".tar.gz")) - (sha256 - (base32 - "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) - (properties `((upstream-name . "variantslib")))))) - (define-public ocaml-ppx-fields-conv (package (name "ocaml-ppx-fields-conv") -- cgit v1.2.3 From 571878854c90f3a0546dbaf1dd69223200ac5001 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:42:56 +0100 Subject: gnu: Remove ocaml4.07-parsexp. * gnu/packages/ocaml.scm (ocaml4.07-parsexp): Remove variable. (ocaml-parsexp)[properties]: Remove variant. Change-Id: I8f4ba60895845ba8a45d87107c5b0f7ce0674f99 --- gnu/packages/ocaml.scm | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9682f5be8a..33340e95af 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5994,7 +5994,6 @@ (define-public ocaml-parsexp (build-system dune-build-system) (inputs (list ocaml-sexplib0 ocaml-base)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-parsexp)))) (synopsis "S-expression parsing library") (description "This library provides generic parsers for parsing S-expressions from @@ -6023,17 +6022,6 @@ (define-public ocaml-parsexp parsexp_io.") (license license:expat))) -(define-public ocaml4.07-parsexp - (package-with-ocaml4.07 - (package - (inherit ocaml-parsexp) - (name "ocaml-parsexp") - (version "0.11.0") - (source - (janestreet-origin "parsexp" version - "11a30zkfgbi6pb4whq22k1zc8ghdp9bwxl5s5cdlmx1z8s4yxsf0")) - (properties '())))) - (define-public ocaml-sexplib (package (name "ocaml-sexplib") -- cgit v1.2.3 From 1cef2c561f51acc309060855b963892ebf776c36 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:43:31 +0100 Subject: gnu: Remove ocaml4.07-fmt. * gnu/packages/ocaml.scm (ocaml4.07-fmt): Remove variable. (ocaml-fmt)[properties]: Remove variant. Change-Id: I35d294d764a1e3fd8160a7da9cbd5cab9bea4660 --- gnu/packages/ocaml.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 33340e95af..cc3e15ff9c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2363,27 +2363,12 @@ (define-public ocaml-fmt #:phases (modify-phases %standard-phases (delete 'configure)))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-fmt)))) (home-page "https://erratique.ch/software/fmt") (synopsis "OCaml Format pretty-printer combinators") (description "Fmt exposes combinators to devise Format pretty-printing functions.") (license license:isc))) -(define-public ocaml4.07-fmt - (package-with-ocaml4.07 - (package - (inherit ocaml-fmt) - (version "0.8.9") - (source (origin - (method url-fetch) - (uri (string-append "http://erratique.ch/software/fmt/releases/fmt-" - version ".tbz")) - (sha256 - (base32 - "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk")))) - (properties '())))) - (define-public ocaml-astring (package (name "ocaml-astring") -- cgit v1.2.3 From aed922fcdd68af287eb231b3476d592978ef4cf1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:44:29 +0100 Subject: gnu: Remove ocaml4.07-migrate-parsetree. * gnu/packages/ocaml.scm (ocaml4.07-migrate-parsetree): Remove variable. (ocaml-migrate-parsetree)[properties]: Remove variant. Change-Id: Iec470c670517fbb8b1b554c3a357b08972c48853 --- gnu/packages/ocaml.scm | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cc3e15ff9c..a3c664e62d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1942,34 +1942,13 @@ (define-public ocaml-migrate-parsetree (arguments `(#:tests? #f)) (propagated-inputs (list ocaml-ppx-derivers ocamlbuild ocaml-result)) - (properties `((upstream-name . "ocaml-migrate-parsetree") - (ocaml4.07-variant . ,(delay ocaml4.07-migrate-parsetree)))) + (properties `((upstream-name . "ocaml-migrate-parsetree"))) (synopsis "OCaml parsetree converter") (description "This library converts between parsetrees of different OCaml versions. For each version, there is a snapshot of the parsetree and conversion functions to the next and/or previous version.") (license license:lgpl2.1+))) -;; OCaml 4.07 packages require version 1.* -(define-public ocaml4.07-migrate-parsetree - (package-with-ocaml4.07 - (package - (inherit ocaml-migrate-parsetree) - (name "ocaml-migrate-parsetree") - (version "1.8.0") - (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) - (properties '((upstream-name . "ocaml-migrate-parsetree")))))) - (define-public ocaml-linenoise (package (name "ocaml-linenoise") -- cgit v1.2.3 From 937cae5bbe46b59c4546d86cd8faaf091d9ec5fd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:45:12 +0100 Subject: gnu: Remove ocaml4.07-configurator. * gnu/packages/ocaml.scm (ocaml4.07-configurator): Remove variable. Change-Id: If30443dcb2004f5248e6dff33c96b14e4d00daa9 --- gnu/packages/ocaml.scm | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a3c664e62d..7d4f63a7e3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7416,43 +7416,6 @@ (define-public ocaml-base-quickcheck types provided by Base.") (license license:expat))) -(define-public ocaml4.07-configurator - (package - (name "ocaml4.07-configurator") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/configurator-v" version ".tar.gz")) - (sha256 - (base32 - "0kwgi3sh92v4n242dk5hgpwd85zzgnczgbkqi0q0kr6m93zgbf7p")))) - (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) - (home-page "https://github.com/janestreet/configurator") - (synopsis "Helper library for gathering system configuration") - (description "Configurator is a small library that helps writing OCaml -scripts that test features available on the system, in order to generate config.h -files for instance. - -Configurator allows one to: -@itemize -@item test if a C program compiles -@item query pkg-config -@item import #define from OCaml header files -@item generate config.h file -@end itemize") - (license license:asl2.0))) - (define-public ocaml-spawn (package (name "ocaml-spawn") -- cgit v1.2.3 From 34063642500ff05d595a80993f584ba80c8caa12 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:45:54 +0100 Subject: gnu: Remove ocaml4.07-ppxlib. * gnu/packages/ocaml.scm (ocaml4.07-ppxlib): Remove variable. (ocaml-ppxlib)[properties]: Remove variant. Change-Id: I6b19e7751d1c21549d261281ae400f90c8d88c6c --- gnu/packages/ocaml.scm | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7d4f63a7e3..a411bb78e0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6313,7 +6313,6 @@ (define-public ocaml-ppxlib (list ocaml-stdio ocaml-cinaps ocaml-base)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-ppxlib)))) (synopsis "Base library and tools for ppx rewriters") (description @@ -6331,46 +6330,6 @@ (define-public ocaml-ppxlib @end itemize") (license license:expat))) -(define-public ocaml4.07-ppxlib - (package-with-ocaml4.07 - (package - (inherit ocaml-ppxlib) - (name "ocaml-ppxlib") - (version "0.6.0") - (home-page "https://github.com/ocaml-ppx/ppxlib") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv")))) - (build-system dune-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-topfind - (lambda* (#:key inputs #:allow-other-keys) - ;; add the line #directory ".." at the top of each file - ;; using #use "topfind";; to be able to find topfind - (let* ((findlib-path (assoc-ref inputs "findlib")) - (findlib-libdir - (string-append findlib-path "/lib/ocaml/site-lib"))) - (substitute* '("test/base/test.ml" - "test/code_path/test.ml" - "test/deriving/test.ml" - "test/driver/attributes/test.ml" - "test/driver/non-compressible-suffix/test.ml" - "test/driver/transformations/test.ml") - (("#use \"topfind\";;" all) - (string-append "#directory \"" findlib-libdir "\"\n" - all)))) - #t))))) - (properties '())))) - (define-public ocaml-ppx-compare (package (name "ocaml-ppx-compare") -- cgit v1.2.3 From ad5a1abec87d861b1d4c45a42fd754a3c5493e9c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:46:37 +0100 Subject: gnu: Remove ocaml4.07-uuidm. * gnu/packages/ocaml.scm (ocaml4.07-uuidm): Remove variable. (ocaml-uuidm)[properties]: Remove variant. Change-Id: I8ff5a145eb1057f8aff869f865c562134c9afc9d --- gnu/packages/ocaml.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a411bb78e0..f59bdb938d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4829,7 +4829,6 @@ (define-public ocaml-uuidm (propagated-inputs `(("cmdliner" ,ocaml-cmdliner) ("topkg" ,ocaml-topkg))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-uuidm)))) (home-page "https://erratique.ch/software/uuidm") (synopsis "Universally unique identifiers for OCaml") (description "Uuidm is an OCaml module implementing 128 bits universally @@ -4837,20 +4836,6 @@ (define-public ocaml-uuidm and 4 (random based) according to RFC 4122.") (license license:isc))) -(define-public ocaml4.07-uuidm - (package-with-ocaml4.07 - (package - (inherit ocaml-uuidm) - (version "0.9.7") - (source (origin - (method url-fetch) - (uri (string-append "http://erratique.ch/software/uuidm/" - "releases/uuidm-" version ".tbz")) - (sha256 - (base32 - "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8")))) - (properties '())))) - (define-public ocaml-graph (package (name "ocaml-graph") -- cgit v1.2.3 From 3936d07da2220c7a130f579f438f47862b69e1b8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:47:33 +0100 Subject: gnu: Remove ocaml4.07-lablgtk. * gnu/packages/ocaml.scm (ocaml4.07-lablgtk): Remove variable. (lablgtk)[properties]: Remove variant. Change-Id: I931b9316834d109fe291dbb8d1217690e129b9ee --- gnu/packages/ocaml.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f59bdb938d..7f891f34d0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1332,7 +1332,6 @@ (define-public lablgtk (substitute* "config.make" ((ocaml) out)) #t)))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-lablgtk)))) (home-page "http://lablgtk.forge.ocamlcore.org/") (synopsis "GTK+ bindings for OCaml") (description @@ -1346,16 +1345,6 @@ (define-public lablgtk libpanel, librsvg and quartz.") (license license:lgpl2.1))) -(define-public ocaml4.07-lablgtk - (package - (inherit lablgtk) - (name "ocaml4.07-lablgtk") - (native-inputs - `(("ocaml" ,ocaml-4.07) - ("findlib" ,ocaml4.07-findlib) - ("pkg-config" ,pkg-config))) - (properties '()))) - (define-public unison (package (name "unison") -- cgit v1.2.3 From 29a82bf5fcc4c6d000e93b2c5bcd791cac926fa3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:48:21 +0100 Subject: gnu: Remove ocaml4.07-cmdliner. * gnu/packages/ocaml.scm (ocaml4.07-cmdliner): Remove variable. (ocaml-cmdliner)[properties]: Remove variant. Change-Id: I83cd2ca87356a103201b3c1ffb1a8de4b081a9da --- gnu/packages/ocaml.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7f891f34d0..46c96b87c3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2280,7 +2280,6 @@ (define-public ocaml-cmdliner (("Sys.readdir dir") "let a = Sys.readdir dir in Array.sort String.compare a; a")) #t))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-cmdliner)))) (home-page "https://erratique.ch/software/cmdliner") (synopsis "Declarative definition of command line interfaces for OCaml") (description "Cmdliner is a module for the declarative definition of command @@ -2291,20 +2290,6 @@ (define-public ocaml-cmdliner most of the POSIX and GNU conventions.") (license license:bsd-3))) -(define-public ocaml4.07-cmdliner - (package-with-ocaml4.07 - (package - (inherit ocaml-cmdliner) - (version "1.0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://erratique.ch/software/cmdliner/releases/" - "cmdliner-" version ".tbz")) - (sha256 - (base32 - "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw")))) - (properties '())))) - (define-public ocaml-fmt (package (name "ocaml-fmt") -- cgit v1.2.3 From aca25d415b0c59b4b692d06bb2194c9274399452 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:48:59 +0100 Subject: gnu: Remove ocaml4.07-compiler-libs. * gnu/packages/ocaml.scm (ocaml4.07-compiler-libs): Remove variable. (ocaml-compiler-libs)[properties]: Remove variant. Change-Id: Idf54330537c2ff9317a4650df06ece7bd980b1da --- gnu/packages/ocaml.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 46c96b87c3..0ab46bb8bf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6084,33 +6084,13 @@ (define-public ocaml-compiler-libs "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv")))) (build-system dune-build-system) (arguments `(#:tests? #f)) ;no tests - (properties `((upstream-name . "ocaml-compiler-libs") - (ocaml4.07-variant . ,(delay ocaml4.07-compiler-libs)))) + (properties `((upstream-name . "ocaml-compiler-libs"))) (synopsis "Compiler libraries repackaged") (description "This package simply repackages the OCaml compiler libraries so they don't expose everything at toplevel. For instance, @code{Ast_helper} is now @code{Ocaml_common.Ast_helper}.") (license license:expat))) -(define-public ocaml4.07-compiler-libs - (package-with-ocaml4.07 - (package - (inherit ocaml-compiler-libs) - (name "ocaml-compiler-libs") - (version "0.11.0") - (home-page "https://github.com/janestreet/ocaml-compiler-libs") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) - (properties `((upstream-name . "ocaml-compiler-libs")))))) - (define-public ocaml-stdio (package (name "ocaml-stdio") -- cgit v1.2.3 From 0806c87cb288b90b99bf2620e03beaad25a4b4dd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:49:41 +0100 Subject: gnu: Remove ocaml4.07-re. * gnu/packages/ocaml.scm (ocaml4.07-re): Remove variable. (ocaml-re)[properties]: Remove variant. Change-Id: Ib3cf5188737579908e945bd49617b6d717da4250 --- gnu/packages/ocaml.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0ab46bb8bf..82d6aec9a8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4521,7 +4521,6 @@ (define-public ocaml-re (list ocaml-seq)) (native-inputs `(("ounit" ,ocaml-ounit))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-re)))) (home-page "https://github.com/ocaml/ocaml-re/") (synopsis "Regular expression library for OCaml") (description "Pure OCaml regular expressions with: @@ -4534,18 +4533,6 @@ (define-public ocaml-re @end enumerate") (license license:expat))) -(define-public ocaml4.07-re - (package-with-ocaml4.07 - (package - (inherit ocaml-re) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-dune-version - (lambda _ - (delete-file "dune-project")))))) - (properties '())))) - (define-public ocaml-ocplib-endian (package (name "ocaml-ocplib-endian") -- cgit v1.2.3 From cad3698635f1687d01ba54545d7f8512f8c402b9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:50:20 +0100 Subject: gnu: Remove ocaml4.07-stdio. * gnu/packages/ocaml.scm (ocaml4.07-stdio): Remove variable. (ocaml-stdio)[properties]: Remove variant. Change-Id: I5a664b5130408eba41266f36cfc03641e2a8fd9d --- gnu/packages/ocaml.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 82d6aec9a8..f750159c1d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6090,7 +6090,6 @@ (define-public ocaml-stdio (propagated-inputs (list ocaml-base ocaml-sexplib0)) (arguments `(#:tests? #f)) ;no tests - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-stdio)))) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It @@ -6098,16 +6097,6 @@ (define-public ocaml-stdio a more consistent API.") (license license:expat))) -(define-public ocaml4.07-stdio - (package-with-ocaml4.07 - (package - (inherit ocaml-stdio) - (version "0.11.0") - (source - (janestreet-origin "stdio" version - "0pqbp2wy5fgmc38irwvmj9nlcvclb1ix1mp4y7l39bgvvlz303h9")) - (properties '())))) - (define-public ocaml-ppx-deriving (package (name "ocaml-ppx-deriving") -- cgit v1.2.3 From b1b2eb4040579dc95c600128b561a5d0c8eb033f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:51:26 +0100 Subject: gnu: Remove ocaml4.07-base. * gnu/packages/ocaml.scm (ocaml4.07-base): Remove variable. (ocaml-base)[properties]: Remove variant. Change-Id: I07813a2865b3bb42e0adf75e74bfebe372f1e789 --- gnu/packages/ocaml.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f750159c1d..5d8237d80a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5997,8 +5997,7 @@ (define-public ocaml-base (build-system dune-build-system) (propagated-inputs (list ocaml-sexplib0)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base)) - (ocaml5.0-variant . ,(delay ocaml5.0-base)))) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-base)))) (synopsis "Full standard library replacement for OCaml") (description @@ -6035,25 +6034,6 @@ (define-public ocaml5.0-base "15vsiv3q53l1bzrvqgspf3lp2104s9dzw62z3nl75f53jvjvsyf6")))) (properties '()))))) -(define-public ocaml4.07-base - (package-with-ocaml4.07 - (package - (inherit ocaml-base) - (name "ocaml-base") - (version "0.11.1") - (source - (origin - ;; version 0.11.1 is not released on ocaml.janestreet.org. - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/base.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir")))) - (properties '())))) - (define-public ocaml-compiler-libs (package (name "ocaml-compiler-libs") -- cgit v1.2.3 From e22e54aa0488189e76eaa308af01bc84b2bbb477 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:52:01 +0100 Subject: gnu: Remove ocaml4.07-lwt. * gnu/packages/ocaml.scm (ocaml4.07-lwt): Remove variable. (ocaml-lwt)[properties]: Remove variant. Change-Id: I3db8b1656ead127a9081d843a3ad387706bcc982 --- gnu/packages/ocaml.scm | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5d8237d80a..ed868ea1f9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2825,26 +2825,8 @@ (define-public ocaml-lwt make it easy to run normally-blocking I/O operations concurrently in a single process. Also, in many cases, Lwt threads can interact without the need for locks or other synchronization primitives.") - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-lwt)))) (license license:lgpl2.1))) -(define-public ocaml4.07-lwt - (package-with-ocaml4.07 - (package - (inherit ocaml-lwt) - (name "ocaml-lwt") - (version "5.5.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocsigen/lwt") - (commit version))) - (file-name (git-file-name name version)) - (sha256 (base32 - "1jbjz2rsz3j56k8vh5qlmm87hhkr250bs2m3dvpy9vsri8rkzj9z")))) - (properties '())))) - ;; TODO this alias is not ideal but ocaml-lwt already explicitly specifies a ;; package argument and at least this way the importer doesn't try to ;; re-import it. -- cgit v1.2.3 From 4a7b5889237cf785efc6b1feb0acf1fe7622c776 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:52:55 +0100 Subject: gnu: Remove ocaml4.07-sexplib0. * gnu/packages/ocaml.scm (ocaml4.07-sexplib0): Remove variable. (ocaml-sexplib0)[properties]: Remove variant. Change-Id: Ie370668adc446fc4c2b04206a6657380e5e09790 --- gnu/packages/ocaml.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ed868ea1f9..f636ce0085 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5849,7 +5849,6 @@ (define-public ocaml-sexplib0 "05m93g4m4jhj1v8pazg3s2ydcfymr3h4476yjhdca5fm4sn35bg8")))) (build-system dune-build-system) (arguments `(#:tests? #f)) ;no tests - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sexplib0)))) (synopsis "Library containing the definition of S-expressions and some base converters") (description "Part of Jane Street's Core library The Core suite of @@ -5857,18 +5856,6 @@ (define-public ocaml-sexplib0 that was developed by Jane Street, the largest industrial user of OCaml.") (license license:expat))) -(define-public ocaml4.07-sexplib0 - (package-with-ocaml4.07 - (package - (inherit ocaml-sexplib0) - (name "ocaml-sexplib0") - (version "0.11.0") - (source - (janestreet-origin "sexplib0" version - "1p06p2s7p9xsjn0z9qicniv1ai54d8sj11k8j633di2mm7jzxpin")) - (arguments `(#:tests? #f)) ; no tests - (properties '())))) - (define-public ocaml-parsexp (package (name "ocaml-parsexp") -- cgit v1.2.3 From b8aea26c4f45dfb34deefe980c6d6002d6aa12f3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 12:14:54 +0100 Subject: gnu: Remove ocaml-markup0.8.0. This is only used for ocaml4.07. * gnu/packages/ocaml.scm (ocaml-markup0.8.0): Remove variable. (ocaml-markup)[properties]: Remove variant. Change-Id: Ib6444d67f5b8fba13e8ca7bca444ed9e29efa7de --- gnu/packages/ocaml.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu/packages/ocaml.scm') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f636ce0085..a8c497da95 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7608,8 +7608,6 @@ (define-public ocaml-markup (list ocaml-bisect-ppx ocaml-uchar ocaml-uutf ocaml-lwt)) (native-inputs (list ocaml-ounit2 pkg-config)) - (properties - `((ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-markup0.8.0))))) (synopsis "Error-recovering functional HTML5 and XML parsers and writers") (description "Markup.ml provides an HTML parser and an XML parser. The parsers are wrapped in a simple interface: they are functions that transform @@ -7631,28 +7629,6 @@ (define-public ocaml-markup stream, and convert everything to UTF-8.") (license license:bsd-3))) -;; ocaml-markup 1.0.0 can not be built with old version of dune used in -;; package-with-ocaml4.07 -(define-public ocaml-markup0.8.0 - (package - (inherit ocaml-markup) - (name "ocaml-markup") - (version "0.8.0") - (home-page "https://github.com/aantron/markup.ml") - (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0aif4abvfmi9xc1pvw5n5rbm6rzkkpsxyvdn0lanr33rjpvkwdlm")))) - (native-inputs - (list ocaml-ounit pkg-config)) - (properties '()))) - (define-public ocaml-tyxml (package (name "ocaml-tyxml") -- cgit v1.2.3