tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-27 19:41:50 +02:00
Code Activity

Merge remote-tracking branch 'origin/master' into core-updates

Browse Source
This commit is contained in:
Christopher Baines
2020-11-29 14:19:55 +00:00
parent ed2545f0fa 7c2e67400f
commit ff01206345
437 changed files with 137482 additions and 74327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/packages.scm
+43
View File
@@ -1463,6 +1463,49 @@
(eq? foo grep)
(eq? bar dep))))))
(test-assert "package-input-rewriting/spec, identity"
;; Make sure that 'package-input-rewriting/spec' doesn't gratuitously
;; introduce variants. In this case, the LIBFFI propagated input should not
;; be duplicated when passing GOBJECT through REWRITE.
;; See <https://issues.guix.gnu.org/43890>.
(let* ((libffi (dummy-package "libffi"
(build-system trivial-build-system)))
(glib (dummy-package "glib"
(build-system trivial-build-system)
(propagated-inputs `(("libffi" ,libffi)))))
(gobject (dummy-package "gobject-introspection"
(build-system trivial-build-system)
(inputs `(("glib" ,glib)))
(propagated-inputs `(("libffi" ,libffi)))))
(rewrite (package-input-rewriting/spec
`(("glib" . ,identity)))))
(and (= (length (package-transitive-inputs gobject))
(length (package-transitive-inputs (rewrite gobject))))
(string=? (derivation-file-name
(package-derivation %store (rewrite gobject)))
(derivation-file-name
(package-derivation %store gobject))))))
(test-assert "package-input-rewriting, identity"
;; Similar to the test above, but with 'package-input-rewriting'.
;; See <https://issues.guix.gnu.org/43890>.
(let* ((libffi (dummy-package "libffi"
(build-system trivial-build-system)))
(glib (dummy-package "glib"
(build-system trivial-build-system)
(propagated-inputs `(("libffi" ,libffi)))))
(gobject (dummy-package "gobject-introspection"
(build-system trivial-build-system)
(inputs `(("glib" ,glib)))
(propagated-inputs `(("libffi" ,libffi)))))
(rewrite (package-input-rewriting `((,glib . ,glib)))))
(and (= (length (package-transitive-inputs gobject))
(length (package-transitive-inputs (rewrite gobject))))
(string=? (derivation-file-name
(package-derivation %store (rewrite gobject)))
(derivation-file-name
(package-derivation %store gobject))))))
(test-equal "package-patched-vulnerabilities"
'(("CVE-2015-1234")
("CVE-2016-1234" "CVE-2018-4567")