me
/
guix
Archived
1
0
Fork 0
Code

gnu: stumpwm: Update contrib module package names. 

This also causes the contribution modules to inherit from a common base.

* gnu/packages/wm.scm (stumpish, sbcl-stumpwm-ttf-fonts, sbcl-stumpwm-pass,
sbcl-stumpwm-globalwindows, sbcl-stumpwm-swm-gaps): Bring package name in line
with the Guix symbol name.

Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
master
Katherine Cox-Buday 2020-06-04 17:32:55 -05:00 committed by Oleg Pykhalov
parent 152d50d903
commit 81b045e149
No known key found for this signature in database
GPG Key ID: 167F8EA5001AFA9C
1 changed files with 91 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
gnu/packages/wm.scm
View File

@ -1660,11 +1660,11 @@ productive, customizable lisp based systems.")
(delete 'cleanup) (delete 'cleanup)
(delete 'create-symlinks))))))) (delete 'create-symlinks)))))))
(define-public stumpish (define stumpwm-contrib
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d63")
(revision "2")) (revision "2"))
(package (package
(name "stumpish") (name "stumpwm-contrib")
(version (git-version "0.0.1" revision commit)) ;no upstream release (version (git-version "0.0.1" revision commit)) ;no upstream release
(source (source
(origin (origin
@ -1672,154 +1672,116 @@ productive, customizable lisp based systems.")
(uri (git-reference (uri (git-reference
(url "https://github.com/stumpwm/stumpwm-contrib.git") (url "https://github.com/stumpwm/stumpwm-contrib.git")
(commit commit))) (commit commit)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
(build-system asdf-build-system/sbcl)
(inputs (inputs
`(("bash" ,bash) `(("stumpwm" ,stumpwm "lib")))
("rlwrap" ,rlwrap)))
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(copy-recursively (assoc-ref %build-inputs "source") ".")
(chdir "util/stumpish")
(substitute* "stumpish"
(("rlwrap") (string-append (assoc-ref %build-inputs "rlwrap")
"/bin/rlwrap"))
(("/bin/sh") (string-append (assoc-ref %build-inputs "bash")
"/bin/bash")))
(install-file "stumpish" (string-append %output "/bin")))))
(home-page "https://github.com/stumpwm/stumpwm-contrib") (home-page "https://github.com/stumpwm/stumpwm-contrib")
(synopsis "StumpWM interactive shell") (synopsis "StumpWM interactive shell")
(description "This package provides a StumpWM interactive shell.") (description "This package provides a StumpWM interactive shell.")
(license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (license (list license:gpl2+ license:gpl3+ license:bsd-2)))))
(define-public stumpish
(package
(inherit stumpwm-contrib)
(name "stumpish")
(inputs
`(("bash" ,bash)
("rlwrap" ,rlwrap)))
(build-system trivial-build-system)
(arguments
'(#:modules ((guix build utils))
#:tests? #f
#:builder
(begin
(use-modules (guix build utils))
(copy-recursively (assoc-ref %build-inputs "source") ".")
(chdir "util/stumpish")
(substitute* "stumpish"
(("rlwrap") (string-append (assoc-ref %build-inputs "rlwrap")
"/bin/rlwrap"))
(("/bin/sh") (string-append (assoc-ref %build-inputs "bash")
"/bin/bash")))
(install-file "stumpish" (string-append %output "/bin")))))
(home-page "https://github.com/stumpwm/stumpwm-contrib")
(synopsis "StumpWM interactive shell")
(description "This package provides a StumpWM interactive shell.")
(license (list license:gpl2+ license:gpl3+ license:bsd-2))))
(define-public sbcl-stumpwm+slynk (define-public sbcl-stumpwm+slynk
(deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk)) (deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk))
(define-public sbcl-stumpwm-ttf-fonts (define-public sbcl-stumpwm-ttf-fonts
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") (package
(revision "2")) (inherit stumpwm-contrib)
(package (name "sbcl-stumpwm-ttf-fonts")
(name "sbcl-ttf-fonts") (inputs
(version (git-version "0.0.1" revision commit)) ;no upstream release `(("stumpwm" ,stumpwm "lib")
(source ("clx-truetype" ,sbcl-clx-truetype)))
(origin (arguments
(method git-fetch) '(#:asd-system-name "ttf-fonts"
(uri (git-reference #:tests? #f
(url "https://github.com/stumpwm/stumpwm-contrib.git") #:phases
(commit commit))) (modify-phases %standard-phases
(file-name (git-file-name name version)) (add-after 'unpack 'chdir
(sha256 (lambda _ (chdir "util/ttf-fonts") #t)))))
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (home-page "https://github.com/stumpwm/stumpwm-contrib")
(inputs (synopsis "Implementation of TTF font rendering for Lisp")
`(("stumpwm" ,stumpwm "lib") (description "This package provides a Lisp implementation of TTF font
("clx-truetype" ,sbcl-clx-truetype)))
(build-system asdf-build-system/sbcl)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _
(chdir "util/ttf-fonts"))))))
(home-page "https://github.com/stumpwm/stumpwm-contrib")
(synopsis "Implementation of TTF font rendering for Lisp")
(description "This package provides a Lisp implementation of TTF font
rendering.") rendering.")
(license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (license (list license:gpl2+ license:gpl3+ license:bsd-2))))
(define-public sbcl-stumpwm-pass (define-public sbcl-stumpwm-pass
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") (package
(revision "2")) (inherit stumpwm-contrib)
(package (name "sbcl-stumpwm-pass")
(name "sbcl-pass") (arguments
(version (git-version "0.0.1" revision commit)) ;no upstream release '(#:asd-system-name "pass"
(source #:tests? #f
(origin #:phases
(method git-fetch) (modify-phases %standard-phases
(uri (git-reference (add-after 'unpack 'chdir
(url "https://github.com/stumpwm/stumpwm-contrib.git") (lambda _ (chdir "util/pass") #t)))))
(commit commit))) (home-page "https://github.com/stumpwm/stumpwm-contrib")
(file-name (git-file-name name version)) (synopsis "Integrate @code{pass} wih StumpWM")
(sha256 (description "This package provides an interface which integrates
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
(inputs
`(("stumpwm" ,stumpwm "lib")))
(build-system asdf-build-system/sbcl)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _
(chdir "util/pass"))))))
(home-page "https://github.com/stumpwm/stumpwm-contrib")
(synopsis "Integrate @code{pass} wih StumpWM")
(description "This package provides an interface which integrates
password-store into StumpWM.") password-store into StumpWM.")
(license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (license (list license:gpl2+ license:gpl3+ license:bsd-2))))
(define-public sbcl-stumpwm-globalwindows (define-public sbcl-stumpwm-globalwindows
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") (package
(revision "2")) (inherit stumpwm-contrib)
(package (name "sbcl-stumpwm-globalwindows")
(name "sbcl-globalwindows") (arguments
(version (git-version "0.0.1" revision commit)) ;no upstream release '(#:asd-system-name "globalwindows"
(source #:tests? #f
(origin #:phases
(method git-fetch) (modify-phases %standard-phases
(uri (git-reference (add-after 'unpack 'chdir
(url "https://github.com/stumpwm/stumpwm-contrib.git") (lambda _ (chdir "util/globalwindows") #t)))))
(commit commit))) (home-page "https://github.com/stumpwm/stumpwm-contrib")
(file-name (git-file-name name version)) (synopsis "Manipulate all windows in the current X session")
(sha256 (description "This package provides a StumpWM module to manipulate all
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
(inputs
`(("stumpwm" ,stumpwm "lib")))
(build-system asdf-build-system/sbcl)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _
(chdir "util/globalwindows"))))))
(home-page "https://github.com/stumpwm/stumpwm-contrib")
(synopsis "Manipulate all windows in the current X session")
(description "This package provides a StumpWM module to manipulate all
windows in the current X session.") windows in the current X session.")
(license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (license (list license:gpl2+ license:gpl3+ license:bsd-2))))
(define-public sbcl-stumpwm-swm-gaps (define-public sbcl-stumpwm-swm-gaps
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") (package
(revision "2")) (inherit stumpwm-contrib)
(package (name "sbcl-stumpwm-swm-gaps")
(name "sbcl-swm-gaps") (arguments
(version (git-version "0.0.1" revision commit)) ;no upstream release '(#:asd-system-name "swm-gaps"
(source #:tests? #f
(origin #:phases
(method git-fetch) (modify-phases %standard-phases
(uri (git-reference (add-after 'unpack 'chdir
(url "https://github.com/stumpwm/stumpwm-contrib.git") (lambda _ (chdir "util/swm-gaps") #t)))))
(commit commit))) (home-page "https://github.com/stumpwm/stumpwm-contrib")
(file-name (git-file-name name version)) (synopsis "Gaps between windows for StumpWM")
(sha256 (description "This package provides a StumpWM module which adds gaps
(base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml"))))
(inputs
`(("stumpwm" ,stumpwm "lib")))
(build-system asdf-build-system/sbcl)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _
(chdir "util/swm-gaps"))))))
(home-page "https://github.com/stumpwm/stumpwm-contrib")
(synopsis "Gaps between windows for StumpWM")
(description "This package provides a StumpWM module which adds gaps
between windows.") between windows.")
(license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (license (list license:gpl2+ license:gpl3+ license:bsd-2))))
(define-public lemonbar (define-public lemonbar
(let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4")