Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sbcl.pkgs: update to Quicklisp dist from June 2023 #238790

Merged
merged 3 commits into from
Jul 15, 2023

Conversation

Uthar
Copy link
Contributor

@Uthar Uthar commented Jun 20, 2023

Description of changes

Ran ql-import.lisp

Upstream announcement: http://blog.quicklisp.org/2023/06/june-2023-quicklisp-dist-update-now.html

Notably:

I removed Nyxt because it uses its own style of build system (nasdf) that doesn't work very well with Quicklisp. I recommend getting it directly if you want to use it.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@Uthar Uthar force-pushed the quicklisp-june-2023 branch 2 times, most recently from 5e4dd15 to 5a1f380 Compare June 20, 2023 22:02
@Uthar
Copy link
Contributor Author

Uthar commented Jun 20, 2023

@ofborg build nyxt

@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Jun 20, 2023
@ofborg ofborg bot requested review from hraban, 7c6f434c, lukego and nagy June 20, 2023 23:13
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 101-500 labels Jun 20, 2023
@Vonfry
Copy link
Member

Vonfry commented Jun 21, 2023

#235095 updates some packages manually to build the new version nyxt. Should we revert these updates and apply the new ones in quicklisp?

@7c6f434c
Copy link
Member

Re: Nyxt deps: I guess if Quicklisp has updated at least as far, we can try dropping the overrides (and see if Nyxt is happy). But this can be done separately.

@Uthar Uthar marked this pull request as ready for review June 22, 2023 15:18
@dariof4
Copy link
Contributor

dariof4 commented Jul 5, 2023

Result of nixpkgs-review pr 238790 run on x86_64-linux 1

2 packages failed to build:
  • sbclPackages.cl-gtk4_dot_webkit2
  • sbclPackages.cl-tar
