From 341f49657784d55f7e3207d00bdfd26a367a332c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 4 Sep 2015 19:26:07 +0200 Subject: gnu: Add prefix to license imports in (gnu packages photo). * gnu/packages/photo.scm: Import (guix licenses) with #:prefix license: to avoid an impending clash with the import of zlib from both (guix licenses) and (gnu packages compression). --- gnu/packages/photo.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/photo.scm') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index cbfc1e8730..4dba088fdd 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,7 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages photo) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -48,7 +49,7 @@ (description "LibRaw is a library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others).") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libexif (package @@ -67,7 +68,7 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") (description "The libexif C library allows applications to read, edit, and save EXIF data as produced by digital cameras.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libgphoto2 (package @@ -97,7 +98,7 @@ MTP, and other vendor specific protocols for controlling and transferring data from digital cameras.") ;; 'COPYING' says LGPLv2.1+, but in practices files are under LGPLv2+. - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public gphoto2 (package @@ -140,7 +141,7 @@ number of different digital cameras. Through libgphoto2, it supports PTP, MTP, and much more.") ;; Files are typically under LGPLv2+, but 'COPYING' says GPLv2+. - (license gpl2+))) + (license license:gpl2+))) (define-public perl-image-exiftool (package -- cgit v1.2.3