* [PR PATCH] next: rename to nyxt
@ 2020-08-05 19:02 egorenar
2020-08-05 19:03 ` [PR PATCH] [Updated] " egorenar
` (7 more replies)
0 siblings, 8 replies; 22+ messages in thread
From: egorenar @ 2020-08-05 19:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
There is a new pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24083
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24083.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24083.patch --]
[-- Type: text/x-diff, Size: 1224 bytes --]
From 76bd0b24a740bd9a615ed54e8efcbde70d5a7a2c Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Wed, 5 Aug 2020 20:54:29 +0200
Subject: [PATCH] next: rename to nyxt
---
srcpkgs/nyxt/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 00000000000..11183ab71e3
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,21 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=1.5.0
+revision=1
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config"
+makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
+depends="sqlite xclip libfixposix-devel libressl-devel"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz"
+checksum=bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
+nostrip=yes
+nopie=yes
+nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-08-05 19:02 [PR PATCH] next: rename to nyxt egorenar
@ 2020-08-05 19:03 ` egorenar
2020-08-05 19:12 ` ericonr
` (6 subsequent siblings)
7 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2020-08-05 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24083
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24083.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24083.patch --]
[-- Type: text/x-diff, Size: 1432 bytes --]
From 2c4302bcbad9959c3ce9f1bad142e4de9b1ec5ca Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Wed, 5 Aug 2020 20:54:29 +0200
Subject: [PATCH] next: rename to nyxt
---
srcpkgs/{next => nyxt}/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
rename srcpkgs/{next => nyxt}/template (68%)
diff --git a/srcpkgs/next/template b/srcpkgs/nyxt/template
similarity index 68%
rename from srcpkgs/next/template
rename to srcpkgs/nyxt/template
index cf803dd16ab..11183ab71e3 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/nyxt/template
@@ -1,5 +1,5 @@
-# Template file for 'next'
-pkgname=next
+# Template file for 'nyxt'
+pkgname=nyxt
version=1.5.0
revision=1
build_style=gnu-makefile
@@ -9,9 +9,9 @@ depends="sqlite xclip libfixposix-devel libressl-devel"
short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-distfiles="https://github.com/atlas-engineer/next/archive/${version}.tar.gz"
-checksum=b8688d056d40778fa6dd8ccd3ba7b5a00f16ea1e81ea8293ebe58e28f63c7e22
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz"
+checksum=bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
nostrip=yes
nopie=yes
nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: next: rename to nyxt
2020-08-05 19:02 [PR PATCH] next: rename to nyxt egorenar
2020-08-05 19:03 ` [PR PATCH] [Updated] " egorenar
@ 2020-08-05 19:12 ` ericonr
2020-08-05 19:22 ` egorenar
` (5 subsequent siblings)
7 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-05 19:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24083#issuecomment-669416712
Comment:
You need to make `next` a sub package of `nyxt` that depends on it, so people who have `next` installed will get the next `nyxt` update.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: next: rename to nyxt
2020-08-05 19:02 [PR PATCH] next: rename to nyxt egorenar
2020-08-05 19:03 ` [PR PATCH] [Updated] " egorenar
2020-08-05 19:12 ` ericonr
@ 2020-08-05 19:22 ` egorenar
2020-08-06 0:51 ` fosslinux
` (4 subsequent siblings)
7 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2020-08-05 19:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
New comment by egorenar on void-packages repository
https://github.com/void-linux/void-packages/pull/24083#issuecomment-669430422
Comment:
> You need to make `next` a sub package of `nyxt` that depends on it, so people who have `next` installed will get the next `nyxt` update.
Not the other way around, nyxt a subpackage of next ?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: next: rename to nyxt
2020-08-05 19:02 [PR PATCH] next: rename to nyxt egorenar
` (2 preceding siblings ...)
2020-08-05 19:22 ` egorenar
@ 2020-08-06 0:51 ` fosslinux
2020-09-08 12:42 ` sgn
` (3 subsequent siblings)
7 siblings, 0 replies; 22+ messages in thread
From: fosslinux @ 2020-08-06 0:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24083#issuecomment-669619597
Comment:
No, next a subpackage of the renamed package or the "new" package nyxt.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: next: rename to nyxt
2020-08-05 19:02 [PR PATCH] next: rename to nyxt egorenar
` (3 preceding siblings ...)
2020-08-06 0:51 ` fosslinux
@ 2020-09-08 12:42 ` sgn
2020-09-08 17:58 ` egorenar
` (2 subsequent siblings)
7 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-09-08 12:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/24083#issuecomment-688840671
Comment:
Is this abandoned?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: next: rename to nyxt
2020-08-05 19:02 [PR PATCH] next: rename to nyxt egorenar
` (4 preceding siblings ...)
2020-09-08 12:42 ` sgn
@ 2020-09-08 17:58 ` egorenar
2020-09-08 18:05 ` [PR PATCH] [Updated] " egorenar
2020-09-08 18:05 ` [PR PATCH] [Closed]: " egorenar
7 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2020-09-08 17:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by egorenar on void-packages repository
https://github.com/void-linux/void-packages/pull/24083#issuecomment-689042225
Comment:
not yet, please, i'll update it shortly
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-08-05 19:02 [PR PATCH] next: rename to nyxt egorenar
` (5 preceding siblings ...)
2020-09-08 17:58 ` egorenar
@ 2020-09-08 18:05 ` egorenar
2020-09-08 18:05 ` [PR PATCH] [Closed]: " egorenar
7 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2020-09-08 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24083
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24083.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24083.patch --]
[-- Type: text/x-diff, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Closed]: next: rename to nyxt
2020-08-05 19:02 [PR PATCH] next: rename to nyxt egorenar
` (6 preceding siblings ...)
2020-09-08 18:05 ` [PR PATCH] [Updated] " egorenar
@ 2020-09-08 18:05 ` egorenar
7 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2020-09-08 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
There's a closed pull request on the void-packages repository
next: rename to nyxt
https://github.com/void-linux/void-packages/pull/24083
Description:
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (11 preceding siblings ...)
2021-06-05 16:11 ` egorenar
@ 2021-06-05 16:12 ` egorenar
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2021-06-05 16:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 5150 bytes --]
From 29c0e7821cc0410eee58025e7e8ae9bf4b0eb597 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0
---
srcpkgs/next | 1 +
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
srcpkgs/next/template | 38 ---------------------------
srcpkgs/nyxt/template | 33 +++++++++++++++++++++++
4 files changed, 34 insertions(+), 69 deletions(-)
create mode 120000 srcpkgs/next
delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
delete mode 100644 srcpkgs/next/template
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 8350ff933c37faa15101662516d8614a9c301a36
-Author: Pierre Neidhardt <mail@ambrevar.xyz>
-Date: Thu Mar 5 16:43:55 2020 +0100
-
- Work around Guix compilation error of define-key.
-
- Error happens in search-buffer's search-over-buffers which calls define-key.
-
- ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
- ; (NEXT:DEFINE-KEY "C-s"
- ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
- ; :KEYMAP NEXT::KEYMAP)
- ;
- ; caught WARNING:
- ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
-
- Maybe the type is wrong. But our define-key lambdalist is weird anyways.
-
-diff --git a/source/keymap.lisp b/source/keymap.lisp
-index bbcb9d21..e29bdf3a 100644
---- source/keymap.lisp
-+++ source/keymap.lisp
-@@ -144,7 +144,7 @@
- (setf (key-chord-stack *browser*) nil))
- (t (setf (key-chord-stack *browser*) nil))))))
-
--(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
-+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
- @export
- (defun define-key (&rest key-command-pairs
- &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
-depends="dbus sqlite xclip libfixposix-devel openssl-devel"
-short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
- mkdir ${wrksrc}/vendor
- mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
- export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..24ad61505d06
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,33 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=1
+wrksrc=nyxt
+build_style=gnu-makefile
+make_build_target=all
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt-linux-${version}.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+# Disable check because ASDF/USER::PROVE is not installed
+make_check=no
+nostrip=yes
+nopie=yes
+nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags"
+
+do_install() {
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
+ vlicense licenses/ASSET-LICENSE
+ vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (10 preceding siblings ...)
2021-06-05 13:49 ` egorenar
@ 2021-06-05 16:11 ` egorenar
2021-06-05 16:12 ` egorenar
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2021-06-05 16:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 5145 bytes --]
From 29625ef1337f3df1e95444ef65174b331d355db8 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0
---
srcpkgs/next | 1 +
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
srcpkgs/next/template | 38 ---------------------------
srcpkgs/nyxt/template | 33 +++++++++++++++++++++++
4 files changed, 34 insertions(+), 69 deletions(-)
create mode 120000 srcpkgs/next
delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
delete mode 100644 srcpkgs/next/template
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 8350ff933c37faa15101662516d8614a9c301a36
-Author: Pierre Neidhardt <mail@ambrevar.xyz>
-Date: Thu Mar 5 16:43:55 2020 +0100
-
- Work around Guix compilation error of define-key.
-
- Error happens in search-buffer's search-over-buffers which calls define-key.
-
- ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
- ; (NEXT:DEFINE-KEY "C-s"
- ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
- ; :KEYMAP NEXT::KEYMAP)
- ;
- ; caught WARNING:
- ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
-
- Maybe the type is wrong. But our define-key lambdalist is weird anyways.
-
-diff --git a/source/keymap.lisp b/source/keymap.lisp
-index bbcb9d21..e29bdf3a 100644
---- source/keymap.lisp
-+++ source/keymap.lisp
-@@ -144,7 +144,7 @@
- (setf (key-chord-stack *browser*) nil))
- (t (setf (key-chord-stack *browser*) nil))))))
-
--(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
-+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
- @export
- (defun define-key (&rest key-command-pairs
- &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
-depends="dbus sqlite xclip libfixposix-devel openssl-devel"
-short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
- mkdir ${wrksrc}/vendor
- mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
- export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..d1a2c8268c78
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,33 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=1
+wrksrc=nyxt
+build_style=gnu-makefile
+make_build_target=all
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt-linux-2.0.0.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+# Disable check because ASDF/USER::PROVE is not installed
+make_check=no
+nostrip=yes
+nopie=yes
+nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags"
+
+do_install() {
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
+ vlicense licenses/ASSET-LICENSE
+ vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (9 preceding siblings ...)
2021-06-05 13:48 ` egorenar
@ 2021-06-05 13:49 ` egorenar
2021-06-05 16:11 ` egorenar
2021-06-05 16:12 ` egorenar
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2021-06-05 13:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 5133 bytes --]
From 764e2c9363093fbc7f779c8423c2c8c28d0fac8c Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0
---
srcpkgs/next | 1 +
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
srcpkgs/next/template | 38 ---------------------------
srcpkgs/nyxt/template | 33 +++++++++++++++++++++++
4 files changed, 34 insertions(+), 69 deletions(-)
create mode 120000 srcpkgs/next
delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
delete mode 100644 srcpkgs/next/template
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 8350ff933c37faa15101662516d8614a9c301a36
-Author: Pierre Neidhardt <mail@ambrevar.xyz>
-Date: Thu Mar 5 16:43:55 2020 +0100
-
- Work around Guix compilation error of define-key.
-
- Error happens in search-buffer's search-over-buffers which calls define-key.
-
- ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
- ; (NEXT:DEFINE-KEY "C-s"
- ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
- ; :KEYMAP NEXT::KEYMAP)
- ;
- ; caught WARNING:
- ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
-
- Maybe the type is wrong. But our define-key lambdalist is weird anyways.
-
-diff --git a/source/keymap.lisp b/source/keymap.lisp
-index bbcb9d21..e29bdf3a 100644
---- source/keymap.lisp
-+++ source/keymap.lisp
-@@ -144,7 +144,7 @@
- (setf (key-chord-stack *browser*) nil))
- (t (setf (key-chord-stack *browser*) nil))))))
-
--(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
-+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
- @export
- (defun define-key (&rest key-command-pairs
- &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
-depends="dbus sqlite xclip libfixposix-devel openssl-devel"
-short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
- mkdir ${wrksrc}/vendor
- mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
- export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..6ff240d2e51a
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,33 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=1
+wrksrc=nyxt
+build_style=gnu-makefile
+make_build_target=all
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+# Disable check because ASDF/USER::PROVE is not installed
+make_check=no
+nostrip=yes
+nopie=yes
+nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags"
+
+do_install() {
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
+ vlicense licenses/ASSET-LICENSE
+ vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (8 preceding siblings ...)
2021-06-05 13:42 ` egorenar
@ 2021-06-05 13:48 ` egorenar
2021-06-05 13:49 ` egorenar
` (2 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2021-06-05 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 5133 bytes --]
From 410649099f89f59278a8550a13d34127605dd5b1 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0
---
srcpkgs/next | 1 +
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
srcpkgs/next/template | 38 ---------------------------
srcpkgs/nyxt/template | 33 +++++++++++++++++++++++
4 files changed, 34 insertions(+), 69 deletions(-)
create mode 120000 srcpkgs/next
delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
delete mode 100644 srcpkgs/next/template
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 8350ff933c37faa15101662516d8614a9c301a36
-Author: Pierre Neidhardt <mail@ambrevar.xyz>
-Date: Thu Mar 5 16:43:55 2020 +0100
-
- Work around Guix compilation error of define-key.
-
- Error happens in search-buffer's search-over-buffers which calls define-key.
-
- ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
- ; (NEXT:DEFINE-KEY "C-s"
- ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
- ; :KEYMAP NEXT::KEYMAP)
- ;
- ; caught WARNING:
- ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
-
- Maybe the type is wrong. But our define-key lambdalist is weird anyways.
-
-diff --git a/source/keymap.lisp b/source/keymap.lisp
-index bbcb9d21..e29bdf3a 100644
---- source/keymap.lisp
-+++ source/keymap.lisp
-@@ -144,7 +144,7 @@
- (setf (key-chord-stack *browser*) nil))
- (t (setf (key-chord-stack *browser*) nil))))))
-
--(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
-+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
- @export
- (defun define-key (&rest key-command-pairs
- &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
-depends="dbus sqlite xclip libfixposix-devel openssl-devel"
-short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
- mkdir ${wrksrc}/vendor
- mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
- export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..0b8ada5c5e6d
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,33 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=1
+wrksrc=nyxt
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+make_build_target=all
+# Disable check because ASDF/USER::PROVE is not installed
+make_check=no
+nostrip=yes
+nopie=yes
+nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags"
+
+do_install() {
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
+ vlicense licenses/ASSET-LICENSE
+ vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (7 preceding siblings ...)
2021-06-05 11:48 ` egorenar
@ 2021-06-05 13:42 ` egorenar
2021-06-05 13:48 ` egorenar
` (3 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2021-06-05 13:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 5133 bytes --]
From 8b52fd9c0fa14b7fee8879c37fa5e785d1eb74f5 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0
---
srcpkgs/next | 1 +
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
srcpkgs/next/template | 38 ---------------------------
srcpkgs/nyxt/template | 33 +++++++++++++++++++++++
4 files changed, 34 insertions(+), 69 deletions(-)
create mode 120000 srcpkgs/next
delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
delete mode 100644 srcpkgs/next/template
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 8350ff933c37faa15101662516d8614a9c301a36
-Author: Pierre Neidhardt <mail@ambrevar.xyz>
-Date: Thu Mar 5 16:43:55 2020 +0100
-
- Work around Guix compilation error of define-key.
-
- Error happens in search-buffer's search-over-buffers which calls define-key.
-
- ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
- ; (NEXT:DEFINE-KEY "C-s"
- ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
- ; :KEYMAP NEXT::KEYMAP)
- ;
- ; caught WARNING:
- ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
-
- Maybe the type is wrong. But our define-key lambdalist is weird anyways.
-
-diff --git a/source/keymap.lisp b/source/keymap.lisp
-index bbcb9d21..e29bdf3a 100644
---- source/keymap.lisp
-+++ source/keymap.lisp
-@@ -144,7 +144,7 @@
- (setf (key-chord-stack *browser*) nil))
- (t (setf (key-chord-stack *browser*) nil))))))
-
--(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
-+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
- @export
- (defun define-key (&rest key-command-pairs
- &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
-depends="dbus sqlite xclip libfixposix-devel openssl-devel"
-short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
- mkdir ${wrksrc}/vendor
- mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
- export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..04bf768e90fb
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,33 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=1
+wrksrc=nyxt
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+nostrip=yes
+nopie=yes
+make_build_target=all
+# Disable check because ASDF/USER::PROVE is not installed
+make_check=no
+nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags"
+
+do_install() {
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
+ vlicense licenses/ASSET-LICENSE
+ vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (6 preceding siblings ...)
2021-06-05 11:27 ` egorenar
@ 2021-06-05 11:48 ` egorenar
2021-06-05 13:42 ` egorenar
` (4 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2021-06-05 11:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 4996 bytes --]
From 94599dd3cf6f269bcbbfa40b22bbb2bb0d48830d Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0
---
srcpkgs/next | 1 +
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
srcpkgs/next/template | 38 ---------------------------
srcpkgs/nyxt/template | 34 ++++++++++++++++++++++++
4 files changed, 35 insertions(+), 69 deletions(-)
create mode 120000 srcpkgs/next
delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
delete mode 100644 srcpkgs/next/template
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 8350ff933c37faa15101662516d8614a9c301a36
-Author: Pierre Neidhardt <mail@ambrevar.xyz>
-Date: Thu Mar 5 16:43:55 2020 +0100
-
- Work around Guix compilation error of define-key.
-
- Error happens in search-buffer's search-over-buffers which calls define-key.
-
- ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
- ; (NEXT:DEFINE-KEY "C-s"
- ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
- ; :KEYMAP NEXT::KEYMAP)
- ;
- ; caught WARNING:
- ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
-
- Maybe the type is wrong. But our define-key lambdalist is weird anyways.
-
-diff --git a/source/keymap.lisp b/source/keymap.lisp
-index bbcb9d21..e29bdf3a 100644
---- source/keymap.lisp
-+++ source/keymap.lisp
-@@ -144,7 +144,7 @@
- (setf (key-chord-stack *browser*) nil))
- (t (setf (key-chord-stack *browser*) nil))))))
-
--(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
-+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
- @export
- (defun define-key (&rest key-command-pairs
- &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
-depends="dbus sqlite xclip libfixposix-devel openssl-devel"
-short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
- mkdir ${wrksrc}/vendor
- mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
- export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..436daeab529c
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,34 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=1
+wrksrc=nyxt
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+nostrip=yes
+nopie=yes
+make_check=no
+
+do_build() {
+ make ${makejobs} all
+}
+
+do_install() {
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
+ vlicense licenses/ASSET-LICENSE
+ vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (5 preceding siblings ...)
2021-06-05 11:19 ` egorenar
@ 2021-06-05 11:27 ` egorenar
2021-06-05 11:48 ` egorenar
` (5 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2021-06-05 11:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 5125 bytes --]
From 62abe26dbfcc7ce2f77bc97aa8a2bfa0ee299adf Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0
---
srcpkgs/next | 1 +
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
srcpkgs/next/template | 38 ---------------------------
srcpkgs/nyxt/template | 35 ++++++++++++++++++++++++
4 files changed, 36 insertions(+), 69 deletions(-)
create mode 120000 srcpkgs/next
delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
delete mode 100644 srcpkgs/next/template
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 8350ff933c37faa15101662516d8614a9c301a36
-Author: Pierre Neidhardt <mail@ambrevar.xyz>
-Date: Thu Mar 5 16:43:55 2020 +0100
-
- Work around Guix compilation error of define-key.
-
- Error happens in search-buffer's search-over-buffers which calls define-key.
-
- ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
- ; (NEXT:DEFINE-KEY "C-s"
- ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
- ; :KEYMAP NEXT::KEYMAP)
- ;
- ; caught WARNING:
- ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
-
- Maybe the type is wrong. But our define-key lambdalist is weird anyways.
-
-diff --git a/source/keymap.lisp b/source/keymap.lisp
-index bbcb9d21..e29bdf3a 100644
---- source/keymap.lisp
-+++ source/keymap.lisp
-@@ -144,7 +144,7 @@
- (setf (key-chord-stack *browser*) nil))
- (t (setf (key-chord-stack *browser*) nil))))))
-
--(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
-+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
- @export
- (defun define-key (&rest key-command-pairs
- &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
-depends="dbus sqlite xclip libfixposix-devel openssl-devel"
-short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
- mkdir ${wrksrc}/vendor
- mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
- export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..bd7f56d0fe7b
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,35 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=1
+wrksrc=nyxt
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel libgirepository-devel"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+nostrip=yes
+nopie=yes
+nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+make_check=no
+
+do_build() {
+ make ${makejobs} all
+}
+
+do_install() {
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
+ vlicense licenses/ASSET-LICENSE
+ vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (4 preceding siblings ...)
2021-06-05 11:18 ` egorenar
@ 2021-06-05 11:19 ` egorenar
2021-06-05 11:27 ` egorenar
` (6 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2021-06-05 11:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 5110 bytes --]
From 0c6329fae3bbc83a77ac991723687cd8713790fc Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0
---
srcpkgs/next | 1 +
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
srcpkgs/next/template | 38 ---------------------------
srcpkgs/nyxt/template | 34 ++++++++++++++++++++++++
4 files changed, 35 insertions(+), 69 deletions(-)
create mode 120000 srcpkgs/next
delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
delete mode 100644 srcpkgs/next/template
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 8350ff933c37faa15101662516d8614a9c301a36
-Author: Pierre Neidhardt <mail@ambrevar.xyz>
-Date: Thu Mar 5 16:43:55 2020 +0100
-
- Work around Guix compilation error of define-key.
-
- Error happens in search-buffer's search-over-buffers which calls define-key.
-
- ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
- ; (NEXT:DEFINE-KEY "C-s"
- ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
- ; :KEYMAP NEXT::KEYMAP)
- ;
- ; caught WARNING:
- ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
-
- Maybe the type is wrong. But our define-key lambdalist is weird anyways.
-
-diff --git a/source/keymap.lisp b/source/keymap.lisp
-index bbcb9d21..e29bdf3a 100644
---- source/keymap.lisp
-+++ source/keymap.lisp
-@@ -144,7 +144,7 @@
- (setf (key-chord-stack *browser*) nil))
- (t (setf (key-chord-stack *browser*) nil))))))
-
--(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
-+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
- @export
- (defun define-key (&rest key-command-pairs
- &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
-depends="dbus sqlite xclip libfixposix-devel openssl-devel"
-short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
- mkdir ${wrksrc}/vendor
- mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
- export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..b0ba5dd3481e
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,34 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=1
+wrksrc=nyxt
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel libgirepository-devel"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+nostrip=yes
+nopie=yes
+nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+
+do_build() {
+ make ${makejobs} all
+}
+
+do_install() {
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
+ vlicense licenses/ASSET-LICENSE
+ vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (3 preceding siblings ...)
2020-09-09 7:34 ` egorenar
@ 2021-06-05 11:18 ` egorenar
2021-06-05 11:19 ` egorenar
` (7 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2021-06-05 11:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 5110 bytes --]
From 60d429a925c99772385a19d7a79e1bdbdc646ac6 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0
---
srcpkgs/next | 1 +
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
srcpkgs/next/template | 38 ---------------------------
srcpkgs/nyxt/template | 34 ++++++++++++++++++++++++
4 files changed, 35 insertions(+), 69 deletions(-)
create mode 120000 srcpkgs/next
delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
delete mode 100644 srcpkgs/next/template
create mode 100644 srcpkgs/nyxt/template
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 8350ff933c37faa15101662516d8614a9c301a36
-Author: Pierre Neidhardt <mail@ambrevar.xyz>
-Date: Thu Mar 5 16:43:55 2020 +0100
-
- Work around Guix compilation error of define-key.
-
- Error happens in search-buffer's search-over-buffers which calls define-key.
-
- ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
- ; (NEXT:DEFINE-KEY "C-s"
- ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
- ; :KEYMAP NEXT::KEYMAP)
- ;
- ; caught WARNING:
- ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
-
- Maybe the type is wrong. But our define-key lambdalist is weird anyways.
-
-diff --git a/source/keymap.lisp b/source/keymap.lisp
-index bbcb9d21..e29bdf3a 100644
---- source/keymap.lisp
-+++ source/keymap.lisp
-@@ -144,7 +144,7 @@
- (setf (key-chord-stack *browser*) nil))
- (t (setf (key-chord-stack *browser*) nil))))))
-
--(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
-+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
- @export
- (defun define-key (&rest key-command-pairs
- &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
-depends="dbus sqlite xclip libfixposix-devel openssl-devel"
-short_desc="Keyboard-oriented, extensible web-browser"
-maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
- mkdir ${wrksrc}/vendor
- mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
- export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..7abb0afe2778
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,34 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=3
+wrksrc=nyxt
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel libgirepository-devel"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+nostrip=yes
+nopie=yes
+nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+
+do_build() {
+ make ${makejobs} all
+}
+
+do_install() {
+ make PREFIX=/usr DESTDIR=${DESTDIR} install
+ vlicense licenses/ASSET-LICENSE
+ vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
` (2 preceding siblings ...)
2020-09-09 7:19 ` egorenar
@ 2020-09-09 7:34 ` egorenar
2021-06-05 11:18 ` egorenar
` (8 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2020-09-09 7:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 2043 bytes --]
From 50f3d7701be4b57dd79df043d5fecc83ed47c15a Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt
---
srcpkgs/next | 1 +
srcpkgs/{next => nyxt}/template | 18 ++++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/next
rename srcpkgs/{next => nyxt}/template (59%)
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 00000000000..8d07cc8517b
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/template b/srcpkgs/nyxt/template
similarity index 59%
rename from srcpkgs/next/template
rename to srcpkgs/nyxt/template
index cf803dd16ab..abbd2162cdf 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/nyxt/template
@@ -1,7 +1,7 @@
-# Template file for 'next'
-pkgname=next
+# Template file for 'nyxt'
+pkgname=nyxt
version=1.5.0
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="sbcl curl pkg-config"
makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
@@ -9,9 +9,9 @@ depends="sqlite xclip libfixposix-devel libressl-devel"
short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-distfiles="https://github.com/atlas-engineer/next/archive/${version}.tar.gz"
-checksum=b8688d056d40778fa6dd8ccd3ba7b5a00f16ea1e81ea8293ebe58e28f63c7e22
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz"
+checksum=bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
nostrip=yes
nopie=yes
nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
@@ -19,3 +19,9 @@ nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
post_install() {
vlicense LICENSE
}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
2020-09-08 18:52 ` [PR PATCH] [Updated] " egorenar
2020-09-09 5:07 ` egorenar
@ 2020-09-09 7:19 ` egorenar
2020-09-09 7:34 ` egorenar
` (9 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2020-09-09 7:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 1924 bytes --]
From 57c99fb5f387e8df41f7dda601ee258d017ef455 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt
---
srcpkgs/next | 1 +
srcpkgs/{next => nyxt}/template | 16 +++++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/next
rename srcpkgs/{next => nyxt}/template (60%)
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 00000000000..8d07cc8517b
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/template b/srcpkgs/nyxt/template
similarity index 60%
rename from srcpkgs/next/template
rename to srcpkgs/nyxt/template
index cf803dd16ab..36a472bf5ff 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/nyxt/template
@@ -1,5 +1,5 @@
-# Template file for 'next'
-pkgname=next
+# Template file for 'nyxt'
+pkgname=nyxt
version=1.5.0
revision=1
build_style=gnu-makefile
@@ -9,9 +9,9 @@ depends="sqlite xclip libfixposix-devel libressl-devel"
short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-distfiles="https://github.com/atlas-engineer/next/archive/${version}.tar.gz"
-checksum=b8688d056d40778fa6dd8ccd3ba7b5a00f16ea1e81ea8293ebe58e28f63c7e22
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz"
+checksum=bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
nostrip=yes
nopie=yes
nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
@@ -19,3 +19,9 @@ nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
post_install() {
vlicense LICENSE
}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
2020-09-08 18:52 ` [PR PATCH] [Updated] " egorenar
@ 2020-09-09 5:07 ` egorenar
2020-09-09 7:19 ` egorenar
` (10 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2020-09-09 5:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 1857 bytes --]
From 26b94a65fd8b9dd650270db27441978c166dcf89 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt
---
srcpkgs/next | 1 +
srcpkgs/{next => nyxt}/template | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/next
rename srcpkgs/{next => nyxt}/template (59%)
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 00000000000..8d07cc8517b
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/template b/srcpkgs/nyxt/template
similarity index 59%
rename from srcpkgs/next/template
rename to srcpkgs/nyxt/template
index cf803dd16ab..83baa88b0e3 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/nyxt/template
@@ -1,5 +1,5 @@
-# Template file for 'next'
-pkgname=next
+# Template file for 'nyxt'
+pkgname=nyxt
version=1.5.0
revision=1
build_style=gnu-makefile
@@ -9,13 +9,20 @@ depends="sqlite xclip libfixposix-devel libressl-devel"
short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-distfiles="https://github.com/atlas-engineer/next/archive/${version}.tar.gz"
-checksum=b8688d056d40778fa6dd8ccd3ba7b5a00f16ea1e81ea8293ebe58e28f63c7e22
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz"
+checksum=bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
nostrip=yes
nopie=yes
nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+subpackages="next"
post_install() {
vlicense LICENSE
}
+
+next_package() {
+ depends="nyxt"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] next: rename to nyxt
2020-09-08 18:09 [PR PATCH] " egorenar
@ 2020-09-08 18:52 ` egorenar
2020-09-09 5:07 ` egorenar
` (11 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: egorenar @ 2020-09-08 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by egorenar against master on the void-packages repository
https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765
next: rename to nyxt
A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 1818 bytes --]
From e17c4830fed2fc2e8b3c09894113e7ac46c5aded Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt
---
srcpkgs/next | 1 +
srcpkgs/{next => nyxt}/template | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/next
rename srcpkgs/{next => nyxt}/template (62%)
diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 00000000000..8d07cc8517b
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/template b/srcpkgs/nyxt/template
similarity index 62%
rename from srcpkgs/next/template
rename to srcpkgs/nyxt/template
index cf803dd16ab..dad12246a6e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/nyxt/template
@@ -1,5 +1,5 @@
-# Template file for 'next'
-pkgname=next
+# Template file for 'nyxt'
+pkgname=nyxt
version=1.5.0
revision=1
build_style=gnu-makefile
@@ -9,13 +9,20 @@ depends="sqlite xclip libfixposix-devel libressl-devel"
short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
license="BSD-3-Clause"
-homepage="https://next.atlas.engineer/"
-distfiles="https://github.com/atlas-engineer/next/archive/${version}.tar.gz"
-checksum=b8688d056d40778fa6dd8ccd3ba7b5a00f16ea1e81ea8293ebe58e28f63c7e22
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz"
+checksum=bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
nostrip=yes
nopie=yes
nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+subpackages="next"
post_install() {
vlicense LICENSE
}
+
+next_package() {
+ post_install() {
+ vlicense LICENSE
+ }
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2021-06-05 16:12 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-05 19:02 [PR PATCH] next: rename to nyxt egorenar
2020-08-05 19:03 ` [PR PATCH] [Updated] " egorenar
2020-08-05 19:12 ` ericonr
2020-08-05 19:22 ` egorenar
2020-08-06 0:51 ` fosslinux
2020-09-08 12:42 ` sgn
2020-09-08 17:58 ` egorenar
2020-09-08 18:05 ` [PR PATCH] [Updated] " egorenar
2020-09-08 18:05 ` [PR PATCH] [Closed]: " egorenar
2020-09-08 18:09 [PR PATCH] " egorenar
2020-09-08 18:52 ` [PR PATCH] [Updated] " egorenar
2020-09-09 5:07 ` egorenar
2020-09-09 7:19 ` egorenar
2020-09-09 7:34 ` egorenar
2021-06-05 11:18 ` egorenar
2021-06-05 11:19 ` egorenar
2021-06-05 11:27 ` egorenar
2021-06-05 11:48 ` egorenar
2021-06-05 13:42 ` egorenar
2021-06-05 13:48 ` egorenar
2021-06-05 13:49 ` egorenar
2021-06-05 16:11 ` egorenar
2021-06-05 16:12 ` egorenar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).