301 packages built:
  • nyxt
  • sbclPackages.access
  • sbclPackages.acclimation
  • sbclPackages.agutil
  • sbclPackages.alexandria
  • sbclPackages.arnesi
  • sbclPackages.array-operations
  • sbclPackages.array-utils
  • sbclPackages.babel
  • sbclPackages.binpack
  • sbclPackages.bordeaux-threads
  • sbclPackages.buildnode
  • sbclPackages.buildnode-xhtml
  • sbclPackages.calispel
  • sbclPackages.cffi
  • sbclPackages.cffi-grovel
  • sbclPackages.cffi-libffi
  • sbclPackages.cffi-toolchain
  • sbclPackages.cffi-uffi-compat
  • sbclPackages.chanl
  • sbclPackages.check-it
  • sbclPackages.chipz
  • sbclPackages.circular-streams
  • sbclPackages.cl-ana
  • sbclPackages.cl-annot
  • sbclPackages.cl-ansi-text
  • sbclPackages.cl-async
  • sbclPackages.cl-async-base
  • sbclPackages.cl-async-repl
  • sbclPackages.cl-async-ssl
  • sbclPackages.cl-async-util
  • sbclPackages.cl-avro
  • sbclPackages.cl-cairo2
  • sbclPackages.cl-cairo2-xlib
  • sbclPackages.cl-cffi-gtk
  • sbclPackages.cl-cffi-gtk-cairo
  • sbclPackages.cl-cffi-gtk-gdk
  • sbclPackages.cl-cffi-gtk-gdk-pixbuf
  • sbclPackages.cl-cffi-gtk-gio
  • sbclPackages.cl-cffi-gtk-glib
  • sbclPackages.cl-cffi-gtk-gobject
  • sbclPackages.cl-cffi-gtk-pango
  • sbclPackages.cl-change-case
  • sbclPackages.cl-colors
  • sbclPackages.cl-colors2
  • sbclPackages.cl-colors2_0_5_3
  • sbclPackages.cl-containers
  • sbclPackages.cl-cookie
  • sbclPackages.cl-csv
  • sbclPackages.cl-cuda
  • sbclPackages.cl-dbi
  • sbclPackages.cl-emb
  • sbclPackages.cl-environments
  • sbclPackages.cl-fad
  • sbclPackages.cl-form-types
  • sbclPackages.cl-freetype2
  • sbclPackages.cl-fuse
  • sbclPackages.cl-fuse-meta-fs
  • sbclPackages.cl-fuzz
  • sbclPackages.cl-glib
  • sbclPackages.cl-glib_dot_gio
  • sbclPackages.cl-gobject-introspection
  • sbclPackages.cl-gtk2-gdk
  • sbclPackages.cl-gtk2-glib
  • sbclPackages.cl-gtk2-pango
  • sbclPackages.cl-gtk4
  • sbclPackages.cl-gtk4_dot_adw
  • sbclPackages.cl-hooks
  • sbclPackages.cl-html5-parser
  • sbclPackages.cl-interpol
  • sbclPackages.cl-l10n
  • sbclPackages.cl-liballegro-nuklear
  • sbclPackages.cl-libuv
  • sbclPackages.cl-libxml2
  • sbclPackages.cl-libyaml
  • sbclPackages.cl-locale
  • sbclPackages.cl-mysql
  • sbclPackages.cl-notify
  • sbclPackages.cl-pango
  • sbclPackages.cl-paths-ttf
  • sbclPackages.cl-pattern
  • sbclPackages.cl-pdf
  • sbclPackages.cl-postgres
  • sbclPackages.cl-postgres_plus_local-time
  • sbclPackages.cl-ppcre
  • sbclPackages.cl-ppcre-template
  • sbclPackages.cl-ppcre-unicode
  • sbclPackages.cl-prevalence
  • sbclPackages.cl-readline
  • sbclPackages.cl-reexport
  • sbclPackages.cl-rsvg2
  • sbclPackages.cl-sat
  • sbclPackages.cl-sat_dot_glucose
  • sbclPackages.cl-sat_dot_minisat
  • sbclPackages.cl-shellwords
  • sbclPackages.cl-slice
  • sbclPackages.cl-smt-lib
  • sbclPackages.cl-smtp
  • sbclPackages.cl-syntax
  • sbclPackages.cl-syntax-annot
  • sbclPackages.cl-syntax-anonfun
  • sbclPackages.cl-syntax-markup
  • sbclPackages.cl-syslog
  • sbclPackages.cl-tar-file
  • sbclPackages.cl-test-more
  • sbclPackages.cl-typesetting
  • sbclPackages.cl-unicode
  • sbclPackages.cl-webkit2
  • sbclPackages.cl-webkit2_3_5_8
  • sbclPackages.cl-xmlspam
  • sbclPackages.cl_plus_ssl
  • sbclPackages.clack
  • sbclPackages.clack-socket
  • sbclPackages.classowary
  • sbclPackages.clfswm
  • sbclPackages.closer-mop
  • sbclPackages.closure-common
  • sbclPackages.closure-html
  • sbclPackages.clss
  • sbclPackages.cluffer
  • sbclPackages.clump
  • sbclPackages.clump-2-3-tree
  • sbclPackages.clump-binary-tree
  • sbclPackages.clx
  • sbclPackages.clx-truetype
  • sbclPackages.collectors
  • sbclPackages.colorize
  • sbclPackages.qtgui (sbclPackages.qtcore ,sbclPackages.qthelp ,sbclPackages.qtnetwork ,sbclPackages.qtopengl ,sbclPackages.qtscript ,sbclPackages.qtsql ,sbclPackages.qtsvg ,sbclPackages.qttest ,sbclPackages.qtuitools ,sbclPackages.qtxml ,sbclPackages.qtxmlpatterns ,sbclPackages.smokebase)
  • sbclPackages.css-lite
  • sbclPackages.css-selectors
  • sbclPackages.css-selectors-simple-tree
  • sbclPackages.css-selectors-stp
  • sbclPackages.cxml
  • sbclPackages.cxml-stp
  • sbclPackages.data-table
  • sbclPackages.dbd-mysql
  • sbclPackages.dbd-postgres
  • sbclPackages.dbd-sqlite3
  • sbclPackages.dbi
  • sbclPackages.dbi-test
  • sbclPackages.dbus
  • sbclPackages.defclass-std
  • sbclPackages.dexador
  • sbclPackages.djula
  • sbclPackages.do-urlencode
  • sbclPackages.documentation-utils
  • sbclPackages.drakma
  • sbclPackages.duckdb
  • sbclPackages.eager-future2
  • sbclPackages.enchant
  • sbclPackages.esrap
  • sbclPackages.esrap-peg
  • sbclPackages.external-program
  • sbclPackages.fare-mop
  • sbclPackages.fare-quasiquote-extras
  • sbclPackages.fare-quasiquote-optima
  • sbclPackages.fare-quasiquote-readtable
  • sbclPackages.fast-http
  • sbclPackages.fast-io
  • sbclPackages.fiasco
  • sbclPackages.file-attributes
  • sbclPackages.fiveam
  • sbclPackages.float-features
  • sbclPackages.flow
  • sbclPackages.fn
  • sbclPackages.form-fiddle
  • sbclPackages.fset
  • sbclPackages.generic-cl
  • sbclPackages.gsll
  • sbclPackages.history-tree
  • sbclPackages.http-body
  • sbclPackages.hu_dot_dwim_dot_common
  • sbclPackages.hu_dot_dwim_dot_def
  • sbclPackages.hu_dot_dwim_dot_def_plus_swank
  • sbclPackages.hu_dot_dwim_dot_stefil
  • sbclPackages.hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def
  • sbclPackages.hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank
  • sbclPackages.hu_dot_dwim_dot_stefil_plus_swank
  • sbclPackages.hunchensocket
  • sbclPackages.hunchentoot
  • sbclPackages.inferior-shell
  • sbclPackages.iolib
  • sbclPackages.iolib_dot_asdf
  • sbclPackages.iolib_dot_base
  • sbclPackages.iolib_dot_common-lisp
  • sbclPackages.iolib_dot_conf
  • sbclPackages.ironclad
  • sbclPackages.jonathan
  • sbclPackages.jpl-queues
  • sbclPackages.jzon
  • sbclPackages.kons-9
  • sbclPackages.lack
  • sbclPackages.lack-component
  • sbclPackages.lack-middleware-backtrace
  • sbclPackages.lack-util
  • sbclPackages.legit
  • sbclPackages.let-plus
  • sbclPackages.lev
  • sbclPackages.lfarm-client
  • sbclPackages.lfarm-common
  • sbclPackages.lfarm-server
  • sbclPackages.lfarm-ssl
  • sbclPackages.lisp-binary
  • sbclPackages.lisp-namespace
  • sbclPackages.lisp-unit2
  • sbclPackages.lla
  • sbclPackages.log4cl
  • sbclPackages.lparallel
  • sbclPackages.lquery
  • sbclPackages.magicl
  • sbclPackages.mathkit
  • sbclPackages.metabang-bind
  • sbclPackages.mgl
  • sbclPackages.mgl-mat
  • sbclPackages.mgl-pax
  • sbclPackages.mmap
  • sbclPackages.moptilities
  • sbclPackages.more-conditions
  • sbclPackages.named-readtables
  • sbclPackages.nbd
  • sbclPackages.nclasses_0_5_0
  • sbclPackages.nfiles_1_1_2
  • sbclPackages.nhooks
  • sbclPackages.nkeymaps
  • sbclPackages.nsymbols_0_3_1
  • sbclPackages.nyxt (sbclPackages.nyxt-gtk)
  • sbclPackages.optima
  • sbclPackages.osicat
  • sbclPackages.parachute
  • sbclPackages.parenscript
  • sbclPackages.parse-float
  • sbclPackages.parser-combinators
  • sbclPackages.parser_dot_common-rules
  • sbclPackages.pcall
  • sbclPackages.pcall-queue
  • sbclPackages.plump
  • sbclPackages.polyclot
  • sbclPackages.postmodern
  • sbclPackages.proc-parse
  • sbclPackages.prompter
  • sbclPackages.prove
  • sbclPackages.pythonic-string-reader
  • sbclPackages.pzmq
  • sbclPackages.pzmq-compat
  • sbclPackages.pzmq-examples
  • sbclPackages.pzmq-test
  • sbclPackages.qt
  • sbclPackages.qtools
  • sbclPackages.query-fs
  • sbclPackages.quri
  • sbclPackages.quri_7_0
  • sbclPackages.rove
  • sbclPackages.s-sql
  • sbclPackages.s-sysdeps
  • sbclPackages.serapeum
  • sbclPackages.simple-date-time
  • sbclPackages.simple-inferiors
  • sbclPackages.simple-tasks
  • sbclPackages.slynk
  • sbclPackages.spinneret
  • sbclPackages.sqlite
  • sbclPackages.static-dispatch
  • sbclPackages.static-vectors
  • sbclPackages.stefil
  • sbclPackages.str
  • stumpwm (sbclPackages.stumpwm)
  • stumpwm-unwrapped (sbclPackages.stumpwm-unwrapped)
  • sbclPackages.swap-bytes
  • sbclPackages.sycamore
  • sbclPackages.symbol-munger
  • sbclPackages.trivia
  • sbclPackages.trivia_dot_balland2006
  • sbclPackages.trivia_dot_level0
  • sbclPackages.trivia_dot_level1
  • sbclPackages.trivia_dot_level2
  • sbclPackages.trivia_dot_quasiquote
  • sbclPackages.trivia_dot_trivial
  • sbclPackages.trivial-arguments
  • sbclPackages.trivial-clipboard
  • sbclPackages.trivial-features
  • sbclPackages.trivial-indent
  • sbclPackages.trivial-main-thread
  • sbclPackages.trivial-package-manager
  • sbclPackages.trivial-with-current-source-form
  • sbclPackages.type-i
  • sbclPackages.uax-15
  • sbclPackages.usocket
  • sbclPackages.usocket-server
  • sbclPackages.utilities_dot_print-items
  • sbclPackages.utilities_dot_print-tree
  • sbclPackages.uuid
  • sbclPackages.varjo
  • sbclPackages.vecto
  • sbclPackages.woo
  • sbclPackages.wookie
  • sbclPackages.xembed
  • sbclPackages.xkeyboard
  • sbclPackages.xml_dot_location
  • sbclPackages.xpath
  • sbclPackages.yason
  • sbclPackages.zpb-ttf

