guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into core-updates


From: Leo Famulari
Subject: 01/01: Merge branch 'master' into core-updates
Date: Sun, 23 Jul 2017 19:27:07 -0400 (EDT)

lfam pushed a commit to branch core-updates
in repository guix.

commit e081e2dd0b4c3a842d0bac6384545861c76e02d5
Merge: d3dce32 2472f7a
Author: Leo Famulari <address@hidden>
Date:   Sun Jul 23 19:06:49 2017 -0400

    Merge branch 'master' into core-updates

 gnu/packages/admin.scm       |  4 ++--
 gnu/packages/bash.scm        |  4 ++--
 gnu/packages/bootloaders.scm |  8 +++++--
 gnu/packages/check.scm       |  4 ++--
 gnu/packages/databases.scm   |  4 ++--
 gnu/packages/dns.scm         |  4 ++--
 gnu/packages/linux.scm       | 14 +----------
 gnu/packages/ncurses.scm     | 14 +++++++++++
 gnu/packages/python.scm      | 56 ++++++++++++++++++++------------------------
 gnu/packages/samba.scm       | 17 ++++++++------
 gnu/packages/wm.scm          | 34 +++++++++++++++++++++++++++
 gnu/packages/xorg.scm        | 49 +++++++++++++++++++++++++++++++++++++-
 gnu/system.scm               |  1 +
 13 files changed, 149 insertions(+), 64 deletions(-)

diff --cc gnu/packages/ncurses.scm
index d8b72a1,7899f19..65531ec
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@@ -189,6 -190,30 +190,19 @@@ ncursesw library provides wide characte
      (license x11)
      (home-page "https://www.gnu.org/software/ncurses/";)))
  
 -(define ncurses/fixed
 -  (package
 -    (inherit ncurses)
 -    (source
 -      (origin
 -        (inherit (package-source ncurses))
 -        (patches
 -          (append
 -            (origin-patches (package-source ncurses))
 -            (search-patches "ncurses-CVE-2017-10684-10685.patch")))))))
 -
+ (define-public ncurses/gpm
+   (package/inherit ncurses
+     (name "ncurses-with-gpm")
+     (arguments
+      (substitute-keyword-arguments (package-arguments ncurses)
+        ((#:configure-flags cf)
+         `(cons (string-append "--with-gpm="
+                               (assoc-ref %build-inputs "gpm")
+                               "/lib/libgpm.so.2")
+                ,cf))))
+     (inputs
+      `(("gpm" ,gpm)))))
+ 
  (define-public dialog
    (package
      (name "dialog")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]