aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/wm.scm
diff options
context:
space:
mode:
authorGuillaume Le Vaillant <glv@posteo.net>2020-09-10 17:25:33 +0200
committerGuillaume Le Vaillant <glv@posteo.net>2020-09-12 11:18:56 +0200
commit2ff8b5bafc80b559d4da94562371f69fe1d364aa (patch)
tree8d8450e4f80821efbe5712493a1d1ea52640f7e2 /gnu/packages/wm.scm
parenta13f45c1505fb4cf02dcbd3a80df90cc3edbb9ca (diff)
downloadguix-2ff8b5bafc80b559d4da94562371f69fe1d364aa.tar
guix-2ff8b5bafc80b559d4da94562371f69fe1d364aa.tar.gz
gnu: Adapt Lisp packages to changes in asdf-build-system.
* gnu/packages/patches/sbcl-graph-asdf-definitions.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/lisp-xyz.scm (sbcl-cl-ppcre)[arguments]: Add 'disable-ppcre-unicode' phase. (sbcl-cl-unicode-base): Remove variable and merge its content in ... (sbcl-cl-unicode): ... here. (sbcl-cl-ppcre-unicode)[arguments]: Add 'disable-ppcre' phase. (sbcl-cl-aa, sbcl-cl-paths, sbcl-cl-paths-ttf): Remove variables and merge their contents in ... (sbcl-cl-vectors): ... here. (sbcl-spatial-trees)[arguments]: Remove 'asd-file' keyword. (sbcl-clx-truetype)[inputs]: Remove 'cl-paths-ttf'. (sbcl-slynk-boot0, sbcl-slynk-arglists, sbcl-slynk-util, sbcl-slynk-fancy-inspector, sbcl-slynk-package-fu, sbcl-slynk-mrepl, sbcl-slynk-trace-dialog, sbcl-slynk-profiler, sbcl-slynk-stickers, sbcl-slynk-indentation, sbcl-slynk-retro, slynk-systems): Remove variables and merge their contents in ... (sbcl-slynk): ... here. (uglify-js)[arguments]: Fix ASDF initialization in Lisp script. (sbcl-cl-yacc)[arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. (sbcl-3bmd-ext-code-blocks): Remove variable and merge its content in ... (sbcl-3bmd): ... here. (sbcl-slime-swank, ecl-slime-swank): New variables. (sbcl-mgl-pax)[propagated-inputs]: Remove and move the content in ... [inputs]: ... here. Remove '3bmd-ext-code-blocks'. (sbcl-prove-asdf): Remove variable and merge its content in ... (sbcl-prove): ... here. (sbcl-proc-parse)[native-inputs]: Remove 'prove-asdf'. (sbcl-ascii-strings, sbcl-simple-scanf): Remove variables and merge their contents in ... (sbcl-cl-string-match): ... here. (sbcl-queues.simple-queue, sbcl-queues.simple-cqueue, sbcl-queues.priority-queue, sbcl-queues.priority-cqueue): Remove variables and merge their contents in ... (sbcl-queues): ... here. (sbcl-cffi-bootstrap, sbcl-cffi-toolchain, sbcl-cffi-libffi, sbcl-cffi-grovel, sbcl-cffi-uffi-compat): Remove variables and merge their contents in ... (sbcl-cffi): ... here. (ecl-cffi): New variable. (sbcl-cl-sqlite)[arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. (sbcl-cl-cffi-gtk-boot0, sbcl-cl-cffi-gtk-glib, sbcl-cl-cffi-gtk-gobject, sbcl-cl-cffi-gtk-gio, sbcl-cl-cffi-gtk-cairo, sbcl-cl-cffi-gtk-pango, sbcl-cl-cffi-gtk-gdk-pixbuf, sbcl-cl-cffi-gtk-gdk): Remove variables and merge their contents in ... (sbcl-cl-cffi-gtk): ... here. (sbcl-cl-webkit)[arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. (sbcl-usocket-boot0, sbcl-usocket-server): Remove variables and merge their contents in ... (sbcl-usocket): ... here. (sbcl-cl-annot)[arguments]: Remove. (sbcl-cl-syntax-annot, sbcl-cl-syntax-interpol): Remove variables and merge their contents in ... (sbcl-cl-syntax): ... here. (sbcl-cl-utilities)[arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. (sbcl-quri, sbcl-myway, sbcl-subseq, sbcl-smart-buffer)[native-inputs]: Remove 'prove-asdf'. (sbcl-fast-http)[native-inputs]: Remove 'prove-asdf' and 'cl-syntax-interpol'. Add 'cl-syntax'. (sbcl-static-vectors)[native-inputs]: Remove 'cffi-grovel'. Add 'cffi'. (sbcl-jonathan)[native-inputs]: Remove 'prove-asdf'. [inputs]: Remove 'cl-syntax-annot'. (sbcl-http-body)[native-inputs]: Remove 'prove-asdf'. (sbcl-lack-request, sbcl-lack-response, sbcl-lack-component, sbcl-lack-util, sbcl-lack-middleware-backtrace, sbcl-lack-middleware-static): Remove variables and merge their contents in ... (sbcl-lack): ... here. (sbcl-ningle)[native-inputs]: Remove 'prove-asdf'. [inputs]: Remove 'cl-syntax-annot', 'lack-request', 'lack-response' and 'lack-component'. Add 'lack'. (clack-commit, clack-revision, sbcl-clack-handler-fcgi, sbcl-clack-socket, sbcl-clack-handler-hunchentoot): Remove variables and merge their contents in ... (sbcl-clack): ... here. (sbcl-parse-declarations)[arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. (sbcl-burgled-batteries3)[inputs]: Remove 'cffi-grovel'. (sbcl-trivial-utf-8)[arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. (sbcl-iolib.asdf, sbcl-iolib.conf, sbcl-iolib.common-lisp, sbcl-iolib.base, sbcl-iolib.grovel, sbcl-iolib+syscalls, sbcl-iolib+multiplex, sbcl-iolib+streams, sbcl-iolib+sockets): Remove variables and merge their contents in ... (sbcl-iolib): ... here. (sbcl-cxml+xml, sbcl-cxml+dom, sbcl-cxml+klacks, sbcl-cxml+test): Remove variables and merge their contents in ... (sbcl-cxml): ... here. (sbcl-cl-cookie)[native-inputs]: Remove 'prove-asdf'. (sbcl-dexador)[native-inputs]: Remove 'prove-asdf' and 'lack-request'. Add 'lack". (sbcl-fare-quasiquote-optima, sbcl-fare-quasiquote-readtable, sbcl-fare-quasiquote-extras): Remove variables and merge their contents in ... (sbcl-fare-quasiquote): ... here. (sbcl-trivia.level0, sbcl-trivia.level1, sbcl-trivia.level2): Remove variables and merge their contents in ... (sbcl-trivia.trivial): ... here. (sbcl-trivia.balland2006, sbcl-trivia.ppcre, sbcl-trivia.quasiquote, sbcl-trivia.cffi): Remove variables and merge their contents in ... (sbcl-trivia): ... here. (sbcl-cl-str)[native-inputs]: Remove 'prove-asdf'. [arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. (sbcl-dbus): New variable. (sbcl-s-sysdeps)[inputs]: Remove 'usocket-server'. (sbcl-periods-series): Remove variable and merge its content in ... (sbcl-periods): ... here. (sbcl-fprog): Remove variable and merge its content in ... (sbcl-cambl): ... here. (sbcl-cl-ledger)[inputs]: Remove 'periods-series'. Add 'periods'. (sbcl-serapeum)[inputs]: Remove 'trivia.quasiquote' and 'fare-quasiquote-extras'. Add 'fare-quasiquote'. (sbcl-stefil)[native-inputs]: Remove. [inputs]: Add swank. (sbcl-graph-dot, sbcl-graph-json): Remove variables and merge their contents in ... (sbcl-graph): ... here. (sbcl-foreign-array, sbcl-physical-dimension, sbcl-science-data): Remove variables and merge their contents in ... (sbcl-antik-base): ... here. (sbcl-gsll)[inputs]: Remove 'cffi-grovel', 'cffi-libffi' and 'foreign-array'. Add 'antik-base' and 'cffi'. (sbcl-antik)[inputs]: Remove 'physical-dimension". Add 'antik-base'. [arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. Add 'fix-build' phase. (sbcl-symbol-munger-boot0): Remove variable and merge its content in ... (sbcl-symbol-munger): ... here. (sbcl-lisp-unit2-boot0): Remove variable and merge its content in ... (sbcl-lisp-unit2): ... here. (sbcl-cl-ana-boot0, sbcl-cl-ana.pathname-utils, sbcl-cl-ana.package-utils, sbcl-cl-ana.string-utils, sbcl-cl-ana.functional-utils, sbcl-cl-ana.list-utils, sbcl-cl-ana.generic-math, sbcl-cl-ana.math-functions, sbcl-cl-ana.calculus, sbcl-cl-ana.symbol-utils, sbcl-cl-ana.macro-utils, sbcl-cl-ana.binary-tree, sbcl-cl-ana.tensor, sbcl-cl-ana.error-propagation, sbcl-cl-ana.quantity, sbcl-cl-ana.table, sbcl-cl-ana.table-utils, sbcl-cl-ana.hdf-cffi, sbcl-cl-ana.int-char, sbcl-cl-ana.memoization, sbcl-cl-ana.typespec, sbcl-cl-ana.hdf-typespec, sbcl-cl-ana.hdf-utils, typed-table, sbcl-cl-ana.hdf-table, sbcl-cl-ana.gsl-cffi, sbcl-cl-ana.ntuple-table, sbcl-cl-ana.csv-table, sbcl-cl-ana.reusable-table, sbcl-cl-ana.linear-algebra, sbcl-cl-ana.lorentz, sbcl-cl-ana.clos-utils, sbcl-cl-ana.hash-table-utils, sbcl-cl-ana.map, sbcl-cl-ana.fitting, sbcl-cl-ana.histogram, sbcl-cl-ana.file-utils, sbcl-cl-ana.statistics, sbcl-cl-ana.gnuplot-interface, sbcl-cl-ana.plotting, sbcl-cl-ana.table-viewing, sbcl-cl-ana.serialization, sbcl-cl-ana.makeres, sbcl-cl-ana.makeres-macro, sbcl-cl-ana.makeres-block, sbcl-cl-ana.makeres-progress, sbcl-cl-ana.makeres-table, sbcl-cl-ana.makeres-graphviz, sbcl-cl-ana.makeres-branch, sbcl-cl-ana.utils, sbcl-cl-ana.statistical-learning): Remove variables and merge their contents in ... (sbcl-cl-ana): ... here. (sbcl-cl-libuv)[inputs]: Remove 'cffi-grovel'. (sbcl-cl-async-base, sbcl-cl-async-util, sbcl-cl-async-repl, sbcl-cl-async-ssl): Remove variables and merge their contents in ... (sbcl-cl-async): ... here. (sbcl-ltk-mw, sbcl-ltk-remote): Remove variables and merge their contents in ... (sbcl-ltk): ... here. [arguments]: Add 'fix-build' phase. (sbcl-hdf5-cffi)[inputs]: Remove 'cffi-grovel'. [arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. (sbcl-cl-randist, sbcl-float-features, sbcl-function-cache, sbcl-type-r, sbcl-trivialib-type-unify, sbcl-specialized-function, sbcl-constantfold, sbcl-gtype, sbcl-numcl)[arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. (sbcl-pzmq)[inputs]: Remove 'cffi-grovel'. (sbcl-simple-date, sbcl-cl-postgres, sbcl-simple-date-postgrs-glue, sbcl-s-sql): Remove variables and merge their contents in ... (sbcl-postmodern): ... here. (sbcl-dbd-mysql, sbcl-dbd-postgres, sbcl-dbd-sqlite3): Remove variables and merge their contents in ... (sbcl-dbi): ... here. (sbcl-clsql-uffi, sbcl-clsql-sqlite3, sbcl-clsql-postgresql, sbcl-clsql-postgresql-socket3, sbcl-clsql-mysql): Remove variables and merge their contents in ... (sbcl-clsql): ... here. (sbcl-sycamore)[arguments]: Remove 'asd-file' keyword and add 'asd-files' keyword. (sbcl-osicat)[native-inputs]: Remove 'cffi-grovel'. (sbcl-clx-xembed, sbcl-quantile-estimator): Remove 'asd-system-name' keyword and add 'asd-systems' keyword. (sbcl-prometheus.collectors.sbcl, sbcl-prometheus.collectors.process, sbcl-prometheus.formats.test, sbcl-prometheus.exposers.hunchentoot, sbcl-prometheus.pushgateway): Remove variables and merge their contents in ... (sbcl-prometheus): ... here. (sbcl-sxql)[native-inputs]: Remove 'prove-asdf'. [inputs]: Remove 'cl-syntax-annot'. Add 'cl-syntax'. (sbcl-1am)[arguments]: Remove 'asd-system-name' keyword and add 'asd-systems' keyword. (sbcl-cl-rdkafka)[inputs]: Remove 'cffi-grovel'. (sbcl-clump-2-3-tree, sbcl-clum-binary-tree): Remove variables and merge their contents in ... (sbcl-clump): ... here. (sbcl-cluffer-base, sbcl-cluffer-standard-line, sbcl-cluffer-standard-buffer, sbcl-cluffer-simple-line, sbcl-cluffer-simple-buffer): Remove variables and merge their contents in ... (sbcl-cluffer): ... here. (sbcl-cl-libsvm-format, sbcl-cl-online-learning, sbcl-cl-random-forest)[native-inputs]: Remove 'prove-asdf'. (sbcl-cl-freetype2)[inputs]: Remove 'cffi-grovel'. (sbcl-clim-lisp, sbcl-clim-basic, sbcl-clim-core, sbcl-esa-mcclim, sbcl-mcclim-fonts, sbcl-automaton, sbcl-persistent, sbcl-drei-mcclim, sbcl-clim, sbcl-mcclim-backend-common, sbcl-mcclim-clx, sbcl-mcclim-fonts-truetype, sbcl-mcclim-fonts-clx-truetype, sbcl-mcclim-clx-truetype, sbcl-mcclim-fontconfig, sbcl-mcclim-harfbuzz, sbcl-mcclim-fonts-clx-truetype, sbcl-mcclim-clx-freetype, sbcl-mcclim-render, sbcl-mcclim-clx-fb, xbcl-mcclim-null, sbcl-clim-postscript-font, sbcl-clim-postscript, sbcl-clim-pdf, sbcl-mcclim-looks, sbcl-mcclim-franz, sbcl-mcclim-bezier-core, sbcl-mcclim-bezier-clx, sbcl-mcclim-bezier, sbcl-mcclim-bitmaps, sbcl-conditional-commands, sbcl-mcclim-layouts-tab, sbcl-mcclim-extensions, sbcl-mcclim-test-util, sbcl-mcclim-raster-image, sbcl-clim-examples): Remove variables and merge their contents in ... (sbcl-mcclim): ... here. (sbcl-mito-core, sbcl-mito-migration, sbcl-lack-middleware-mito): Remove variables and merge their contents in ... (sbcl-mito): ... here. (sbcl-kebab)[native-inputs]: Remove 'prove-asdf'. (sbcl-datafly)[native-inputs]: Remove 'prove-asdf' and 'dbd-sqlite3'. [inputs]: Remove 'cl-syntax-annot'. Add 'cl-syntax'. (sbcl-caveman)[inputs]: Remove 'lack-request', 'lack-response' and 'cl-syntax-annot'. Add 'lack' and 'cl-syntax'. [arguments]: Remove 'asd-file' and 'asd-system-name' keywords and add 'asd-files' and 'asd-systems' keywords. * gnu/packages/wm.scm (stumpwm, sbcl-stumpwm-ttf-fontsn, sbcl-stumpwm-pass, sbcl-stumpwm-globalwindows, sbcl-stumpwm-swm-gaps, sbcl-stumpwm-net, sbcl-stumpwm-wifi, sbcl-stumpwm-stumptray, sbcl-stumpwm-kbd-layouts): Remove 'asd-system-name' keyword and add 'asd-systems' keyword. (stumpwm-with-slynk)[arguments]: Remove references to variables that don't exist anymore.
Diffstat (limited to 'gnu/packages/wm.scm')
-rw-r--r--gnu/packages/wm.scm29
1 files changed, 12 insertions, 17 deletions
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 15fbf43ec7..53cfa5c916 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1598,10 +1598,10 @@ compositors that support the layer-shell protocol.")
("alexandria" ,sbcl-alexandria)))
(outputs '("out" "lib"))
(arguments
- '(#:asd-system-name "stumpwm"
+ '(#:asd-systems '("stumpwm")
#:phases
(modify-phases %standard-phases
- (add-after 'create-symlinks 'build-program
+ (add-after 'create-asdf-configuration 'build-program
(lambda* (#:key outputs #:allow-other-keys)
(build-program
(string-append (assoc-ref outputs "out") "/bin/stumpwm")
@@ -1670,20 +1670,15 @@ productive, customizable lisp based systems.")
(program (string-append out "/bin/stumpwm")))
(build-program program outputs
#:entry-program '((stumpwm:stumpwm) 0)
- #:dependencies '("stumpwm"
- ,@(@@ (gnu packages lisp-xyz) slynk-systems))
+ #:dependencies '("stumpwm" "slynk")
#:dependency-prefixes
(map (lambda (input) (assoc-ref inputs input))
'("stumpwm" "slynk")))
- ;; Remove unneeded file.
- (delete-file (string-append out "/bin/stumpwm-exec.fasl"))
#t)))
(delete 'copy-source)
(delete 'build)
(delete 'check)
- (delete 'create-asd-file)
- (delete 'cleanup)
- (delete 'create-symlinks)))))))
+ (delete 'cleanup)))))))
(define stumpwm-contrib
(let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d63")
@@ -1745,7 +1740,7 @@ productive, customizable lisp based systems.")
`(("stumpwm" ,stumpwm "lib")
("clx-truetype" ,sbcl-clx-truetype)))
(arguments
- '(#:asd-system-name "ttf-fonts"
+ '(#:asd-systems '("ttf-fonts")
#:tests? #f
#:phases
(modify-phases %standard-phases
@@ -1762,7 +1757,7 @@ rendering.")
(inherit stumpwm-contrib)
(name "sbcl-stumpwm-pass")
(arguments
- '(#:asd-system-name "pass"
+ '(#:asd-systems '("pass")
#:tests? #f
#:phases
(modify-phases %standard-phases
@@ -1779,7 +1774,7 @@ password-store into StumpWM.")
(inherit stumpwm-contrib)
(name "sbcl-stumpwm-globalwindows")
(arguments
- '(#:asd-system-name "globalwindows"
+ '(#:asd-systems '("globalwindows")
#:tests? #f
#:phases
(modify-phases %standard-phases
@@ -1796,7 +1791,7 @@ windows in the current X session.")
(inherit stumpwm-contrib)
(name "sbcl-stumpwm-swm-gaps")
(arguments
- '(#:asd-system-name "swm-gaps"
+ '(#:asd-systems '("swm-gaps")
#:tests? #f
#:phases
(modify-phases %standard-phases
@@ -1813,7 +1808,7 @@ between windows.")
(inherit stumpwm-contrib)
(name "sbcl-stumpwm-net")
(arguments
- '(#:asd-system-name "net"
+ '(#:asd-systems '("net")
#:tests? #f
#:phases
(modify-phases %standard-phases
@@ -1831,7 +1826,7 @@ between windows.")
(inherit stumpwm-contrib)
(name "sbcl-stumpwm-wifi")
(arguments
- '(#:asd-system-name "wifi"
+ '(#:asd-systems '("wifi")
#:tests? #f
#:phases
(modify-phases %standard-phases
@@ -1849,7 +1844,7 @@ between windows.")
(inherit stumpwm-contrib)
(name "sbcl-stumpwm-stumptray")
(arguments
- '(#:asd-system-name "stumptray"
+ '(#:asd-systems '("stumptray")
#:tests? #f
#:phases
(modify-phases %standard-phases
@@ -1871,7 +1866,7 @@ between windows.")
(inherit stumpwm-contrib)
(name "sbcl-stumpwm-kbd-layouts")
(arguments
- '(#:asd-system-name "kbd-layouts"
+ '(#:asd-systems '("kbd-layouts")
#:tests? #f
#:phases
(modify-phases %standard-phases