On Wed, Feb 19, 2025 at 02:06:43PM -0800, Vagrant Cascadian wrote: > On 2025-02-15, Vagrant Cascadian wrote: > > On 2025-02-11, Efraim Flashner wrote: > >> We discussed the next release during Guix Days and I volunteered to lead > >> the effort. > ... > > I may just make an attempt at making a git snapshot or something, which > > I did once in the distant past... any recommendations on a particular > > commit to aim at? Even an alpha or release candidate or whatever tag > > would be nice... > > So, in order to try this, the first thing I needed to do was remember > how to run "make dist" to generate the tarball... > > Basically from a clean git checkout: > > guix git tag v1.4.0+XYZ HEAD # I used > f7cd085f4a36e118aa05af5524e74830a30b3dca > guix git authenticate && \ > guix shell --container --pure --development guix guix git imagemagick perl > graphviz less -- ./bootstrap && \ > guix shell --container --pure --development guix guix git imagemagick perl > graphviz less -- ./configure && \ > guix shell --container --pure --development guix guix git imagemagick perl > graphviz less -- make -j1 dist > > Not sure if that is the "right" way or if there is better > documentation... ?
I think there is/was a 'make dist' cuirass job, but I've never actually looked at it closely. The guix.scm and manifest.scm both are in use, but I could see putting together a make-dist.scm manifest, probably in etc/manifests, and then documenting (somewhere) that it exists. Or putting the command in as a comment in the Makefile. > Running "make -j5 dist" failed in various ways... so there are probably > some undefined dependencies. > > graphviz was needed otherwise the bootstrap-graph.pdf failed to build > (graphviz-minimal gets pulled in by "--development guix" but does not > support .pdf generation). > > The other inputs, well, they're just from the last times I tried running > "make dist"! maybe they are no longer needed, maybe the are! > > > The generated tarball also appears to be missing a few files, some of > which seem fine (e.g. .gitignore) but some which actually cause problems > (e.g. missing po4a.cfg, tests/*.scm, gnu/patches/*.patch), some of which > probably should be added to dist_patch_DATA in gnu/local.mk or other > relevent values: > > Only in ../guix-master/build-aux: cuirass > Only in ../guix-master/build-aux: gitlog-to-changelog > Only in ../guix-master: .editorconfig > Only in ../guix-master/etc: copyright.el > Only in ../guix-master/etc: git > Only in ../guix-master/etc: snippets > Only in ../guix-master/etc: teams > Only in ../guix-master/etc: teams.scm > Only in ../guix-master: .gitattributes > Only in ../guix-master: .gitignore > Only in ../guix-master/gnu/packages/patches: cyrus-sasl-ac-try-run-fix.patch > Only in ../guix-master/gnu/packages/patches: > gcc-10-tree-sra-union-handling.patch > Only in ../guix-master/gnu/packages/patches: > gegl-compatibility-old-librsvg.patch > Only in ../guix-master/gnu/packages/patches: > go-github-com-skip2-go-qrcode-fix-tests.patch > Only in ../guix-master/gnu/packages/patches: > librewolf-neuter-locale-download.patch > Only in ../guix-master/gnu/packages/patches: > openjdk-15-jtask-reproducibility.patch > Only in ../guix-master/gnu/packages/patches: > python-pytorch-for-r-torch-fix-codegen.patch > Only in ../guix-master/gnu/packages/patches: > python-pytorch-for-r-torch-system-libraries.patch > Only in ../guix-master/gnu/packages/patches: > rdkit-unbundle-external-dependencies.patch > Only in ../guix-master/gnu/packages/patches: tinydir-fix-cbehave-test.patch > Only in ../guix-master/gnu/system/examples: bare-hurd64.tmpl > Only in ../guix-master/gnu/system/examples: devel-hurd64.tmpl > Only in ../guix-master/gnu/system/examples: devel-hurd.tmpl > Only in ../guix-master/gnu/tests: lightdm.scm > Only in ../guix-master/gnu/tests: sddm.scm > Only in ../guix-master: .mailmap > Only in ../guix-master: .mumi > Only in ../guix-master/nix: .gitignore > Only in ../guix-master/nix/libstore: .gitignore > Only in ../guix-master: .patman > Only in ../guix-master/po/doc: po4a.cfg > Only in ../guix-master/tests: hexpm.scm > Only in ../guix-master/tests: ipfs.scm I saw a suggestion elsewhere to use pattern globbing for some stuff in the Makefile. I only saw files ending in .patch in gnu/packages/patches, and apparently we have over 1500 files there. I'm guessing we could do something similar with the .tmpl files in gnu/system/examples and perhaps other places too. > > I also fixed a bunch of typos, spelling, grammar, etc. that my workflow > building Guix in Debian detects in various package > synopsis/descriptions, and seem to have inspired others to do the same! > :) The package python-codespell has the codespell binary, and is something I use occasionally to find typos. > In this process I also found a bug that caused "make dist" to fail due > to embedded store paths, and pushed a fix to guix.git as > 0626f567378cf549fd097f3c3372fa498000a8a3. > > > Also, in reviewing the copyright and license headers while packaging for > Debian, this raised a broader question about translating license headers > in files such as doc/guix.de.info: > > > https://salsa.debian.org/debian/guix/-/blob/debian/latest/doc/guix.de.info#L93 > > With my limited german, it is clearly a header to declare the file is > released under the GFDL in some form, but I wonder if that is a good > idea to translate the license headers ... as at least in the US, in > order to ship that file I would maybe need to at least consult with a > lawyer (the US only recognizes English for legal documents), and I > suspect various other countries might need something similar for > arbitrary languages... having to get a lawyer involved kind of kills the > joy of free software and the goal of free distribution... > > This of course touches on some awful issues around language > imperialism. :/ > > > live well, > vagrant -- Efraim Flashner <efr...@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
signature.asc
Description: PGP signature