[PATCH] python-lzo + python-lz4

[PATCH] python-lzo + python-lz4

[ng0]

[-- Attachment #1.1: Type: text/plain, Size: 81 bytes --]

lz4: builds. lzo: I don't know how to make it find lzo headers, help
requested.


[-- Attachment #1.2: 0001-gnu-Add-python-lz4.patch --]
[-- Type: text/x-patch, Size: 2604 bytes --]

From 2fb504abdf78e63de0d538fd2cebef43b9fc38f6 Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Wed, 21 Sep 2016 23:21:39 +0000
Subject: [PATCH 1/2] gnu: Add python-lz4.

* gnu/packages/compression.scm (python-lz4): New variable.
---
 gnu/packages/compression.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 6504641..b1d5338 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,6 +39,7 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages assembly)
   #:use-module (gnu packages autotools)
@@ -45,6 +47,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages valgrind)
   #:use-module ((srfi srfi-1) #:select (last)))
 
@@ -632,6 +635,34 @@ time for compression ratio.")
     ;; line interface programs (lz4, fullbench, fuzzer, datagen) are GPL2+.
     (license (list license:bsd-2 license:gpl2+))))
 
+(define-public python-lz4
+  (package
+    (name "python-lz4")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "lz4" version))
+       (sha256
+        (base32
+         "1irad4sq4hdr30fr53smvv3zzk4rddcf9b4jx19w8s9xsxhr1x3b"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-nose" ,python-nose)))
+    (home-page "https://github.com/python-lz4/python-lz4")
+    (synopsis "LZ4 Bindings for Python")
+    (description
+     "This package provides python bindings for the lz4 compression library
+by Yann Collet.  The project contains bindings for the LZ4 block format and
+the LZ4 frame format.")
+    (license license:bsd-3)))
+
+(define-public python2-lz4
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-lz4)))
+    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
+
 (define-public squashfs-tools
   (package
     (name "squashfs-tools")
-- 
2.10.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-python-lzo.patch --]
[-- Type: text/x-patch, Size: 1894 bytes --]

From 2b96177def2703329cc5544efddcc740264d7944 Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Thu, 22 Sep 2016 00:08:21 +0000
Subject: [PATCH 2/2] gnu: Add python-lzo.

* gnu/packages/compression.scm (python-lzo): New variable.
---
 gnu/packages/compression.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index b1d5338..30e69c6 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -364,6 +364,37 @@ LZO is written in ANSI C.  Both the source code and the compressed data
 format are designed to be portable across platforms.")
     (license license:gpl2+)))
 
