[bug#27913] [PATCH] gnu: Add python-ghp-import.

[bug#27913] [PATCH] gnu: Add python-ghp-import.

[Oleg Pykhalov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH] gnu: Add python-ghp-import. --]
[-- Type: text/x-patch, Size: 1694 bytes --]

From eb71446f05762d4981bdef0ce7e0ada55fa9ce4f 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.
To: guix-patches@gnu.org

* gnu/packages/version-control.scm (python-ghp-import, python2-ghp-import):
New variable.
---
 gnu/packages/version-control.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 2e17201a5..062134d23 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -520,6 +520,31 @@ 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)
+    (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:gpl3+)))
+
+(define-public python2-ghp-import
+  (package-with-python2
+   (strip-python2-variant python-ghp-import)))
+
 (define-public shflags
   (package
     (name "shflags")
-- 
2.13.3

[bug#27913] Acknowledgement ([PATCH] gnu: Add python-ghp-import.)

[Oleg Pykhalov]

Hello Guix.

The license is not gpl3+, it's “Tumbolia Public License”.
https://raw.githubusercontent.com/davisp/ghp-import/master/LICENSE

Is it OK in Guix?  If yes, what is good way to provide this licence?
Just install it in “output”?

[bug#27913] Acknowledgement ([PATCH] gnu: Add python-ghp-import.)

[Leo Famulari]

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

[bug#27913] Acknowledgement ([PATCH] gnu: Add python-ghp-import.)

[Oleg Pykhalov]

[-- 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)")))

[bug#27913] [PATCH 0/2] Add python-ghp-import.

[Oleg Pykhalov]

Hello Leo,

Leo Famulari <leo@famulari.name> writes:

> 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

I probably miss understood you.  Did you want to define a new license in
guix/licenses.scm and then set license variable to this in
python-ghp-import?

Oleg Pykhalov (2):
  licenses: Add tumbolia license.
  gnu: Add python-ghp-import.

 gnu/packages/version-control.scm | 34 ++++++++++++++++++++++++++++++++++
 guix/licenses.scm                |  7 +++++++
 2 files changed, 41 insertions(+)

-- 
2.14.1

[bug#27913] [PATCH 1/2] licenses: Add tumbolia license.

[Oleg Pykhalov]

[-- Attachment #1: [PATCH 1/2] licenses: Add tumbolia license. --]
[-- Type: text/x-patch, Size: 1459 bytes --]

From a3c4a9f4c59016d8df10acb5369b187f9fdf3e29 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sun, 20 Aug 2017 00:05:06 +0300
Subject: [PATCH 1/2] licenses: Add tumbolia license.

* guix/licenses.scm (tumbolia): New variable.
---
 guix/licenses.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index b7dadd975..c12f2867e 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2017 Petter <petter@mykolab.ch>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -83,6 +84,7 @@
             silofl1.1
             sleepycat
             tcl/tk
+            tumbolia
             unlicense
             vim
             x11 x11-style
@@ -552,6 +554,11 @@ at URI, which may be a file:// URI pointing the package's tree."
            "http://www.tcl.tk/software/tcltk/license.html"
            "A non-copyleft free software license from the Tcl/Tk project"))
 
+(define tumbolia
+  (license "Tumbolia"
+           "https://raw.github.com/davisp/ghp-import/master/LICENSE"
+           "A non-copyleft permissive-style license"))
+
 (define vim
   (license "Vim"
            "http://directory.fsf.org/wiki/License:Vim7.2"
-- 
2.14.1

[bug#27913] [PATCH 2/2] gnu: Add python-ghp-import.

[Oleg Pykhalov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH 2/2] gnu: Add python-ghp-import. --]
[-- Type: text/x-patch, Size: 2210 bytes --]

From 68ae12d2aaf08e23d48bd6ed785704ffaa3d4da6 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sun, 20 Aug 2017 00:05:15 +0300
Subject: [PATCH 2/2] 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..da2961e20 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:tumbolia)))
+
+(define-public python2-ghp-import
+  (package-with-python2
+   (strip-python2-variant python-ghp-import)))
+
 (define-public shflags
   (package
     (name "shflags")
-- 
2.14.1

bug#27913: [PATCH 2/2] gnu: Add python-ghp-import.

[Ludovic Courtès]

Oleg Pykhalov <go.wigust@gmail.com> skribis:

>>From 68ae12d2aaf08e23d48bd6ed785704ffaa3d4da6 Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Sun, 20 Aug 2017 00:05:15 +0300
> Subject: [PATCH 2/2] gnu: Add python-ghp-import.
>
> * gnu/packages/version-control.scm (python-ghp-import, python2-ghp-import):
> New variable.

Pushed as 65101a2596aa6b9dce629c7efad7967e8818f204, using…

> +    (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:tumbolia)))

… ‘license:copyleft’ here as suggested by Leo.

Thanks!

Ludo’.