diff mbox

(3 patches): move dwm+dmenu to wm, move slock to xdisorg.

Message ID 87vazc90o9.fsf@we.make.ritual.n0.is
State New
Headers show

Commit Message

non such Aug. 7, 2016, 1:19 p.m. UTC
With these 3 moved to more logical places, only surf remains. We keep
web browsers in sepearate places so far, that's nothing I want to work
on today.
A grep for "gnu packages suckless" only showed the
gnu/services/desktop.scm calling it, which seems to be slock, I changed
that in patch which moves slock to xdisorg.
Anyone got ideas for what to do with package surf?

Comments

non such Aug. 7, 2016, 1:22 p.m. UTC | #1
Iforgot to mention: A requirement is the patch which changes the dwm
description, sent before this series.
Logically moving and changing description are not one and the same
thing, so I separated them.

ng0 <ng0@we.make.ritual.n0.is> writes:

> With these 3 moved to more logical places, only surf remains. We keep
> web browsers in sepearate places so far, that's nothing I want to work
> on today.
> A grep for "gnu packages suckless" only showed the
> gnu/services/desktop.scm calling it, which seems to be slock, I changed
> that in patch which moves slock to xdisorg.
> Anyone got ideas for what to do with package surf?
>
> From 0260bba10303e9c24302b5d3fd4ba1e0d1e2303f Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Sun, 7 Aug 2016 12:52:18 +0000
> Subject: [PATCH 1/3] gnu: dwm: Move to wm.scm.
>
> * gnu/packages/suckless.scm (dwm): Move from here ...
> * gnu/packages/wm.scm (dwm): ... to here.
> ---
>  gnu/packages/suckless.scm | 38 --------------------------------------
>  gnu/packages/wm.scm       | 39 +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 39 insertions(+), 38 deletions(-)
>
> diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
> index 16e9146..9ec6dcf 100644
> --- a/gnu/packages/suckless.scm
> +++ b/gnu/packages/suckless.scm
> @@ -31,44 +31,6 @@
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages webkit))
>  
> -(define-public dwm
> -  (package
> -    (name "dwm")
> -    (version "6.0")
> -    (source (origin
> -             (method url-fetch)
> -             (uri (string-append "http://dl.suckless.org/dwm/dwm-"
> -                                 version ".tar.gz"))
> -             (sha256
> -              (base32 "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj"))))
> -    (build-system gnu-build-system)
> -    (arguments
> -     `(#:tests? #f
> -       #:phases
> -       (alist-replace
> -        'configure
> -        (lambda _
> -         (substitute* "Makefile" (("\\$\\{CC\\}") "gcc"))
> -         #t)
> -        (alist-replace
> -         'install
> -         (lambda* (#:key outputs #:allow-other-keys)
> -          (let ((out (assoc-ref outputs "out")))
> -           (zero?
> -            (system* "make" "install"
> -                     (string-append "DESTDIR=" out) "PREFIX="))))
> -         %standard-phases))))
> -    (inputs
> -     `(("libx11" ,libx11)
> -       ("libxinerama" ,libxinerama)))
> -    (home-page "http://dwm.suckless.org/")
> -    (synopsis "Dynamic window manager")
> -    (description
> -     "dwm is a dynamic window manager for X.  It manages windows in tiled,
> -monocle and floating layouts.  All of the layouts can be applied dynamically,
> -optimising the environment for the application in use and the task performed.")
> -    (license license:x11)))
> -
>  (define-public dmenu
>    (package
>      (name "dmenu")
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index 2cc9f44..8df4a8e 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -9,6 +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>
> +;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -465,3 +466,41 @@ Windows are grouped by tags in awesome.  Each window can be tagged with one or
>  more tags.  Selecting certain tags displays all windows with these tags.")
>      (license license:gpl2+)
>      (home-page "https://awesome.naquadah.org/")))
> +
> +(define-public dwm
> +  (package
> +    (name "dwm")
> +    (version "6.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "http://dl.suckless.org/dwm/dwm-"
> +                                  version ".tar.gz"))
> +              (sha256
> +               (base32 "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:tests? #f
> +       #:phases
> +       (alist-replace
> +        'configure
> +        (lambda _
> +          (substitute* "Makefile" (("\\$\\{CC\\}") "gcc"))
> +          #t)
> +        (alist-replace
> +         'install
> +         (lambda* (#:key outputs #:allow-other-keys)
> +           (let ((out (assoc-ref outputs "out")))
> +             (zero?
> +              (system* "make" "install"
> +                       (string-append "DESTDIR=" out) "PREFIX="))))
> +         %standard-phases))))
> +    (inputs
> +     `(("libx11" ,libx11)
> +       ("libxinerama" ,libxinerama)))
> +    (home-page "http://dwm.suckless.org/")
> +    (synopsis "Dynamic window manager")
> +    (description
> +     "dwm is a dynamic window manager for X.  It manages windows in tiled,
> +monocle and floating layouts.  All of the layouts can be applied dynamically,
> +optimising the environment for the application in use and the task performed.")
> +    (license license:x11)))
> -- 
> 2.9.2
>
> From 65f9936b6a0a943259472c352f0c88fefad1a3bc Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Sun, 7 Aug 2016 12:58:40 +0000
> Subject: [PATCH 2/3] gnu: dmenu: Move to wm.scm.
>
> * gnu/packages/suckless.scm (dmenu): Move from here ...
> * gnu/packages/wm.scm (dmenu): ... to here.
> ---
>  gnu/packages/suckless.scm | 28 ----------------------------
>  gnu/packages/wm.scm       | 28 ++++++++++++++++++++++++++++
>  2 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
> index 9ec6dcf..1bb577c 100644
> --- a/gnu/packages/suckless.scm
> +++ b/gnu/packages/suckless.scm
> @@ -31,34 +31,6 @@
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages webkit))
>  
> -(define-public dmenu
> -  (package
> -    (name "dmenu")
> -    (version "4.5")
> -    (source (origin
> -              (method url-fetch)
> -              (uri (string-append "http://dl.suckless.org/tools/dmenu-"
> -                                  version ".tar.gz"))
> -              (sha256
> -               (base32
> -                "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08"))))
> -    (build-system gnu-build-system)
> -    (arguments
> -     '(#:tests? #f ; no tests
> -       #:make-flags (list "CC=gcc"
> -                          (string-append "PREFIX=" %output))
> -       #:phases
> -       (alist-delete 'configure %standard-phases)))
> -    (inputs
> -     `(("libx11" ,libx11)
> -       ("libxinerama" ,libxinerama)))
> -    (home-page "http://tools.suckless.org/dmenu/")
> -    (synopsis "Dynamic menu")
> -    (description
> -     "A dynamic menu for X, originally designed for dwm.  It manages large
> -numbers of user-defined menu items efficiently.")
> -    (license license:x11)))
> -
>  (define-public slock
>    (package
>      (name "slock")
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index 8df4a8e..b03133f 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -504,3 +504,31 @@ more tags.  Selecting certain tags displays all windows with these tags.")
>  monocle and floating layouts.  All of the layouts can be applied dynamically,
>  optimising the environment for the application in use and the task performed.")
>      (license license:x11)))
> +
> +(define-public dmenu
> +  (package
> +    (name "dmenu")
> +    (version "4.5")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "http://dl.suckless.org/tools/dmenu-"
> +                                  version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     '(#:tests? #f ; no tests
> +       #:make-flags (list "CC=gcc"
> +                          (string-append "PREFIX=" %output))
> +       #:phases
> +       (alist-delete 'configure %standard-phases)))
> +    (inputs
> +     `(("libx11" ,libx11)
> +       ("libxinerama" ,libxinerama)))
> +    (home-page "http://tools.suckless.org/dmenu/")
> +    (synopsis "Dynamic menu")
> +    (description
> +     "A dynamic menu for X, originally designed for dwm.  It manages large
> +numbers of user-defined menu items efficiently.")
> +    (license license:x11)))
> -- 
> 2.9.2
>
> From df66c705b9801b2c583b69acc14327478f61b46d Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Sun, 7 Aug 2016 13:03:52 +0000
> Subject: [PATCH] gnu: slock: Move to xdisorg.scm.
>
> * gnu/packages/suckless.scm (slock): Move from here ...
> * gnu/packages/xdisorg.scm (slock): ... to here.
> ---
>  gnu/packages/suckless.scm | 27 ---------------------------
>  gnu/packages/xdisorg.scm  | 28 ++++++++++++++++++++++++++++
>  gnu/services/desktop.scm  |  2 +-
>  3 files changed, 29 insertions(+), 28 deletions(-)
>
> diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
> index 1bb577c..7fe3403 100644
> --- a/gnu/packages/suckless.scm
> +++ b/gnu/packages/suckless.scm
> @@ -31,33 +31,6 @@
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages webkit))
>  
> -(define-public slock
> -  (package
> -    (name "slock")
> -    (version "1.2")
> -    (source (origin
> -              (method url-fetch)
> -              (uri (string-append "http://dl.suckless.org/tools/slock-"
> -                                  version ".tar.gz"))
> -              (sha256
> -               (base32
> -                "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il"))))
> -    (build-system gnu-build-system)
> -    (arguments
> -     '(#:tests? #f ; no tests
> -       #:make-flags (list "CC=gcc"
> -                          (string-append "PREFIX=" %output))
> -       #:phases (alist-delete 'configure %standard-phases)))
> -    (inputs
> -     `(("libx11" ,libx11)
> -       ("libxext" ,libxext)
> -       ("libxinerama" ,libxinerama)))
> -    (home-page "http://tools.suckless.org/slock/")
> -    (synopsis "Simple X session lock")
> -    (description
> -     "Simple X session lock with trivial feedback on password entry.")
> -    (license license:x11)))
> -
>  (define-public surf
>    (package
>      (name "surf")
> diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
> index 226e5c1..18b8cb8 100644
> --- a/gnu/packages/xdisorg.scm
> +++ b/gnu/packages/xdisorg.scm
> @@ -14,6 +14,7 @@
>  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
>  ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
> +;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -976,3 +977,30 @@ connectivity of the X server running on a particular @code{DISPLAY}.")
>  applications you regularily use and also allows you to search for an application
>  by name.")
>      (license license:expat)))
> +
> +(define-public slock
> +  (package
> +    (name "slock")
> +    (version "1.2")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "http://dl.suckless.org/tools/slock-"
> +                                  version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     '(#:tests? #f ; no tests
> +       #:make-flags (list "CC=gcc"
> +                          (string-append "PREFIX=" %output))
> +       #:phases (alist-delete 'configure %standard-phases)))
> +    (inputs
> +     `(("libx11" ,libx11)
> +       ("libxext" ,libxext)
> +       ("libxinerama" ,libxinerama)))
> +    (home-page "http://tools.suckless.org/slock/")
> +    (synopsis "Simple X session lock")
> +    (description
> +     "Simple X session lock with trivial feedback on password entry.")
> +    (license license:x11)))
> diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
> index bf21707..9fdbb47 100644
> --- a/gnu/services/desktop.scm
> +++ b/gnu/services/desktop.scm
> @@ -3,6 +3,7 @@
>  ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
>  ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
>  ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
> +;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -37,7 +38,6 @@
>    #:use-module (gnu packages avahi)
>    #:use-module (gnu packages polkit)
>    #:use-module (gnu packages xdisorg)
> -  #:use-module (gnu packages suckless)
>    #:use-module (gnu packages linux)
>    #:use-module (guix records)
>    #:use-module (guix packages)
> -- 
> 2.9.2
>
>
> -- 
> ♥Ⓐ  ng0
> Current Keys: https://we.make.ritual.n0.is/ng0.txt
> For non-prism friendly talk find me on http://www.psyced.org
non such Aug. 12, 2016, 8:36 a.m. UTC | #2
This comment updates the state of the patches I now no longer track:

Web view of guix-devel at gnu.org server is currently unreachable.
With two voices against/concerned about the suckless move, these patches
need no longer to be applied.
diff mbox

Patch

From df66c705b9801b2c583b69acc14327478f61b46d Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Sun, 7 Aug 2016 13:03:52 +0000
Subject: [PATCH] gnu: slock: Move to xdisorg.scm.

* gnu/packages/suckless.scm (slock): Move from here ...
* gnu/packages/xdisorg.scm (slock): ... to here.
---
 gnu/packages/suckless.scm | 27 ---------------------------
 gnu/packages/xdisorg.scm  | 28 ++++++++++++++++++++++++++++
 gnu/services/desktop.scm  |  2 +-
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 1bb577c..7fe3403 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -31,33 +31,6 @@ 
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages webkit))
 
-(define-public slock
-  (package
-    (name "slock")
-    (version "1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://dl.suckless.org/tools/slock-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:tests? #f ; no tests
-       #:make-flags (list "CC=gcc"
-                          (string-append "PREFIX=" %output))
-       #:phases (alist-delete 'configure %standard-phases)))
-    (inputs
-     `(("libx11" ,libx11)
-       ("libxext" ,libxext)
-       ("libxinerama" ,libxinerama)))
-    (home-page "http://tools.suckless.org/slock/")
-    (synopsis "Simple X session lock")
-    (description
-     "Simple X session lock with trivial feedback on password entry.")
-    (license license:x11)))
-
 (define-public surf
   (package
     (name "surf")
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 226e5c1..18b8cb8 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -14,6 +14,7 @@ 
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
+;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -976,3 +977,30 @@  connectivity of the X server running on a particular @code{DISPLAY}.")
 applications you regularily use and also allows you to search for an application
 by name.")
     (license license:expat)))
+
+(define-public slock
+  (package
+    (name "slock")
+    (version "1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://dl.suckless.org/tools/slock-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; no tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:phases (alist-delete 'configure %standard-phases)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxinerama" ,libxinerama)))
+    (home-page "http://tools.suckless.org/slock/")
+    (synopsis "Simple X session lock")
+    (description
+     "Simple X session lock with trivial feedback on password entry.")
+    (license license:x11)))
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index bf21707..9fdbb47 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -3,6 +3,7 @@ 
 ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
+;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,7 +38,6 @@ 
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages polkit)
   #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages suckless)
   #:use-module (gnu packages linux)
   #:use-module (guix records)
   #:use-module (guix packages)
-- 
2.9.2