+(define-public python-lzo
+  (package
+    (name "python-lzo")
+    (version "1.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "python-lzo" version))
+       (sha256
+        (base32
+         "11p3ifg14p086byhhin6azx5svlkg8dzw2b5abixik97xd6fm81q"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-setuppy
+           (lambda _
+             (substitute* "setup.py"
+               (("^include_dirs.append")
+                (string-append "include_dirs.append(\""
+                               (assoc-ref %build-inputs "lzo") "/include" "\")"))))))))
+    (inputs
+     `(("lzo" ,lzo)))
+    (home-page "https://github.com/jd-boyd/python-lzo")
+    (synopsis "Python bindings for the LZO data compression library")
+    (description
+     "Python-LZO provides Python bindings for LZO, i.e. you can access
+the LZO library from your Python scripts thereby compressing ordinary
+Python strings.")
+    (license license:gpl2+)))
+
 (define-public lzop
   (package
     (name "lzop")
-- 
2.10.0


[-- Attachment #1.4: Type: text/plain, Size: 26 bytes --]


-- 
              ng0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]

Re: [PATCH] python-lzo + python-lz4

[Danny Milosavljevic]

On Sat, 24 Sep 2016 15:27:45 +0000
ng0 <ngillmann@runbox.com> wrote:

> lz4: builds. lzo: I don't know how to make it find lzo headers, help
> requested.

python-lzo-1.11/setup.py hard-codes /usr/include/lzo . Substitute that by (assoc-ref inputs "lzo") or something. Probably also set -Wl,-rpath there. When testing, make sure to not have lzo in your profile.

Re: [PATCH] python-lzo + python-lz4

[Danny Milosavljevic]

On Sat, 24 Sep 2016 15:27:45 +0000
ng0 <ngillmann@runbox.com> wrote:
> +               (("^include_dirs.append")
                     ^ remove "^"

And add .*

so

 ("include_dirs.append.*")
...

Note that this also matches the newline codepoint (sigh), so you have to re-add it in the substitution at the end.
 
 ("include_dirs.append.*") "......./include/lzo
"
^newline

Re: [PATCH] python-lzo + python-lz4

[ng0]

Hi,

Danny Milosavljevic <dannym@scratchpost.org> writes:

> On Sat, 24 Sep 2016 15:27:45 +0000
> ng0 <ngillmann@runbox.com> wrote:
>> +               (("^include_dirs.append")
>                      ^ remove "^"
>
> And add .*
>
> so
>
>  ("include_dirs.append.*")
> ...
>
> Note that this also matches the newline codepoint (sigh), so you have to re-add it in the substitution at the end.
>  
>  ("include_dirs.append.*") "......./include/lzo
> "
> ^newline
>
>
Thanks for your tips.
I tried to apply, but I might've gotten it wrong. Can you send this in
patch form so I can be sure of what I change? Especially the linebreak
is not good to understand just in ascii.

Thanks
-- 
              ng0

Re: [PATCH] python-lzo + python-lz4

[Danny Milosavljevic]

Hi,

On Sat, 24 Sep 2016 19:16:23 +0000
ng0 <ngillmann@runbox.com> wrote:

> Thanks for your tips.
> I tried to apply, but I might've gotten it wrong. Can you send this in
> patch form so I can be sure of what I change? Especially the linebreak
> is not good to understand just in ascii.

Sure. (It's a normal line break in a string literal)

I've posted the new patch. 

Re: [PATCH] python-lzo + python-lz4

[Danny Milosavljevic]

On Sat, 24 Sep 2016 15:27:45 +0000
ng0 <ngillmann@runbox.com> wrote:

Note: Also add

     #:test-target "check"

[PATCH v2] python-lzo + python-lz4

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

python-lzo + python-lz4

* gnu/packages/compression.scm (python-lzo, python-lz4): New variables.

Co-authored-by: ng0 <ngillmann@runbox.com>
---
 gnu/packages/compression.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-python-lzo-python-lz4.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-python-lzo-python-lz4.patch", Size: 3610 bytes --]

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 6504641..30d05ea 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,6 +39,7 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages assembly)
   #:use-module (gnu packages autotools)
@@ -45,6 +47,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages valgrind)
   #:use-module ((srfi srfi-1) #:select (last)))
 
@@ -361,6 +364,39 @@ LZO is written in ANSI C.  Both the source code and the compressed data
 format are designed to be portable across platforms.")
     (license license:gpl2+)))
 
+(define-public python-lzo
+  (package
+    (name "python-lzo")
+    (version "1.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "python-lzo" version))
+       (sha256
+        (base32
+         "11p3ifg14p086byhhin6azx5svlkg8dzw2b5abixik97xd6fm81q"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:test-target "check"
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-setuppy
+           (lambda _
+             (substitute* "setup.py"
+               (("include_dirs.append.*")
+                (string-append "include_dirs.append(\""
+                               (assoc-ref %build-inputs "lzo") "/include/lzo" "\")
+"))))))))
+    (inputs
+     `(("lzo" ,lzo)))
+    (home-page "https://github.com/jd-boyd/python-lzo")
+    (synopsis "Python bindings for the LZO data compression library")
+    (description
+     "Python-LZO provides Python bindings for LZO, i.e. you can access
+the LZO library from your Python scripts thereby compressing ordinary
+Python strings.")
+    (license license:gpl2+)))
+
 (define-public lzop
   (package
     (name "lzop")
@@ -632,6 +668,34 @@ time for compression ratio.")
     ;; line interface programs (lz4, fullbench, fuzzer, datagen) are GPL2+.
     (license (list license:bsd-2 license:gpl2+))))
 
