From aa0551c270abe45cf36c2fda80a15351fbcaba3b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 19 Jun 2018 23:12:05 +0200
Subject: gnu: bspwm: Update to 0.9.5.

* gnu/packages/wm.scm (bspwm): Update to 0.9.5.
---
 gnu/packages/wm.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/wm.scm')

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a3705c9d91..2a09521601 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -103,7 +103,7 @@ nested include statements).")
 (define-public bspwm
   (package
     (name "bspwm")
-    (version "0.9.4")
+    (version "0.9.5")
     (source
      (origin
        (file-name (string-append name "-" version ".tar.gz"))
@@ -113,7 +113,7 @@ nested include statements).")
              version ".tar.gz"))
        (sha256
         (base32
-         "0yjr0vzbj3ar8qfr6gvpvjd82ay8iy1sg2fkw2swghlqiy6ix4kw"))))
+         "10pph8wxqysgk7b2h0svs0nwacn1a4y44jnzzry32pd1ysx92d97"))))
     (build-system gnu-build-system)
     (inputs
      `(("libxcb" ,libxcb)
@@ -123,10 +123,13 @@ nested include statements).")
        ("xcb-util-keysyms" ,xcb-util-keysyms)
        ("xcb-util-wm" ,xcb-util-wm)))
     (arguments
-     '(#:phases (modify-phases %standard-phases (delete 'configure))
-       #:tests? #f  ; no check target
-       #:make-flags (list "CC=gcc"
-                          (string-append "PREFIX=" %output))))
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure))           ; no configure script
+       #:tests? #f                      ; no check target
+       #:make-flags
+       (list "CC=gcc"
+             (string-append "PREFIX=" %output))))
     (home-page "https://github.com/baskerville/bspwm")
     (synopsis "Tiling window manager based on binary space partitioning")
     (description "bspwm is a tiling window manager that represents windows as
-- 
cgit 1.4.1


From de99ba7e7c0ba782451f1ccf60135adfce058ad5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 20 Jun 2018 01:03:47 +0200
Subject: Fix some more lonely unquotes.

* gnu/packages/gnome.scm (workrave)[inputs]: Move unquote to its
operand.
* gnu/packages/java.scm (java-asm-bootstrap)[propagated-inputs]:
Likewise.
* gnu/packages/maven.scm (maven-compat)[native-inputs]: Likewise.
(maven)[inputs]: Likewise.
* gnu/packages/networking.scm (amule)[inputs]: Likewise.
* gnu/packages/wm.scm (nitrogen)[native-inputs]: Likewise.
---
 gnu/packages/gnome.scm      | 2 +-
 gnu/packages/java.scm       | 2 +-
 gnu/packages/maven.scm      | 4 ++--
 gnu/packages/networking.scm | 2 +-
 gnu/packages/wm.scm         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/wm.scm')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b5d8170ae2..a21adf4f56 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7287,7 +7287,7 @@ mp3, Ogg Vorbis and FLAC")
                            ("libxtst" ,libxtst)
                            ("dconf" ,dconf)
                            ("libice" ,libice)))
-      (inputs `(("libsm", libsm)
+      (inputs `(("libsm" ,libsm)
                 ("python-cheetah" ,python2-cheetah)))
       (native-inputs `(("glib" ,glib "bin")
                        ("pkg-config" ,pkg-config)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b4b1eedd2e..30a9b77380 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3583,7 +3583,7 @@ complex transformations and code analysis tools.")
      `(("java-aqute-bndlib" ,java-aqute-bndlib-bootstrap)
        ("java-aqute-libg" ,java-aqute-libg-bootstrap)
        ,@(delete `("java-aqute-bndlib" ,java-aqute-bndlib)
-                 (delete `("java-aqute-libg", java-aqute-libg)
+                 (delete `("java-aqute-libg" ,java-aqute-libg)
                          (package-inputs java-asm)))))))
 
 (define-public java-cglib
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 070bd7131c..0feb01f040 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1405,7 +1405,7 @@ logging support.")))
        ;; tests
        ("java-plexus-cipher" ,java-plexus-cipher)
        ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher)
-       ("java-jsr250", java-jsr250)
+       ("java-jsr250" ,java-jsr250)
        ("java-cdi-api" ,java-cdi-api)
        ("java-junit" ,java-junit)
        ("maven-resolver-impl" ,maven-resolver-impl)
@@ -1463,7 +1463,7 @@ layer for plugins that need to keep Maven2 compatibility.")))
        ("maven-settings" ,maven-settings)
        ("maven-settings-builder" ,maven-settings-builder)
        ("maven-plugin-api" ,maven-plugin-api)
-       ("maven-repository-metadata", maven-repository-metadata)
+       ("maven-repository-metadata" ,maven-repository-metadata)
        ("maven-shared-utils" ,maven-shared-utils)
        ("maven-resolver-api" ,maven-resolver-api)
        ("maven-resolver-spi" ,maven-resolver-spi)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 5cdfec3431..b72a4734d7 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1776,7 +1776,7 @@ file for more details.")
      `(("zlib" ,zlib)
        ("crypto++" ,crypto++)
        ("libpng" ,libpng)
-       ("wxwidgets-gtk2", wxwidgets-gtk2)))
+       ("wxwidgets-gtk2" ,wxwidgets-gtk2)))
     (home-page "http://amule.org/")
     (synopsis "Peer-to-peer client for the eD2K and Kademlia networks")
     (description
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 2a09521601..a076cbbb1d 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -991,7 +991,7 @@ project derived from the original Calm Window Manager.")
        ("glib" ,glib)
        ("glibmm" ,glibmm)))
     (native-inputs
-     `(("pkg-config", pkg-config)))
+     `(("pkg-config" ,pkg-config)))
     (arguments
      `(#:configure-flags (list
                           (string-append "--prefix=" %output)
-- 
cgit 1.4.1