[PATCH] distro: Add Python 2.7.3.

[PATCH] distro: Add Python 2.7.3.

[Nikita Karetnikov]

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

Hi,

Note that I haven't tested this patch with the latest code because of
this error [1].  But the build succeeded in the other repo.

Also, should we explictly mention the licenses for third-party software
incorporated in the Python distribution [2]?

Nikita

[1] https://lists.gnu.org/archive/html/bug-guix/2013-01/msg00139.html
[2] http://docs.python.org/2/license.html#licenses-and-acknowledgements-for-incorporated-software


[-- Attachment #1.2: 0001-distro-Add-Python-2.7.3.patch --]
[-- Type: text/x-diff, Size: 3587 bytes --]

From 79c91df9df0899aa96418dad0f3015a7e58fc618 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Mon, 14 Jan 2013 22:26:43 +0000
Subject: [PATCH] distro: Add Python 2.7.3.

* distro/packages/python.scm: New file.
* Makefile.am (MODULES): Add it.
---
 Makefile.am                |    1 +
 distro/packages/python.scm |   60 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 0 deletions(-)
 create mode 100644 distro/packages/python.scm

diff --git a/Makefile.am b/Makefile.am
index 7c36eff..9935076 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,6 +98,7 @@ MODULES =					\
   distro/packages/perl.scm			\
   distro/packages/pkg-config.scm		\
   distro/packages/pth.scm			\
+  distro/packages/python.scm			\
   distro/packages/readline.scm			\
   distro/packages/recutils.scm			\
   distro/packages/rsync.scm			\
diff --git a/distro/packages/python.scm b/distro/packages/python.scm
new file mode 100644
index 0000000..4157821
--- /dev/null
+++ b/distro/packages/python.scm
@@ -0,0 +1,60 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (distro packages python)
+  #:use-module (guix licenses)
+  #:use-module ((distro packages compression)
+                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module ((distro packages openssl)
+                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module (distro packages base)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public python
+  (package
+    (name "python")
+    (version "2.7.3")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://www.python.org/ftp/python/"
+                          version "/Python-" version ".tar.xz"))
+      (sha256
+       (base32
+        "11f9aw855lrmknr6c82gm1ijr3n0smc6idyp94y7774yivjnplv1"))))
+    (build-system gnu-build-system)
+    (arguments `(#:tests? #f)) ; XXX: some tests fail
+    (inputs
+     `(("zlib" ,guix:zlib)
+       ("openssl" ,guix:openssl)
+       ("bzip2" ,guix:bzip2)
+       ("glibc" ,glibc-final)))
+    (home-page "http://python.org")
+    (synopsis
+     "Python, a high-level dynamically-typed programming language")
+    (description
+     "Python is a remarkably powerful dynamic programming language that
+is used in a wide variety of application domains.  Some of its key
+distinguishing features include: clear, readable syntax; strong
+introspection capabilities; intuitive object orientation; natural
+expression of procedural code; full modularity, supporting hierarchical
+packages; exception-based error handling; and very high level dynamic
+data types.")
+    (license psfl)))
-- 
1.7.5.4


[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH] distro: Add Python 2.7.3.

[Ludovic Courtès]

Hi,

Nikita Karetnikov <nikita@karetnikov.org> skribis:

> Also, should we explictly mention the licenses for third-party software
> incorporated in the Python distribution [2]?

Perhaps just add the link in a comment.

> +    (arguments `(#:tests? #f)) ; XXX: some tests fail

Did you try to investigate?  How hard would it be to fix that?

> +    (inputs
> +     `(("zlib" ,guix:zlib)
> +       ("openssl" ,guix:openssl)
> +       ("bzip2" ,guix:bzip2)

To avoid the #:renamer, I recommend doing this instead:

  #:use-module ((guix licenses) #:select (psfl))

> +       ("glibc" ,glibc-final)))

This is not needed: there’s an implicit “libc” input already (see
build-system/gnu.scm).

Thanks,
Ludo’.

Re: [PATCH] distro: Add Python 2.7.3.

[Nikita Karetnikov]

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

> Did you try to investigate?  How hard would it be to fix that?

Here is the output:

328 tests OK.
9 tests failed:
    test_distutils test_file test_file2k test_openpty test_pty
    test_site test_socket test_subprocess test_unittest
52 tests skipped:
    test_aepack test_al test_applesingle test_bsddb test_bsddb185
    test_bsddb3 test_bz2 test_cd test_cl test_codecmaps_cn
    test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr
    test_codecmaps_tw test_crypt test_curses test_dbm test_dl test_gdb
    test_gdbm test_gl test_gzip test_imgfile test_ioctl test_kqueue
    test_linuxaudiodev test_macos test_macostools test_msilib test_nis
    test_ossaudiodev test_pep277 test_readline test_scriptpackages
    test_smtpnet test_socketserver test_sqlite test_ssl test_startfile
    test_sunaudiodev test_tcl test_timeout test_tk test_ttk_guionly
    test_ttk_textonly test_unicode_file test_urllib2net test_urllibnet
    test_winreg test_winsound test_zipfile64 test_zlib
16 skips unexpected on linux2:
    test_bsddb test_bsddb3 test_bz2 test_crypt test_dbm test_gdb
    test_gdbm test_gzip test_ioctl test_readline test_ssl test_tcl
    test_tk test_ttk_guionly test_ttk_textonly test_zlib
