~ruther/guix-local

91426243f15696c38fbe84d3885a71f45911217f — ng0 9 years ago 9916ef8
gnu: awesome: Update to 4.0.

* gnu/packages/wm.scm (awesome): Update to 4.0.
[source]: Adjust URL.
[inputs]: Add xcb-util-xrm and libxkbcommon.
* gnu/packages/patches/awesome-reproducible-png.patch: Adjust patch.

Signed-off-by: Leo Famulari <leo@famulari.name>
2 files changed, 9 insertions(+), 7 deletions(-)

M gnu/packages/patches/awesome-reproducible-png.patch
M gnu/packages/wm.scm
M gnu/packages/patches/awesome-reproducible-png.patch => gnu/packages/patches/awesome-reproducible-png.patch +2 -2
@@ 7,8 7,8 @@ See <https://wiki.debian.org/ReproducibleBuilds/TimestampsInPNG>.
         set(ALL_ICONS ${ALL_ICONS} ${output})
 
         add_custom_command(
-            COMMAND ${CONVERT_EXECUTABLE} ${input} ${ARGN} ${output}
+            COMMAND ${CONVERT_EXECUTABLE} +set date:create +set date:modify -define png:exclude-chunk=time ${input} ${ARGN} ${output}
-            COMMAND ${CONVERT_EXECUTABLE} ${input} -strip ${ARGN} ${output}
+            COMMAND ${CONVERT_EXECUTABLE} +set date:create +set date:modify -define png:exclude-chunk=time ${input} -strip ${ARGN} ${output}
             OUTPUT  ${output}
             DEPENDS ${input}
             VERBATIM)

M gnu/packages/wm.scm => gnu/packages/wm.scm +7 -5
@@ 9,7 9,7 @@
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016 ng0 <ng0@libertad.pw>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
;;;


@@ 497,15 497,15 @@ experience.")
(define-public awesome
  (package
    (name "awesome")
    (version "3.5.9")
    (version "4.0")
    (source
     (origin (method url-fetch)
             (uri (string-append
                   "https://awesome.naquadah.org/download/awesome-"
                   version ".tar.xz"))
                   "https://github.com/awesomeWM/awesome-releases/raw/"
                   "master/awesome-" version ".tar.xz"))
             (sha256
              (base32
               "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"))
               "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w"))
             (modules '((guix build utils)
                        (srfi srfi-19)))
             (snippet


@@ 538,6 538,7 @@ experience.")
              ("libxcb" ,libxcb)
              ("libxcursor" ,libxcursor)
              ("libxdg-basedir" ,libxdg-basedir)
              ("libxkbcommon" ,libxkbcommon)
              ("lua" ,lua)
              ("lua-lgi",lua-lgi)
              ("pango" ,pango)


@@ 547,6 548,7 @@ experience.")
              ("xcb-util-image" ,xcb-util-image)
              ("xcb-util-keysyms" ,xcb-util-keysyms)
              ("xcb-util-renderutil" ,xcb-util-renderutil)
              ("xcb-util-xrm" ,xcb-util-xrm)
              ("xcb-util-wm" ,xcb-util-wm)))
    (arguments
     `(;; Let compression happen in our 'compress-documentation' phase so that