[PATCH 0/5] gnu: cbqn: Update to 0.9.0.

This series of patches aims to update CBQN to use the latest v0.9.0 release;

also achieved via this patch series is a full source bootstrap of CBQN without

using pre-compiled bytecode or building DBQN.

I have added both (dzaima's fork of) REPLXX and Singeli as pure sources so CBQN

can be compiled to make use of them. Some of this builds on work done in the

(as far as I can see uncompleted) bug#69023, though this patch series makes no

attempt to add Singeli as a standalone package. Regardless of Singeli's value

here I believe REPLXX adds valuable quality of life improvements to using CBQN

as an interactive interpreter.

`bqn-sources' has been updated to a recent patch. I couldn't get the updates

to `cbqn' to build properly without updating `bqn-sources', though the CBQN

repo makes no suggestions as to where in history to take `bqn-sources' from.

I first updated to a commit from the same time as CBQN v0.9.0, but why not

update to something more recent? In testing this produced no obvious bugs or

weird behaviour vs. CBQN v0.9.0-era checkout.

The `cbqn-bootstrap'->`cbqn' interaction has been rearranged to achieve what I

believe to be a reasonable full-source bootstrap without DBQN. New tests have

been added also.

I've added comments everywhere I feel appropriate; this might be too verbose

for some so I'm happy to remove any. `cbqn' has been linted and styled and

builds and works fine as far as I can see.

Lee Thompson (5):

gnu: bqn-sources: Update to 5880fa15.

gnu: Add replxx-sources.

gnu: Add singeli-sources.

gnu: cbqn-bootstrap: Update to 0.9.0.

gnu: cbqn: Update to 0.9.0.

gnu/packages/bqn.scm | 175 ++++++++++++++++++++++++++++---------------

1 file changed, 113 insertions(+), 62 deletions(-)

--

2.48.1

Change-Id: Ida46884232955c3090bca72928f0a6d4240ed45c

---

gnu/packages/bqn.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Change-Id: I6ab4a714ec82165c7df9e5c67c26b43c40a5c625

---

gnu/packages/bqn.scm | 14 ++++++++++++++

1 file changed, 14 insertions(+)

Change-Id: I9a96915a23adc786a3c92fd7ad34aaa5ee938ad6

---

gnu/packages/bqn.scm | 13 +++++++++++++

1 file changed, 13 insertions(+)

removed. Now runs `make for-bootstrap'.

Change-Id: I54c39dbcad7f485b539cf5fc3156829efec4f8c4

---

gnu/packages/bqn.scm | 77 ++++++++++++++++++++++----------------------

1 file changed, 38 insertions(+), 39 deletions(-)

generate bytecode added. Library dependencies on replxx-sources and

singeli-sources added. New tests added to list. Dependency on dbqn eliminated.

Change-Id: I97ba12dd9d67b944ef7be1d6d76a98f4f2d69e35

---

gnu/packages/bqn.scm | 67 ++++++++++++++++++++++++++++++--------------

1 file changed, 46 insertions(+), 21 deletions(-)

Please, use changelog format for changes in commit message.

See:

- (substitute-keyword-arguments (strip-keyword-arguments

- (list #:tests?)

- (package-arguments cbqn-bootstrap))

- ((#:make-flags flags #~(list))

- #~(cons* "shared-o3" "o3" #$flags))

- ((#:phases phases #~%standard-phases)

+ (substitute-keyword-arguments (strip-keyword-arguments (list #:tests?)

+ (package-arguments

+ cbqn-bootstrap))

+ ((#:make-flags flags

+ #~(list))

+ #~(cons* "shared-o3" "o3"

+ #$flags))

+ ((#:phases phases

+ #~%standard-phases)

Try to avoid unnecessary modifications in original code, this makes hard

to follow the contributions.

- #+bqn-sources

- "/test/this.bqn\""))

+ #+bqn-sources "/test/this.bqn\""))

Idem

- (let* ((bin (string-append (assoc-ref outputs "out")

- "/bin"))

- (lib (string-append (assoc-ref outputs "lib")

- "/lib"))

+ (let* ((bin (string-append (assoc-ref outputs "out") "/bin"))

+ (lib (string-append (assoc-ref outputs "lib") "/lib"))

(include (string-append (assoc-ref outputs "lib")

- "/include")))

+ "/include")))

Again. You get the idea.

+ ;; Default behaviour is to extract git hash to use for version

+ ;; string, here our version string is manually substituted in

You exceed maximum column here.

Use ‘./pre-inst-env guix lint PACKAGE’ before submitting to fix this

kind of errors.

+ (license license:gpl3)))

Have you checked "licenses" folder ?

Additionally, none of your sources include a license field. And yet, they are

used in cbqn/bootstrap.This is anomalous to me.

Cayetano Santos <csantosb@inventati.org> writes:

Okay this is my bad, though I am wondering if there's a more ergonomic

way to style/lint packages that aren't defined publicly like this one.

What I find myself doing is changing the `(define cbqn-bootstrap ...' to

`(define-public ...', running `./pre-inst-env guix style

cbqn-bootstrap', then swapping `define-public' back to `define'. Is

there something I'm missing with this?

This paragraph from upstream about licenses:

https://github.com/dzaima/CBQN?tab=readme-ov-file#licensingtalks a bit

about the licensing situation for CBQN itself. It seems obvious to me to

list out lgpl3, gpl3 and mpl2, though do you think I'd be better off

listing all the licenses under `licenses' including Boost and Apache

etc?

Unless I'm mistaken I don't think there's a way to specify a license for

a plain `origin' like I've used for the `-sources' I've added. I chose

to add Singeli and REPLXX as just `origin's instead of full packages

taking inspiration from the existing `bqn-sources'. `bqn-sources'

currently doesn't mention its ISC license at all.

Despite this checking the build output it looks like all the following

still manage to end up in

/gnu/store/...-cbqn-0.9.0/share/doc/cbqn-0.9.0:

Cayetano Santos <csantosb@inventati.org> writes:

I'm following guidance to run `./pre-inst-env guix style PACKAGE' before

sending in a patch. What you see here is just the result of running

that. I agree though it makes reading diffs confusing.

Is there a way to only `guix style' what's been changed?

I see what you mean. Generally speaking, guix community privileges

avoiding unnecessary changes and readability, over strict styling (you

can verify in most packages).

Not that I’m aware of, but would be useful !

In my case, I usually do the same.

I think so. You may get inspiration from iverilog and similar packages.

I guess that once the (non-license) source is included in a package, its

license must appear in the package itself.

Yes, the builder detects the licenses folder and assumes all of its

contents as licenses, so it takes them all; they still need to be

mentioned in the package.

Change-Id: Ida46884232955c3090bca72928f0a6d4240ed45c

---

gnu/packages/bqn.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Change-Id: I6ab4a714ec82165c7df9e5c67c26b43c40a5c625

---

gnu/packages/bqn.scm | 14 ++++++++++++++

1 file changed, 14 insertions(+)

Change-Id: I9a96915a23adc786a3c92fd7ad34aaa5ee938ad6

---

gnu/packages/bqn.scm | 13 +++++++++++++

1 file changed, 13 insertions(+)

[version]: Now 0.9.0 instead of assembled from git-version, revision, commit.

[source]: Commit swapped out for version, hash updated.

[arguments]<#:make-flags>: Manual version added, flag to disable git during

build, build type switched to "for-bootstrap".

<#:phases>: `generate-bytecode' deleted here, moved to `cbqn' package.

[native-inputs]: All deleted, bootstrap no longer needs `dbqn' or sources.

[inputs]: Deleted `icedtea-8'.

[license]: License list updated, covers CBQN code and exceptions.

Change-Id: I54c39dbcad7f485b539cf5fc3156829efec4f8c4

---

gnu/packages/bqn.scm | 36 +++++++++++++++++++++---------------

1 file changed, 21 insertions(+), 15 deletions(-)

[arguments]<#:phases>: Phases linking REPLXX and Singeli and to generate

bytecode are added before build, new tests are added to the replaced 'check.

[native-inputs]: Removed `dbqn', added `cbqn-bootstrap', `replxx-sources' and

`singeli-sources'.

[license]: Licenses for REPLXX and Singeli appended to those for just CBQN.

Change-Id: I97ba12dd9d67b944ef7be1d6d76a98f4f2d69e35

---

gnu/packages/bqn.scm | 41 ++++++++++++++++++++++++++++++++++++-----

1 file changed, 36 insertions(+), 5 deletions(-)

Thanks Lee Thompson for picking this up again. I had forgotten about #69023 and will suggest closing it in favour of this.

Also many thanks to Cayetano Santos for their assistance with the patch.

As for Singeli: Singeli as library: a package exposing source code will work. Conceptually though it is an interpreter/compiler and better served as an executable. That was an effort I didn't feel comfortable taking on at the time :)

As for REPLXX: Unlike libffi which is a functional feature, REPLXX is strictly a UX feature that I don't use and didn't want to spend time with but I appreciate you having done so.

Looking forward to the patch making it upstream.

- aecepoglu

Hi,

What about this series

[bug#77552] [PATCH v2 1/5] gnu: bqn-sources: Update to 5880fa15.

[bug#77552] [PATCH v2 2/5] gnu: Add replxx-sources.

[bug#77552] [PATCH v2 3/5] gnu: Add singeli-sources.

[bug#77552] [PATCH v2 4/5] gnu: cbqn-bootstrap: Update to 0.9.0.

[bug#77552] [PATCH v2 5/5] gnu: cbqn: Update to 0.9.0.

?

Well, I’m not an expert on this topic but it LTGM.

Cheers,

simon

Hi Simon,

Thanks for taking a look at this after so long. I've had a quick check

and it looks like there's been no more recent release of CBQN itself

since I made this patch set. The replxx and singeli source versions are

tied to CBQN also.

The BQN source used for the bootstrap has no real release and has seen

some minor updates since I posted this in, so that may be worth

updating.

I've been out of the loop on Guix since shortly after posting this patch

set in, and I see now things have shifted to Codeberg, so I'll have a

read of the news and docs and see if I need to duplicate this patch set

there (I'm assuming I will have to).

I've had a quick check and I can't see that this patch set has been

reproduced there, though some of my pre-Codeberg patches for APL and BQN

fonts have been reproduced.

Again thanks for taking the time to look this over,

Lee

This is now https://codeberg.org/guix/guix/pulls/2729

Andreas