+(define-public python-lz4
+  (package
+    (name "python-lz4")
+    (version "0.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "lz4" version))
+       (sha256
+        (base32
+         "1irad4sq4hdr30fr53smvv3zzk4rddcf9b4jx19w8s9xsxhr1x3b"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-nose" ,python-nose)))
+    (home-page "https://github.com/python-lz4/python-lz4")
+    (synopsis "LZ4 Bindings for Python")
+    (description
+     "This package provides python bindings for the lz4 compression library
+by Yann Collet.  The project contains bindings for the LZ4 block format and
+the LZ4 frame format.")
+    (license license:bsd-3)))
+
+(define-public python2-lz4
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-lz4)))
+    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
+
 (define-public squashfs-tools
   (package
     (name "squashfs-tools")

Re: [PATCH v2] python-lzo + python-lz4

[ngillmann]

[-- Attachment #1.1: Type: text/plain, Size: 200 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

Okay, there was one character which I did miss. this fixed it. Here's
the updated patch including the python2 variant, which yours did not
have.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-python-lzo.patch --]
[-- Type: text/x-patch, Size: 2214 bytes --]

From 21672f816d1d685a18f1c4bd9d4a6e0766655a66 Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Thu, 22 Sep 2016 00:08:21 +0000
Subject: [PATCH] gnu: Add python-lzo.

* gnu/packages/compression.scm (python-lzo): New variable.

Co-authored-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/packages/compression.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index b1d5338..50859ff 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -364,6 +364,46 @@ LZO is written in ANSI C.  Both the source code and the compressed data
 format are designed to be portable across platforms.")
     (license license:gpl2+)))
 
+(define-public python-lzo
+  (package
+    (name "python-lzo")
+    (version "1.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "python-lzo" version))
+       (sha256
+        (base32
+         "11p3ifg14p086byhhin6azx5svlkg8dzw2b5abixik97xd6fm81q"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:test-target "check"
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-setuppy
+           (lambda _
+             (substitute* "setup.py"
+               (("include_dirs.append.*")
+                (string-append "include_dirs.append(\""
+                               (assoc-ref %build-inputs "lzo") "/include/lzo" "\")
+"))))))))
+    (inputs
+     `(("lzo" ,lzo)))
+    (home-page "https://github.com/jd-boyd/python-lzo")
+    (synopsis "Python bindings for the LZO data compression library")
+    (description
+     "Python-LZO provides Python bindings for LZO, i.e. you can access
+the LZO library from your Python scripts thereby compressing ordinary
+Python strings.")
+    (license license:gpl2+)))
+
+(define-public python2-lzo
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-lzo)))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))))
+
 (define-public lzop
   (package
     (name "lzop")
-- 
2.10.0


[-- Attachment #1.3: Type: text/plain, Size: 26 bytes --]


-- 
              ng0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]

Re: [PATCH v2] python-lzo + python-lz4

[Danny Milosavljevic]

On Sat, 24 Sep 2016 20:22:00 +0000
ngillmann@runbox.com wrote:

> Danny Milosavljevic <dannym@scratchpost.org> writes:
> 
> Okay, there was one character which I did miss. this fixed it. Here's
> the updated patch including the python2 variant, which yours did not
> have.

Right.

Your new patch is missing imports for the function pypi-uri. I think it's (guix build-system python).

Re: [PATCH v2] python-lzo + python-lz4

[ng0]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> On Sat, 24 Sep 2016 20:22:00 +0000
> ngillmann@runbox.com wrote:
>
>> Danny Milosavljevic <dannym@scratchpost.org> writes:
>> 
>> Okay, there was one character which I did miss. this fixed it. Here's
>> the updated patch including the python2 variant, which yours did not
>> have.
>
> Right.
>
> Your new patch is missing imports for the function pypi-uri. I think it's (guix build-system python).
>
No, it is not. lzo was number 2 in the original patch couple  and is
still intended to be applied as such.
-- 
              ng0

Re: [PATCH v2] python-lzo + python-lz4

[Danny Milosavljevic]

> No, it is not. lzo was number 2 in the original patch couple  and is
> still intended to be applied as such.

I see what you mean but I really doubt that patchwork can see it (also because of the subject it probably will replace the entire set by just this package).

Re: [PATCH v2] python-lzo + python-lz4

[ng0]

Danny Milosavljevic <dannym@scratchpost.org> writes:

>> No, it is not. lzo was number 2 in the original patch couple  and is
>> still intended to be applied as such.
>
> I see what you mean but I really doubt that patchwork can see it (also because of the subject it probably will replace the entire set by just this package).
>
Okay, I understand but won't send it again.
I used patchwork for a while, and looking at the past discussions about
alternatives and looking at how much functionality it lacks and almost
no one except ludovic, myself and maybe 2 more people seemed to use
it. So I don't care about patchworks as it is broken. Whoever applies my
patches uses email, no need to adjust my work to a broken tool we
started to test.

Good night
-- 
              ng0

Re: [PATCH] python-lzo + python-lz4

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

On Sat, Sep 24, 2016 at 03:27:45PM +0000, ng0 wrote:
> From 2fb504abdf78e63de0d538fd2cebef43b9fc38f6 Mon Sep 17 00:00:00 2001
> From: ng0 <ngillmann@runbox.com>
> Date: Wed, 21 Sep 2016 23:21:39 +0000
> Subject: [PATCH 1/2] gnu: Add python-lz4.
> 
> * gnu/packages/compression.scm (python-lz4): New variable.

This bundles the upstream lz4 library. We should try to make it not use
the bundled copy of the library.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]