diff options
author | Robin Gloster <mail@glob.in> | 2016-07-31 20:51:34 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-07-31 20:51:34 +0000 |
commit | 63c7b4f9a7844f0bc84d008b810375eb0fba6b2f (patch) | |
tree | e351ecd702d87ab1c4fd03246383162ec19d6de2 /doc | |
parent | 43ba8d295f414ab985bd3fc5d5125421bd8bd0ad (diff) | |
parent | a629cd3f02c2ad071e58d5898c5f48fb0336a705 (diff) | |
download | nixpkgs-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar nixpkgs-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.gz nixpkgs-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.bz2 nixpkgs-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.lz nixpkgs-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.xz nixpkgs-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.tar.zst nixpkgs-63c7b4f9a7844f0bc84d008b810375eb0fba6b2f.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'doc')
-rw-r--r-- | doc/coding-conventions.xml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index e7166a64919..8105611f2ba 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -251,16 +251,13 @@ bound to the variable name <varname>e2fsprogs</varname> in <listitem><para>The version part of the <literal>name</literal> attribute <emphasis>must</emphasis> start with a digit (following a - dash) — e.g., <literal>"hello-0.3-pre-r3910"</literal> instead of - <literal>"hello-svn-r3910"</literal>, as the latter would be seen as - a package named <literal>hello-svn</literal> by - <command>nix-env</command>.</para></listitem> + dash) — e.g., <literal>"hello-0.3.1rc2"</literal>.</para></listitem> - <listitem><para>If package is fetched from git's commit then + <listitem><para>If a package is not a release but a commit from a repository, then the version part of the name <emphasis>must</emphasis> be the date of that (fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal> format. - Also add <literal>"git"</literal> to the name - e.g., - <literal>"pkgname-git-2014-09-23"</literal>.</para></listitem> + Also append <literal>"unstable"</literal> to the name - e.g., + <literal>"pkgname-unstable-2014-09-23"</literal>.</para></listitem> <listitem><para>Dashes in the package name should be preserved in new variable names, rather than converted to underscores |