make: [test] Error 1 (ignored)

I also tried to run tests with '-v' (i.e., verbose) and got a different
output:

# source environment-variables
# /tmp/nix-build-python-2.7.3.drv-5/Python-2.7.3/python -v /tmp/nix-build-python-2.7.3.drv-5/Python-2.7.3/Lib/test/regrtest.py

331 tests OK.
5 tests failed:
    test_atexit test_distutils test_ioctl test_openpty test_pty
1 test altered the execution environment:
    test_site
52 tests skipped:
    test_aepack test_al test_applesingle test_bsddb test_bsddb185
    test_bsddb3 test_bz2 test_cd test_cl test_codecmaps_cn
    test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr
    test_codecmaps_tw test_crypt test_curses test_dbm test_dl test_gdb
    test_gdbm test_gl test_gzip test_imgfile test_kqueue
    test_linuxaudiodev test_macos test_macostools test_msilib test_nis
    test_ossaudiodev test_pep277 test_py3kwarn test_readline
    test_scriptpackages test_smtpnet test_socketserver test_sqlite
    test_ssl test_startfile test_sunaudiodev test_tcl test_timeout
    test_tk test_ttk_guionly test_ttk_textonly test_unicode_file
    test_urllib2net test_urllibnet test_winreg test_winsound
    test_zipfile64 test_zlib
15 skips unexpected on linux2:
    test_bsddb test_bsddb3 test_bz2 test_crypt test_dbm test_gdb
    test_gdbm test_gzip test_readline test_ssl test_tcl test_tk
    test_ttk_guionly test_ttk_textonly test_zlib

Python is required by GLib, which is a leaf dependency of GNU Parted.
So I would prefer to push Python without tests and spend more time on
Parted.  (GNU packages are preferred, right?)

Nikita

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH] distro: Add Python 2.7.3.

[Nikita Karetnikov]

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

> Python is required by GLib, which is a leaf dependency of GNU Parted.
> So I would prefer to push Python without tests and spend more time on
> Parted.  (GNU packages are preferred, right?)

Can I push this patch and the one that adds 'psfl'?

Nikita


[-- Attachment #1.2: 0001-distro-Add-Python-2.7.3.patch --]
[-- Type: text/x-diff, Size: 3498 bytes --]

From 0f46f14c53b6645f6ceddf847b642ea97dbb8e58 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Tue, 15 Jan 2013 02:29:28 +0000
Subject: [PATCH] distro: Add Python 2.7.3.

* distro/packages/python.scm: New file.
* Makefile.am (MODULES): Add it.
---
 Makefile.am                |    1 +
 distro/packages/python.scm |   58 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 0 deletions(-)
 create mode 100644 distro/packages/python.scm

diff --git a/Makefile.am b/Makefile.am
index 32c648d..d434d8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,6 +98,7 @@ MODULES =					\
   distro/packages/perl.scm			\
   distro/packages/pkg-config.scm		\
   distro/packages/pth.scm			\
+  distro/packages/python.scm			\
   distro/packages/readline.scm			\
   distro/packages/recutils.scm			\
   distro/packages/rsync.scm			\
diff --git a/distro/packages/python.scm b/distro/packages/python.scm
new file mode 100644
index 0000000..5692cd5
--- /dev/null
+++ b/distro/packages/python.scm
@@ -0,0 +1,58 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (distro packages python)
+  #:use-module ((guix licenses) #:select (psfl))
+  #:use-module (distro packages compression)
+  #:use-module (distro packages openssl)
+  #:use-module (distro packages base)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public python
+  (package
+    (name "python")
+    (version "2.7.3")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://www.python.org/ftp/python/"
+                          version "/Python-" version ".tar.xz"))
+      (sha256
+       (base32
+        "11f9aw855lrmknr6c82gm1ijr3n0smc6idyp94y7774yivjnplv1"))))
+    (build-system gnu-build-system)
+    (arguments `(#:tests? #f)) ; XXX: some tests fail
+    (inputs
+     `(("zlib" ,zlib)
+       ("openssl" ,openssl)
+       ("bzip2" ,bzip2)))
+    (home-page "http://python.org")
+    (synopsis
+     "Python, a high-level dynamically-typed programming language")
+    (description
+     "Python is a remarkably powerful dynamic programming language that
+is used in a wide variety of application domains.  Some of its key
+distinguishing features include: clear, readable syntax; strong
+introspection capabilities; intuitive object orientation; natural
+expression of procedural code; full modularity, supporting hierarchical
+packages; exception-based error handling; and very high level dynamic
+data types.")
+    (license psfl)))
-- 
1.7.5.4


[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH] distro: Add Python 2.7.3.

[Ludovic Courtès]

Hi,

Nikita Karetnikov <nikita@karetnikov.org> skribis:

>> Python is required by GLib, which is a leaf dependency of GNU Parted.
>> So I would prefer to push Python without tests and spend more time on
>> Parted.  (GNU packages are preferred, right?)

OK, makes sense.  The failing tests don’t look scary, and could well
relate to the chroot environment (in particular the pty tests.)

> Can I push this patch and the one that adds 'psfl'?

I pushed the latter, so yes, you can push this one.

Thanks,
Ludo’.