* [PATCH 1/2] gnu: gajim: License is "version 3 only".
@ 2016-10-19 4:50 Arun Isaac
2016-10-19 4:50 ` [PATCH 2/2] gnu: gajim: Update to 0.16.6 Arun Isaac
2016-10-19 17:23 ` [PATCH 1/2] gnu: gajim: License is "version 3 only" Leo Famulari
0 siblings, 2 replies; 9+ messages in thread
From: Arun Isaac @ 2016-10-19 4:50 UTC (permalink / raw)
To: guix-devel
* gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
---
gnu/packages/messaging.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0089da1..37bbed7 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -504,7 +504,7 @@ Among its features are: a tabbed chat window and single window modes; support
for group chat (with Multi-User Chat protocol), invitation, chat to group chat
transformation; audio and video conferences; file transfer; TLS, GPG and
end-to-end encryption support; XML console.")
- (license license:gpl3+)))
+ (license license:gpl3)))
(define-public prosody
(package
--
2.10.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] gnu: gajim: Update to 0.16.6.
2016-10-19 4:50 [PATCH 1/2] gnu: gajim: License is "version 3 only" Arun Isaac
@ 2016-10-19 4:50 ` Arun Isaac
2016-10-19 17:25 ` Leo Famulari
2016-10-19 17:23 ` [PATCH 1/2] gnu: gajim: License is "version 3 only" Leo Famulari
1 sibling, 1 reply; 9+ messages in thread
From: Arun Isaac @ 2016-10-19 4:50 UTC (permalink / raw)
To: guix-devel
* gnu/packages/messaging.scm (gajim): Update to 0.16.6.
---
gnu/packages/messaging.scm | 43 ++++++++++++++++++-------------------------
1 file changed, 18 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 37bbed7..66cf231 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -452,7 +452,7 @@ was initially a fork of xmpppy, but is using non-blocking sockets.")
(define-public gajim
(package
(name "gajim")
- (version "0.16.5")
+ (version "0.16.6")
(source (origin
(method url-fetch)
(uri (string-append "https://gajim.org/downloads/"
@@ -460,34 +460,27 @@ was initially a fork of xmpppy, but is using non-blocking sockets.")
"/gajim-" version ".tar.bz2"))
(sha256
(base32
- "14fhcqnkqygh91132dnf1idayj4r3iqbwb44sd3mxv20n6ribh55"))))
+ "1p3qwzy07f0wkika9yigyiq167l2k6wn12flqa7x55z4ihbysmqk"))))
(build-system gnu-build-system)
(arguments
- `(;; The only check done by gajim-0.16.x is to check that the
- ;; translations are up-to-date, and in 0.16.5 they are not, so
- ;; "make check" fails. Therefore, we disable tests for now.
- ;;
- ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later.
- ;;
- #:tests? #f
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-program
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Make sure all Python scripts run with the correct PYTHONPATH.
- (let ((out (assoc-ref outputs "out"))
- (path (getenv "PYTHONPATH")))
- (for-each (lambda (name)
- (let ((file (string-append out "/bin/" name)))
- ;; Wrapping destroys identification of intended
- ;; application, so we need to override "APP".
- (substitute* file
- (("APP=`basename \\$0`")
- (string-append "APP=" name)))
- (wrap-program file
- `("PYTHONPATH" ":" prefix (,path)))))
- '("gajim" "gajim-remote" "gajim-history-manager")))
- #t)))))
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Make sure all Python scripts run with the correct PYTHONPATH.
+ (let ((out (assoc-ref outputs "out"))
+ (path (getenv "PYTHONPATH")))
+ (for-each (lambda (name)
+ (let ((file (string-append out "/bin/" name)))
+ ;; Wrapping destroys identification of intended
+ ;; application, so we need to override "APP".
+ (substitute* file
+ (("APP=`basename \\$0`")
+ (string-append "APP=" name)))
+ (wrap-program file
+ `("PYTHONPATH" ":" prefix (,path)))))
+ '("gajim" "gajim-remote" "gajim-history-manager")))
+ #t)))))
(native-inputs
`(("intltool" ,intltool)))
(propagated-inputs
--
2.10.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/2] gnu: gajim: Update to 0.16.6.
2016-10-19 4:50 ` [PATCH 2/2] gnu: gajim: Update to 0.16.6 Arun Isaac
@ 2016-10-19 17:25 ` Leo Famulari
2016-10-20 10:18 ` Arun Isaac
2016-10-20 11:02 ` [PATCH 1/2] gnu: gajim: License is "version 3 only" Arun Isaac
0 siblings, 2 replies; 9+ messages in thread
From: Leo Famulari @ 2016-10-19 17:25 UTC (permalink / raw)
To: Arun Isaac; +Cc: guix-devel
On Wed, Oct 19, 2016 at 10:20:05AM +0530, Arun Isaac wrote:
> * gnu/packages/messaging.scm (gajim): Update to 0.16.6.
> (arguments
> - `(;; The only check done by gajim-0.16.x is to check that the
> - ;; translations are up-to-date, and in 0.16.5 they are not, so
> - ;; "make check" fails. Therefore, we disable tests for now.
> - ;;
> - ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later.
> - ;;
> - #:tests? #f
Is that comment still true? If so, I think we can leave the tests
disabled.
> (add-after 'install 'wrap-program
> - (lambda* (#:key outputs #:allow-other-keys)
> - ;; Make sure all Python scripts run with the correct PYTHONPATH.
> - (let ((out (assoc-ref outputs "out"))
> - (path (getenv "PYTHONPATH")))
> - (for-each (lambda (name)
> - (let ((file (string-append out "/bin/" name)))
> - ;; Wrapping destroys identification of intended
> - ;; application, so we need to override "APP".
> - (substitute* file
> - (("APP=`basename \\$0`")
> - (string-append "APP=" name)))
> - (wrap-program file
> - `("PYTHONPATH" ":" prefix (,path)))))
> - '("gajim" "gajim-remote" "gajim-history-manager")))
> - #t)))))
> + (lambda* (#:key outputs #:allow-other-keys)
> + ;; Make sure all Python scripts run with the correct PYTHONPATH.
> + (let ((out (assoc-ref outputs "out"))
> + (path (getenv "PYTHONPATH")))
> + (for-each (lambda (name)
> + (let ((file (string-append out "/bin/" name)))
> + ;; Wrapping destroys identification of intended
> + ;; application, so we need to override "APP".
> + (substitute* file
> + (("APP=`basename \\$0`")
> + (string-append "APP=" name)))
> + (wrap-program file
> + `("PYTHONPATH" ":" prefix (,path)))))
> + '("gajim" "gajim-remote" "gajim-history-manager")))
> + #t)))))
This is just an indentation fix, right? Just checking :)
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 2/2] gnu: gajim: Update to 0.16.6.
2016-10-19 17:25 ` Leo Famulari
@ 2016-10-20 10:18 ` Arun Isaac
2016-10-20 11:02 ` [PATCH 1/2] gnu: gajim: License is "version 3 only" Arun Isaac
1 sibling, 0 replies; 9+ messages in thread
From: Arun Isaac @ 2016-10-20 10:18 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 2670 bytes --]
Leo Famulari writes:
>> (arguments
>> - `(;; The only check done by gajim-0.16.x is to check that the
>> - ;; translations are up-to-date, and in 0.16.5 they are not, so
>> - ;; "make check" fails. Therefore, we disable tests for now.
>> - ;;
>> - ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later.
>> - ;;
>> - #:tests? #f
>
> Is that comment still true? If so, I think we can leave the tests
> disabled.
I was able to build gajim with the tests enabled. So, I'm assuming this
comment is no longer true.
>> (add-after 'install 'wrap-program
>> - (lambda* (#:key outputs #:allow-other-keys)
>> - ;; Make sure all Python scripts run with the correct PYTHONPATH.
>> - (let ((out (assoc-ref outputs "out"))
>> - (path (getenv "PYTHONPATH")))
>> - (for-each (lambda (name)
>> - (let ((file (string-append out "/bin/" name)))
>> - ;; Wrapping destroys identification of intended
>> - ;; application, so we need to override "APP".
>> - (substitute* file
>> - (("APP=`basename \\$0`")
>> - (string-append "APP=" name)))
>> - (wrap-program file
>> - `("PYTHONPATH" ":" prefix (,path)))))
>> - '("gajim" "gajim-remote" "gajim-history-manager")))
>> - #t)))))
>> + (lambda* (#:key outputs #:allow-other-keys)
>> + ;; Make sure all Python scripts run with the correct PYTHONPATH.
>> + (let ((out (assoc-ref outputs "out"))
>> + (path (getenv "PYTHONPATH")))
>> + (for-each (lambda (name)
>> + (let ((file (string-append out "/bin/" name)))
>> + ;; Wrapping destroys identification of intended
>> + ;; application, so we need to override "APP".
>> + (substitute* file
>> + (("APP=`basename \\$0`")
>> + (string-append "APP=" name)))
>> + (wrap-program file
>> + `("PYTHONPATH" ":" prefix (,path)))))
>> + '("gajim" "gajim-remote" "gajim-history-manager")))
>> + #t)))))
>
> This is just an indentation fix, right? Just checking :)
Yes, this is just an indentation fix.
I'll send an updated set of patches with the changes to the "version 3
only" fix incorporated.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/2] gnu: gajim: License is "version 3 only".
2016-10-19 17:25 ` Leo Famulari
2016-10-20 10:18 ` Arun Isaac
@ 2016-10-20 11:02 ` Arun Isaac
2016-10-20 11:02 ` [PATCH 2/2] gnu: gajim: Update to 0.16.6 Arun Isaac
1 sibling, 1 reply; 9+ messages in thread
From: Arun Isaac @ 2016-10-20 11:02 UTC (permalink / raw)
To: guix-devel
* gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
---
gnu/packages/messaging.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0089da1..f5a8c4a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -504,7 +504,11 @@ Among its features are: a tabbed chat window and single window modes; support
for group chat (with Multi-User Chat protocol), invitation, chat to group chat
transformation; audio and video conferences; file transfer; TLS, GPG and
end-to-end encryption support; XML console.")
- (license license:gpl3+)))
+ ;; Gajim is released under the GPL3 license, but a few files are
+ ;; released under the GPL3+ and the 2-clause BSD licenses
+ (license (list license:gpl3
+ license:gpl3+
+ license:bsd-2))))
(define-public prosody
(package
--
2.10.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] gnu: gajim: Update to 0.16.6.
2016-10-20 11:02 ` [PATCH 1/2] gnu: gajim: License is "version 3 only" Arun Isaac
@ 2016-10-20 11:02 ` Arun Isaac
0 siblings, 0 replies; 9+ messages in thread
From: Arun Isaac @ 2016-10-20 11:02 UTC (permalink / raw)
To: guix-devel
* gnu/packages/messaging.scm (gajim): Update to 0.16.6.
---
gnu/packages/messaging.scm | 43 ++++++++++++++++++-------------------------
1 file changed, 18 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index f5a8c4a..4ce7310 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -452,7 +452,7 @@ was initially a fork of xmpppy, but is using non-blocking sockets.")
(define-public gajim
(package
(name "gajim")
- (version "0.16.5")
+ (version "0.16.6")
(source (origin
(method url-fetch)
(uri (string-append "https://gajim.org/downloads/"
@@ -460,34 +460,27 @@ was initially a fork of xmpppy, but is using non-blocking sockets.")
"/gajim-" version ".tar.bz2"))
(sha256
(base32
- "14fhcqnkqygh91132dnf1idayj4r3iqbwb44sd3mxv20n6ribh55"))))
+ "1p3qwzy07f0wkika9yigyiq167l2k6wn12flqa7x55z4ihbysmqk"))))
(build-system gnu-build-system)
(arguments
- `(;; The only check done by gajim-0.16.x is to check that the
- ;; translations are up-to-date, and in 0.16.5 they are not, so
- ;; "make check" fails. Therefore, we disable tests for now.
- ;;
- ;; XXX TODO Try re-enabling tests in gajim-0.16.6 or later.
- ;;
- #:tests? #f
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-program
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Make sure all Python scripts run with the correct PYTHONPATH.
- (let ((out (assoc-ref outputs "out"))
- (path (getenv "PYTHONPATH")))
- (for-each (lambda (name)
- (let ((file (string-append out "/bin/" name)))
- ;; Wrapping destroys identification of intended
- ;; application, so we need to override "APP".
- (substitute* file
- (("APP=`basename \\$0`")
- (string-append "APP=" name)))
- (wrap-program file
- `("PYTHONPATH" ":" prefix (,path)))))
- '("gajim" "gajim-remote" "gajim-history-manager")))
- #t)))))
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Make sure all Python scripts run with the correct PYTHONPATH.
+ (let ((out (assoc-ref outputs "out"))
+ (path (getenv "PYTHONPATH")))
+ (for-each (lambda (name)
+ (let ((file (string-append out "/bin/" name)))
+ ;; Wrapping destroys identification of intended
+ ;; application, so we need to override "APP".
+ (substitute* file
+ (("APP=`basename \\$0`")
+ (string-append "APP=" name)))
+ (wrap-program file
+ `("PYTHONPATH" ":" prefix (,path)))))
+ '("gajim" "gajim-remote" "gajim-history-manager")))
+ #t)))))
(native-inputs
`(("intltool" ,intltool)))
(propagated-inputs
--
2.10.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: gajim: License is "version 3 only".
2016-10-19 4:50 [PATCH 1/2] gnu: gajim: License is "version 3 only" Arun Isaac
2016-10-19 4:50 ` [PATCH 2/2] gnu: gajim: Update to 0.16.6 Arun Isaac
@ 2016-10-19 17:23 ` Leo Famulari
2016-10-20 19:46 ` Ludovic Courtès
1 sibling, 1 reply; 9+ messages in thread
From: Leo Famulari @ 2016-10-19 17:23 UTC (permalink / raw)
To: Arun Isaac; +Cc: guix-devel
On Wed, Oct 19, 2016 at 10:20:04AM +0530, Arun Isaac wrote:
> * gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
Thanks for checking on this!
Indeed, the bulk of the license headers say "version 3 only", so I think
gajim is GPL3. But, I found a few files that are GPL3+, and at least one
2-clause BSD licensed file in 'src/command-system'.
Can you revise this patch to give a license list, with comments
explaining that the package is GPL3 but includes some
differently-licensed components?
> ---
> gnu/packages/messaging.scm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 0089da1..37bbed7 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -504,7 +504,7 @@ Among its features are: a tabbed chat window and single window modes; support
> for group chat (with Multi-User Chat protocol), invitation, chat to group chat
> transformation; audio and video conferences; file transfer; TLS, GPG and
> end-to-end encryption support; XML console.")
> - (license license:gpl3+)))
> + (license license:gpl3)))
>
> (define-public prosody
> (package
> --
> 2.10.1
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: gajim: License is "version 3 only".
2016-10-19 17:23 ` [PATCH 1/2] gnu: gajim: License is "version 3 only" Leo Famulari
@ 2016-10-20 19:46 ` Ludovic Courtès
2016-10-23 6:28 ` Arun Isaac
0 siblings, 1 reply; 9+ messages in thread
From: Ludovic Courtès @ 2016-10-20 19:46 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
Leo Famulari <leo@famulari.name> skribis:
> On Wed, Oct 19, 2016 at 10:20:04AM +0530, Arun Isaac wrote:
>> * gnu/packages/messaging.scm (gajim)[license]: Change to GPL3.
>
> Thanks for checking on this!
>
> Indeed, the bulk of the license headers say "version 3 only", so I think
> gajim is GPL3. But, I found a few files that are GPL3+, and at least one
> 2-clause BSD licensed file in 'src/command-system'.
>
> Can you revise this patch to give a license list, with comments
> explaining that the package is GPL3 but includes some
> differently-licensed components?
Given that the combination is GPLv3-only in practice, I think it’s
enough to write ‘gpl3’ (I know we’ve been somewhat inconsistent here…).
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-10-23 6:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-19 4:50 [PATCH 1/2] gnu: gajim: License is "version 3 only" Arun Isaac
2016-10-19 4:50 ` [PATCH 2/2] gnu: gajim: Update to 0.16.6 Arun Isaac
2016-10-19 17:25 ` Leo Famulari
2016-10-20 10:18 ` Arun Isaac
2016-10-20 11:02 ` [PATCH 1/2] gnu: gajim: License is "version 3 only" Arun Isaac
2016-10-20 11:02 ` [PATCH 2/2] gnu: gajim: Update to 0.16.6 Arun Isaac
2016-10-19 17:23 ` [PATCH 1/2] gnu: gajim: License is "version 3 only" Leo Famulari
2016-10-20 19:46 ` Ludovic Courtès
2016-10-23 6:28 ` Arun Isaac
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).