* Imlib2 license
@ 2014-10-24 6:12 Alex Kost
2014-10-25 22:16 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Alex Kost @ 2014-10-24 6:12 UTC (permalink / raw)
To: guix-devel
I've noticed that there is “imlib2” license:
- http://www.gnu.org/licenses/license-list.html#imlib
- http://directory.fsf.org/wiki/License:Imlib2
Is it worth to add it to (guix licenses) module and to use it for
“imlib2” package?
--
Alex
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Imlib2 license
2014-10-24 6:12 Imlib2 license Alex Kost
@ 2014-10-25 22:16 ` Ludovic Courtès
2014-10-26 13:09 ` Alex Kost
0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2014-10-25 22:16 UTC (permalink / raw)
To: Alex Kost; +Cc: guix-devel
Alex Kost <alezost@gmail.com> skribis:
> I've noticed that there is “imlib2” license:
>
> - http://www.gnu.org/licenses/license-list.html#imlib
> - http://directory.fsf.org/wiki/License:Imlib2
>
> Is it worth to add it to (guix licenses) module and to use it for
> “imlib2” package?
Yes, sure.
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Imlib2 license
2014-10-25 22:16 ` Ludovic Courtès
@ 2014-10-26 13:09 ` Alex Kost
2014-10-26 13:53 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Alex Kost @ 2014-10-26 13:09 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
Ludovic Courtès (2014-10-26 01:16 +0300) wrote:
> Alex Kost <alezost@gmail.com> skribis:
>
>> I've noticed that there is “imlib2” license:
>>
>> - http://www.gnu.org/licenses/license-list.html#imlib
>> - http://directory.fsf.org/wiki/License:Imlib2
>>
>> Is it worth to add it to (guix licenses) module and to use it for
>> “imlib2” package?
>
> Yes, sure.
OK for the attached patch?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-licenses-Add-imlib2.patch --]
[-- Type: text/x-diff, Size: 1801 bytes --]
From b7564a7f68fe2d2d74d0d1bc768eb19dbab09a36 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sun, 26 Oct 2014 15:27:56 +0300
Subject: [PATCH] licenses: Add 'imlib2'.
* guix/licenses.scm (imlib2): New variable.
* gnu/packages/image.scm (imlib2): Use it.
---
gnu/packages/image.scm | 4 +---
guix/licenses.scm | 6 ++++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index e4f831e..2515a0c 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -313,9 +313,7 @@ without sacrificing speed.
This is a complete rewrite over the Imlib 1.x series. The architecture is
more modular, simple, and flexible.")
- ;; This license adds several sentences to the original X11 license.
- (license (license:x11-style "file://COPYING"
- "See 'COPYING' in the distribution."))))
+ (license license:imlib2)))
(define-public giblib
(package
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 65ef06c..8b7ea53 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -37,6 +37,7 @@
isc
ijg
ibmpl1.0
+ imlib2
lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+
mpl2.0
openldap2.8 openssl
@@ -195,6 +196,11 @@ which may be a file:// URI pointing the package's tree."
"http://directory.fsf.org/wiki/License:IBMPLv1.0"
"https://www.gnu.org/licenses/license-list#IBMPL"))
+(define imlib2
+ (license "Imlib2"
+ "http://directory.fsf.org/wiki/License:Imlib2"
+ "https://www.gnu.org/licenses/license-list#imlib"))
+
(define lgpl2.0
(license "LGPL 2.0"
"https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html"
--
2.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: Imlib2 license
2014-10-26 13:09 ` Alex Kost
@ 2014-10-26 13:53 ` Ludovic Courtès
2014-10-27 9:12 ` Mark H Weaver
0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2014-10-26 13:53 UTC (permalink / raw)
To: Alex Kost; +Cc: guix-devel
Alex Kost <alezost@gmail.com> skribis:
> OK for the attached patch?
>
>
> From b7564a7f68fe2d2d74d0d1bc768eb19dbab09a36 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Sun, 26 Oct 2014 15:27:56 +0300
> Subject: [PATCH] licenses: Add 'imlib2'.
>
> * guix/licenses.scm (imlib2): New variable.
> * gnu/packages/image.scm (imlib2): Use it.
OK!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Imlib2 license
2014-10-26 13:53 ` Ludovic Courtès
@ 2014-10-27 9:12 ` Mark H Weaver
2014-10-27 12:25 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Mark H Weaver @ 2014-10-27 9:12 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel, Alex Kost
ludo@gnu.org (Ludovic Courtès) writes:
> Alex Kost <alezost@gmail.com> skribis:
>
>> OK for the attached patch?
>>
>>
>> From b7564a7f68fe2d2d74d0d1bc768eb19dbab09a36 Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> Date: Sun, 26 Oct 2014 15:27:56 +0300
>> Subject: [PATCH] licenses: Add 'imlib2'.
>>
>> * guix/licenses.scm (imlib2): New variable.
>> * gnu/packages/image.scm (imlib2): Use it.
>
> OK!
FYI, this patch broke the package 'feh' and caused fatal evaluation
errors on hydra, because gnu/packages/feh.scm used the package 'imlib2'
from (gnu packages image) and also imported (guix licenses) without a
prefix. 'imlib2', used as an input to 'feh', ended up being a license
object. I fixed it in commit 4e2f98c5394c515a5849be3aad6d06e8ad89807b.
Mark
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Imlib2 license
2014-10-27 9:12 ` Mark H Weaver
@ 2014-10-27 12:25 ` Ludovic Courtès
0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2014-10-27 12:25 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel, Alex Kost
Mark H Weaver <mhw@netris.org> skribis:
> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Alex Kost <alezost@gmail.com> skribis:
>>
>>> OK for the attached patch?
>>>
>>>
>>> From b7564a7f68fe2d2d74d0d1bc768eb19dbab09a36 Mon Sep 17 00:00:00 2001
>>> From: Alex Kost <alezost@gmail.com>
>>> Date: Sun, 26 Oct 2014 15:27:56 +0300
>>> Subject: [PATCH] licenses: Add 'imlib2'.
>>>
>>> * guix/licenses.scm (imlib2): New variable.
>>> * gnu/packages/image.scm (imlib2): Use it.
>>
>> OK!
>
> FYI, this patch broke the package 'feh' and caused fatal evaluation
> errors on hydra, because gnu/packages/feh.scm used the package 'imlib2'
> from (gnu packages image) and also imported (guix licenses) without a
> prefix. 'imlib2', used as an input to 'feh', ended up being a license
> object. I fixed it in commit 4e2f98c5394c515a5849be3aad6d06e8ad89807b.
Sorry for overlooking that, thank you!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-10-27 12:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-24 6:12 Imlib2 license Alex Kost
2014-10-25 22:16 ` Ludovic Courtès
2014-10-26 13:09 ` Alex Kost
2014-10-26 13:53 ` Ludovic Courtès
2014-10-27 9:12 ` Mark H Weaver
2014-10-27 12:25 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).