mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm
This commit is contained in:
commit
8d59c262ad
176 changed files with 16041 additions and 6439 deletions
|
@ -277,6 +277,29 @@
|
|||
(let ((pkg (dummy-package "under_score")))
|
||||
(check-name pkg))))
|
||||
|
||||
(test-equal "tests-true: #:tests? must not be set to #t"
|
||||
"#:tests? must not be explicitly set to #t"
|
||||
(single-lint-warning-message
|
||||
(let ((pkg (dummy-package "x" (arguments '(#:tests? #t)))))
|
||||
(check-tests-true pkg))))
|
||||
|
||||
(test-equal "tests-true: absent #:tests? is acceptable"
|
||||
'()
|
||||
(let ((pkg (dummy-package "x")))
|
||||
(check-tests-true pkg)))
|
||||
|
||||
(test-equal "tests-true: #:tests? #f is acceptable"
|
||||
'()
|
||||
(let ((pkg (dummy-package "x" (arguments '(#:tests? #f)))))
|
||||
(check-tests-true pkg)))
|
||||
|
||||
(test-equal "tests-true: #:tests? #t acceptable when compiling natively"
|
||||
'()
|
||||
(let ((pkg (dummy-package "x"
|
||||
(arguments
|
||||
`(#:tests? ,(not (%current-target-system)))))))
|
||||
(check-tests-true pkg)))
|
||||
|
||||
(test-equal "inputs: pkg-config is probably a native input"
|
||||
"'pkg-config' should probably be a native input"
|
||||
(single-lint-warning-message
|
||||
|
@ -1008,10 +1031,13 @@
|
|||
(method url-fetch)
|
||||
(uri "http://example.org/foo.tgz")
|
||||
(sha256 (make-bytevector 32))))
|
||||
(warnings (with-http-server '((404 "Not archived."))
|
||||
(warnings (with-http-server '((404 "Not archived.")
|
||||
(404 "Not in Disarchive database."))
|
||||
(parameterize ((%swh-base-url (%local-url)))
|
||||
(check-archival (dummy-package "x"
|
||||
(source origin)))))))
|
||||
(mock ((guix download) %disarchive-mirrors
|
||||
(list (%local-url)))
|
||||
(check-archival (dummy-package "x"
|
||||
(source origin))))))))
|
||||
(warning-contains? "not archived" warnings)))
|
||||
|
||||
(test-equal "archival: content available"
|
||||
|
@ -1027,6 +1053,29 @@
|
|||
(parameterize ((%swh-base-url (%local-url)))
|
||||
(check-archival (dummy-package "x" (source origin)))))))
|
||||
|
||||
(test-equal "archival: content unavailable but disarchive available"
|
||||
'()
|
||||
(let* ((origin (origin
|
||||
(method url-fetch)
|
||||
(uri "http://example.org/foo.tgz")
|
||||
(sha256 (make-bytevector 32))))
|
||||
(disarchive (object->string
|
||||
'(disarchive (version 0)
|
||||
...
|
||||
"swh:1:dir:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")))
|
||||
;; https://archive.softwareheritage.org/api/1/directory/
|
||||
(directory "[ { \"checksums\": {},
|
||||
\"dir_id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",
|
||||
\"type\": \"file\",
|
||||
\"name\": \"README\"
|
||||
\"length\": 42 } ]"))
|
||||
(with-http-server `((404 "") ;lookup-content
|
||||
(200 ,disarchive) ;Disarchive database lookup
|
||||
(200 ,directory)) ;lookup-directory
|
||||
(mock ((guix download) %disarchive-mirrors (list (%local-url)))
|
||||
(parameterize ((%swh-base-url (%local-url)))
|
||||
(check-archival (dummy-package "x" (source origin))))))))
|
||||
|
||||
(test-assert "archival: missing revision"
|
||||
(let* ((origin (origin
|
||||
(method git-fetch)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue