ambrevar pushed a commit to branch wip-next4 in repository guix. commit c178e339684f80bca6823c55fcf8b0218b110e3a Author: Pierre Neidhardt <m...@ambrevar.xyz> Date: Thu Oct 25 16:08:04 2018 +0200
next (FIX name) --- gnu/packages/web-browsers.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index a0db4a7..e252531 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -325,19 +325,19 @@ access.") GUI. It is based on PyQt5 and QtWebKit.") (license license:gpl3+))) -(define-public next-browser-core - (let ((commit "984961706a64d6168d551d4ac9be089bfc3444f2")) +(define-public next-core + (let ((commit "6564e3c4b487882a1ba36d120268c8a62a7dbfc0")) (package - (name "next-browser-core") + (name "next-core") (version (git-version "0.0.8" "1" commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ferada/next") + (url "https://github.com/atlas-engineer/next") (commit commit))) (sha256 (base32 - "0cmnl02gaxa4kmss75x748kv5k6rbl0rablvnr3p7d2h44cb5yj3")) + "02higawx0fqc7fwxa91pvjywag5dgz7dydqiqdxkxah9y2zzk9p3")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) ;; TODO: Move Common Lisp libraries to "native-inputs"? @@ -363,18 +363,18 @@ by Emacs and designed for power users. The application has familiar key-bindings, is fully configurable and extensible in Lisp.") (license license:expat)))) -(define-public next-browser +(define-public next (package - (inherit next-browser-core) - (name "next-browser") + (inherit next-core) + (name "next") (outputs '("out" "lib")) (inputs - `(("next" ,next-browser-core) + `(("next" ,next-core) ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk) ("cl-webkit" ,sbcl-cl-webkit) ("lparallel" ,sbcl-lparallel))) (arguments - (substitute-keyword-arguments (package-arguments next-browser-core) + (substitute-keyword-arguments (package-arguments next-core) ((#:asd-system-name _ #f) "next/gtk") ((#:phases phases '%standard-phases) `(modify-phases ,phases @@ -383,7 +383,7 @@ key-bindings, is fully configurable and extensible in Lisp.") (define lib (assoc-ref outputs "lib")) (define actual-fasl (string-append lib - "/lib/sbcl/next/source/next-gtk.fasl")) + "/lib/sbcl/source/next-gtk.fasl")) (define expected-fasl (string-append lib "/lib/sbcl/gtk--system.fasl")) @@ -392,7 +392,7 @@ key-bindings, is fully configurable and extensible in Lisp.") (add-after 'create-symlinks 'build-program (lambda* (#:key outputs #:allow-other-keys) (build-program - (string-append (assoc-ref outputs "out") "/bin/next-browser") + (string-append (assoc-ref outputs "out") "/bin/next") outputs #:entry-program '((next:start) 0) #:dependencies '("next-gtk"))))))))))