From 279e30e7ef4cae96d1f5fcbc5fc02ebb4779199b Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Tue, 26 Mar 2024 18:32:25 +0100 Subject: build: replace changelog-d with local script hacking changelog-d to support not just github but also forgejo and gerrit is a lot more complicated than it's worth, even moreso since the entire thing can just as well be done with ~60 lines of python. this new script is also much cheaper to instantiate (being python), so having it enabled in all shells is far less of a hassle. we've also adjusted existing release notes that referenced a gerrit cl to auto-link to the cl in question, making the diff a bit bigger closes https://git.lix.systems/lix-project/lix/issues/176 Change-Id: I8ba7dd0070aad9ba4474401731215fcf5d9d2130 --- doc/manual/local.mk | 4 ++-- doc/manual/rl-next/config | 2 -- doc/manual/rl-next/dup-attr-errors.md | 2 +- doc/manual/rl-next/nixversion-fake.md | 2 +- doc/manual/rl-next/short-expr-flag.md | 2 +- doc/manual/rl-next/upstart-removal.md | 2 +- doc/manual/src/contributing/hacking.md | 3 --- 7 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 doc/manual/rl-next/config (limited to 'doc') diff --git a/doc/manual/local.mk b/doc/manual/local.mk index b9e7b8398..b33a4f777 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk @@ -151,9 +151,9 @@ $(d)/language.json: $(doc_nix) # Generate "Upcoming release" notes (or clear it and remove from menu) $(d)/src/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/* - @if type -p changelog-d > /dev/null; then \ + @if type -p build-release-notes > /dev/null; then \ echo " GEN " $@; \ - changelog-d doc/manual/rl-next > $@; \ + build-release-notes doc/manual/rl-next > $@; \ else \ echo " NULL " $@; \ true > $@; \ diff --git a/doc/manual/rl-next/config b/doc/manual/rl-next/config deleted file mode 100644 index b3c2e868f..000000000 --- a/doc/manual/rl-next/config +++ /dev/null @@ -1,2 +0,0 @@ -organization: NixOS -repository: nix diff --git a/doc/manual/rl-next/dup-attr-errors.md b/doc/manual/rl-next/dup-attr-errors.md index 127c8ceb1..cce3d9f30 100644 --- a/doc/manual/rl-next/dup-attr-errors.md +++ b/doc/manual/rl-next/dup-attr-errors.md @@ -1,6 +1,6 @@ --- synopsis: Duplicate attribute reports are more accurate -# prs: cl 557 +cls: 557 --- Duplicate attribute errors are now more accurate, showing the path at which an error was detected rather than the full, possibly longer, path that caused the error. diff --git a/doc/manual/rl-next/nixversion-fake.md b/doc/manual/rl-next/nixversion-fake.md index 1a97e412c..6e42b2bd2 100644 --- a/doc/manual/rl-next/nixversion-fake.md +++ b/doc/manual/rl-next/nixversion-fake.md @@ -1,6 +1,6 @@ --- synopsis: "`builtins.nixVersion` now returns a fixed value \"2.18.3-lix\"" -# prs: cl 558 +cls: 558 --- `builtins.nixVersion` now returns a fixed value `"2.18.3-lix"`. This prevents diff --git a/doc/manual/rl-next/short-expr-flag.md b/doc/manual/rl-next/short-expr-flag.md index a02c944bd..5fddd3a25 100644 --- a/doc/manual/rl-next/short-expr-flag.md +++ b/doc/manual/rl-next/short-expr-flag.md @@ -1,6 +1,6 @@ --- synopsis: reintroduce shortened `-E` form for `--expr` to new CLI -# prs: cl 605 +cls: 605 --- In the past, it was possible to supply a shorter `-E` flag instead of fully diff --git a/doc/manual/rl-next/upstart-removal.md b/doc/manual/rl-next/upstart-removal.md index faec2264a..b1b7ad176 100644 --- a/doc/manual/rl-next/upstart-removal.md +++ b/doc/manual/rl-next/upstart-removal.md @@ -1,6 +1,6 @@ --- synopsis: Upstart scripts removed -# prs: cl 574 +cls: 574 --- Upstart scripts have been removed from Lix, since Upstart is obsolete and has diff --git a/doc/manual/src/contributing/hacking.md b/doc/manual/src/contributing/hacking.md index 3693361bb..133a61b5c 100644 --- a/doc/manual/src/contributing/hacking.md +++ b/doc/manual/src/contributing/hacking.md @@ -340,9 +340,6 @@ Significant changes should add the following header, which moves them to the top significance: significant ``` - -See also the [format documentation](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#changelog). - ### Build process Releases have a precomputed `rl-MAJOR.MINOR.md`, and no `rl-next.md`. -- cgit v1.2.3