Fix 'nix fmt' test

(cherry picked from commit a3c843e635)
Mark official release
2022-04-19 21:47:46 +02:00 · 2022-04-19 21:13:51 +02:00
3 changed files with 2 additions and 3 deletions
--- a/doc/manual/src/SUMMARY.md.in
+++ b/doc/manual/src/SUMMARY.md.in
@@ -71,7 +71,6 @@
  - [Hacking](contributing/hacking.md)
  - [CLI guideline](contributing/cli-guideline.md)
 - [Release Notes](release-notes/release-notes.md)
-  - [Release X.Y (202?-??-??)](release-notes/rl-next.md)
  - [Release 2.8 (2022-04-19)](release-notes/rl-2.8.md)
  - [Release 2.7 (2022-03-07)](release-notes/rl-2.7.md)
  - [Release 2.6 (2022-01-24)](release-notes/rl-2.6.md)
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
        then ""
        else "pre${builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}_${self.shortRev or "dirty"}";

-      officialRelease = false;
+      officialRelease = true;

      linux64BitSystems = [ "x86_64-linux" "aarch64-linux" ];
      linuxSystems = linux64BitSystems ++ [ "i686-linux" ];
--- a/tests/fmt.sh
+++ b/tests/fmt.sh
@@ -25,6 +25,6 @@ cat << EOF > flake.nix
 EOF
 nix fmt ./file ./folder | grep 'Formatting: ./file ./folder'
 nix flake check
-nix flake show | grep -P 'x86_64-linux|x86_64-darwin'
+nix flake show | grep -P "package 'formatter'"

 clearStore
Author	SHA1	Message	Date
Eelco Dolstra	69c6fb12ee	Fix 'nix fmt' test (cherry picked from commit `a3c843e635`)	2022-04-19 21:47:46 +02:00
Eelco Dolstra	86c07fcf2d	Mark official release	2022-04-19 21:13:51 +02:00