From b26b87f594c71514e5deaeb44371eb6a6cbac177 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 29 Nov 2020 11:40:57 +0100 Subject: [PATCH] package-lists: Use SBCL packages in Common Lisp. --- .package-lists/guix-common-lisp-channels.scm | 30 ++++++++ .package-lists/guix-common-lisp-manifest.scm | 61 +++++++-------- .package-lists/guix-nyxt-channels.scm | 6 +- .package-lists/guix-nyxt-manifest.scm | 80 ++++++++++---------- .package-lists/guix-nyxt-site-channels.scm | 6 +- .package-lists/guix-nyxt-site-manifest.scm | 35 +++++---- 6 files changed, 120 insertions(+), 98 deletions(-) create mode 100644 .package-lists/guix-common-lisp-channels.scm diff --git a/.package-lists/guix-common-lisp-channels.scm b/.package-lists/guix-common-lisp-channels.scm new file mode 100644 index 00000000..4d94244d --- /dev/null +++ b/.package-lists/guix-common-lisp-channels.scm @@ -0,0 +1,30 @@ +(list (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix.git") + (commit + "7d555abb81f9f48edf333d7deedcb39f803e2d36") + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + (channel + (name 'guix-gaming-games) + (url "https://gitlab.com/guix-gaming-channels/games.git") + (commit + "cfb3e76e6dbb52bd5e1605812020c0c01f8c08c4") + (introduction + (make-channel-introduction + "c23d64f1b8cc086659f8781b27ab6c7314c5cca5" + (openpgp-fingerprint + "50F3 3E2E 5B0C 3D90 0424 ABE8 9BDC F497 A4BB CC7F")))) + (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (commit + "ae3c7e7d275a63b46dd5a7f04434871dfdd904ff") + (introduction + (make-channel-introduction + "9edb3f66fd807b096b48283debdcddccfea34bad" + (openpgp-fingerprint + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))) diff --git a/.package-lists/guix-common-lisp-manifest.scm b/.package-lists/guix-common-lisp-manifest.scm index 4c847cf2..e932cce7 100644 --- a/.package-lists/guix-common-lisp-manifest.scm +++ b/.package-lists/guix-common-lisp-manifest.scm @@ -1,35 +1,32 @@ (specifications->manifest '("sbcl" - "cl-alexandria" - "cl-bordeaux-threads" - "cl-chanl" - "cl-closer-mop" - "cl-csv" - "cl-dexador" - "cl-fset" - "cl-hu.dwim.defclass-star" - "cl-interpol" - "cl-iolib" - "cl-local-time" - "cl-log4cl" - "cl-mk-string-metrics" - "cl-moptilities" - "cl-osicat" - "cl-plump" ; Parse HTML. - "cl-ppcre" - "cl-prevalence" - "cl-quicksearch" - "cl-quri" - "cl-serapeum" - "cl-series" - "cl-str" - "cl-trivia" - "cl-trivial-file-size" - "cl-trivial-package-local-nicknames" - "cl-trivial-types" - "cl-unix-opts" - - ;; Calispel: - "cl-jpl-queues" - "cl-jpl-util")) + "sbcl-alexandria" + "sbcl-bordeaux-threads" + "sbcl-calispel" + "sbcl-chanl" + "sbcl-closer-mop" + "sbcl-cl-csv" + "sbcl-dexador" + "sbcl-fset" + "sbcl-hu.dwim.defclass-star" + "sbcl-cl-interpol" + "sbcl-iolib" + "sbcl-local-time" + "sbcl-log4cl" + "sbcl-mk-string-metrics" + "sbcl-moptilities" + "sbcl-osicat" + "sbcl-plump" ; Parse HTML. + "sbcl-cl-ppcre" + "sbcl-cl-prevalence" + "sbcl-quicksearch" + "sbcl-quri" + "sbcl-serapeum" + "sbcl-series" + "sbcl-cl-str" + "sbcl-trivia" + "sbcl-trivial-file-size" + "sbcl-trivial-package-local-nicknames" + "sbcl-trivial-types" + "sbcl-unix-opts")) diff --git a/.package-lists/guix-nyxt-channels.scm b/.package-lists/guix-nyxt-channels.scm index 4463b641..4d94244d 100644 --- a/.package-lists/guix-nyxt-channels.scm +++ b/.package-lists/guix-nyxt-channels.scm @@ -2,7 +2,7 @@ (name 'nonguix) (url "https://gitlab.com/nonguix/nonguix.git") (commit - "a82266987a3698d2dfe1f851bbd5401f43d4042c") + "7d555abb81f9f48edf333d7deedcb39f803e2d36") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" @@ -12,7 +12,7 @@ (name 'guix-gaming-games) (url "https://gitlab.com/guix-gaming-channels/games.git") (commit - "3c9a3c450343b24fb7c27e4986b5da402347c1e3") + "cfb3e76e6dbb52bd5e1605812020c0c01f8c08c4") (introduction (make-channel-introduction "c23d64f1b8cc086659f8781b27ab6c7314c5cca5" @@ -22,7 +22,7 @@ (name 'guix) (url "https://git.savannah.gnu.org/git/guix.git") (commit - "09b83d6833de48c07736dc1097971a8825e4ced5") + "ae3c7e7d275a63b46dd5a7f04434871dfdd904ff") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" diff --git a/.package-lists/guix-nyxt-manifest.scm b/.package-lists/guix-nyxt-manifest.scm index 95b1b81b..df46bbbe 100644 --- a/.package-lists/guix-nyxt-manifest.scm +++ b/.package-lists/guix-nyxt-manifest.scm @@ -17,48 +17,44 @@ "pkg-config" ; So that we find webkitgtk's pkg-config. ;; "xclip" - ;; Not (yet) required by Nyxt, but useful for sbclscript and general hacking. - "cl-series" - "cl-slynk" ; To hack Nyxt from the SLY REPL. - "cl-gobject-introspection" ; Maybe in Nyxt in the future. - "cl-csv" - "cl-quicksearch" - "cl-interpol" + "sbcl-slynk" ; To hack Nyxt from the SLY REPL. + "sbcl-cl-gobject-introspection" ; Maybe in Nyxt in the future. ;; Direct dependencies: - "cl-alexandria" - "cl-bordeaux-threads" - "cl-chanl" - "cl-css" - "cl-json" - "cl-markup" - "cl-ppcre" - "cl-prevalence" - "cl-closer-mop" - "cl-containers" - "cl-cluffer" - "cl-dexador" - "cl-enchant" - "cl-fset" - "cl-hu.dwim.defclass-star" - "cl-iolib" - "cl-local-time" - "cl-log4cl" - "cl-mk-string-metrics" - "cl-moptilities" - "cl-osicat" ; Only Guix package of Nyxt needs SBCL version needed for libosicat.so. - "cl-parenscript" - "cl-plump" - "cl-quri" - "cl-serapeum" - "cl-str" - "cl-slime-swank" - "cl-trivia" - "cl-trivial-clipboard" - "cl-trivial-features" - "cl-trivial-package-local-nicknames" - "cl-trivial-types" - "cl-unix-opts" + "sbcl-alexandria" + "sbcl-bordeaux-threads" + "sbcl-calispel" ; TODO: Replace sbcl-chanl with this when updated. + "sbcl-chanl" + "sbcl-cl-css" + "sbcl-cl-json" + "sbcl-cl-markup" + "sbcl-cl-ppcre" + "sbcl-cl-prevalence" + "sbcl-closer-mop" + "sbcl-cl-containers" + "sbcl-cluffer" + "sbcl-dexador" + "sbcl-enchant" + "sbcl-fset" + "sbcl-hu.dwim.defclass-star" + "sbcl-iolib" + "sbcl-local-time" + "sbcl-log4cl" + "sbcl-mk-string-metrics" + "sbcl-moptilities" + "sbcl-osicat" + "sbcl-parenscript" + "sbcl-plump" + "sbcl-quri" + "sbcl-serapeum" + "sbcl-cl-str" + "sbcl-slime-swank" + "sbcl-trivia" + "sbcl-trivial-clipboard" + "sbcl-trivial-features" + "sbcl-trivial-package-local-nicknames" + "sbcl-trivial-types" + "sbcl-unix-opts" ;; WebKitGTK deps - "cl-cffi-gtk" ; TODO: Does it have info doc? - "cl-webkit")) + "sbcl-cl-cffi-gtk" ; TODO: Does it have info doc? + "sbcl-cl-webkit")) diff --git a/.package-lists/guix-nyxt-site-channels.scm b/.package-lists/guix-nyxt-site-channels.scm index 4463b641..4d94244d 100644 --- a/.package-lists/guix-nyxt-site-channels.scm +++ b/.package-lists/guix-nyxt-site-channels.scm @@ -2,7 +2,7 @@ (name 'nonguix) (url "https://gitlab.com/nonguix/nonguix.git") (commit - "a82266987a3698d2dfe1f851bbd5401f43d4042c") + "7d555abb81f9f48edf333d7deedcb39f803e2d36") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" @@ -12,7 +12,7 @@ (name 'guix-gaming-games) (url "https://gitlab.com/guix-gaming-channels/games.git") (commit - "3c9a3c450343b24fb7c27e4986b5da402347c1e3") + "cfb3e76e6dbb52bd5e1605812020c0c01f8c08c4") (introduction (make-channel-introduction "c23d64f1b8cc086659f8781b27ab6c7314c5cca5" @@ -22,7 +22,7 @@ (name 'guix) (url "https://git.savannah.gnu.org/git/guix.git") (commit - "09b83d6833de48c07736dc1097971a8825e4ced5") + "ae3c7e7d275a63b46dd5a7f04434871dfdd904ff") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" diff --git a/.package-lists/guix-nyxt-site-manifest.scm b/.package-lists/guix-nyxt-site-manifest.scm index f8db7ddd..6c9d7f54 100644 --- a/.package-lists/guix-nyxt-site-manifest.scm +++ b/.package-lists/guix-nyxt-site-manifest.scm @@ -6,21 +6,20 @@ ;; "fcgi" ;; "sqlite" - "cl-alexandria" - "cl-caveman" - "cl-clack" - ;; "cl-clack-handler-fastcgi" - "cl-datafly" - "cl-envy" - "cl-flexi-streams" - "cl-hunchentoot" - "cl-lack" - "cl-ppcre" - "cl-ironclad" - "cl-markup" - "cl-mito" - "cl-project" - "cl-s-xml" - "cl-str" - "cl-sxql" - "cl-uuid")) + "sbcl-alexandria" + "sbcl-caveman" + "sbcl-clack" + "sbcl-datafly" + "sbcl-envy" + "sbcl-flexi-streams" + "sbcl-hunchentoot" + "sbcl-lack" + "sbcl-cl-ppcre" + "sbcl-ironclad" + "sbcl-cl-markup" + "sbcl-mito" + "sbcl-cl-project" + "sbcl-s-xml" + "sbcl-cl-str" + "sbcl-sxql" + "sbcl-uuid"))