Out of the package that failed sbclPackages.cl-gtk4_dot_webkit2 was already failing (see: 7486a74) and sbclPackage.cl-tar is failing with these errors:

; caught WARNING:
;   Argument :PACKAGE-SYMBOL is deprecated in DEFSECTION macr. Use :PACKAGE instead.
; 
; caught ERROR:
;   (during macroexpansion of (40ANTS-DOC:DEFSECTION @MANUAL
;       ...))
;   (FIND-PACKAGE :TAR) fell through ETYPECASE expression.
;   Wanted one of (PACKAGE KEYWORD STRING SYMBOL).

I debugged around a bit and found the culprit, this commit here for _40ants-doc 40ants/doc@897d29f which deprecates :package-symbol and uses :find-package internally, with this patch applied to cl-tar it builds correctly, this seems like an upstream issue though, other than that LGTM.

diff --git a/src/docs.lisp b/src/docs.lisp
index 49046ae..3265cf3 100644
--- a/src/docs.lisp
+++ b/src/docs.lisp
@@ -14,7 +14,7 @@
 (40ants-doc:defsection @manual
     (:title "Tar"
      :export nil
-     :package-symbol (find-package :tar))
+     :package :tar)
   #.(uiop:read-file-string (asdf:system-relative-pathname :tar "README.md"))
   (@tar 40ants-doc/locatives:section)
   (@tar-simple-extract 40ants-doc/locatives:section)
