gnu: ocaml@4.02: Remove the package, affected by a CVE, and its dependent
packages. This fixes <https://bugs.gnu.org/27462>. * gnu/packages/ocaml.scm (ocaml-4.02, camlp4-4.02, ocaml4.02-menhir) (ocaml4.02-lablgtk, ocaml4.02-findlib, ocaml4.02-ounit) (ocaml4.02-camlzip, ocaml4.02-ocamlmod, ocaml4.02-zarith) (ocaml4.02-qcheck, ocaml4.02-qtest, ocaml4.02-stringext) (ocaml4.02-bisect, ocaml4.02-bitstring, ocaml4.02-result) (ocaml4.02-topkg, ocaml4.02-rresult, ocaml4.02-sqlite3, ocaml4.02-csv) (ocaml4.02-mtime, ocaml4.02-cmdliner, ocaml4.02-fmt, ocaml4.02-astring) (ocaml4.02-alcotest, ocaml4.02-ppx-tools, ocaml4.02-react, ocaml4.02-ssl) (ocaml4.02-lwt, ocaml4.02-lwt-log, ocaml4.02-logs, ocaml4.02-fpath) (ocaml4.02-bos, ocaml4.02-xmlm, ocaml4.02-ulex, ocaml4.02-uchar) (ocaml4.02-uutf, ocaml4.02-jsonm, ocaml4.02-ocurl, ocaml4.02-base64) (ocaml4.02-omake, ocaml4.02-batteries, ocaml4.02-pcre, ocaml4.02-oasis) (ocaml4.02-js-build-tools, ocaml4.02-bin-prot, ocaml4.02-fieldslib) (ocaml4.02-ppx-core, ocaml4.02-ppx-optcomp, ocaml4.02-ppx-driver) (ocaml4.02-cppo, ocaml4.02-ppx-deriving, ocaml4.02-ppx-type-conv) (ocaml4.02-ppx-inline-test, ocaml4.02-ppx-bench, ocaml4.02-ppx-compare) (ocaml4.02-sexplib, ocaml4.02-typerep, ocaml4.02-variantslib) (ocaml4.02-ppx-sexp-conv, ocaml4.02-ppx-variants-conv) (ocaml4.02-ppx-here, ocaml4.02-ppx-assert, ocaml4.02-ppx-enumerate) (ocaml4.02-ppx-let, ocaml4.02-ppx-typerep-conv, ocaml4.02-ppx-sexp-value) (ocaml4.02-ppx-pipebang, ocaml4.02-ppx-bin-prot, ocaml4.02-ppx-fail) (ocaml4.02-ppx-custom-printf, ocaml4.02-ppx-sexp-message) (ocaml4.02-ppx-fields-conv, ocaml4.02-seq, ocaml4.02-re) (ocaml4.02-ppx-expect, ocaml4.02-ppx-jane, ocaml4.02-core-kernel) (ocaml4.02-async-kernel, ocaml4.02-async-rpc-kernel, ocaml4.02-core) (ocaml4.02-async-unix, ocaml4.02-async-extra, ocaml4.02-async) (ocaml4.02-ocplib-endian, ocaml4.02-easy-format, optcomp) (ocaml4.02-piqilib, ocaml4.02-uuidm, ocaml4.02-graph, ocaml4.02-piqi) (ocaml4.02-camomile, ocaml4.02-zed, ocaml4.02-lambda-term): Remove variables. * guix/build-system/ocaml.scm (default-ocaml4.02) (default-ocaml4.02-findlib, package-with-ocaml4.02) (strip-ocaml4.02-variant): Remove variables.master
parent
6e49426761
commit
c3634df2a4
File diff suppressed because it is too large
Load Diff
|
@ -28,9 +28,7 @@
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:export (%ocaml-build-system-modules
|
#:export (%ocaml-build-system-modules
|
||||||
package-with-ocaml4.01
|
package-with-ocaml4.01
|
||||||
package-with-ocaml4.02
|
|
||||||
strip-ocaml4.01-variant
|
strip-ocaml4.01-variant
|
||||||
strip-ocaml4.02-variant
|
|
||||||
default-findlib
|
default-findlib
|
||||||
default-ocaml
|
default-ocaml
|
||||||
lower
|
lower
|
||||||
|
@ -94,14 +92,6 @@
|
||||||
(let ((module (resolve-interface '(gnu packages ocaml))))
|
(let ((module (resolve-interface '(gnu packages ocaml))))
|
||||||
(module-ref module 'ocaml4.01-findlib)))
|
(module-ref module 'ocaml4.01-findlib)))
|
||||||
|
|
||||||
(define (default-ocaml4.02)
|
|
||||||
(let ((ocaml (resolve-interface '(gnu packages ocaml))))
|
|
||||||
(module-ref ocaml 'ocaml-4.02)))
|
|
||||||
|
|
||||||
(define (default-ocaml4.02-findlib)
|
|
||||||
(let ((module (resolve-interface '(gnu packages ocaml))))
|
|
||||||
(module-ref module 'ocaml4.02-findlib)))
|
|
||||||
|
|
||||||
(define* (package-with-explicit-ocaml ocaml findlib old-prefix new-prefix
|
(define* (package-with-explicit-ocaml ocaml findlib old-prefix new-prefix
|
||||||
#:key variant-property)
|
#:key variant-property)
|
||||||
"Return a procedure of one argument, P. The procedure creates a package
|
"Return a procedure of one argument, P. The procedure creates a package
|
||||||
|
@ -161,24 +151,12 @@ pre-defined variants."
|
||||||
"ocaml-" "ocaml4.01-"
|
"ocaml-" "ocaml4.01-"
|
||||||
#:variant-property 'ocaml4.01-variant))
|
#:variant-property 'ocaml4.01-variant))
|
||||||
|
|
||||||
(define package-with-ocaml4.02
|
|
||||||
(package-with-explicit-ocaml (delay (default-ocaml4.02))
|
|
||||||
(delay (default-ocaml4.02-findlib))
|
|
||||||
"ocaml-" "ocaml4.02-"
|
|
||||||
#:variant-property 'ocaml4.02-variant))
|
|
||||||
|
|
||||||
(define (strip-ocaml4.01-variant p)
|
(define (strip-ocaml4.01-variant p)
|
||||||
"Remove the 'ocaml4.01-variant' property from P."
|
"Remove the 'ocaml4.01-variant' property from P."
|
||||||
(package
|
(package
|
||||||
(inherit p)
|
(inherit p)
|
||||||
(properties (alist-delete 'ocaml4.01-variant (package-properties p)))))
|
(properties (alist-delete 'ocaml4.01-variant (package-properties p)))))
|
||||||
|
|
||||||
(define (strip-ocaml4.02-variant p)
|
|
||||||
"Remove the 'ocaml4.02-variant' property from P."
|
|
||||||
(package
|
|
||||||
(inherit p)
|
|
||||||
(properties (alist-delete 'ocaml4.02-variant (package-properties p)))))
|
|
||||||
|
|
||||||
(define* (lower name
|
(define* (lower name
|
||||||
#:key source inputs native-inputs outputs system target
|
#:key source inputs native-inputs outputs system target
|
||||||
(ocaml (default-ocaml))
|
(ocaml (default-ocaml))
|
||||||
|
|
Reference in New Issue