diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
| commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
| tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /tests | |
| parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
| parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
| download | guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/bootloaders.scm
gnu/packages/linphone.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/system.scm
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/print.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/print.scm b/tests/print.scm index d4b2cca93f..3386590d3a 100644 --- a/tests/print.scm +++ b/tests/print.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2017, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +21,7 @@ #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix packages) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-64)) (define-syntax-rule (define-with-source object source expr) @@ -42,11 +42,11 @@ (sha256 (base32 "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")))) - (build-system gnu-build-system) + (build-system (@ (guix build-system gnu) gnu-build-system)) (home-page "http://gnu.org") (synopsis "Dummy") (description "This is a dummy package.") - (license gpl3+))) + (license license:gpl3+))) (define-with-source pkg-with-inputs pkg-with-inputs-source (package @@ -59,20 +59,20 @@ (sha256 (base32 "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")))) - (build-system gnu-build-system) + (build-system (@ (guix build-system gnu) gnu-build-system)) (inputs `(("coreutils" ,(@ (gnu packages base) coreutils)) ("glibc" ,(@ (gnu packages base) glibc) "debug"))) (home-page "http://gnu.org") (synopsis "Dummy") (description "This is a dummy package.") - (license gpl3+))) + (license license:gpl3+))) (test-equal "simple package" - pkg-source + `(define-public test ,pkg-source) (package->code pkg)) (test-equal "package with inputs" - pkg-with-inputs-source + `(define-public test ,pkg-with-inputs-source) (package->code pkg-with-inputs)) (test-end "print") |