From ab0ede51c041927a1c35535aec3504f84d7a9751 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 2 Oct 2019 13:11:51 +0200 Subject: gnu: next: Update to 1.3.3. * gnu/packages/web-browsers.scm (next-gtk-webkit): Bump version. (sbcl-next-history-tree): New package. (sbcl-next-password-manager): New package. (next)[inputs]: Add cl-ansi-text, cl-prevalence, sbcl-next-history-tree, sbcl-next-password-manager. --- gnu/packages/web-browsers.scm | 44 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 46b5ea7327..ae63ca6cc5 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -367,7 +367,7 @@ driven and does not detract you from your daily work.") (define next-gtk-webkit (package (name "next-gtk-webkit") - (version "1.3.2") + (version "1.3.3") (source (origin (method git-fetch) @@ -378,7 +378,7 @@ driven and does not detract you from your daily work.") (commit version))) (sha256 (base32 - "0863p6ch4pdrn6b81cx2abis0ld7r2n6x34v3z0ihj3jlfj21yx4")) + "0vxjihldvif147l2kjd83kk1wcs4ixgv1yxjnpn3wgg8306pgnlh")) (file-name (git-file-name "next" version)))) (build-system glib-or-gtk-build-system) (arguments @@ -445,6 +445,40 @@ features for productive professionals.") ("prove-asdf" ,sbcl-prove-asdf))) (synopsis "Infinitely extensible web-browser (ring)"))) +(define sbcl-next-history-tree + (package + (inherit next-gtk-webkit) + (name "sbcl-next-history-tree") + (build-system asdf-build-system/sbcl) + (arguments + `(#:tests? #t + #:asd-file "next.asd" + #:asd-system-name "next/history-tree")) + (native-inputs + `(("trivial-features" ,sbcl-trivial-features) + ("prove-asdf" ,sbcl-prove-asdf))) + (synopsis "Infinitely extensible web-browser (history-tree)"))) + +(define sbcl-next-password-manager + (package + (inherit next-gtk-webkit) + (name "sbcl-next-password-manager") + (build-system asdf-build-system/sbcl) + (arguments + `(#:tests? #t + #:asd-file "next.asd" + #:asd-system-name "next/password-manager")) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-annot" ,sbcl-cl-annot) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("str" ,sbcl-cl-str) + ("trivial-clipboard" ,sbcl-trivial-clipboard))) + (native-inputs + `(("trivial-features" ,sbcl-trivial-features) + ("prove-asdf" ,sbcl-prove-asdf))) + (synopsis "Infinitely extensible web-browser (password manager)"))) + (define-public next (let ((version (package-version next-gtk-webkit))) (package @@ -509,12 +543,14 @@ features for productive professionals.") `(("alexandria" ,sbcl-alexandria) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("cl-annot" ,sbcl-cl-annot) + ("cl-ansi-text" ,sbcl-cl-ansi-text) ("cl-css" ,sbcl-cl-css) ("cl-hooks" ,sbcl-cl-hooks) ("cl-json" ,sbcl-cl-json) ("cl-markup" ,sbcl-cl-markup) ("cl-ppcre" ,sbcl-cl-ppcre) ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) + ("cl-prevalence" ,sbcl-cl-prevalence) ("closer-mop" ,sbcl-closer-mop) ("dbus" ,cl-dbus) ("dexador" ,sbcl-dexador) @@ -534,7 +570,9 @@ features for productive professionals.") ;; Local deps ("next-gtk-webkit" ,next-gtk-webkit) ("next-download-manager" ,sbcl-next-download-manager) - ("next-ring" ,sbcl-next-ring))) + ("next-ring" ,sbcl-next-ring) + ("next-history-tree" ,sbcl-next-history-tree) + ("next-password-manager" ,sbcl-next-password-manager))) (native-inputs `(("trivial-features" ,sbcl-trivial-features) ("prove-asdf" ,sbcl-prove-asdf))) -- cgit v1.2.3 From 2026204a13515aaa9b7814f9a6f0a60b65493bd1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 2 Oct 2019 21:48:02 +0200 Subject: gnu: slime-swank: Update to 2.24 and use asdf-build-system/source. * gnu/packages/lisp.scm (sbcl-slime-swank): Deprecate in favour of cl-slime-swank. (cl-slime-swank): New package. (sbcl-mgl-pax): Use cl-slime-swank. * gnu/packages/web-browsers.scm (next): Use cl-slime-swank. --- gnu/packages/lisp.scm | 46 ++++++++++++++++--------------------------- gnu/packages/web-browsers.scm | 2 +- 2 files changed, 18 insertions(+), 30 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ba009bb7a6..2939fdc4ed 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2327,42 +2327,27 @@ writing code that contains string literals that contain code themselves.") (define-public ecl-pythonic-string-reader (sbcl-package->ecl-package sbcl-pythonic-string-reader)) -(define-public sbcl-slime-swank +;; SLIME does not have a ASDF system definition to build all of Swank. As a +;; result, the asdf-build-system/sbcl will produce an almost empty package. +;; Some work was done to fix this at +;; https://github.com/sionescu/slime/tree/swank-asdf but it was never merged +;; and is now lagging behind. Building SBCL fasls might not be worth the +;; hassle, so let's just ship the source then. +(define-public cl-slime-swank (package - (name "sbcl-slime-swank") - (version "2.22") + (name "cl-slime-swank") + (version "2.24") (source (origin (file-name (string-append name "-" version ".tar.gz")) (method git-fetch) (uri (git-reference - ;; (url "https://github.com/slime/slime/") - ;; (commit "841f61467c03dea9f38ff9d5af0e21a8aa29e8f7") - ;; REVIEW: Do we need sionescu's patch to package SWANK? - (url "https://github.com/sionescu/slime/") - ;; (commit "swank-asdf") - (commit "2f7c3fcb3ac7d50d844d5c6ca0e89b52a45e1d3a"))) + (url "https://github.com/slime/slime/") + (commit (string-append "v" version)))) (sha256 (base32 - ;; "065bc4y6iskazdfwlhgcjlzg9bi2hyjbhmyjw3461506pgkj08vi" - "0pkmg94wn4ii1zhlrncn44mdc5i6c5v0i9gbldx4dwl2yy7ibz5c")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "contrib/swank-listener-hooks.lisp" - ((":compile-toplevel :load-toplevel ") "")) - (substitute* "contrib/swank-presentations.lisp" - ((":compile-toplevel :load-toplevel ") "")) - (substitute* "swank.asd" - ((":file \"packages\".*" all) - (string-append all "(:file \"swank-loader-asdf\")\n"))) - (substitute* "swank-loader-asdf.lisp" - ((":common-lisp" all) (string-append all " #:asdf"))) - #t)))) - (build-system asdf-build-system/sbcl) - (arguments - `(#:asd-file "swank.asd" - #:asd-system-name "swank")) + "0js24x42m7b5iymb4rxz501dff19vav5pywnzv50b673rbkaaqvh")))) + (build-system asdf-build-system/source) (home-page "https://github.com/slime/slime") (synopsis "Common Lisp Swank server") (description @@ -2371,6 +2356,9 @@ processes that doesn't run under Emacs. Lisp processes created by @command{M-x slime} automatically start the server.") (license (list license:gpl2+ license:public-domain)))) +(define-public sbcl-slime-swank + (deprecated-package "sbcl-slime-swank" cl-slime-swank)) + (define-public sbcl-mgl-pax (let ((commit "818448418d6b9de74620f606f5b23033c6082769")) (package @@ -2395,7 +2383,7 @@ processes that doesn't run under Emacs. Lisp processes created by ("ironclad" ,sbcl-ironclad) ("named-readtables" ,sbcl-named-readtables) ("pythonic-string-reader" ,sbcl-pythonic-string-reader) - ("swank" ,sbcl-slime-swank))) + ("swank" ,cl-slime-swank))) (synopsis "Exploratory programming environment and documentation generator") (description "PAX provides an extremely poor man's Explorable Programming diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index ae63ca6cc5..9010c26897 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -563,7 +563,7 @@ features for productive professionals.") ("quri" ,sbcl-quri) ("sqlite" ,sbcl-cl-sqlite) ("str" ,sbcl-cl-str) - ("swank" ,sbcl-slime-swank) + ("swank" ,cl-slime-swank) ("trivia" ,sbcl-trivia) ("trivial-clipboard" ,sbcl-trivial-clipboard) ("unix-opts" ,sbcl-unix-opts) -- cgit v1.2.3 From 3dbc41c042df418298e36e0f9e945b266ae78783 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 5 Oct 2019 09:54:57 +0200 Subject: gnu: next: Update to 1.3.4. * gnu/packages/web-browsers.scm (next-gtk-webkit): Update to 1.3.4. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 9010c26897..e1d2051386 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -367,7 +367,7 @@ driven and does not detract you from your daily work.") (define next-gtk-webkit (package (name "next-gtk-webkit") - (version "1.3.3") + (version "1.3.4") (source (origin (method git-fetch) @@ -378,7 +378,7 @@ driven and does not detract you from your daily work.") (commit version))) (sha256 (base32 - "0vxjihldvif147l2kjd83kk1wcs4ixgv1yxjnpn3wgg8306pgnlh")) + "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi")) (file-name (git-file-name "next" version)))) (build-system glib-or-gtk-build-system) (arguments -- cgit v1.2.3