public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74850 from davidak/PRETTY_NAME

Browse Source 
nixos/version: PRETTY_NAME in /etc/os-release uses the release now
This commit is contained in:
Eelco Dolstra 2019-12-03 15:08:52 +01:00 committed by GitHub
commit 56588e9eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -236,6 +236,13 @@
release announcement</link> for more information. release announcement</link> for more information.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>PRETTY_NAME</literal> in <literal>/etc/os-release</literal>
uses the release now instead of full version
to be more suitable for presentation to the user
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

2
nixos/modules/misc/version.nix
View File

@ -92,7 +92,7 @@ in
VERSION="${cfg.version} (${cfg.codeName})" VERSION="${cfg.version} (${cfg.codeName})"
VERSION_CODENAME=${toLower cfg.codeName} VERSION_CODENAME=${toLower cfg.codeName}
VERSION_ID="${cfg.version}" VERSION_ID="${cfg.version}"
PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})" PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})"
LOGO="nix-snowflake" LOGO="nix-snowflake"
HOME_URL="https://nixos.org/" HOME_URL="https://nixos.org/"
DOCUMENTATION_URL="https://nixos.org/nixos/manual/index.html" DOCUMENTATION_URL="https://nixos.org/nixos/manual/index.html"