From: Oleg Pykhalov <go.wigust@gmail.com>
To: Leo Famulari <leo@famulari.name>
Cc: 27913@debbugs.gnu.org
Subject: [bug#27913] Acknowledgement ([PATCH] gnu: Add python-ghp-import.)
Date: Thu, 03 Aug 2017 21:48:22 +0300 [thread overview]
Message-ID: <878tj0zdvt.fsf@gmail.com> (raw)
In-Reply-To: <20170802200128.GA20759@jasmine.lan> (Leo Famulari's message of "Wed, 2 Aug 2017 16:01:28 -0400")
[-- Attachment #1: Type: text/plain, Size: 1744 bytes --]
Hello Leo,
Leo Famulari <leo@famulari.name> writes:
> On Wed, Aug 02, 2017 at 07:15:21PM +0300, Oleg Pykhalov wrote:
>> Hello Guix.
>>
>> The license is not gpl3+, it's “Tumbolia Public License”.
>> https://raw.githubusercontent.com/davisp/ghp-import/master/LICENSE
>
> For everyone's reference, this is the text of the license:
>
> ------
> Tumbolia Public License
>
> Copyright 2013, Paul Davis <paul.joseph.davis@gmail.com>
>
> Copying and distribution of this file, with or without modification, are
> permitted in any medium without royalty provided the copyright notice and this
> notice are preserved.
>
> TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
>
> 0. opan saurce LOL
> ------
>
> It was discussed on the Fedora Legal mailing list:
>
> https://www.spinics.net/linux/fedora/fedora-legal/msg02842.html
>
> I don't know the final outcome there (i.e. does Fedora offer
> Tumbolia-license software now?) but it seems positive.
>
> Also, Debian distributes the software:
>
> https://packages.debian.org/sid/ghp-import
>
>> Is it OK in Guix? If yes, what is good way to provide this licence?
>
> I think it's fine. The author's intent to make the software available
> under a permissive-style license seems clear to me.
>
> Please change the license field of the package definition from 'gpl3+'
> to 'non-copyleft'. That license can be annotated; there are lots of
> examples in the maths module:
>
> https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/maths.scm
>
> And the source of 'non-copyleft':
>
> https://git.savannah.gnu.org/cgit/guix.git/tree/guix/licenses.scm?id=41209a6f3a9945b55bcc06b989628e09e9f98b6a#n157
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Change licence and add documentation --]
[-- Type: text/x-patch, Size: 2210 bytes --]
From fdb3e7aeef4988f43d2981850ae0f5900e647280 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Wed, 2 Aug 2017 06:32:04 +0300
Subject: [PATCH] gnu: Add python-ghp-import.
* gnu/packages/version-control.scm (python-ghp-import, python2-ghp-import):
New variable.
---
gnu/packages/version-control.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 2e17201a5..69a6cd243 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -520,6 +520,40 @@ collaboration using typical untrusted file hosts or services.")
a built-in cache to decrease server I/O pressure.")
(license license:gpl2)))
+(define-public python-ghp-import
+ (package
+ (name "python-ghp-import")
+ (version "0.5.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/davisp/ghp-import/archive/"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0x887v690xsac2hzjkpbvp3a6crh3m08mqbk3nb4xwc9dnk869q7"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after 'install 'install-documentation
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (string-append out "/share/doc"))
+ (licenses (string-append out "/share/licenses")))
+ (install-file "README.md" doc)
+ (install-file "LICENSE" licenses)))))))
+ (home-page "https://github.com/davisp/ghp-import")
+ (synopsis "Copy directory to the gh-pages branch")
+ (description "Script that copies a directory to the gh-pages branch (by
+default) of the repository.")
+ (license license:non-copyleft)))
+
+(define-public python2-ghp-import
+ (package-with-python2
+ (strip-python2-variant python-ghp-import)))
+
(define-public shflags
(package
(name "shflags")
--
2.13.3
[-- Attachment #3: Type: text/plain, Size: 507 bytes --]
If somebody interested, I also found that “ghp_import.py” has some
Python 2 code only. It doesn't make a big deal and “ghp-import” works
just fine. But I made a snippet to fix this. I'm not sure how to deal
with “python2-ghp-import”, because he doesn't need the snippet.
(modules '((guix build utils)))
(snippet ; Python 3 renamed the unicode type to str.
'(substitute* "ghp_import.py"
(("isinstance\\(text, unicode\\)")
"isinstance(text, str)")))
next prev parent reply other threads:[~2017-08-03 18:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-02 3:38 [bug#27913] [PATCH] gnu: Add python-ghp-import Oleg Pykhalov
[not found] ` <handler.27913.B.150164512919572.ack@debbugs.gnu.org>
2017-08-02 16:15 ` [bug#27913] Acknowledgement ([PATCH] gnu: Add python-ghp-import.) Oleg Pykhalov
2017-08-02 20:01 ` Leo Famulari
2017-08-03 18:48 ` Oleg Pykhalov [this message]
2017-08-19 21:16 ` [bug#27913] [PATCH 0/2] Add python-ghp-import Oleg Pykhalov
2017-08-19 21:19 ` [bug#27913] [PATCH 1/2] licenses: Add tumbolia license Oleg Pykhalov
2017-08-19 21:20 ` [bug#27913] [PATCH 2/2] gnu: Add python-ghp-import Oleg Pykhalov
2017-09-04 13:25 ` bug#27913: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878tj0zdvt.fsf@gmail.com \
--to=go.wigust@gmail.com \
--cc=27913@debbugs.gnu.org \
--cc=leo@famulari.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).