max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-29 00:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't run changelog-d in the build

Browse source 
This way we lose the preview of release notes on master, as well
as on https://nixos.org/manual/nix/unstable/release-notes/rl-next
but we can come back to this.
This commit is contained in:
Robert Hensing 2023-11-24 15:48:41 +01:00
parent 857f9168f7
commit d63f72197c
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/manual/local.mk
View file

@ -146,7 +146,13 @@ $(d)/language.json: $(bindir)/nix
# Generate "Upcoming release" notes (or clear it and remove from menu) # Generate "Upcoming release" notes (or clear it and remove from menu)
$(d)/src/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/* $(d)/src/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/*
$(trace-gen) changelog-d doc/manual/rl-next > $@ @if type -p changelog-d > /dev/null; then \
echo " GEN " $@; \
changelog-d doc/manual/rl-next > $@; \
else \
echo " NULL " $@; \
true > $@; \
fi
$(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md $(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md
$(trace-gen) true $(trace-gen) true

2
doc/manual/src/contributing/hacking.md
View file

@ -257,4 +257,4 @@ See also the [format documentation](https://github.com/haskell/cabal/blob/master
### Build process ### Build process
Releases have a precomputed `rl-MAJOR.MINOR.md`, and no `rl-next.md`. Releases have a precomputed `rl-MAJOR.MINOR.md`, and no `rl-next.md`.
Non-releases build the release notes on the fly. Set `buildUnreleasedNotes = true;` in `flake.nix` to build the release notes on the fly.

9
flake.nix
View file

@ -14,6 +14,9 @@
officialRelease = false; officialRelease = false;
# Set to true to build the release notes for the next release.
buildUnreleasedNotes = false;
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
versionSuffix = versionSuffix =
if officialRelease if officialRelease
@ -196,7 +199,7 @@
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [(buildPackages.util-linuxMinimal or buildPackages.utillinuxMinimal)] ++ lib.optionals stdenv.hostPlatform.isLinux [(buildPackages.util-linuxMinimal or buildPackages.utillinuxMinimal)]
# Official releases don't have rl-next, so we don't need to compile a changelog # Official releases don't have rl-next, so we don't need to compile a changelog
++ lib.optional (!officialRelease) changelog-d ++ lib.optional (!officialRelease && buildUnreleasedNotes) changelog-d
; ;
buildDeps = buildDeps =
@ -734,8 +737,8 @@
++ lib.optional ++ lib.optional
(stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform)
pkgs.buildPackages.clang-tools pkgs.buildPackages.clang-tools
# We want changelog-d in the shell even if it's an official release # We want changelog-d in the shell even if the current build doesn't need it
++ lib.optional officialRelease changelog-d ++ lib.optional (officialRelease || ! buildUnreleasedNotes) changelog-d
; ;
buildInputs = buildDeps ++ propagatedDeps buildInputs = buildDeps ++ propagatedDeps