me
/
guix
Archived
1
0
Fork 0

gnu: Make intermediate packages public but hidden.

This makes those packages visible to (gnu ci), giving them first class
in the eyes of Cuirass and similar tools, in turn ensuring substitutes
are available (this was discovered by running ‘guix weather -c 10’).

* gnu/packages/rust.scm (rust-bootstrap, rust-1.55)
(rust-1.56, rust-1.57, rust-1.58, rust-1.59, rust-1.60)
(rust-1.61, rust-1.62, rust-1.63, rust-1.64, rust-1.65)
(rust-1.66, rust-1.67, rust-1.68, rust-1.69, rust-1.70)
(rust-1.71, rust-1.72, rust-1.73): Make variable public and add
‘hidden?’ property.
(rust): Remove ‘hidden?’ property.
* gnu/packages/java.scm (java-hamcrest-parent-pom)
(java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Make variable public
and add ‘hidden?’ property.
* gnu/packages/ocaml.scm (dune-bootstrap)
(ocaml4.09-dune-bootstrap, ocaml5.0-dune-bootstrap): Likewise.

Change-Id: I32b0ea639a4f1c39466875acdbc9cbadf75c7668
master
Ludovic Courtès 2024-01-10 22:47:35 +01:00
parent 3f301ddc4f
commit db43edaa0a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 36 additions and 28 deletions

View File

@ -3405,9 +3405,10 @@ declaratively, to be used in other frameworks. Typical scenarios include
testing frameworks, mocking libraries and UI validation rules.") testing frameworks, mocking libraries and UI validation rules.")
(license license:bsd-2))) (license license:bsd-2)))
(define java-hamcrest-parent-pom (define-public java-hamcrest-parent-pom
(package (package
(inherit java-hamcrest-core) (inherit java-hamcrest-core)
(properties '((hidden? . #t)))
(name "java-hamcrest-parent-pom") (name "java-hamcrest-parent-pom")
(propagated-inputs '()) (propagated-inputs '())
(native-inputs '()) (native-inputs '())
@ -4965,7 +4966,7 @@ transformations and analysis algorithms allow easily assembling custom
complex transformations and code analysis tools.") complex transformations and code analysis tools.")
(license license:bsd-3))) (license license:bsd-3)))
(define java-org-ow2-parent-pom-1.3 (define-public java-org-ow2-parent-pom-1.3
(package (package
(name "java-org-ow2-parent-pom") (name "java-org-ow2-parent-pom")
(version "1.3") (version "1.3")
@ -4989,12 +4990,14 @@ complex transformations and code analysis tools.")
(synopsis "Ow2.org parent pom") (synopsis "Ow2.org parent pom")
(description "This package contains the parent pom for projects from ow2.org, (description "This package contains the parent pom for projects from ow2.org,
including java-asm.") including java-asm.")
(properties '((hidden? . #t)))
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define java-asm-bootstrap (define-public java-asm-bootstrap
(package (package
(inherit java-asm) (inherit java-asm)
(name "java-asm-bootstrap") (name "java-asm-bootstrap")
(properties '((hidden? . #t)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments java-asm) (substitute-keyword-arguments (package-arguments java-asm)
((#:tests? _) #f))) ((#:tests? _) #f)))

View File

@ -1713,7 +1713,7 @@ full_split, cut, rcut, etc..")
;; where it says `mit'. ;; where it says `mit'.
(license license:expat))) (license license:expat)))
(define dune-bootstrap (define-public dune-bootstrap
(package (package
(name "dune") (name "dune")
(version "3.6.1") (version "3.6.1")
@ -1745,12 +1745,13 @@ full_split, cut, rcut, etc..")
(description "Dune is a build system that was designed to simplify the (description "Dune is a build system that was designed to simplify the
release of Jane Street packages. It reads metadata from @file{dune} files release of Jane Street packages. It reads metadata from @file{dune} files
following a very simple s-expression syntax.") following a very simple s-expression syntax.")
(properties '((hidden? . #t)))
(license license:expat))) (license license:expat)))
(define ocaml4.09-dune-bootstrap (define-public ocaml4.09-dune-bootstrap
(package-with-ocaml4.09 dune-bootstrap)) (package-with-ocaml4.09 dune-bootstrap))
(define ocaml5.0-dune-bootstrap (define-public ocaml5.0-dune-bootstrap
(package-with-ocaml5.0 dune-bootstrap)) (package-with-ocaml5.0 dune-bootstrap))
(define-public dune-configurator (define-public dune-configurator

View File

@ -69,6 +69,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 optargs) #:use-module (ice-9 optargs)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)) #:use-module (srfi srfi-26))
;; This is the hash for the empty file, and the reason it's relevant is not ;; This is the hash for the empty file, and the reason it's relevant is not
@ -161,7 +162,7 @@
;;; Rust 1.54 is special in that it is built with mrustc, which shortens the ;;; Rust 1.54 is special in that it is built with mrustc, which shortens the
;;; bootstrap path. ;;; bootstrap path.
(define rust-bootstrap (define-public rust-bootstrap
(package (package
(name "rust") (name "rust")
(version "1.54.0") (version "1.54.0")
@ -186,7 +187,8 @@
(patches (search-patches "rustc-1.54.0-src.patch")) (patches (search-patches "rustc-1.54.0-src.patch"))
(patch-flags '("-p0")))) ;default is -p1 (patch-flags '("-p0")))) ;default is -p1
(outputs '("out" "cargo")) (outputs '("out" "cargo"))
(properties '((timeout . 72000) ;20 hours (properties '((hidden? . #t)
(timeout . 72000) ;20 hours
(max-silent-time . 18000))) ;5 hours (for armel) (max-silent-time . 18000))) ;5 hours (for armel)
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -379,7 +381,7 @@ safety and thread safety guarantees.")
;; Dual licensed. ;; Dual licensed.
(license (list license:asl2.0 license:expat)))) (license (list license:asl2.0 license:expat))))
(define rust-1.55 (define-public rust-1.55
(package (package
(name "rust") (name "rust")
(version "1.55.0") (version "1.55.0")
@ -407,7 +409,8 @@ safety and thread safety guarantees.")
((" target_arch = \"s390x\"," all) ((" target_arch = \"s390x\"," all)
(string-append all "\n target_arch = \"riscv64\","))))))) (string-append all "\n target_arch = \"riscv64\",")))))))
(outputs '("out" "cargo")) (outputs '("out" "cargo"))
(properties '((timeout . 72000) ;20 hours (properties '((hidden? . #t)
(timeout . 72000) ;20 hours
(max-silent-time . 18000))) ;5 hours (for armel) (max-silent-time . 18000))) ;5 hours (for armel)
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -564,7 +567,7 @@ safety and thread safety guarantees.")
;; Dual licensed. ;; Dual licensed.
(license (list license:asl2.0 license:expat)))) (license (list license:asl2.0 license:expat))))
(define rust-1.56 (define-public rust-1.56
(let ((base-rust (rust-bootstrapped-package (let ((base-rust (rust-bootstrapped-package
rust-1.55 "1.56.1" rust-1.55 "1.56.1"
"04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3"))) "04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3")))
@ -584,13 +587,13 @@ safety and thread safety guarantees.")
(string-append name "\"" ,%cargo-reference-hash "\""))) (string-append name "\"" ,%cargo-reference-hash "\"")))
(generate-all-checksums "vendor")))))))))) (generate-all-checksums "vendor"))))))))))
(define rust-1.57 (define-public rust-1.57
(rust-bootstrapped-package (rust-bootstrapped-package
;; Verified that it *doesn't* build with 1.55. e.g.: ;; Verified that it *doesn't* build with 1.55. e.g.:
;; * feature `edition2021` is required ;; * feature `edition2021` is required
rust-1.56 "1.57.0" "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim")) rust-1.56 "1.57.0" "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim"))
(define rust-1.58 (define-public rust-1.58
(rust-bootstrapped-package (rust-bootstrapped-package
;; Verified that it *doesn't* build with 1.56. e.g.: ;; Verified that it *doesn't* build with 1.56. e.g.:
;; * error: attributes starting with `rustc` are reserved for use by the ;; * error: attributes starting with `rustc` are reserved for use by the
@ -600,7 +603,7 @@ safety and thread safety guarantees.")
;; `const_eval_select_ct` ;; `const_eval_select_ct`
rust-1.57 "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8")) rust-1.57 "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"))
(define rust-1.59 (define-public rust-1.59
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
;; Verified that it *doesn't* build with 1.57. e.g.: ;; Verified that it *doesn't* build with 1.57. e.g.:
@ -629,13 +632,13 @@ safety and thread safety guarantees.")
(("\\.insn i 0x0F, 0, x0, x0, 0x010") ".word 0x0100000F"))))))) (("\\.insn i 0x0F, 0, x0, x0, 0x010") ".word 0x0100000F")))))))
(package-arguments base-rust)))))) (package-arguments base-rust))))))
(define rust-1.60 (define-public rust-1.60
(rust-bootstrapped-package (rust-bootstrapped-package
;; Verified that it *doesn't* build with 1.58. e.g.: ;; Verified that it *doesn't* build with 1.58. e.g.:
;; * error: unknown codegen option: `symbol-mangling-version` ;; * error: unknown codegen option: `symbol-mangling-version`
rust-1.59 "1.60.0" "1drqr0a26x1rb2w3kj0i6abhgbs3jx5qqkrcwbwdlx7n3inq5ji0")) rust-1.59 "1.60.0" "1drqr0a26x1rb2w3kj0i6abhgbs3jx5qqkrcwbwdlx7n3inq5ji0"))
(define rust-1.61 (define-public rust-1.61
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.60 "1.61.0" "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd"))) rust-1.60 "1.61.0" "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd")))
@ -657,15 +660,15 @@ safety and thread safety guarantees.")
(for-each delete-file (for-each delete-file
(find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))))) (find-files "vendor" ".*\\.(a|dll|exe|lib)$")))))))))
(define rust-1.62 (define-public rust-1.62
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.61 "1.62.1" "0gqkg34ic77dcvsz69qbdng6g3zfhl6hnhx7ha1mjkyrzipvxb3j")) rust-1.61 "1.62.1" "0gqkg34ic77dcvsz69qbdng6g3zfhl6hnhx7ha1mjkyrzipvxb3j"))
(define rust-1.63 (define-public rust-1.63
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.62 "1.63.0" "1l4rrbzhxv88pnfq94nbyb9m6lfnjwixma3mwjkmvvs2aqlq158z")) rust-1.62 "1.63.0" "1l4rrbzhxv88pnfq94nbyb9m6lfnjwixma3mwjkmvvs2aqlq158z"))
(define rust-1.64 (define-public rust-1.64
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk"))) rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk")))
@ -689,7 +692,7 @@ safety and thread safety guarantees.")
(string-append name "\"" ,%cargo-reference-hash "\""))) (string-append name "\"" ,%cargo-reference-hash "\"")))
(generate-all-checksums "vendor")))))))))) (generate-all-checksums "vendor"))))))))))
(define rust-1.65 (define-public rust-1.65
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.64 "1.65.0" "0f005kc0vl7qyy298f443i78ibz71hmmh820726bzskpyrkvna2q"))) rust-1.64 "1.65.0" "0f005kc0vl7qyy298f443i78ibz71hmmh820726bzskpyrkvna2q")))
@ -701,11 +704,11 @@ safety and thread safety guarantees.")
(patches '()) (patches '())
(patch-flags '("-p1"))))))) (patch-flags '("-p1")))))))
(define rust-1.66 (define-public rust-1.66
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.65 "1.66.1" "1fjr94gsicsxd2ypz4zm8aad1zdbiccr7qjfbmq8f8f7jhx96g2v")) rust-1.65 "1.66.1" "1fjr94gsicsxd2ypz4zm8aad1zdbiccr7qjfbmq8f8f7jhx96g2v"))
(define rust-1.67 (define-public rust-1.67
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.66 "1.67.1" "0vpzv6rm3w1wbni17ryvcw83k5klhghklylfdza3nnp8blz3sj26"))) rust-1.66 "1.67.1" "0vpzv6rm3w1wbni17ryvcw83k5klhghklylfdza3nnp8blz3sj26")))
@ -714,11 +717,11 @@ safety and thread safety guarantees.")
(inputs (modify-inputs (package-inputs base-rust) (inputs (modify-inputs (package-inputs base-rust)
(replace "llvm" llvm-15)))))) (replace "llvm" llvm-15))))))
(define rust-1.68 (define-public rust-1.68
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcwk")) rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcwk"))
(define rust-1.69 (define-public rust-1.69
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.68 "1.69.0" rust-1.68 "1.69.0"
@ -737,7 +740,7 @@ safety and thread safety guarantees.")
(for-each delete-file (for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))))))) (find-files "vendor" "\\.(a|dll|exe|lib)$")))))))))
(define rust-1.70 (define-public rust-1.70
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.69 "1.70.0" rust-1.69 "1.70.0"
@ -754,7 +757,7 @@ safety and thread safety guarantees.")
;; for a precompiled library. ;; for a precompiled library.
(patches (search-patches "rust-1.70-fix-rustix-build.patch"))))))) (patches (search-patches "rust-1.70-fix-rustix-build.patch")))))))
(define rust-1.71 (define-public rust-1.71
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.70 "1.71.1" "0bj79syjap1kgpg9pc0r4jxc0zkxwm6phjf3digsfafms580vabg"))) rust-1.70 "1.71.1" "0bj79syjap1kgpg9pc0r4jxc0zkxwm6phjf3digsfafms580vabg")))
@ -773,7 +776,7 @@ safety and thread safety guarantees.")
(string-append name "\"" ,%cargo-reference-hash "\""))) (string-append name "\"" ,%cargo-reference-hash "\"")))
(generate-all-checksums "vendor")))))))))) (generate-all-checksums "vendor"))))))))))
(define rust-1.72 (define-public rust-1.72
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.71 "1.72.1" "15gqd1jzhnc16a7gjmav4x1v83jjbzyjh1gvcdfvpkajd9gq8j3z"))) rust-1.71 "1.72.1" "15gqd1jzhnc16a7gjmav4x1v83jjbzyjh1gvcdfvpkajd9gq8j3z")))
@ -798,7 +801,7 @@ safety and thread safety guarantees.")
(string-append "rustix = { version = \"=0.37.11\"," (string-append "rustix = { version = \"=0.37.11\","
" features = [\"use-libc\"] }")))))))))) " features = [\"use-libc\"] }"))))))))))
(define rust-1.73 (define-public rust-1.73
(let ((base-rust (rust-bootstrapped-package rust-1.72 "1.73.0" (let ((base-rust (rust-bootstrapped-package rust-1.72 "1.73.0"
"0fmvn7vg3qg9xprgfwv10g3ygy8i4j4bkcxcr1xdy89d3xnjxmln"))) "0fmvn7vg3qg9xprgfwv10g3ygy8i4j4bkcxcr1xdy89d3xnjxmln")))
(package (package
@ -838,6 +841,7 @@ safety and thread safety guarantees.")
(let ((base-rust rust-1.73)) (let ((base-rust rust-1.73))
(package (package
(inherit base-rust) (inherit base-rust)
(properties (alist-delete 'hidden? (package-properties base-rust)))
(outputs (cons* "rust-src" "tools" (package-outputs base-rust))) (outputs (cons* "rust-src" "tools" (package-outputs base-rust)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base-rust) (substitute-keyword-arguments (package-arguments base-rust)