@@ -24,7 +24,7 @@
 (40ants-doc:defsection @tar-simple-extract
     (:title "Simple Extraction"
      :export nil
-     :package-symbol (find-package :tar-simple-extract))
+     :package :tar-simple-extract)
   "This section describes the support for simple extraction to the filesystem."
   (simple-extract-archive 40ants-doc/locatives:function)
   (@tar-simple-extract-conditions 40ants-doc/locatives:section))
@@ -32,7 +32,7 @@
 (40ants-doc:defsection @tar-simple-extract-conditions
     (:title "Simple Extraction Conditions"
      :export nil
-     :package-symbol (find-package :tar-simple-extract))
+     :package :tar-simple-extract)
   "This section describes the conditions that can occur during
 SIMPLE-EXTRACT-ARCHIVE."
   (extraction-error 40ants-doc/locatives:class)
@@ -56,7 +56,7 @@ SIMPLE-EXTRACT-ARCHIVE."
 (40ants-doc:defsection @tar-extract
     (:title "Extraction"
      :export nil
-     :package-symbol (find-package :tar-extract))
+     :package :tar-extract)
   "This section describes the support for non-portable extraction to the
 filesystem."
   (extract-archive 40ants-doc/locatives:function)
@@ -65,7 +65,7 @@ filesystem."
 (40ants-doc:defsection @tar-extract-conditions
     (:title "Extraction Conditions"
      :export nil
-     :package-symbol (find-package :tar-extract))
+     :package :tar-extract)
   "This section describes the conditions that can occur during
 EXTRACT-ARCHIVE."
   (extraction-error 40ants-doc/locatives:class)
