[PATCH] gnu: services: Add nginx-service.

[David Thompson]

Here's a basic nginx service.  There are more actions that could be
added in the future, but this does the essentials.

From 4bd0c36545258d028a74e2fc7144a4037ec1148f Mon Sep 17 00:00:00 2001
From: David Thompson dthomps...@worcester.edu
Date: Sun, 2 Aug 2015 23:29:53 -0400
Subject: [PATCH] gnu: services: Add nginx-service.

* gnu/services/web.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am|   1 +
 gnu/services/web.scm | 105 +++
 2 files changed, 106 insertions(+)
 create mode 100644 gnu/services/web.scm

diff --git a/gnu-system.am b/gnu-system.am
index 87924fe..5a28c4b 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -345,6 +345,7 @@ GNU_SYSTEM_MODULES =\
   gnu/services/lirc.scm\
   gnu/services/networking.scm			\
   gnu/services/ssh.scm\
+  gnu/services/web.scm\
   gnu/services/xorg.scm\
 		\
   gnu/system.scm\
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
new file mode 100644
index 000..85c6e07
--- /dev/null
+++ b/gnu/services/web.scm
@@ -0,0 +1,105 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 David Thompson da...@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 (gnu services web)
+  #:use-module (gnu services)
+  #:use-module (gnu system shadow)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages web)
+  #:use-module (guix records)
+  #:use-module (guix monads)
+  #:use-module (guix store)
+  #:use-module (guix gexp)
+  #:export (nginx-service))
+
+;;; Commentary:
+;;;
+;;; Web services.
+;;;
+;;; Code:
+
+(define %default-nginx-config
+  (text-file* nginx.conf
+  user nginx nginx;\n
+  pid /var/run/nginx/pid;\n
+  error_log /var/log/nginx/error.log info;\n
+  http {\n
+  access_log /var/log/nginx/access.log;\n
+  root /var/www;\n
+  server {}\n
+  }\n
+  events {}\n))
+
+(define* (nginx-service #:key (nginx nginx)
+(config-file %default-nginx-config)
+(log-directory /var/log/nginx)
+(run-directory /var/run/nginx))
+  Return a service that runs NGINX, the nginx web server.
+
+The nginx daemon loads its runtime configuration from CONFIG-FIGLE, stores log
+files in LOG-DIRECTORY, and stores temporary runtime files in RUN-DIRECTORY.
+  (define nginx* #~(string-append #$nginx /sbin/nginx))
+
+  (define start-script
+(mlet %store-monad ((config-file config-file))
+  (gexp-script start-nginx
+#~(system* #$nginx* -c #$config-file
+   -p #$run-directory
+
+  (define stop-script
+(mlet %store-monad ((config-file config-file))
+  (gexp-script stop-nginx
+#~(system* #$nginx* -c #$config-file
+   -p #$run-directory -s stop
+
+  (define activate
+(mlet %store-monad ((config-file config-file))
+  (return
+   #~(begin
+   (use-modules (guix build utils))
+   (format #t creating nginx log directory '~a'~% #$log-directory)
+   (mkdir-p #$log-directory)
+   (format #t creating nginx run directory '~a'~% #$run-directory)
+   (mkdir-p #$run-directory)
+   ;; Check configuration file syntax.
+   (system* #$nginx* -c #$config-file -t)
+
+  (mlet %store-monad ((start-script start-script)
+  (stop-script  stop-script)
+  (activate activate))
+(return
+ (service
+  (provision '(nginx))
+  (documentation Run the nginx daemon.)
+  (requirement '(user-processes loopback))
+  (start #~(lambda _
+ (zero? (status:exit-val (system* #$start-script)
+  (stop #~(lambda _
+(zero? (status:exit-val (system* #$stop-script)
+  (activate activate)
+  (user-groups (list (user-group
+  (name nginx)
+  (system? #t
+  (user-accounts (list (user-account
+(name nginx)
+(group nginx)
+(system? #t)
+(comment nginx server user)
+  

Re: [PATCH] build: file-systems: Allow for bind mounting regular files.

[Thompson, David]

On Sun, Aug 2, 2015 at 8:10 AM, Alex Kost alez...@gmail.com wrote:
 David Thompson (2015-08-01 22:17 +0300) wrote:

 diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
 index c58d23c..f0d6f70 100644
 --- a/gnu/build/file-systems.scm
 +++ b/gnu/build/file-systems.scm
 @@ -305,6 +305,10 @@ the following:
 fsck code device)
 (start-repl)

 +(define (regular-file? file-name)
 +  Return #t if FILE-NAME is a regular file.
 +  (eq? (stat:type (stat file-name)) 'regular))

 There are similar procedures in (guix build utils): 'directory-exists?',
 'executable-file?' and 'symbolic-link?'.  So I think it is better to put
 'regular-file?' there.  WDYT?

Sure, that makes sense.  Done.

- Dave
From 1b2413bd06b1e769edfbe4d170de41398015a67d Mon Sep 17 00:00:00 2001
From: David Thompson dthomps...@worcester.edu
Date: Sat, 1 Aug 2015 13:43:33 -0400
Subject: [PATCH] build: file-systems: Allow for bind mounting regular files.

* guix/build/utils.scm (regular-file?): New procedure.
* gnu/build/file-systems.scm (mount-file-system): Create a regular file
  instead of a directory when bind mounting a regular file.
---
 gnu/build/file-systems.scm | 11 ++-
 guix/build/utils.scm   |  5 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index c58d23c..f0b4b79 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -339,7 +339,16 @@ run a file system check.
(flags   (mount-flags-bit-mask flags)))
(when check?
  (check-file-system source type))
-   (mkdir-p mount-point)
+
+   ;; Create the mount point.  Most of the time this is a directory, but
+   ;; in the case of a bind mount, a regular file may be needed.
+   (if (and (= MS_BIND (logand flags MS_BIND))
+(regular-file? source))
+   (begin
+ (mkdir-p (dirname mount-point))
+ (call-with-output-file mount-point (const #t)))
+   (mkdir-p mount-point))
+
(mount source mount-point type flags options)
 
;; For read-only bind mounts, an extra remount is needed, as per
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index 676a012..b9543ed 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -38,6 +38,7 @@
 directory-exists?
 executable-file?
 symbolic-link?
+regular-file?
 call-with-ascii-input-file
 elf-file?
 ar-file?
@@ -110,6 +111,10 @@
   Return #t if FILE is a symbolic link (aka. \symlink\.)
   (eq? (stat:type (lstat file)) 'symlink))
 
+(define (regular-file? file-name)
+  Return #t if FILE-NAME is a regular file.
+  (eq? (stat:type (stat file-name)) 'regular))
+
 (define (call-with-ascii-input-file file proc)
   Open FILE as an ASCII or binary file, and pass the resulting port to
 PROC.  FILE is closed when PROC's dynamic extent is left.  Return the
-- 
2.4.3

Re: [PATCH] build: file-systems: Allow for bind mounting regular files.

[Andreas Enge]

On Sun, Aug 02, 2015 at 08:51:46AM -0400, Thompson, David wrote:
 Ah, of course, I forgot about something:  This patch triggers a
 rebuild of *everything* now!  I guess it should be applied to
 core-updates.

I think it would be better to wait until hydra is done building the
security updates Mark is adding.

Andreas

Re: haskell-mode

[Alex Kost]

Federico Beffa (2015-08-01 19:18 +0300) wrote:

 Hi,

 I would like to propose to change the name of package 'haskell-mode'
 to 'emacs-haskell-mode' as we recently started doing for emacs
 packages.

 WDYT?

I agree on this, but I don't understand the convention of naming emacs
packages.  What about geiser, emms, magit, paredit?  I have a
feeling they shouldn't be renamed into emacs-geiser, … but I can't
explain why.

-- 
Alex

Re: Qtwebengine

[Andreas Enge]

On Mon, Jul 27, 2015 at 09:43:21PM +0800, 宋文武 wrote:
 It's indeed possible since nixpkgs did it:
 https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/qt-5/5.4/default.nix
 I think the tricks are at build time for qmake:
 https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/qt-5/5.4/setup-hook.sh

Interesting, but without knowing Nix, these recipes are difficult to under-
stand.

 And set QT_PLUGIN_PATH, QML2_IMPORT_PATH, etc. at runtime time.

Which does not make the use easier. Could these be defined as search paths
by qt-base? In any case, feel free to implement a more modular qt, for me
this is not a priority.

Thanks!

Andreas

[PATCH] gnu: python-2: update to 2.7.10.

[eric]

On 31.07.2015 20:05, Andreas Enge wrote:

Hello,

could maybe one of the python experts look at packaging a newer version
of python 2.7? I need at least 2.7.9 for updating calibre, the old 
version

of which does not compile with qt 5.5.

Thanks for your help, I think someone knowing the package would be much
more efficient than me with packaging.

Andreas


Hello,

I updated the package to 2.7.10. This patch should be added to Hydra in 
a branch first to see if the 500 dependencies are still building 
properly.


Altough the tests are still failing, I ran them after the build failed 
with :


guix build -K
cd tmp/nix-build-*
env -i $(which bash)
source environment-variables

And they all passed except for some skips and a module that failed 
trying to write to a dir without permissions.


Maybe there is a fix to do to enable the tests, the problem might be 
coming from the OS module. They fail because of an OSError exception, so 
I wonder if it could be because the module doesn't work withing the 
chroot.


Eric.From 1ffc21f29ce255a1d3f613cb42532a0233f03b60 Mon Sep 17 00:00:00 2001
From: Eric Dvorsak yen...@gmail.com
Date: Sun, 2 Aug 2015 19:27:24 +0200
Subject: [PATCH] gnu: python-2: update to 2.7.10. Remove patches added to
 upstream

---
 gnu-system.am  |  2 -
 .../patches/python-libffi-mips-n32-fix.patch   | 21 --
 .../patches/python2-sqlite-3.8.4-test-fix.patch| 15 
 gnu/packages/python.scm| 86 ++
 4 files changed, 39 insertions(+), 85 deletions(-)
 delete mode 100644 gnu/packages/patches/python-libffi-mips-n32-fix.patch
 delete mode 100644 gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch

diff --git a/gnu-system.am b/gnu-system.am
index 87924fe..12a87ef 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -593,9 +593,7 @@ dist_patch_DATA =		\
   gnu/packages/patches/pyqt-configure.patch			\
   gnu/packages/patches/python-disable-ssl-test.patch		\
   gnu/packages/patches/python-fix-tests.patch			\
-  gnu/packages/patches/python-libffi-mips-n32-fix.patch		\
   gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch	\
-  gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch	\
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   gnu/packages/patches/qemu-CVE-2015-3209.patch			\
   gnu/packages/patches/qemu-CVE-2015-3456.patch			\
diff --git a/gnu/packages/patches/python-libffi-mips-n32-fix.patch b/gnu/packages/patches/python-libffi-mips-n32-fix.patch
deleted file mode 100644
index 3938837..000
--- a/gnu/packages/patches/python-libffi-mips-n32-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix handling of uint32_t arguments on the MIPS N32 ABI.
-
-Patch by Mark H Weaver m...@netris.org.
-
 Modules/_ctypes/libffi/src/mips/ffi.c.orig	2013-03-16 07:19:39.0 -0400
-+++ Modules/_ctypes/libffi/src/mips/ffi.c	2013-10-22 01:11:03.111985247 -0400
-@@ -170,7 +170,14 @@
- 		break;
- 		  
- 	  case FFI_TYPE_UINT32:
-+#ifdef FFI_MIPS_N32
-+		/* The N32 ABI requires that 32-bit integers
-+		   be sign-extended to 64-bits, regardless of
-+		   whether they are signed or unsigned. */
-+		*(ffi_arg *)argp = *(SINT32 *)(* p_argv);
-+#else
- 		*(ffi_arg *)argp = *(UINT32 *)(* p_argv);
-+#endif
- 		break;
- 
- 	  /* This can only happen with 64bit slots.  */
diff --git a/gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch b/gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch
deleted file mode 100644
index f121e88..000
--- a/gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From resolution of upstream python issue #20901: http://bugs.python.org/issue20901
-
-diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
 Lib/sqlite3/test/hooks.py
-+++ Lib/sqlite3/test/hooks.py
-@@ -162,7 +162,7 @@ class ProgressTests(unittest.TestCase):
- create table bar (a, b)
- )
- second_count = len(progress_calls)
--self.assertTrue(first_count  second_count)
-+self.assertGreaterEqual(first_count, second_count)
- 
- def CheckCancelOperation(self):
- 
-
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4c13316..4e08fc9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -74,63 +74,55 @@
 (define-public python-2
   (package
 (name python)
-(version 2.7.6)
+(version 2.7.10)
 (source
  (origin
   (method url-fetch)
   (uri (string-append https://www.python.org/ftp/python/;
   version /Python- version .tar.xz))
-  (patches (list (search-patch python-libffi-mips-n32-fix.patch)
- (search-patch python2-sqlite-3.8.4-test-fix.patch)))
-  (patch-flags '(-p0))
   (sha256
(base32
-18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz
+   1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw
 (build-system 

Re: [PATCH] build: file-systems: Allow for bind mounting regular files.

[Alex Kost]

David Thompson (2015-08-01 22:17 +0300) wrote:

 diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
 index c58d23c..f0d6f70 100644
 --- a/gnu/build/file-systems.scm
 +++ b/gnu/build/file-systems.scm
 @@ -305,6 +305,10 @@ the following:
 fsck code device)
 (start-repl)
  
 +(define (regular-file? file-name)
 +  Return #t if FILE-NAME is a regular file.
 +  (eq? (stat:type (stat file-name)) 'regular))

There are similar procedures in (guix build utils): 'directory-exists?',
'executable-file?' and 'symbolic-link?'.  So I think it is better to put
'regular-file?' there.  WDYT?

-- 
Alex

Re: [PATCH] build: file-systems: Allow for bind mounting regular files.

[Thompson, David]

On Sun, Aug 2, 2015 at 8:43 AM, Thompson, David
dthomps...@worcester.edu wrote:
 On Sun, Aug 2, 2015 at 8:10 AM, Alex Kost alez...@gmail.com wrote:
 David Thompson (2015-08-01 22:17 +0300) wrote:

 diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
 index c58d23c..f0d6f70 100644
 --- a/gnu/build/file-systems.scm
 +++ b/gnu/build/file-systems.scm
 @@ -305,6 +305,10 @@ the following:
 fsck code device)
 (start-repl)

 +(define (regular-file? file-name)
 +  Return #t if FILE-NAME is a regular file.
 +  (eq? (stat:type (stat file-name)) 'regular))

 There are similar procedures in (guix build utils): 'directory-exists?',
 'executable-file?' and 'symbolic-link?'.  So I think it is better to put
 'regular-file?' there.  WDYT?

 Sure, that makes sense.  Done.

Ah, of course, I forgot about something:  This patch triggers a
rebuild of *everything* now!  I guess it should be applied to
core-updates.  Or, the first patch I submitted can be applied to
master, and then a patch that moves 'regular-file?' to (guix build
utils) can be applied to core-updates later.

Thoughts?

- Dave

Re: [PATCH] gnu: python-2: update to 2.7.10.

[Mark H Weaver]

Hi Eric,

First, I notice that your mail client added
guix-devel-bounces+eric=dvorsak...@gnu.org to the CC list.  That's the
envelope sender of the emails you receive from this email list, and
it's used to detect bounces in case the mail is not successfully
delivered to you.  If you send email to it more than a few times, our
mailman software might conclude that your email address is broken and
disable deliveries to you.  To make matters worse, anyone who replies
to all to your email will by default include that address.

Your mail client is buggy, and should be fixed somehow.  When you Reply
to all (or similar), it should *not* include the envelope sender.
Maybe you could report the problem to its author, or switch clients?

Anyway, moving on to your patch...

e...@dvorsak.fr writes:
 I updated the package to 2.7.10. This patch should be added to Hydra
 in a branch first to see if the 500 dependencies are still building
 properly.

Your patch looks good except for three issues:

* it needs a proper commit log conforming to our conventions
* it needs proper indentation
* you should add a copyright line for yourself to the top of python.scm

See below for more details.

 Altough the tests are still failing, I ran them after the build failed
 with :

 guix build -K
 cd tmp/nix-build-*
 env -i $(which bash)
 source environment-variables

 And they all passed except for some skips and a module that failed
 trying to write to a dir without permissions.

Okay, I guess the tests fail because of something missing from the
isolated build environment.  This is a longstanding problem unaffected
by this patch.

 From 1ffc21f29ce255a1d3f613cb42532a0233f03b60 Mon Sep 17 00:00:00 2001
 From: Eric Dvorsak yen...@gmail.com
 Date: Sun, 2 Aug 2015 19:27:24 +0200
 Subject: [PATCH] gnu: python-2: update to 2.7.10. Remove patches added to
  upstream

This needs a proper commit log that lists the changes made to each file,
conforming to our conventions.  See our existing git commits for
examples.  In this case, it should look something like this:

--8---cut here---start-8---
gnu: python-2: Update to 2.7.10.

* gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch,
  gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/python.scm (python-2): Update to 2.7.10.  Remove patches.
  Update comment showing test failures.
--8---cut here---end---8---

 diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
 index 4c13316..4e08fc9 100644
 --- a/gnu/packages/python.scm
 +++ b/gnu/packages/python.scm

Please add a copyright line for yourself to the top of this file.

 @@ -74,63 +74,55 @@
  (define-public python-2
(package
  (name python)
 -(version 2.7.6)
 +(version 2.7.10)
  (source
   (origin
(method url-fetch)
(uri (string-append https://www.python.org/ftp/python/;
version /Python- version .tar.xz))
 -  (patches (list (search-patch python-libffi-mips-n32-fix.patch)
 - (search-patch python2-sqlite-3.8.4-test-fix.patch)))
 -  (patch-flags '(-p0))
(sha256
 (base32
 -18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz
 +   1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw

The open quote should be below the b, as it was before.

  (build-system gnu-build-system)
  (arguments
   `(#:tests? #f
 -;;   258 tests OK.
 -;;   103 tests failed:
 -;;  test_bz2 test_distutils test_file test_file2k test_popen2
 -;;  test_shutil test_signal test_site test_slice test_smtplib
 -;;  test_smtpnet test_socket test_socketserver test_softspace
 -;;  test_sort test_sqlite test_ssl test_startfile test_str
 -;;  test_strftime test_string test_stringprep test_strop 
 test_strptime
 -;;  test_strtod test_struct test_structmembers test_structseq
 -;;  test_subprocess test_sunaudiodev test_sundry test_symtable
 -;;  test_syntax test_sys test_sys_setprofile test_sys_settrace
 -;;  test_sysconfig test_tarfile test_tcl test_telnetlib test_tempfile
 -;;  test_textwrap test_thread test_threaded_import
 -;;  test_threadedtempfile test_threading test_threading_local
 -;;  test_threadsignals test_time test_timeout test_tk test_tokenize
 -;;  test_tools test_trace test_traceback test_transformer
 -;;  test_ttk_guionly test_ttk_textonly test_tuple test_typechecks
 -;;  test_ucn test_unary test_undocumented_details test_unicode
 -;;  test_unicode_file test_unicodedata test_univnewlines
 -;;  test_univnewlines2k test_unpack test_urllib test_urllib2
 -;;  test_urllib2_localnet test_urllib2net test_urllibnet 
 test_urlparse
 -;;  test_userdict test_userlist test_userstring test_uu test_uuid
 -;;  test_wait3 

Re: [PATCH] gnu: python-2: update to 2.7.10.

[eric]

Hi Mark,

Thank you very much for the detailed review.

On 02.08.2015 21:56, Mark H Weaver wrote:

Hi Eric,

First, I notice that your mail client added
guix-devel-bounces+eric=dvorsak...@gnu.org to the CC list.  That's 
the

envelope sender of the emails you receive from this email list, and
it's used to detect bounces in case the mail is not successfully
delivered to you.  If you send email to it more than a few times, our
mailman software might conclude that your email address is broken and
disable deliveries to you.  To make matters worse, anyone who replies
to all to your email will by default include that address.

Your mail client is buggy, and should be fixed somehow.  When you 
Reply

to all (or similar), it should *not* include the envelope sender.
Maybe you could report the problem to its author, or switch clients?



It's the webclient (roundcube) from my mail provider (OVH). I am a bit 
surprised that it is buggy and I will switch for an Emacs client really 
soon, I just need to choose and configure it first.



Anyway, moving on to your patch...

e...@dvorsak.fr writes:

I updated the package to 2.7.10. This patch should be added to Hydra
in a branch first to see if the 500 dependencies are still building
properly.


Your patch looks good except for three issues:

* it needs a proper commit log conforming to our conventions


I used your commit log below, I couldn't find anything else to add and I 
will try to be more cautious next time.



* it needs proper indentation


I hope I nailed the big comment because I wasn't sure I got your 
instructions right. Emacs M-q command was breaking it, that's why I 
did not use it there and failed the alignment.



* you should add a copyright line for yourself to the top of python.scm


It's already there from a previous patch.

Eric



See below for more details.


Altough the tests are still failing, I ran them after the build failed
with :

guix build -K
cd tmp/nix-build-*
env -i $(which bash)
source environment-variables

And they all passed except for some skips and a module that failed
trying to write to a dir without permissions.


Okay, I guess the tests fail because of something missing from the
isolated build environment.  This is a longstanding problem unaffected
by this patch.


From 1ffc21f29ce255a1d3f613cb42532a0233f03b60 Mon Sep 17 00:00:00 2001
From: Eric Dvorsak yen...@gmail.com
Date: Sun, 2 Aug 2015 19:27:24 +0200
Subject: [PATCH] gnu: python-2: update to 2.7.10. Remove patches added 
to

 upstream


This needs a proper commit log that lists the changes made to each 
file,

conforming to our conventions.  See our existing git commits for
examples.  In this case, it should look something like this:

--8---cut here---start-8---
gnu: python-2: Update to 2.7.10.

* gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch,
  gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/python.scm (python-2): Update to 2.7.10.  Remove 
patches.

  Update comment showing test failures.
--8---cut here---end---8---


diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4c13316..4e08fc9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm


Please add a copyright line for yourself to the top of this file.


@@ -74,63 +74,55 @@
 (define-public python-2
   (package
 (name python)
-(version 2.7.6)
+(version 2.7.10)
 (source
  (origin
   (method url-fetch)
   (uri (string-append https://www.python.org/ftp/python/;
   version /Python- version .tar.xz))
-  (patches (list (search-patch 
python-libffi-mips-n32-fix.patch)
- (search-patch 
python2-sqlite-3.8.4-test-fix.patch)))

-  (patch-flags '(-p0))
   (sha256
(base32
-18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz
+   1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw


The open quote should be below the b, as it was before.


 (build-system gnu-build-system)
 (arguments
  `(#:tests? #f
-;;   258 tests OK.
-;;   103 tests failed:
-;;  test_bz2 test_distutils test_file test_file2k test_popen2
-;;  test_shutil test_signal test_site test_slice test_smtplib
-;;  test_smtpnet test_socket test_socketserver test_softspace
-;;  test_sort test_sqlite test_ssl test_startfile test_str
-;;  test_strftime test_string test_stringprep test_strop 
test_strptime

-;;  test_strtod test_struct test_structmembers test_structseq
-;;  test_subprocess test_sunaudiodev test_sundry 
test_symtable
-;;  test_syntax test_sys test_sys_setprofile 
test_sys_settrace
-;;  test_sysconfig test_tarfile test_tcl test_telnetlib 
test_tempfile

-;;  test_textwrap test_thread test_threaded_import
-;;  test_threadedtempfile test_threading 

Security updates for bundled copies of libraries in Qt

[Mark H Weaver]

Andreas Enge andr...@enge.fr writes:
 In any case, feel free to implement a more modular qt, for me
 this is not a priority.

Fair enough, but consider this: IMO, the most severe problem with using
bundled copies of libraries has to do with security updates.  We have
yet to develop a security policy, but in my opinion we should not allow
software with known security flaws to remain in Guix for more than a
short time.  Either someone must take responsibility for applying
security fixes to a given package, or else that package should be
removed.  Does that make sense?

I've been doing my best to apply security fixes to Guix in a timely
fashion -- which turns out to be a big job and I could use more help --
but I'm *not* willing to do the duplicated work of applying the same
fixes to the bundled copies of libraries in Qt.  If our Qt packages are
going to use bundled copies of libraries, then someone needs to take
responsibility for applying security updates to those copies.

Any takers?

In the meantime, I honestly have no idea what security holes exist in
our Qt packages, so I've purged all software that depends on Qt from my
system.

  Mark

[PATCH] doc: Fix minor typos

[Steve Sprang]

Correct some minor typos I noticed when reading the docs.

-Steve

From 574a7441f0d34b438544611812c026a32e4cbe4c Mon Sep 17 00:00:00 2001
From: Steve Sprang s...@stevesprang.com
Date: Sun, 2 Aug 2015 13:24:38 -0700
Subject: [PATCH] doc: Fix minor typos

* doc/guix.texi (Invoking guix-daemon, Application Setup, The Store): Fix typos
---
 doc/guix.texi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 24b2039..bcf07a6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -861,7 +861,7 @@ Disable automatic file ``deduplication'' in the store.
 By default, files added to the store are automatically ``deduplicated'':
 if a newly added file is identical to another one found in the store,
 the daemon makes the new file a hard link to the other file.  This can
-noticeably reduce disk usage, at the expense of slightly increasde
+noticeably reduce disk usage, at the expense of slightly increased
 input/output load at the end of a build process.  This option disables
 this optimization.
 
@@ -942,7 +942,7 @@ limited to a few UTF-8 locales.
 
 @subsection X11 Fonts
 
-The majority of graphical applications uses Fontconfig to locate and
+The majority of graphical applications use Fontconfig to locate and
 load fonts and perform X11-client-side rendering.  Guix's
 @code{fontconfig} package looks for fonts in @file{$HOME/.guix-profile}
 by default.  Thus, to allow graphical applications installed with Guix
@@ -2541,7 +2541,7 @@ with @code{build-expression-derivation} (@pxref{Derivations,
 Conceptually, the @dfn{store} is where derivations that have been
 successfully built are stored---by default, under @file{/gnu/store}.
 Sub-directories in the store are referred to as @dfn{store paths}.  The
-store has an associated database that contains information such has the
+store has an associated database that contains information such as the
 store paths referred to by each store path, and the list of @emph{valid}
 store paths---paths that result from a successful build.
 
-- 
2.5.0

Re: [PATCH] gnu: python-2: update to 2.7.10.

[Mark H Weaver]

e...@dvorsak.fr writes:

 From 5665e477589d97672cc6e27a1f454585a2ae773e Mon Sep 17 00:00:00 2001
 From: Eric Dvorsak yen...@gmail.com
 Date: Sun, 2 Aug 2015 19:27:24 +0200
 Subject: [PATCH] gnu: python-2: Update to 2.7.10.

 * gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch,
   gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove files.
 * gnu-system.am (dist_patch_DATA): Remove them.
 * gnu/packages/python.scm (python-2): Update to 2.7.10.  Remove patches.
   Update comment showing test failures.

Your updated patch looks good to me, thanks!  After hydra is finished
building the 'icu4c-update' branch and we've merged that into master,
I'll create a new branch for this python update and start hydra building
it.

 Thanks!
   Mark

Re: [PATCH] doc: Fix minor typos

[Mark H Weaver]

Steve Sprang steve.spr...@gmail.com writes:
 From 574a7441f0d34b438544611812c026a32e4cbe4c Mon Sep 17 00:00:00 2001
 From: Steve Sprang s...@stevesprang.com
 Date: Sun, 2 Aug 2015 13:24:38 -0700
 Subject: [PATCH] doc: Fix minor typos

 * doc/guix.texi (Invoking guix-daemon, Application Setup, The Store): Fix 
 typos

Pushed, thanks!

 Mark