@@ -101,7 +101,7 @@ EXTRACT-ARCHIVE."
 (40ants-doc:defsection @tar-create
     (:title "Create"
      :export nil
-     :package-symbol (find-package :tar-create))
+     :package :tar-create)
   "This section describes the support for non-portable creation of archives
 from the filesystem."
   (create-archive 40ants-doc/locatives:function))
@@ -109,7 +109,7 @@ from the filesystem."
 (40ants-doc:defsection @tar
     (:title "Tar"
      :export nil
-     :package-symbol (find-package :tar))
+     :package :tar)
   "This section describes the high level tar archive support."
   (@tar-archives 40ants-doc/locatives:section)
   (@tar-entries 40ants-doc/locatives:section)
@@ -118,7 +118,7 @@ from the filesystem."
 (40ants-doc:defsection @tar-archives
     (:title "Tar Archives"
      :export nil
-     :package-symbol (find-package :tar))
+     :package :tar)
   (tar:archive 40ants-doc/locatives:class)
   (tar:gnu-archive 40ants-doc/locatives:class)
   (tar:pax-archive 40ants-doc/locatives:class)
@@ -132,7 +132,7 @@ from the filesystem."
 (40ants-doc:defsection @tar-entries
     (:title "Tar Entries"
      :export nil
-     :package-symbol (find-package :tar))
+     :package :tar)
   "This section describes the various entry types and how to read/write them
   from/to an archive."
 
@@ -168,7 +168,7 @@ from the filesystem."
 (40ants-doc:defsection @tar-conditions
     (:title "Tar Conditions"
      :export nil
-     :package-symbol (find-package :tar))
+     :package :tar)
   "This section describes the various conditions and restarts in the tar
 system."
   (tar:tar-condition 40ants-doc/locatives:class)

@Uthar
Copy link
Contributor Author

Uthar commented Jul 14, 2023

@ofborg build sbcl.pkgs.tar

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 14, 2023
kgalkowski-comscore and others added 3 commits July 14, 2023 21:37
Out-of-quicklisp version that was manually specified in packages.nix stopped
building after Quicklisp dist bump, because of a change in one of its
dependencies. Switching to using the one imported straight from Quicklisp, in
imported.nix.

See NixOS#238790 (comment)
Doesn't work with the new webkitgtk_6_0
@Uthar Uthar force-pushed the quicklisp-june-2023 branch from 8d557f4 to ec7dea4 Compare July 14, 2023 19:39
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 14, 2023
@7c6f434c 7c6f434c merged commit 3ea2e79 into NixOS:master Jul 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants