Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into uclibc

This commit is contained in:
John Ericson 2018-05-10 00:18:51 -04:00
commit b3ef322770
4573 changed files with 133571 additions and 85778 deletions

View file

@ -13,8 +13,8 @@ charset = utf-8
# see https://nixos.org/nixpkgs/manual/#chap-conventions # see https://nixos.org/nixpkgs/manual/#chap-conventions
# Match nix/ruby files, set indent to spaces with width of two # Match nix/ruby/docbook files, set indent to spaces with width of two
[*.{nix,rb}] [*.{nix,rb,xml}]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2

16
.gitattributes vendored Normal file
View file

@ -0,0 +1,16 @@
**/deps.nix linguist-generated
**/node-packages.nix linguist-generated
pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
pkgs/development/r-modules/*-packages.nix linguist-generated
pkgs/development/haskell-modules/hackage-packages.nix linguist-generated
pkgs/development/beam-modules/hex-packages.nix linguist-generated
doc/** linguist-documentation
doc/default.nix linguist-documentation=false
nixos/doc/** linguist-documentation
nixos/doc/default.nix linguist-documentation=false
nixos/modules/module-list.nix merge=union
# pkgs/top-level/all-packages.nix merge=union

6
.github/CODEOWNERS vendored
View file

@ -13,6 +13,8 @@
# Libraries # Libraries
/lib @edolstra @nbp /lib @edolstra @nbp
/lib/systems @nbp @ericson2314 /lib/systems @nbp @ericson2314
/lib/generators.nix @edolstra @nbp @Profpatsch
/lib/debug.nix @edolstra @nbp @Profpatsch
# Nixpkgs Internals # Nixpkgs Internals
/default.nix @nbp /default.nix @nbp
@ -63,6 +65,9 @@
/pkgs/development/interpreters/ruby @zimbatm /pkgs/development/interpreters/ruby @zimbatm
/pkgs/development/ruby-modules @zimbatm /pkgs/development/ruby-modules @zimbatm
# Rust
/pkgs/development/compilers/rust @Mic92 @LnL7
# Darwin-related # Darwin-related
/pkgs/stdenv/darwin @NixOS/darwin-maintainers /pkgs/stdenv/darwin @NixOS/darwin-maintainers
/pkgs/os-specific/darwin @NixOS/darwin-maintainers /pkgs/os-specific/darwin @NixOS/darwin-maintainers
@ -83,7 +88,6 @@
/pkgs/applications/editors/eclipse @rycee /pkgs/applications/editors/eclipse @rycee
# https://github.com/NixOS/nixpkgs/issues/31401 # https://github.com/NixOS/nixpkgs/issues/31401
/lib/maintainers.nix @ghost
/lib/licenses.nix @ghost /lib/licenses.nix @ghost
# Qt / KDE # Qt / KDE

View file

@ -1 +1 @@
18.03 18.09

View file

@ -12,12 +12,12 @@ build daemon as so-called channels. To get channel information via git, add
``` ```
For stability and maximum binary package support, it is recommended to maintain For stability and maximum binary package support, it is recommended to maintain
custom changes on top of one of the channels, e.g. `nixos-17.09` for the latest custom changes on top of one of the channels, e.g. `nixos-18.03` for the latest
release and `nixos-unstable` for the latest successful build of master: release and `nixos-unstable` for the latest successful build of master:
``` ```
% git remote update channels % git remote update channels
% git rebase channels/nixos-17.09 % git rebase channels/nixos-18.03
``` ```
For pull-requests, please rebase onto nixpkgs `master`. For pull-requests, please rebase onto nixpkgs `master`.
@ -31,9 +31,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Community maintained wiki](https://nixos.wiki/) * [Community maintained wiki](https://nixos.wiki/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09) * [Continuous package builds for 18.03 release](https://hydra.nixos.org/jobset/nixos/release-18.03)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents) * [Tests for 18.03 release](https://hydra.nixos.org/job/nixos/release-18.03/tested#tabs-constituents)
Communication: Communication:

6
doc/.gitignore vendored Normal file
View file

@ -0,0 +1,6 @@
*.chapter.xml
*.section.xml
.version
out
manual-full.xml
highlightjs

95
doc/Makefile Normal file
View file

@ -0,0 +1,95 @@
MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
.PHONY: all
all: validate format out/html/index.html out/epub/manual.epub
.PHONY: debug
debug:
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
.PHONY: format
format:
find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {}
.PHONY: clean
clean:
rm -f ${MD_TARGETS} .version manual-full.xml
rm -rf ./out/ ./highlightjs
.PHONY: validate
validate: manual-full.xml
jing "$$RNG" manual-full.xml
out/html/index.html: manual-full.xml style.css highlightjs
mkdir -p out/html
xsltproc ${xsltFlags} \
--nonet --xinclude \
--output $@ \
"$$XSL/docbook/xhtml/docbook.xsl" \
./manual-full.xml
mkdir -p out/html/highlightjs/
cp -r highlightjs out/html/
cp ./overrides.css out/html/
cp ./style.css out/html/style.css
mkdir -p out/html/images/callouts
cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
chmod u+w -R out/html/
out/epub/manual.epub: manual-full.xml
mkdir -p out/epub/scratch
xsltproc ${xsltFlags} --nonet \
--output out/epub/scratch/ \
"$$XSL/docbook/epub/docbook.xsl" \
./manual-full.xml
cp ./overrides.css out/epub/scratch/OEBPS
cp ./style.css out/epub/scratch/OEBPS
mkdir -p out/epub/scratch/OEBPS/images/callouts/
cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
echo "application/epub+zip" > mimetype
zip -0Xq "out/epub/manual.epub" mimetype
rm mimetype
cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
rm -rf "out/epub/scratch/"
highlightjs:
mkdir -p highlightjs
cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/
cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/
cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/
cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
manual-full.xml: ${MD_TARGETS} .version *.xml
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
.version:
nix-instantiate --eval \
-E '(import ../lib).version' > .version
%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
-e 's|</ulink>|</link>|' \
-e 's|<sect. id=|<section xml:id=|' \
-e 's|</sect[0-9]>|</section>|' \
-e '1s| id=| xml:id=|' \
-e '1s|\(<[^ ]* \)|\1xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" |' \
| cat > $@
%.chapter.xml: %.chapter.md
pandoc $^ -w docbook+smart \
--top-level-division=chapter \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
-e 's|</ulink>|</link>|' \
-e 's|<sect. id=|<section xml:id=|' \
-e 's|</sect[0-9]>|</section>|' \
-e '1s| id=| xml:id=|' \
-e '1s|\(<[^ ]* \)|\1|' \
| cat > $@

File diff suppressed because it is too large Load diff

View file

@ -1,40 +1,51 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-packageconfig"> xml:id="chap-packageconfig">
<title>Global configuration</title>
<title>Global configuration</title> <para>
Nix comes with certain defaults about what packages can and cannot be
<para>Nix comes with certain defaults about what packages can and installed, based on a package's metadata. By default, Nix will prevent
cannot be installed, based on a package's metadata. By default, Nix installation if any of the following criteria are true:
will prevent installation if any of the following criteria are </para>
true:</para> <itemizedlist>
<listitem>
<itemizedlist> <para>
<listitem><para>The package is thought to be broken, and has had The package is thought to be broken, and has had its
its <literal>meta.broken</literal> set to <literal>meta.broken</literal> set to <literal>true</literal>.
<literal>true</literal>.</para></listitem> </para>
</listitem>
<listitem><para>The package's <literal>meta.license</literal> is set <listitem>
to a license which is considered to be unfree.</para></listitem> <para>
The package isn't intended to run on the given system, as none of its
<listitem><para>The package has known security vulnerabilities but <literal>meta.platforms</literal> match the given system.
has not or can not be updated for some reason, and a list of issues </para>
has been entered in to the package's </listitem>
<literal>meta.knownVulnerabilities</literal>.</para></listitem> <listitem>
</itemizedlist> <para>
The package's <literal>meta.license</literal> is set to a license which is
<para>Note that all this is checked during evaluation already, considered to be unfree.
and the check includes any package that is evaluated. </para>
In particular, all build-time dependencies are checked. </listitem>
<literal>nix-env -qa</literal> will (attempt to) hide any packages <listitem>
that would be refused. <para>
</para> The package has known security vulnerabilities but has not or can not be
updated for some reason, and a list of issues has been entered in to the
<para>Each of these criteria can be altered in the nixpkgs package's <literal>meta.knownVulnerabilities</literal>.
configuration.</para> </para>
</listitem>
<para>The nixpkgs configuration for a NixOS system is set in the </itemizedlist>
<literal>configuration.nix</literal>, as in the following example: <para>
Note that all this is checked during evaluation already, and the check
includes any package that is evaluated. In particular, all build-time
dependencies are checked. <literal>nix-env -qa</literal> will (attempt to)
hide any packages that would be refused.
</para>
<para>
Each of these criteria can be altered in the nixpkgs configuration.
</para>
<para>
The nixpkgs configuration for a NixOS system is set in the
<literal>configuration.nix</literal>, as in the following example:
<programlisting> <programlisting>
{ {
nixpkgs.config = { nixpkgs.config = {
@ -42,151 +53,197 @@ configuration.</para>
}; };
} }
</programlisting> </programlisting>
However, this does not allow unfree software for individual users. However, this does not allow unfree software for individual users. Their
Their configurations are managed separately.</para> configurations are managed separately.
</para>
<para>A user's of nixpkgs configuration is stored in a user-specific <para>
configuration file located at A user's of nixpkgs configuration is stored in a user-specific configuration
<filename>~/.config/nixpkgs/config.nix</filename>. For example: file located at <filename>~/.config/nixpkgs/config.nix</filename>. For
example:
<programlisting> <programlisting>
{ {
allowUnfree = true; allowUnfree = true;
} }
</programlisting> </programlisting>
</para> </para>
<para>
<para>Note that we are not able to test or build unfree software on Hydra Note that we are not able to test or build unfree software on Hydra due to
due to policy. Most unfree licenses prohibit us from either executing or policy. Most unfree licenses prohibit us from either executing or
distributing the software.</para> distributing the software.
</para>
<section xml:id="sec-allow-broken"> <section xml:id="sec-allow-broken">
<title>Installing broken packages</title> <title>Installing broken packages</title>
<para>
<para>There are two ways to try compiling a package which has been There are two ways to try compiling a package which has been marked as
marked as broken.</para> broken.
</para>
<itemizedlist> <itemizedlist>
<listitem><para> <listitem>
For allowing the build of a broken package once, you can use an <para>
environment variable for a single invocation of the nix tools: For allowing the build of a broken package once, you can use an
environment variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting> <programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting>
</para></listitem> </para>
</listitem>
<listitem><para> <listitem>
For permanently allowing broken packages to be built, you may <para>
add <literal>allowBroken = true;</literal> to your user's For permanently allowing broken packages to be built, you may add
configuration file, like this: <literal>allowBroken = true;</literal> to your user's configuration file,
like this:
<programlisting> <programlisting>
{ {
allowBroken = true; allowBroken = true;
} }
</programlisting> </programlisting>
</para></listitem> </para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="sec-allow-unsupported-system">
<title>Installing packages on unsupported systems</title>
<section xml:id="sec-allow-unfree"> <para>
<title>Installing unfree packages</title> There are also two ways to try compiling a package which has been marked as
unsuported for the given system.
<para>There are several ways to tweak how Nix handles a package </para>
which has been marked as unfree.</para>
<itemizedlist> <itemizedlist>
<listitem><para> <listitem>
To temporarily allow all unfree packages, you can use an <para>
environment variable for a single invocation of the nix tools: For allowing the build of a broken package once, you can use an
environment variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1</programlisting>
</para>
</listitem>
<listitem>
<para>
For permanently allowing broken packages to be built, you may add
<literal>allowUnsupportedSystem = true;</literal> to your user's
configuration file, like this:
<programlisting>
{
allowUnsupportedSystem = true;
}
</programlisting>
</para>
</listitem>
</itemizedlist>
<programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting> <para>
</para></listitem> The difference between an a package being unsupported on some system and
being broken is admittedly a bit fuzzy. If a program
<emphasis>ought</emphasis> to work on a certain platform, but doesn't, the
platform should be included in <literal>meta.platforms</literal>, but marked
as broken with e.g. <literal>meta.broken =
!hostPlatform.isWindows</literal>. Of course, this begs the question of what
"ought" means exactly. That is left to the package maintainer.
</para>
</section>
<section xml:id="sec-allow-unfree">
<title>Installing unfree packages</title>
<listitem><para> <para>
It is possible to permanently allow individual unfree packages, There are several ways to tweak how Nix handles a package which has been
while still blocking unfree packages by default using the marked as unfree.
<literal>allowUnfreePredicate</literal> configuration </para>
option in the user configuration file.</para>
<para>This option is a function which accepts a package as a <itemizedlist>
parameter, and returns a boolean. The following example <listitem>
configuration accepts a package and always returns false: <para>
To temporarily allow all unfree packages, you can use an environment
variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
</para>
</listitem>
<listitem>
<para>
It is possible to permanently allow individual unfree packages, while
still blocking unfree packages by default using the
<literal>allowUnfreePredicate</literal> configuration option in the user
configuration file.
</para>
<para>
This option is a function which accepts a package as a parameter, and
returns a boolean. The following example configuration accepts a package
and always returns false:
<programlisting> <programlisting>
{ {
allowUnfreePredicate = (pkg: false); allowUnfreePredicate = (pkg: false);
} }
</programlisting> </programlisting>
</para> </para>
<para>
<para>A more useful example, the following configuration allows A more useful example, the following configuration allows only allows
only allows flash player and visual studio code: flash player and visual studio code:
<programlisting> <programlisting>
{ {
allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]); allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
} }
</programlisting> </programlisting>
</para></listitem> </para>
</listitem>
<listitem> <listitem>
<para>It is also possible to whitelist and blacklist licenses <para>
that are specifically acceptable or not acceptable, using It is also possible to whitelist and blacklist licenses that are
<literal>whitelistedLicenses</literal> and specifically acceptable or not acceptable, using
<literal>blacklistedLicenses</literal>, respectively. <literal>whitelistedLicenses</literal> and
</para> <literal>blacklistedLicenses</literal>, respectively.
</para>
<para>The following example configuration whitelists the <para>
licenses <literal>amd</literal> and <literal>wtfpl</literal>: The following example configuration whitelists the licenses
<literal>amd</literal> and <literal>wtfpl</literal>:
<programlisting> <programlisting>
{ {
whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ]; whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];
} }
</programlisting> </programlisting>
</para> </para>
<para>
<para>The following example configuration blacklists the The following example configuration blacklists the <literal>gpl3</literal>
<literal>gpl3</literal> and <literal>agpl3</literal> licenses: and <literal>agpl3</literal> licenses:
<programlisting> <programlisting>
{ {
blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];
} }
</programlisting> </programlisting>
</para> </para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>A complete list of licenses can be found in the file <para>
<filename>lib/licenses.nix</filename> of the nixpkgs tree.</para> A complete list of licenses can be found in the file
</section> <filename>lib/licenses.nix</filename> of the nixpkgs tree.
</para>
</section>
<section xml:id="sec-allow-insecure">
<title>Installing insecure packages</title>
<para>
<section xml:id="sec-allow-insecure"> There are several ways to tweak how Nix handles a package which has been
<title> marked as insecure.
Installing insecure packages </para>
</title>
<para>There are several ways to tweak how Nix handles a package
which has been marked as insecure.</para>
<itemizedlist> <itemizedlist>
<listitem><para> <listitem>
To temporarily allow all insecure packages, you can use an <para>
environment variable for a single invocation of the nix tools: To temporarily allow all insecure packages, you can use an environment
variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting> <programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting>
</para></listitem> </para>
</listitem>
<listitem><para> <listitem>
It is possible to permanently allow individual insecure <para>
packages, while still blocking other insecure packages by It is possible to permanently allow individual insecure packages, while
default using the <literal>permittedInsecurePackages</literal> still blocking other insecure packages by default using the
configuration option in the user configuration file.</para> <literal>permittedInsecurePackages</literal> configuration option in the
user configuration file.
<para>The following example configuration permits the </para>
installation of the hypothetically insecure package <para>
<literal>hello</literal>, version <literal>1.2.3</literal>: The following example configuration permits the installation of the
hypothetically insecure package <literal>hello</literal>, version
<literal>1.2.3</literal>:
<programlisting> <programlisting>
{ {
permittedInsecurePackages = [ permittedInsecurePackages = [
@ -194,47 +251,44 @@ distributing the software.</para>
]; ];
} }
</programlisting> </programlisting>
</para> </para>
</listitem> </listitem>
<listitem>
<listitem><para> <para>
It is also possible to create a custom policy around which It is also possible to create a custom policy around which insecure
insecure packages to allow and deny, by overriding the packages to allow and deny, by overriding the
<literal>allowInsecurePredicate</literal> configuration <literal>allowInsecurePredicate</literal> configuration option.
option.</para> </para>
<para>
<para>The <literal>allowInsecurePredicate</literal> option is a The <literal>allowInsecurePredicate</literal> option is a function which
function which accepts a package and returns a boolean, much accepts a package and returns a boolean, much like
like <literal>allowUnfreePredicate</literal>.</para> <literal>allowUnfreePredicate</literal>.
</para>
<para>The following configuration example only allows insecure <para>
packages with very short names: The following configuration example only allows insecure packages with
very short names:
<programlisting> <programlisting>
{ {
allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) &lt;= 5); allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) &lt;= 5);
} }
</programlisting> </programlisting>
</para> </para>
<para>
<para>Note that <literal>permittedInsecurePackages</literal> is Note that <literal>permittedInsecurePackages</literal> is only checked if
only checked if <literal>allowInsecurePredicate</literal> is not <literal>allowInsecurePredicate</literal> is not specified.
specified. </para>
</para></listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<!--============================================================--> <!--============================================================-->
<section xml:id="sec-modify-via-packageOverrides">
<title>Modify packages via <literal>packageOverrides</literal></title>
<section xml:id="sec-modify-via-packageOverrides"><title>Modify <para>
packages via <literal>packageOverrides</literal></title> You can define a function called <varname>packageOverrides</varname> in your
local <filename>~/.config/nixpkgs/config.nix</filename> to override nix
<para>You can define a function called packages. It must be a function that takes pkgs as an argument and return
<varname>packageOverrides</varname> in your local modified set of packages.
<filename>~/.config/nixpkgs/config.nix</filename> to override nix packages. It
must be a function that takes pkgs as an argument and return modified
set of packages.
<programlisting> <programlisting>
{ {
packageOverrides = pkgs: rec { packageOverrides = pkgs: rec {
@ -242,30 +296,27 @@ set of packages.
}; };
} }
</programlisting> </programlisting>
</para>
</para> </section>
<section xml:id="sec-declarative-package-management">
</section>
<section xml:id="sec-declarative-package-management">
<title>Declarative Package Management</title> <title>Declarative Package Management</title>
<section xml:id="sec-building-environment"> <section xml:id="sec-building-environment">
<title>Build an environment</title> <title>Build an environment</title>
<para> <para>
Using <literal>packageOverrides</literal>, it is possible to manage Using <literal>packageOverrides</literal>, it is possible to manage
packages declaratively. This means that we can list all of our desired packages declaratively. This means that we can list all of our desired
packages within a declarative Nix expression. For example, to have packages within a declarative Nix expression. For example, to have
<literal>aspell</literal>, <literal>bc</literal>, <literal>aspell</literal>, <literal>bc</literal>,
<literal>ffmpeg</literal>, <literal>coreutils</literal>, <literal>ffmpeg</literal>, <literal>coreutils</literal>,
<literal>gdb</literal>, <literal>nixUnstable</literal>, <literal>gdb</literal>, <literal>nixUnstable</literal>,
<literal>emscripten</literal>, <literal>jq</literal>, <literal>emscripten</literal>, <literal>jq</literal>,
<literal>nox</literal>, and <literal>silver-searcher</literal>, we could <literal>nox</literal>, and <literal>silver-searcher</literal>, we could
use the following in <filename>~/.config/nixpkgs/config.nix</filename>: use the following in <filename>~/.config/nixpkgs/config.nix</filename>:
</para> </para>
<screen> <screen>
{ {
packageOverrides = pkgs: with pkgs; { packageOverrides = pkgs: with pkgs; {
myPackages = pkgs.buildEnv { myPackages = pkgs.buildEnv {
@ -276,17 +327,17 @@ set of packages.
} }
</screen> </screen>
<para> <para>
To install it into our environment, you can just run <literal>nix-env -iA To install it into our environment, you can just run <literal>nix-env -iA
nixpkgs.myPackages</literal>. If you want to load the packages to be built nixpkgs.myPackages</literal>. If you want to load the packages to be built
from a working copy of <literal>nixpkgs</literal> you just run from a working copy of <literal>nixpkgs</literal> you just run
<literal>nix-env -f. -iA myPackages</literal>. To explore what's been <literal>nix-env -f. -iA myPackages</literal>. To explore what's been
installed, just look through <filename>~/.nix-profile/</filename>. You can installed, just look through <filename>~/.nix-profile/</filename>. You can
see that a lot of stuff has been installed. Some of this stuff is useful see that a lot of stuff has been installed. Some of this stuff is useful
some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: some of it isn't. Let's tell Nixpkgs to only link the stuff that we want:
</para> </para>
<screen> <screen>
{ {
packageOverrides = pkgs: with pkgs; { packageOverrides = pkgs: with pkgs; {
myPackages = pkgs.buildEnv { myPackages = pkgs.buildEnv {
@ -298,31 +349,30 @@ set of packages.
} }
</screen> </screen>
<para> <para>
<literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed <literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed
which gets rid of the extra stuff in the profile. which gets rid of the extra stuff in the profile. <filename>/bin</filename>
<filename>/bin</filename> and <filename>/share</filename> are good and <filename>/share</filename> are good defaults for a user environment,
defaults for a user environment, getting rid of the clutter. If you are getting rid of the clutter. If you are running on Nix on MacOS, you may
running on Nix on MacOS, you may want to add another path as well, want to add another path as well, <filename>/Applications</filename>, that
<filename>/Applications</filename>, that makes GUI apps available. makes GUI apps available.
</para> </para>
</section> </section>
<section xml:id="sec-getting-documentation"> <section xml:id="sec-getting-documentation">
<title>Getting documentation</title> <title>Getting documentation</title>
<para> <para>
After building that new environment, look through After building that new environment, look through
<filename>~/.nix-profile</filename> to make sure everything is there that <filename>~/.nix-profile</filename> to make sure everything is there that
we wanted. Discerning readers will note that some files are missing. Look we wanted. Discerning readers will note that some files are missing. Look
inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this. inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this.
There are no man pages for any of the Nix tools! This is because some There are no man pages for any of the Nix tools! This is because some
packages like Nix have multiple outputs for things like documentation (see packages like Nix have multiple outputs for things like documentation (see
section 4). Let's make Nix install those as well. section 4). Let's make Nix install those as well.
</para> </para>
<screen> <screen>
{ {
packageOverrides = pkgs: with pkgs; { packageOverrides = pkgs: with pkgs; {
myPackages = pkgs.buildEnv { myPackages = pkgs.buildEnv {
@ -335,14 +385,13 @@ set of packages.
} }
</screen> </screen>
<para> <para>
This provides us with some useful documentation for using our packages. This provides us with some useful documentation for using our packages.
However, if we actually want those manpages to be detected by man, we need However, if we actually want those manpages to be detected by man, we need
to set up our environment. This can also be managed within Nix to set up our environment. This can also be managed within Nix expressions.
expressions. </para>
</para>
<screen> <screen>
{ {
packageOverrides = pkgs: with pkgs; rec { packageOverrides = pkgs: with pkgs; rec {
myProfile = writeText "my-profile" '' myProfile = writeText "my-profile" ''
@ -374,13 +423,13 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
} }
</screen> </screen>
<para> <para>
For this to work fully, you must also have this script sourced when you For this to work fully, you must also have this script sourced when you are
are logged in. Try adding something like this to your logged in. Try adding something like this to your
<filename>~/.profile</filename> file: <filename>~/.profile</filename> file:
</para> </para>
<screen> <screen>
#!/bin/sh #!/bin/sh
if [ -d $HOME/.nix-profile/etc/profile.d ]; then if [ -d $HOME/.nix-profile/etc/profile.d ]; then
for i in $HOME/.nix-profile/etc/profile.d/*.sh; do for i in $HOME/.nix-profile/etc/profile.d/*.sh; do
@ -391,23 +440,22 @@ if [ -d $HOME/.nix-profile/etc/profile.d ]; then
fi fi
</screen> </screen>
<para> <para>
Now just run <literal>source $HOME/.profile</literal> and you can starting Now just run <literal>source $HOME/.profile</literal> and you can starting
loading man pages from your environent. loading man pages from your environent.
</para> </para>
</section> </section>
<section xml:id="sec-gnu-info-setup"> <section xml:id="sec-gnu-info-setup">
<title>GNU info setup</title> <title>GNU info setup</title>
<para> <para>
Configuring GNU info is a little bit trickier than man pages. To work Configuring GNU info is a little bit trickier than man pages. To work
correctly, info needs a database to be generated. This can be done with correctly, info needs a database to be generated. This can be done with
some small modifications to our environment scripts. some small modifications to our environment scripts.
</para> </para>
<screen> <screen>
{ {
packageOverrides = pkgs: with pkgs; rec { packageOverrides = pkgs: with pkgs; rec {
myProfile = writeText "my-profile" '' myProfile = writeText "my-profile" ''
@ -449,16 +497,13 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
} }
</screen> </screen>
<para> <para>
<literal>postBuild</literal> tells Nixpkgs to run a command after building <literal>postBuild</literal> tells Nixpkgs to run a command after building
the environment. In this case, <literal>install-info</literal> adds the the environment. In this case, <literal>install-info</literal> adds the
installed info pages to <literal>dir</literal> which is GNU info's default installed info pages to <literal>dir</literal> which is GNU info's default
root node. Note that <literal>texinfoInteractive</literal> is added to the root node. Note that <literal>texinfoInteractive</literal> is added to the
environment to give the <literal>install-info</literal> command. environment to give the <literal>install-info</literal> command.
</para> </para>
</section> </section>
</section>
</section>
</chapter> </chapter>

View file

@ -1,20 +1,35 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-contributing"> xml:id="chap-contributing">
<title>Contributing to this documentation</title>
<title>Contributing to this documentation</title> <para>
The DocBook sources of the Nixpkgs manual are in the
<para>The DocBook sources of the Nixpkgs manual are in the <filename <filename
xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename> xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
subdirectory of the Nixpkgs repository. If you make modifications to subdirectory of the Nixpkgs repository.
the manual, it's important to build it before committing. You can do that as follows: </para>
<para>
You can quickly check your edits with <command>make</command>:
</para>
<screen> <screen>
$ cd /path/to/nixpkgs $ cd /path/to/nixpkgs/doc
$ nix-build doc $ nix-shell
[nix-shell]$ make
</screen> </screen>
<para>
If the build succeeds, the manual will be in If you experience problems, run <command>make debug</command> to help
<filename>./result/share/doc/nixpkgs/manual.html</filename>.</para> understand the docbook errors.
</para>
<para>
After making modifications to the manual, it's important to build it before
committing. You can do that as follows:
<screen>
$ cd /path/to/nixpkgs/doc
$ nix-shell
[nix-shell]$ make clean
[nix-shell]$ nix-build .
</screen>
If the build succeeds, the manual will be in
<filename>./result/share/doc/nixpkgs/manual.html</filename>.
</para>
</chapter> </chapter>

View file

@ -1,308 +1,469 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-cross"> xml:id="chap-cross">
<title>Cross-compilation</title>
<title>Cross-compilation</title> <section xml:id="sec-cross-intro">
<section xml:id="sec-cross-intro">
<title>Introduction</title> <title>Introduction</title>
<para> <para>
"Cross-compilation" means compiling a program on one machine for another type of machine. "Cross-compilation" means compiling a program on one machine for another
For example, a typical use of cross compilation is to compile programs for embedded devices. type of machine. For example, a typical use of cross compilation is to
These devices often don't have the computing power and memory to compile their own programs. compile programs for embedded devices. These devices often don't have the
One might think that cross-compilation is a fairly niche concern, but there are advantages to being rigorous about distinguishing build-time vs run-time environments even when one is developing and deploying on the same machine. computing power and memory to compile their own programs. One might think
Nixpkgs is increasingly adopting the opinion that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling. that cross-compilation is a fairly niche concern, but there are advantages
to being rigorous about distinguishing build-time vs run-time environments
even when one is developing and deploying on the same machine. Nixpkgs is
increasingly adopting the opinion that packages should be written with
cross-compilation in mind, and nixpkgs should evaluate in a similar way (by
minimizing cross-compilation-specific special cases) whether or not one is
cross-compiling.
</para> </para>
<para> <para>
This chapter will be organized in three parts. This chapter will be organized in three parts. First, it will describe the
First, it will describe the basics of how to package software in a way that supports cross-compilation. basics of how to package software in a way that supports cross-compilation.
Second, it will describe how to use Nixpkgs when cross-compiling. Second, it will describe how to use Nixpkgs when cross-compiling. Third, it
Third, it will describe the internal infrastructure supporting cross-compilation. will describe the internal infrastructure supporting cross-compilation.
</para> </para>
</section> </section>
<!--============================================================--> <!--============================================================-->
<section xml:id="sec-cross-packaging">
<section xml:id="sec-cross-packaging">
<title>Packaging in a cross-friendly manner</title> <title>Packaging in a cross-friendly manner</title>
<section> <section>
<title>Platform parameters</title> <title>Platform parameters</title>
<para>
Nixpkgs follows the <link xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">common historical convention of GNU autoconf</link> of distinguishing between 3 types of platform: <wordasword>build</wordasword>, <wordasword>host</wordasword>, and <wordasword>target</wordasword>.
In summary, <wordasword>build</wordasword> is the platform on which a package is being built, <wordasword>host</wordasword> is the platform on which it is to run. The third attribute, <wordasword>target</wordasword>, is relevant only for certain specific compilers and build tools. <para>
</para> Nixpkgs follows the
<link xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">common
historical convention of GNU autoconf</link> of distinguishing between 3
types of platform: <wordasword>build</wordasword>,
<wordasword>host</wordasword>, and <wordasword>target</wordasword>. In
summary, <wordasword>build</wordasword> is the platform on which a package
is being built, <wordasword>host</wordasword> is the platform on which it
is to run. The third attribute, <wordasword>target</wordasword>, is
relevant only for certain specific compilers and build tools.
</para>
<para> <para>
In Nixpkgs, these three platforms are defined as attribute sets under the names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal>. In Nixpkgs, these three platforms are defined as attribute sets under the
All three are always defined as attributes in the standard environment, and at the top level. That means one can get at them just like a dependency in a function that is imported with <literal>callPackage</literal>: names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>,
<programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>, or just off <varname>stdenv</varname>: and <literal>targetPlatform</literal>. All three are always defined as
<programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>. attributes in the standard environment, and at the top level. That means
</para> one can get at them just like a dependency in a function that is imported
<variablelist> with <literal>callPackage</literal>:
<varlistentry> <programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>
<term><varname>buildPlatform</varname></term> , or just off <varname>stdenv</varname>:
<listitem><para> <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>
The "build platform" is the platform on which a package is built. .
Once someone has a built package, or pre-built binary package, the build platform should not matter and be safe to ignore. </para>
</para></listitem>
</varlistentry> <variablelist>
<varlistentry> <varlistentry>
<term><varname>hostPlatform</varname></term> <term><varname>buildPlatform</varname>
<listitem><para> </term>
The "host platform" is the platform on which a package will be run. <listitem>
This is the simplest platform to understand, but also the one with the worst name. <para>
</para></listitem> The "build platform" is the platform on which a package is built. Once
</varlistentry> someone has a built package, or pre-built binary package, the build
<varlistentry> platform should not matter and be safe to ignore.
<term><varname>targetPlatform</varname></term> </para>
<listitem> </listitem>
<para> </varlistentry>
The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software. <varlistentry>
Instead, it is only relevant for compatibility with building certain specific compilers and build tools. <term><varname>hostPlatform</varname>
It can be safely ignored for all other packages. </term>
</para> <listitem>
<para> <para>
The build process of certain compilers is written in such a way that the compiler resulting from a single build can itself only produce binaries for a single platform. The "host platform" is the platform on which a package will be run. This
The task specifying this single "target platform" is thus pushed to build time of the compiler. is the simplest platform to understand, but also the one with the worst
The root cause of this mistake is often that the compiler (which will be run on the host) and the the standard library/runtime (which will be run on the target) are built by a single build process. name.
</para> </para>
<para> </listitem>
There is no fundamental need to think about a single target ahead of time like this. </varlistentry>
If the tool supports modular or pluggable backends, both the need to specify the target at build time and the constraint of having only a single target disappear. <varlistentry>
An example of such a tool is LLVM. <term><varname>targetPlatform</varname>
</para> </term>
<para> <listitem>
Although the existance of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. <para>
Nixpkgs tries to avoid sharing in the mistake where possible. The "target platform" attribute is, unlike the other two attributes, not
Still, because the concept of a target platform is so ingrained, it is best to support it as is. actually fundamental to the process of building software. Instead, it is
</para> only relevant for compatibility with building certain specific compilers
</listitem> and build tools. It can be safely ignored for all other packages.
</varlistentry> </para>
</variablelist> <para>
<para> The build process of certain compilers is written in such a way that the
The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up. compiler resulting from a single build can itself only produce binaries
You can see examples of ones used in practice in <literal>lib.systems.examples</literal>; note how they are not all very consistent. for a single platform. The task specifying this single "target platform"
For now, here are few fields can count on them containing: is thus pushed to build time of the compiler. The root cause of this
</para> mistake is often that the compiler (which will be run on the host) and
<variablelist> the the standard library/runtime (which will be run on the target) are
<varlistentry> built by a single build process.
<term><varname>system</varname></term> </para>
<listitem> <para>
<para> There is no fundamental need to think about a single target ahead of
This is a two-component shorthand for the platform. time like this. If the tool supports modular or pluggable backends, both
Examples of this would be "x86_64-darwin" and "i686-linux"; see <literal>lib.systems.doubles</literal> for more. the need to specify the target at build time and the constraint of
This format isn't very standard, but has built-in support in Nix, such as the <varname>builtins.currentSystem</varname> impure string. having only a single target disappear. An example of such a tool is
</para> LLVM.
</listitem> </para>
</varlistentry> <para>
<varlistentry> Although the existence of a "target platfom" is arguably a historical
<term><varname>config</varname></term> mistake, it is a common one: examples of tools that suffer from it are
<listitem> GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the
<para> mistake where possible. Still, because the concept of a target platform
This is a 3- or 4- component shorthand for the platform. is so ingrained, it is best to support it as is.
Examples of this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14". </para>
This is a standard format called the "LLVM target triple", as they are pioneered by LLVM and traditionally just used for the <varname>targetPlatform</varname>. </listitem>
This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed. </varlistentry>
This needs a better name than <varname>config</varname>! </variablelist>
</para>
</listitem> <para>
</varlistentry> The exact schema these fields follow is a bit ill-defined due to a long and
<varlistentry> convoluted evolution, but this is slowly being cleaned up. You can see
<term><varname>parsed</varname></term> examples of ones used in practice in
<listitem> <literal>lib.systems.examples</literal>; note how they are not all very
<para> consistent. For now, here are few fields can count on them containing:
This is a nix representation of a parsed LLVM target triple with white-listed components. </para>
This can be specified directly, or actually parsed from the <varname>config</varname>.
[Technically, only one need be specified and the others can be inferred, though the precision of inference may not be very good.] <variablelist>
See <literal>lib.systems.parse</literal> for the exact representation. <varlistentry>
</para> <term><varname>system</varname>
</listitem> </term>
</varlistentry> <listitem>
<varlistentry> <para>
<term><varname>libc</varname></term> This is a two-component shorthand for the platform. Examples of this
<listitem> would be "x86_64-darwin" and "i686-linux"; see
<para> <literal>lib.systems.doubles</literal> for more. This format isn't very
This is a string identifying the standard C library used. standard, but has built-in support in Nix, such as the
Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc. <varname>builtins.currentSystem</varname> impure string.
It should probably be refactored to use the module system, like <varname>parse</varname>. </para>
</para> </listitem>
</listitem> </varlistentry>
</varlistentry> <varlistentry>
<varlistentry> <term><varname>config</varname>
<term><varname>is*</varname></term> </term>
<listitem> <listitem>
<para> <para>
These predicates are defined in <literal>lib.systems.inspect</literal>, and slapped on every platform. This is a 3- or 4- component shorthand for the platform. Examples of
They are superior to the ones in <varname>stdenv</varname> as they force the user to be explicit about which platform they are inspecting. this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14".
Please use these instead of those. This is a standard format called the "LLVM target triple", as they are
</para> pioneered by LLVM and traditionally just used for the
</listitem> <varname>targetPlatform</varname>. This format is strictly more
</varlistentry> informative than the "Nix host double", as the previous format could
<varlistentry> analogously be termed. This needs a better name than
<term><varname>platform</varname></term> <varname>config</varname>!
<listitem> </para>
<para> </listitem>
This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set). </varlistentry>
See <literal>lib.systems.platforms</literal> for examples—there's hopefully one in there that will work verbatim for each platform that is working. <varlistentry>
Please help us triage these flags and give them better homes! <term><varname>parsed</varname>
</para> </term>
</listitem> <listitem>
</varlistentry> <para>
</variablelist> This is a nix representation of a parsed LLVM target triple with
white-listed components. This can be specified directly, or actually
parsed from the <varname>config</varname>. [Technically, only one need
be specified and the others can be inferred, though the precision of
inference may not be very good.] See
<literal>lib.systems.parse</literal> for the exact representation.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>libc</varname>
</term>
<listitem>
<para>
This is a string identifying the standard C library used. Valid
identifiers include "glibc" for GNU libc, "libSystem" for Darwin's
Libsystem, and "uclibc" for µClibc. It should probably be refactored to
use the module system, like <varname>parse</varname>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>is*</varname>
</term>
<listitem>
<para>
These predicates are defined in <literal>lib.systems.inspect</literal>,
and slapped on every platform. They are superior to the ones in
<varname>stdenv</varname> as they force the user to be explicit about
which platform they are inspecting. Please use these instead of those.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>platform</varname>
</term>
<listitem>
<para>
This is, quite frankly, a dumping ground of ad-hoc settings (it's an
attribute set). See <literal>lib.systems.platforms</literal> for
examples—there's hopefully one in there that will work verbatim for
each platform that is working. Please help us triage these flags and
give them better homes!
</para>
</listitem>
</varlistentry>
</variablelist>
</section> </section>
<section> <section>
<title>Specifying Dependencies</title> <title>Specifying Dependencies</title>
<para>
In this section we explore the relationship between both runtime and
buildtime dependencies and the 3 Autoconf platforms.
</para>
<para>
A runtime dependency between 2 packages implies that between them both the
host and target platforms match. This is directly implied by the meaning of
"host platform" and "runtime dependency": The package dependency exists
while both packages are running on a single host platform.
</para>
<para>
A build time dependency, however, implies a shift in platforms between the
depending package and the depended-on package. The meaning of a build time
dependency is that to build the depending package we need to be able to run
the depended-on's package. The depending package's build platform is
therefore equal to the depended-on package's host platform. Analogously,
the depending package's host platform is equal to the depended-on package's
target platform.
</para>
<para>
In this manner, given the 3 platforms for one package, we can determine the
three platforms for all its transitive dependencies. This is the most
important guiding principle behind cross-compilation with Nixpkgs, and will
be called the <wordasword>sliding window principle</wordasword>.
</para>
<para>
Some examples will probably make this clearer. If a package is being built
with a <literal>(build, host, target)</literal> platform triple of
<literal>(foo, bar, bar)</literal>, then its build-time dependencies would
have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those
packages'</emphasis> build-time dependencies would have triple of
<literal>(foo, foo, foo)</literal>. In other words, it should take two
"rounds" of following build-time dependency edges before one reaches a
fixed point where, by the sliding window principle, the platform triple no
longer changes. Indeed, this happens with cross compilation, where only
rounds of native dependencies starting with the second necessarily coincide
with native packages.
</para>
<note>
<para> <para>
In this section we explore the relationship between both runtime and buildtime dependencies and the 3 Autoconf platforms. The depending package's target platform is unconstrained by the sliding
window principle, which makes sense in that one can in principle build
cross compilers targeting arbitrary platforms.
</para> </para>
</note>
<para>
How does this work in practice? Nixpkgs is now structured so that
build-time dependencies are taken from <varname>buildPackages</varname>,
whereas run-time dependencies are taken from the top level attribute set.
For example, <varname>buildPackages.gcc</varname> should be used at build
time, while <varname>gcc</varname> should be used at run time. Now, for
most of Nixpkgs's history, there was no <varname>buildPackages</varname>,
and most packages have not been refactored to use it explicitly. Instead,
one can use the six (<emphasis>gasp</emphasis>) attributes used for
specifying dependencies as documented in
<xref linkend="ssec-stdenv-dependencies"/>. We "splice" together the
run-time and build-time package sets with <varname>callPackage</varname>,
and then <varname>mkDerivation</varname> for each of four attributes pulls
the right derivation out. This splicing can be skipped when not cross
compiling as the package sets are the same, but is a bit slow for cross
compiling. Because of this, a best-of-both-worlds solution is in the works
with no splicing or explicit access of <varname>buildPackages</varname>
needed. For now, feel free to use either method.
</para>
<note>
<para> <para>
A runtime dependency between 2 packages implies that between them both the host and target platforms match. There is also a "backlink" <varname>targetPackages</varname>, yielding a
This is directly implied by the meaning of "host platform" and "runtime dependency": package set whose <varname>buildPackages</varname> is the current package
The package dependency exists while both packages are running on a single host platform. set. This is a hack, though, to accommodate compilers with lousy build
systems. Please do not use this unless you are absolutely sure you are
packaging such a compiler and there is no other way.
</para> </para>
<para> </note>
A build time dependency, however, implies a shift in platforms between the depending package and the depended-on package.
The meaning of a build time dependency is that to build the depending package we need to be able to run the depended-on's package.
The depending package's build platform is therefore equal to the depended-on package's host platform.
Analogously, the depending package's host platform is equal to the depended-on package's target platform.
</para>
<para>
In this manner, given the 3 platforms for one package, we can determine the three platforms for all its transitive dependencies.
This is the most important guiding principle behind cross-compilation with Nixpkgs, and will be called the <wordasword>sliding window principle</wordasword>.
</para>
<para>
Some examples will probably make this clearer.
If a package is being built with a <literal>(build, host, target)</literal> platform triple of <literal>(foo, bar, bar)</literal>, then its build-time dependencies would have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those packages'</emphasis> build-time dependencies would have triple of <literal>(foo, foo, foo)</literal>.
In other words, it should take two "rounds" of following build-time dependency edges before one reaches a fixed point where, by the sliding window principle, the platform triple no longer changes.
Indeed, this happens with cross compilation, where only rounds of native dependencies starting with the second necessarily coincide with native packages.
</para>
<note><para>
The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms.
</para></note>
<para>
How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from <varname>buildPackages</varname>, whereas run-time dependencies are taken from the top level attribute set.
For example, <varname>buildPackages.gcc</varname> should be used at build time, while <varname>gcc</varname> should be used at run time.
Now, for most of Nixpkgs's history, there was no <varname>buildPackages</varname>, and most packages have not been refactored to use it explicitly.
Instead, one can use the six (<emphasis>gasp</emphasis>) attributes used for specifying dependencies as documented in <xref linkend="ssec-stdenv-dependencies"/>.
We "splice" together the run-time and build-time package sets with <varname>callPackage</varname>, and then <varname>mkDerivation</varname> for each of four attributes pulls the right derivation out.
This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling.
Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of <varname>buildPackages</varname> needed.
For now, feel free to use either method.
</para>
<note><para>
There is also a "backlink" <varname>targetPackages</varname>, yielding a package set whose <varname>buildPackages</varname> is the current package set.
This is a hack, though, to accommodate compilers with lousy build systems.
Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way.
</para></note>
</section> </section>
<section> <section>
<title>Cross packagaing cookbook</title> <title>Cross packagaing cookbook</title>
<para>
Some frequently problems when packaging for cross compilation are good to just spell and answer.
Ideally the information above is exhaustive, so this section cannot provide any new information,
but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem.
Feel free to add to this list!
</para>
<qandaset>
<qandaentry>
<question><para>
What if my package's build system needs to build a C program to be run under the build environment?
</para></question>
<answer><para>
<programlisting>depsBuildBuild = [ buildPackages.stdenv.cc ];</programlisting>
Add it to your <function>mkDerivation</function> invocation.
</para></answer>
</qandaentry>
<qandaentry>
<question><para>
My package fails to find <command>ar</command>.
</para></question>
<answer><para>
Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one.
It only provides a prefixed one, just as it only does for all the other binutils programs.
It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
</para></answer>
</qandaentry>
<qandaentry>
<question><para>
My package's testsuite needs to run host platform code.
</para></question>
<answer><para>
<programlisting>doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom;</programlisting>
Add it to your <function>mkDerivation</function> invocation.
</para></answer>
</qandaentry>
</qandaset>
</section>
</section>
<para>
Some frequently problems when packaging for cross compilation are good to
just spell and answer. Ideally the information above is exhaustive, so this
section cannot provide any new information, but its ludicrous and cruel to
expect everyone to spend effort working through the interaction of many
features just to figure out the same answer to the same common problem.
Feel free to add to this list!
</para>
<qandaset>
<qandaentry>
<question>
<para>
What if my package's build system needs to build a C program to be run
under the build environment?
</para>
</question>
<answer>
<para>
<programlisting>depsBuildBuild = [ buildPackages.stdenv.cc ];</programlisting>
Add it to your <function>mkDerivation</function> invocation.
</para>
</answer>
</qandaentry>
<qandaentry>
<question>
<para>
My package fails to find <command>ar</command>.
</para>
</question>
<answer>
<para>
Many packages assume that an unprefixed <command>ar</command> is
available, but Nix doesn't provide one. It only provides a prefixed one,
just as it only does for all the other binutils programs. It may be
necessary to patch the package to fix the build system to use a prefixed
`ar`.
</para>
</answer>
</qandaentry>
<qandaentry>
<question>
<para>
My package's testsuite needs to run host platform code.
</para>
</question>
<answer>
<para>
<programlisting>doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom;</programlisting>
Add it to your <function>mkDerivation</function> invocation.
</para>
</answer>
</qandaentry>
</qandaset>
</section>
</section>
<!--============================================================--> <!--============================================================-->
<section xml:id="sec-cross-usage">
<section xml:id="sec-cross-usage">
<title>Cross-building packages</title> <title>Cross-building packages</title>
<note><para>
More information needs to moved from the old wiki, especially <link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this section. <note>
</para></note> <para>
More information needs to moved from the old wiki, especially
<link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this
section.
</para>
</note>
<para> <para>
Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in which case there is no cross compiling and everything is built by and for that system, Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in
or also with <varname>crossSystem</varname>, in which case packages run on the latter, but all building happens on the former. which case there is no cross compiling and everything is built by and for
Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. that system, or also with <varname>crossSystem</varname>, in which case
As mentioned above, <literal>lib.systems.examples</literal> has some platforms which are used as arguments for these parameters in practice. packages run on the latter, but all building happens on the former. Both
You can use them programmatically, or on the command line: <programlisting> parameters take the same schema as the 3 (build, host, and target) platforms
defined in the previous section. As mentioned above,
<literal>lib.systems.examples</literal> has some platforms which are used as
arguments for these parameters in practice. You can use them
programmatically, or on the command line:
<programlisting>
nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting> nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting>
</para> </para>
<note> <note>
<para> <para>
Eventually we would like to make these platform examples an unnecessary convenience so that <programlisting> Eventually we would like to make these platform examples an unnecessary
convenience so that
<programlisting>
nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;' -A whatever</programlisting> nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;' -A whatever</programlisting>
works in the vast majority of cases. works in the vast majority of cases. The problem today is dependencies on
The problem today is dependencies on other sorts of configuration which aren't given proper defaults. other sorts of configuration which aren't given proper defaults. We rely on
We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf. the examples to crudely to set those configuration parameters in some
Issue <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link> tracks this inconvenience along with its root cause in crufty configuration options. vaguely sane manner on the users behalf. Issue
</para> <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link>
tracks this inconvenience along with its root cause in crufty configuration
options.
</para>
</note> </note>
<para> <para>
While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields. While one is free to pass both parameters in full, there's a lot of logic to
As discussed in the previous section, only one of <varname>system</varname>, <varname>config</varname>, and <varname>parsed</varname> is needed to infer the other two. fill in missing fields. As discussed in the previous section, only one of
Additionally, <varname>libc</varname> will be inferred from <varname>parse</varname>. <varname>system</varname>, <varname>config</varname>, and
Finally, <literal>localSystem.system</literal> is also <emphasis>impurely</emphasis> inferred based on the platform evaluation occurs. <varname>parsed</varname> is needed to infer the other two. Additionally,
This means it is often not necessary to pass <varname>localSystem</varname> at all, as in the command-line example in the previous paragraph. <varname>libc</varname> will be inferred from <varname>parse</varname>.
Finally, <literal>localSystem.system</literal> is also
<emphasis>impurely</emphasis> inferred based on the platform evaluation
occurs. This means it is often not necessary to pass
<varname>localSystem</varname> at all, as in the command-line example in the
previous paragraph.
</para> </para>
<note> <note>
<para> <para>
Many sources (manual, wiki, etc) probably mention passing <varname>system</varname>, <varname>platform</varname>, along with the optional <varname>crossSystem</varname> to nixpkgs: Many sources (manual, wiki, etc) probably mention passing
<literal>import &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..; }</literal>. <varname>system</varname>, <varname>platform</varname>, along with the
Passing those two instead of <varname>localSystem</varname> is still supported for compatibility, but is discouraged. optional <varname>crossSystem</varname> to nixpkgs: <literal>import
Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience. &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..;
</para> }</literal>. Passing those two instead of <varname>localSystem</varname> is
still supported for compatibility, but is discouraged. Indeed, much of the
inference we do for these parameters is motivated by compatibility as much
as convenience.
</para>
</note> </note>
<para> <para>
One would think that <varname>localSystem</varname> and <varname>crossSystem</varname> overlap horribly with the three <varname>*Platforms</varname> (<varname>buildPlatform</varname>, <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see <varname>stage.nix</varname> or the manual). One would think that <varname>localSystem</varname> and
Actually, those identifiers are purposefully not used here to draw a subtle but important distinction: <varname>crossSystem</varname> overlap horribly with the three
While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set. <varname>*Platforms</varname> (<varname>buildPlatform</varname>,
A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage. <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see
That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or <varname>buildPackages</varname>, the three platforms will be defined as one of <varname>localSystem</varname> or <varname>crossSystem</varname>, with the former replacing the latter as one traverses build-time dependencies. <varname>stage.nix</varname> or the manual). Actually, those identifiers are
A last simple difference then is <varname>crossSystem</varname> should be null when one doesn't want to cross-compile, while the <varname>*Platform</varname>s are always non-null. purposefully not used here to draw a subtle but important distinction: While
<varname>localSystem</varname> is always non-null. the granularity of having 3 platforms is necessary to properly *build*
packages, it is overkill for specifying the user's *intent* when making a
build plan or package set. A simple "build vs deploy" dichotomy is adequate:
the sliding window principle described in the previous section shows how to
interpolate between the these two "end points" to get the 3 platform triple
for each bootstrapping stage. That means for any package a given package
set, even those not bound on the top level but only reachable via
dependencies or <varname>buildPackages</varname>, the three platforms will
be defined as one of <varname>localSystem</varname> or
<varname>crossSystem</varname>, with the former replacing the latter as one
traverses build-time dependencies. A last simple difference then is
<varname>crossSystem</varname> should be null when one doesn't want to
cross-compile, while the <varname>*Platform</varname>s are always non-null.
<varname>localSystem</varname> is always non-null.
</para> </para>
</section> </section>
<!--============================================================--> <!--============================================================-->
<section xml:id="sec-cross-infra">
<section xml:id="sec-cross-infra">
<title>Cross-compilation infrastructure</title> <title>Cross-compilation infrastructure</title>
<para>To be written.</para>
<note><para>
If one explores nixpkgs, they will see derivations with names like <literal>gccCross</literal>.
Such <literal>*Cross</literal> derivations is a holdover from before we properly distinguished between the host and target platforms
—the derivation with "Cross" in the name covered the <literal>build = host != target</literal> case, while the other covered the <literal>host = target</literal>, with build platform the same or not based on whether one was using its <literal>.nativeDrv</literal> or <literal>.crossDrv</literal>.
This ugliness will disappear soon.
</para></note>
</section>
<para>
To be written.
</para>
<note>
<para>
If one explores nixpkgs, they will see derivations with names like
<literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is
a holdover from before we properly distinguished between the host and
target platforms —the derivation with "Cross" in the name covered the
<literal>build = host != target</literal> case, while the other covered the
<literal>host = target</literal>, with build platform the same or not based
on whether one was using its <literal>.nativeDrv</literal> or
<literal>.crossDrv</literal>. This ugliness will disappear soon.
</para>
</note>
</section>
</chapter> </chapter>

View file

@ -7,112 +7,42 @@ in
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "nixpkgs-manual"; name = "nixpkgs-manual";
buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ];
buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ]; src = ./.;
xsltFlags = '' # Hacking on these variables? Make sure to close and open
--param section.autolabel 1 # nix-shell between each test, maybe even:
--param section.label.includes.component.label 1 # $ nix-shell --run "make clean all"
--param html.stylesheet 'style.css' # otherwise they won't reapply :)
--param xref.with.number.and.title 1 HIGHLIGHTJS = pkgs.documentation-highlighter;
--param toc.section.depth 3 XSL = "${pkgs.docbook5_xsl}/xml/xsl";
--param admon.style ''' RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
--param callout.graphics.extension '.gif' XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf;
xsltFlags = lib.concatStringsSep " " [
"--param section.autolabel 1"
"--param section.label.includes.component.label 1"
"--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'"
"--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'"
"--param xref.with.number.and.title 1"
"--param toc.section.depth 3"
"--stringparam admon.style ''"
"--stringparam callout.graphics.extension .svg"
];
postPatch = ''
echo ${lib.version} > .version
''; '';
installPhase = ''
dest="$out/share/doc/nixpkgs"
mkdir -p "$(dirname "$dest")"
mv out/html "$dest"
mv "$dest/index.html" "$dest/manual.html"
buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }: mv out/epub/manual.epub "$dest/nixpkgs-manual.epub"
let
extraHeader = lib.optionalString (!useChapters)
''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
in ''
{
pandoc '${inputFile}' -w docbook+smart ${lib.optionalString useChapters "--top-level-division=chapter"} \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
-e 's|</ulink>|</link>|' \
-e 's|<sect. id=|<section xml:id=|' \
-e 's|</sect[0-9]>|</section>|' \
-e '1s| id=| xml:id=|' \
-e '1s|\(<[^ ]* \)|\1${extraHeader}|'
} > '${outputFile}'
'';
in
'' mkdir -p $out/nix-support/
ln -s '${sources}/'*.xml . echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
mkdir ./languages-frameworks
cp -s '${sources-langs}'/* ./languages-frameworks
''
+ toDocbook {
inputFile = ./introduction.md;
outputFile = "introduction.xml";
useChapters = true;
}
+ toDocbook {
inputFile = ./shell.md;
outputFile = "shell.xml";
}
+ toDocbook {
inputFile = ./languages-frameworks/python.md;
outputFile = "./languages-frameworks/python.xml";
}
+ toDocbook {
inputFile = ./languages-frameworks/haskell.md;
outputFile = "./languages-frameworks/haskell.xml";
}
+ toDocbook {
inputFile = ../pkgs/development/idris-modules/README.md;
outputFile = "languages-frameworks/idris.xml";
}
+ toDocbook {
inputFile = ../pkgs/development/node-packages/README.md;
outputFile = "languages-frameworks/node.xml";
}
+ toDocbook {
inputFile = ../pkgs/development/r-modules/README.md;
outputFile = "languages-frameworks/r.xml";
}
+ toDocbook {
inputFile = ./languages-frameworks/rust.md;
outputFile = "./languages-frameworks/rust.xml";
}
+ toDocbook {
inputFile = ./languages-frameworks/vim.md;
outputFile = "./languages-frameworks/vim.xml";
}
+ ''
echo ${lib.nixpkgsVersion} > .version
# validate against relaxng schema
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
${pkgs.jing}/bin/jing ${pkgs.docbook5}/xml/rng/docbook/docbook.rng manual-full.xml
dst=$out/share/doc/nixpkgs
mkdir -p $dst
xsltproc $xsltFlags --nonet --xinclude \
--output $dst/manual.html \
${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
./manual.xml
cp ${./style.css} $dst/style.css
mkdir -p $dst/images/callouts
cp "${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/"*.gif $dst/images/callouts/
mkdir -p $out/nix-support
echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
xsltproc $xsltFlags --nonet --xinclude \
--output $dst/epub/ \
${pkgs.docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \
./manual.xml
cp -r $dst/images $dst/epub/OEBPS
echo "application/epub+zip" > mimetype
manual="$dst/nixpkgs-manual.epub"
zip -0Xq "$manual" mimetype
cd $dst/epub && zip -Xr9D "$manual" *
rm -rf $dst/epub
''; '';
} }

File diff suppressed because it is too large Load diff

View file

@ -1,124 +1,137 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-beam"> xml:id="sec-beam">
<title>BEAM Languages (Erlang, Elixir &amp; LFE)</title>
<title>BEAM Languages (Erlang, Elixir &amp; LFE)</title> <section xml:id="beam-introduction">
<section xml:id="beam-introduction"> <title>Introduction</title>
<title>Introduction</title>
<para>
In this document and related Nix expressions, we use the term,
<emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name
of the Erlang Virtual Machine and, as far as we're concerned, from a
packaging perspective, all languages that run on the BEAM are
interchangeable. That which varies, like the build system, is transparent
to users of any given BEAM package, so we make no distinction.
</para>
</section>
<section xml:id="beam-structure">
<title>Structure</title>
<para>
All BEAM-related expressions are available via the top-level
<literal>beam</literal> attribute, which includes:
</para>
<itemizedlist>
<listitem>
<para>
<literal>interpreters</literal>: a set of compilers running on the
BEAM, including multiple Erlang/OTP versions
(<literal>beam.interpreters.erlangR19</literal>, etc), Elixir
(<literal>beam.interpreters.elixir</literal>) and LFE
(<literal>beam.interpreters.lfe</literal>).
</para>
</listitem>
<listitem>
<para>
<literal>packages</literal>: a set of package sets, each compiled with
a specific Erlang/OTP version, e.g.
<literal>beam.packages.erlangR19</literal>.
</para>
</listitem>
</itemizedlist>
<para>
The default Erlang compiler, defined by
<literal>beam.interpreters.erlang</literal>, is aliased as
<literal>erlang</literal>. The default BEAM package set is defined by
<literal>beam.packages.erlang</literal> and aliased at the top level as
<literal>beamPackages</literal>.
</para>
<para>
To create a package set built with a custom Erlang version, use the
lambda, <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP
derivation and produces a package set similar to
<literal>beam.packages.erlang</literal>.
</para>
<para>
Many Erlang/OTP distributions available in
<literal>beam.interpreters</literal> have versions with ODBC and/or Java
enabled. For example, there's
<literal>beam.interpreters.erlangR19_odbc_javac</literal>, which
corresponds to <literal>beam.interpreters.erlangR19</literal>.
</para>
<para xml:id="erlang-call-package">
We also provide the lambda,
<literal>beam.packages.erlang.callPackage</literal>, which simplifies
writing BEAM package definitions by injecting all packages from
<literal>beam.packages.erlang</literal> into the top-level context.
</para>
</section>
<section xml:id="build-tools">
<title>Build Tools</title>
<section xml:id="build-tools-rebar3">
<title>Rebar3</title>
<para>
By default, Rebar3 wants to manage its own dependencies. This is perfectly
acceptable in the normal, non-Nix setup, but in the Nix world, it is not.
To rectify this, we provide two versions of Rebar3:
<itemizedlist>
<listitem>
<para>
<literal>rebar3</literal>: patched to remove the ability to download
anything. When not running it via <literal>nix-shell</literal> or
<literal>nix-build</literal>, it's probably not going to work as
desired.
</para>
</listitem>
<listitem>
<para>
<literal>rebar3-open</literal>: the normal, unmodified Rebar3. It
should work exactly as would any other version of Rebar3. Any Erlang
package should rely on <literal>rebar3</literal> instead. See <xref
linkend="rebar3-packages"/>.
</para>
</listitem>
</itemizedlist>
</para>
</section>
<section xml:id="build-tools-other">
<title>Mix &amp; Erlang.mk</title>
<para>
Both Mix and Erlang.mk work exactly as expected. There is a bootstrap
process that needs to be run for both, however, which is supported by the
<literal>buildMix</literal> and <literal>buildErlangMk</literal>
derivations, respectively.
</para>
</section>
</section>
<section xml:id="how-to-install-beam-packages">
<title>How to Install BEAM Packages</title>
<para> <para>
BEAM packages are not registered at the top level, simply because they are In this document and related Nix expressions, we use the term,
not relevant to the vast majority of Nix users. They are installable using <emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name of
the <literal>beam.packages.erlang</literal> attribute set (aliased as the Erlang Virtual Machine and, as far as we're concerned, from a packaging
<literal>beamPackages</literal>), which points to packages built by the perspective, all languages that run on the BEAM are interchangeable. That
default Erlang/OTP version in Nixpkgs, as defined by which varies, like the build system, is transparent to users of any given
<literal>beam.interpreters.erlang</literal>. BEAM package, so we make no distinction.
</para>
</section>
To list the available packages in <section xml:id="beam-structure">
<literal>beamPackages</literal>, use the following command: <title>Structure</title>
<para>
All BEAM-related expressions are available via the top-level
<literal>beam</literal> attribute, which includes:
</para> </para>
<programlisting> <itemizedlist>
<listitem>
<para>
<literal>interpreters</literal>: a set of compilers running on the BEAM,
including multiple Erlang/OTP versions
(<literal>beam.interpreters.erlangR19</literal>, etc), Elixir
(<literal>beam.interpreters.elixir</literal>) and LFE
(<literal>beam.interpreters.lfe</literal>).
</para>
</listitem>
<listitem>
<para>
<literal>packages</literal>: a set of package sets, each compiled with a
specific Erlang/OTP version, e.g.
<literal>beam.packages.erlangR19</literal>.
</para>
</listitem>
</itemizedlist>
<para>
The default Erlang compiler, defined by
<literal>beam.interpreters.erlang</literal>, is aliased as
<literal>erlang</literal>. The default BEAM package set is defined by
<literal>beam.packages.erlang</literal> and aliased at the top level as
<literal>beamPackages</literal>.
</para>
<para>
To create a package set built with a custom Erlang version, use the lambda,
<literal>beam.packagesWith</literal>, which accepts an Erlang/OTP derivation
and produces a package set similar to
<literal>beam.packages.erlang</literal>.
</para>
<para>
Many Erlang/OTP distributions available in
<literal>beam.interpreters</literal> have versions with ODBC and/or Java
enabled. For example, there's
<literal>beam.interpreters.erlangR19_odbc_javac</literal>, which corresponds
to <literal>beam.interpreters.erlangR19</literal>.
</para>
<para xml:id="erlang-call-package">
We also provide the lambda,
<literal>beam.packages.erlang.callPackage</literal>, which simplifies
writing BEAM package definitions by injecting all packages from
<literal>beam.packages.erlang</literal> into the top-level context.
</para>
</section>
<section xml:id="build-tools">
<title>Build Tools</title>
<section xml:id="build-tools-rebar3">
<title>Rebar3</title>
<para>
By default, Rebar3 wants to manage its own dependencies. This is perfectly
acceptable in the normal, non-Nix setup, but in the Nix world, it is not.
To rectify this, we provide two versions of Rebar3:
<itemizedlist>
<listitem>
<para>
<literal>rebar3</literal>: patched to remove the ability to download
anything. When not running it via <literal>nix-shell</literal> or
<literal>nix-build</literal>, it's probably not going to work as
desired.
</para>
</listitem>
<listitem>
<para>
<literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should
work exactly as would any other version of Rebar3. Any Erlang package
should rely on <literal>rebar3</literal> instead. See
<xref
linkend="rebar3-packages"/>.
</para>
</listitem>
</itemizedlist>
</para>
</section>
<section xml:id="build-tools-other">
<title>Mix &amp; Erlang.mk</title>
<para>
Both Mix and Erlang.mk work exactly as expected. There is a bootstrap
process that needs to be run for both, however, which is supported by the
<literal>buildMix</literal> and <literal>buildErlangMk</literal>
derivations, respectively.
</para>
</section>
</section>
<section xml:id="how-to-install-beam-packages">
<title>How to Install BEAM Packages</title>
<para>
BEAM packages are not registered at the top level, simply because they are
not relevant to the vast majority of Nix users. They are installable using
the <literal>beam.packages.erlang</literal> attribute set (aliased as
<literal>beamPackages</literal>), which points to packages built by the
default Erlang/OTP version in Nixpkgs, as defined by
<literal>beam.interpreters.erlang</literal>. To list the available packages
in <literal>beamPackages</literal>, use the following command:
</para>
<programlisting>
$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A beamPackages $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A beamPackages
beamPackages.esqlite esqlite-0.2.1 beamPackages.esqlite esqlite-0.2.1
beamPackages.goldrush goldrush-0.1.7 beamPackages.goldrush goldrush-0.1.7
@ -128,34 +141,43 @@ beamPackages.lager lager-3.0.2
beamPackages.meck meck-0.8.3 beamPackages.meck meck-0.8.3
beamPackages.rebar3-pc pc-1.1.0 beamPackages.rebar3-pc pc-1.1.0
</programlisting> </programlisting>
<para> <para>
To install any of those packages into your profile, refer to them by their To install any of those packages into your profile, refer to them by their
attribute path (first column): attribute path (first column):
</para> </para>
<programlisting>
<programlisting>
$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
</programlisting> </programlisting>
<para> <para>
The attribute path of any BEAM package corresponds to the name of that The attribute path of any BEAM package corresponds to the name of that
particular package in <link xlink:href="https://hex.pm">Hex</link> or its particular package in <link xlink:href="https://hex.pm">Hex</link> or its
OTP Application/Release name. OTP Application/Release name.
</para> </para>
</section> </section>
<section xml:id="packaging-beam-applications">
<section xml:id="packaging-beam-applications">
<title>Packaging BEAM Applications</title> <title>Packaging BEAM Applications</title>
<section xml:id="packaging-erlang-applications"> <section xml:id="packaging-erlang-applications">
<title>Erlang Applications</title> <title>Erlang Applications</title>
<section xml:id="rebar3-packages">
<title>Rebar3 Packages</title> <section xml:id="rebar3-packages">
<para> <title>Rebar3 Packages</title>
The Nix function, <literal>buildRebar3</literal>, defined in
<literal>beam.packages.erlang.buildRebar3</literal> and aliased at the <para>
top level, can be used to build a derivation that understands how to The Nix function, <literal>buildRebar3</literal>, defined in
build a Rebar3 project. For example, we can build <link <literal>beam.packages.erlang.buildRebar3</literal> and aliased at the top
xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> as level, can be used to build a derivation that understands how to build a
follows: Rebar3 project. For example, we can build
</para> <link
<programlisting> xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
as follows:
</para>
<programlisting>
{ stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: { stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
buildRebar3 rec { buildRebar3 rec {
@ -172,33 +194,40 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
beamDeps = [ ibrowse jsx erlware_commons ]; beamDeps = [ ibrowse jsx erlware_commons ];
} }
</programlisting> </programlisting>
<para>
Such derivations are callable with <para>
<literal>beam.packages.erlang.callPackage</literal> (see <xref Such derivations are callable with
linkend="erlang-call-package"/>). To call this package using the normal <literal>beam.packages.erlang.callPackage</literal> (see
<literal>callPackage</literal>, refer to dependency packages via <xref
<literal>beamPackages</literal>, e.g. linkend="erlang-call-package"/>). To call this package using
<literal>beamPackages.ibrowse</literal>. the normal <literal>callPackage</literal>, refer to dependency packages
</para> via <literal>beamPackages</literal>, e.g.
<para> <literal>beamPackages.ibrowse</literal>.
Notably, <literal>buildRebar3</literal> includes </para>
<literal>beamDeps</literal>, while
<literal>stdenv.mkDerivation</literal> does not. BEAM dependencies added <para>
there will be correctly handled by the system. Notably, <literal>buildRebar3</literal> includes
</para> <literal>beamDeps</literal>, while <literal>stdenv.mkDerivation</literal>
<para> does not. BEAM dependencies added there will be correctly handled by the
If a package needs to compile native code via Rebar3's port compilation system.
mechanism, add <literal>compilePort = true;</literal> to the derivation. </para>
</para>
</section> <para>
<section xml:id="erlang-mk-packages"> If a package needs to compile native code via Rebar3's port compilation
<title>Erlang.mk Packages</title> mechanism, add <literal>compilePort = true;</literal> to the derivation.
<para> </para>
Erlang.mk functions similarly to Rebar3, except we use </section>
<literal>buildErlangMk</literal> instead of
<literal>buildRebar3</literal>. <section xml:id="erlang-mk-packages">
</para> <title>Erlang.mk Packages</title>
<programlisting>
<para>
Erlang.mk functions similarly to Rebar3, except we use
<literal>buildErlangMk</literal> instead of
<literal>buildRebar3</literal>.
</para>
<programlisting>
{ buildErlangMk, fetchHex, cowlib, ranch }: { buildErlangMk, fetchHex, cowlib, ranch }:
buildErlangMk { buildErlangMk {
@ -222,14 +251,17 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
}; };
} }
</programlisting> </programlisting>
</section> </section>
<section xml:id="mix-packages">
<title>Mix Packages</title> <section xml:id="mix-packages">
<para> <title>Mix Packages</title>
Mix functions similarly to Rebar3, except we use
<literal>buildMix</literal> instead of <literal>buildRebar3</literal>. <para>
</para> Mix functions similarly to Rebar3, except we use
<programlisting> <literal>buildMix</literal> instead of <literal>buildRebar3</literal>.
</para>
<programlisting>
{ buildMix, fetchHex, plug, absinthe }: { buildMix, fetchHex, plug, absinthe }:
buildMix { buildMix {
@ -253,10 +285,12 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
}; };
} }
</programlisting> </programlisting>
<para>
Alternatively, we can use <literal>buildHex</literal> as a shortcut: <para>
</para> Alternatively, we can use <literal>buildHex</literal> as a shortcut:
<programlisting> </para>
<programlisting>
{ buildHex, buildMix, plug, absinthe }: { buildHex, buildMix, plug, absinthe }:
buildHex { buildHex {
@ -278,21 +312,25 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
}; };
} }
</programlisting> </programlisting>
</section> </section>
</section> </section>
</section> </section>
<section xml:id="how-to-develop">
<section xml:id="how-to-develop">
<title>How to Develop</title> <title>How to Develop</title>
<section xml:id="accessing-an-environment"> <section xml:id="accessing-an-environment">
<title>Accessing an Environment</title> <title>Accessing an Environment</title>
<para>
Often, we simply want to access a valid environment that contains a <para>
specific package and its dependencies. We can accomplish that with the Often, we simply want to access a valid environment that contains a
<literal>env</literal> attribute of a derivation. For example, let's say specific package and its dependencies. We can accomplish that with the
we want to access an Erlang REPL with <literal>ibrowse</literal> loaded <literal>env</literal> attribute of a derivation. For example, let's say we
up. We could do the following: want to access an Erlang REPL with <literal>ibrowse</literal> loaded up. We
</para> could do the following:
<programlisting> </para>
<programlisting>
$ nix-shell -A beamPackages.ibrowse.env --run "erl" $ nix-shell -A beamPackages.ibrowse.env --run "erl"
Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false] Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
@ -333,22 +371,25 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
ok ok
2> 2>
</programlisting> </programlisting>
<para>
Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key <para>
to this functionality. Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key
</para> to this functionality.
</para>
</section> </section>
<section xml:id="creating-a-shell"> <section xml:id="creating-a-shell">
<title>Creating a Shell</title> <title>Creating a Shell</title>
<para>
Getting access to an environment often isn't enough to do real <para>
development. Usually, we need to create a <literal>shell.nix</literal> Getting access to an environment often isn't enough to do real development.
file and do our development inside of the environment specified therein. Usually, we need to create a <literal>shell.nix</literal> file and do our
This file looks a lot like the packaging described above, except that development inside of the environment specified therein. This file looks a
<literal>src</literal> points to the project root and we call the package lot like the packaging described above, except that <literal>src</literal>
directly. points to the project root and we call the package directly.
</para> </para>
<programlisting>
<programlisting>
{ pkgs ? import &quot;&lt;nixpkgs&quot;&gt; {} }: { pkgs ? import &quot;&lt;nixpkgs&quot;&gt; {} }:
with pkgs; with pkgs;
@ -368,13 +409,16 @@ in
drv drv
</programlisting> </programlisting>
<section xml:id="building-in-a-shell">
<section xml:id="building-in-a-shell">
<title>Building in a Shell (for Mix Projects)</title> <title>Building in a Shell (for Mix Projects)</title>
<para> <para>
We can leverage the support of the derivation, irrespective of the build We can leverage the support of the derivation, irrespective of the build
derivation, by calling the commands themselves. derivation, by calling the commands themselves.
</para> </para>
<programlisting>
<programlisting>
# ============================================================================= # =============================================================================
# Variables # Variables
# ============================================================================= # =============================================================================
@ -431,44 +475,54 @@ analyze: build plt
$(NIX_SHELL) --run "mix dialyzer --no-compile" $(NIX_SHELL) --run "mix dialyzer --no-compile"
</programlisting> </programlisting>
<para> <para>
Using a <literal>shell.nix</literal> as described (see <xref Using a <literal>shell.nix</literal> as described (see
<xref
linkend="creating-a-shell"/>) should just work. Aside from linkend="creating-a-shell"/>) should just work. Aside from
<literal>test</literal>, <literal>plt</literal>, and <literal>test</literal>, <literal>plt</literal>, and
<literal>analyze</literal>, the Make targets work just fine for all of the <literal>analyze</literal>, the Make targets work just fine for all of the
build derivations. build derivations.
</para> </para>
</section>
</section> </section>
</section> </section>
</section>
<section xml:id="generating-packages-from-hex-with-hex2nix"> <section xml:id="generating-packages-from-hex-with-hex2nix">
<title>Generating Packages from Hex with <literal>hex2nix</literal></title> <title>Generating Packages from Hex with <literal>hex2nix</literal></title>
<para> <para>
Updating the <link xlink:href="https://hex.pm">Hex</link> package set Updating the <link xlink:href="https://hex.pm">Hex</link> package set
requires <link requires
xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>. Given the <link
path to the Erlang modules (usually xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>.
<literal>pkgs/development/erlang-modules</literal>), it will dump a file Given the path to the Erlang modules (usually
called <literal>hex-packages.nix</literal>, containing all the packages that <literal>pkgs/development/erlang-modules</literal>), it will dump a file
use a recognized build system in <link called <literal>hex-packages.nix</literal>, containing all the packages that
xlink:href="https://hex.pm">Hex</link>. It can't be determined, however, use a recognized build system in
whether every package is buildable. <link
</para> xlink:href="https://hex.pm">Hex</link>. It can't be determined,
<para> however, whether every package is buildable.
To make life easier for our users, try to build every <link </para>
xlink:href="https://hex.pm">Hex</link> package and remove those that fail.
To do that, simply run the following command in the root of your <para>
<literal>nixpkgs</literal> repository: To make life easier for our users, try to build every
</para> <link
<programlisting> xlink:href="https://hex.pm">Hex</link> package and remove those
that fail. To do that, simply run the following command in the root of your
<literal>nixpkgs</literal> repository:
</para>
<programlisting>
$ nix-build -A beamPackages $ nix-build -A beamPackages
</programlisting> </programlisting>
<para>
That will attempt to build every package in <para>
<literal>beamPackages</literal>. Then manually remove those that fail. That will attempt to build every package in <literal>beamPackages</literal>.
Hopefully, someone will improve <link Then manually remove those that fail. Hopefully, someone will improve
xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> in the <link
future to automate the process. xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
</para> in the future to automate the process.
</section> </para>
</section>
</section> </section>

View file

@ -1,40 +1,37 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-bower"> xml:id="sec-bower">
<title>Bower</title>
<title>Bower</title> <para>
<link xlink:href="http://bower.io">Bower</link> is a package manager for web
site front-end components. Bower packages (comprising of build artefacts and
sometimes sources) are stored in <command>git</command> repositories,
typically on Github. The package registry is run by the Bower team with
package metadata coming from the <filename>bower.json</filename> file within
each package.
</para>
<para> <para>
<link xlink:href="http://bower.io">Bower</link> is a package manager The end result of running Bower is a <filename>bower_components</filename>
for web site front-end components. Bower packages (comprising of directory which can be included in the web app's build process.
build artefacts and sometimes sources) are stored in </para>
<command>git</command> repositories, typically on Github. The
package registry is run by the Bower team with package metadata
coming from the <filename>bower.json</filename> file within each
package.
</para>
<para> <para>
The end result of running Bower is a
<filename>bower_components</filename> directory which can be included
in the web app's build process.
</para>
<para>
Bower can be run interactively, by installing Bower can be run interactively, by installing
<varname>nodePackages.bower</varname>. More interestingly, the Bower <varname>nodePackages.bower</varname>. More interestingly, the Bower
components can be declared in a Nix derivation, with the help of components can be declared in a Nix derivation, with the help of
<varname>nodePackages.bower2nix</varname>. <varname>nodePackages.bower2nix</varname>.
</para> </para>
<section xml:id="ssec-bower2nix-usage"> <section xml:id="ssec-bower2nix-usage">
<title><command>bower2nix</command> usage</title> <title><command>bower2nix</command> usage</title>
<para> <para>
Suppose you have a <filename>bower.json</filename> with the following contents: Suppose you have a <filename>bower.json</filename> with the following
contents:
<example xml:id="ex-bowerJson">
<example xml:id="ex-bowerJson"><title><filename>bower.json</filename></title> <title><filename>bower.json</filename></title>
<programlisting language="json"> <programlisting language="json">
<![CDATA[{ <![CDATA[{
"name": "my-web-app", "name": "my-web-app",
@ -44,14 +41,12 @@
} }
}]]> }]]>
</programlisting> </programlisting>
</example> </example>
</para> </para>
<para>
Running <command>bower2nix</command> will produce something like the
following output:
<para>
Running <command>bower2nix</command> will produce something like the
following output:
<programlisting language="nix"> <programlisting language="nix">
<![CDATA[{ fetchbower, buildEnv }: <![CDATA[{ fetchbower, buildEnv }:
buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
@ -60,31 +55,31 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1") (fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1")
]; }]]> ]; }]]>
</programlisting> </programlisting>
</para> </para>
<para>
Using the <command>bower2nix</command> command line arguments, the
output can be redirected to a file. A name like
<filename>bower-packages.nix</filename> would be fine.
</para>
<para>
The resulting derivation is a union of all the downloaded Bower
packages (and their dependencies). To use it, they still need to be
linked together by Bower, which is where
<varname>buildBowerComponents</varname> is useful.
</para>
</section>
<section xml:id="ssec-build-bower-components"><title><varname>buildBowerComponents</varname> function</title>
<para> <para>
The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix"> Using the <command>bower2nix</command> command line arguments, the output
<filename>pkgs/development/bower-modules/generic/default.nix</filename></link>. can be redirected to a file. A name like
Example usage: <filename>bower-packages.nix</filename> would be fine.
</para>
<example xml:id="ex-buildBowerComponents"><title>buildBowerComponents</title> <para>
The resulting derivation is a union of all the downloaded Bower packages
(and their dependencies). To use it, they still need to be linked together
by Bower, which is where <varname>buildBowerComponents</varname> is useful.
</para>
</section>
<section xml:id="ssec-build-bower-components">
<title><varname>buildBowerComponents</varname> function</title>
<para>
The function is implemented in
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix">
<filename>pkgs/development/bower-modules/generic/default.nix</filename></link>.
Example usage:
<example xml:id="ex-buildBowerComponents">
<title>buildBowerComponents</title>
<programlisting language="nix"> <programlisting language="nix">
bowerComponents = buildBowerComponents { bowerComponents = buildBowerComponents {
name = "my-web-app"; name = "my-web-app";
@ -92,42 +87,42 @@ bowerComponents = buildBowerComponents {
src = myWebApp; <co xml:id="ex-buildBowerComponents-2" /> src = myWebApp; <co xml:id="ex-buildBowerComponents-2" />
}; };
</programlisting> </programlisting>
</example> </example>
</para> </para>
<para> <para>
In <xref linkend="ex-buildBowerComponents" />, the following arguments In <xref linkend="ex-buildBowerComponents" />, the following arguments are
are of special significance to the function: of special significance to the function:
<calloutlist>
<callout arearefs="ex-buildBowerComponents-1">
<para>
<varname>generated</varname> specifies the file which was created by
<command>bower2nix</command>.
</para>
</callout>
<callout arearefs="ex-buildBowerComponents-2">
<para>
<varname>src</varname> is your project's sources. It needs to contain a
<filename>bower.json</filename> file.
</para>
</callout>
</calloutlist>
</para>
<calloutlist> <para>
<callout arearefs="ex-buildBowerComponents-1"> <varname>buildBowerComponents</varname> will run Bower to link together the
<para> output of <command>bower2nix</command>, resulting in a
<varname>generated</varname> specifies the file which was created by <command>bower2nix</command>. <filename>bower_components</filename> directory which can be used.
</para> </para>
</callout>
<callout arearefs="ex-buildBowerComponents-2"> <para>
<para> Here is an example of a web frontend build process using
<varname>src</varname> is your project's sources. It needs to <command>gulp</command>. You might use <command>grunt</command>, or anything
contain a <filename>bower.json</filename> file. else.
</para> </para>
</callout>
</calloutlist>
</para>
<para> <example xml:id="ex-bowerGulpFile">
<varname>buildBowerComponents</varname> will run Bower to link <title>Example build script (<filename>gulpfile.js</filename>)</title>
together the output of <command>bower2nix</command>, resulting in a
<filename>bower_components</filename> directory which can be used.
</para>
<para>
Here is an example of a web frontend build process using
<command>gulp</command>. You might use <command>grunt</command>, or
anything else.
</para>
<example xml:id="ex-bowerGulpFile"><title>Example build script (<filename>gulpfile.js</filename>)</title>
<programlisting language="javascript"> <programlisting language="javascript">
<![CDATA[var gulp = require('gulp'); <![CDATA[var gulp = require('gulp');
@ -142,10 +137,10 @@ gulp.task('build', [], function () {
.pipe(gulp.dest("./gulpdist/")); .pipe(gulp.dest("./gulpdist/"));
});]]> });]]>
</programlisting> </programlisting>
</example> </example>
<example xml:id="ex-buildBowerComponentsDefaultNix"> <example xml:id="ex-buildBowerComponentsDefaultNix">
<title>Full example — <filename>default.nix</filename></title> <title>Full example — <filename>default.nix</filename></title>
<programlisting language="nix"> <programlisting language="nix">
{ myWebApp ? { outPath = ./.; name = "myWebApp"; } { myWebApp ? { outPath = ./.; name = "myWebApp"; }
, pkgs ? import &lt;nixpkgs&gt; {} , pkgs ? import &lt;nixpkgs&gt; {}
@ -172,73 +167,63 @@ pkgs.stdenv.mkDerivation {
installPhase = "mv gulpdist $out"; installPhase = "mv gulpdist $out";
} }
</programlisting> </programlisting>
</example> </example>
<para> <para>
A few notes about <xref linkend="ex-buildBowerComponentsDefaultNix" />: A few notes about <xref linkend="ex-buildBowerComponentsDefaultNix" />:
<calloutlist>
<calloutlist> <callout arearefs="ex-buildBowerComponentsDefault-1">
<callout arearefs="ex-buildBowerComponentsDefault-1"> <para>
<para> The result of <varname>buildBowerComponents</varname> is an input to the
The result of <varname>buildBowerComponents</varname> is an frontend build.
input to the frontend build. </para>
</para> </callout>
</callout> <callout arearefs="ex-buildBowerComponentsDefault-2">
<para>
<callout arearefs="ex-buildBowerComponentsDefault-2"> Whether to symlink or copy the <filename>bower_components</filename>
<para> directory depends on the build tool in use. In this case a copy is used
Whether to symlink or copy the to avoid <command>gulp</command> silliness with permissions.
<filename>bower_components</filename> directory depends on the </para>
build tool in use. In this case a copy is used to avoid </callout>
<command>gulp</command> silliness with permissions. <callout arearefs="ex-buildBowerComponentsDefault-3">
</para> <para>
</callout> <command>gulp</command> requires <varname>HOME</varname> to refer to a
writeable directory.
<callout arearefs="ex-buildBowerComponentsDefault-3"> </para>
<para> </callout>
<command>gulp</command> requires <varname>HOME</varname> to <callout arearefs="ex-buildBowerComponentsDefault-4">
refer to a writeable directory. <para>
</para>
</callout>
<callout arearefs="ex-buildBowerComponentsDefault-4">
<para>
The actual build command. Other tools could be used. The actual build command. Other tools could be used.
</para> </para>
</callout> </callout>
</calloutlist> </calloutlist>
</para> </para>
</section> </section>
<section xml:id="ssec-bower2nix-troubleshooting"> <section xml:id="ssec-bower2nix-troubleshooting">
<title>Troubleshooting</title> <title>Troubleshooting</title>
<variablelist> <variablelist>
<varlistentry>
<varlistentry> <term><literal>ENOCACHE</literal> errors from
<term>
<literal>ENOCACHE</literal> errors from
<varname>buildBowerComponents</varname> <varname>buildBowerComponents</varname>
</term> </term>
<listitem> <listitem>
<para> <para>
This means that Bower was looking for a package version which This means that Bower was looking for a package version which doesn't
doesn't exist in the generated exist in the generated <filename>bower-packages.nix</filename>.
<filename>bower-packages.nix</filename>. </para>
</para> <para>
<para> If <filename>bower.json</filename> has been updated, then run
If <filename>bower.json</filename> has been updated, then run <command>bower2nix</command> again.
<command>bower2nix</command> again. </para>
</para> <para>
<para> It could also be a bug in <command>bower2nix</command> or
It could also be a bug in <command>bower2nix</command> or <command>fetchbower</command>. If possible, try reformulating the version
<command>fetchbower</command>. If possible, try reformulating specification in <filename>bower.json</filename>.
the version specification in <filename>bower.json</filename>. </para>
</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</section>
</section>
</section> </section>

View file

@ -1,36 +1,38 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-coq"> xml:id="sec-language-coq">
<title>Coq</title>
<title>Coq</title> <para>
<para> Coq libraries should be installed in
Coq libraries should be installed in <literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>. Such
<literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>. directories are automatically added to the <literal>$COQPATH</literal>
Such directories are automatically added to the environment variable by the hook defined in the Coq derivation.
<literal>$COQPATH</literal> environment variable by the hook defined </para>
in the Coq derivation.
</para> <para>
<para> Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact
Some libraries require OCaml and sometimes also Camlp5 or findlib. versions that were used to build Coq are saved in the
The exact versions that were used to build Coq are saved in the <literal>coq.ocaml</literal> and <literal>coq.camlp5</literal> and
<literal>coq.ocaml</literal> and <literal>coq.camlp5</literal> <literal>coq.findlib</literal> attributes.
and <literal>coq.findlib</literal> attributes. </para>
</para>
<para> <para>
Coq libraries may be compatible with some specific versions of Coq only. Coq libraries may be compatible with some specific versions of Coq only. The
The <literal>compatibleCoqVersions</literal> attribute is used to <literal>compatibleCoqVersions</literal> attribute is used to precisely
precisely select those versions of Coq that are compatible with this select those versions of Coq that are compatible with this derivation.
derivation. </para>
</para>
<para> <para>
Here is a simple package example. It is a pure Coq library, thus it Here is a simple package example. It is a pure Coq library, thus it depends
depends on Coq. It builds on the Mathematical Components library, thus it on Coq. It builds on the Mathematical Components library, thus it also takes
also takes <literal>mathcomp</literal> as <literal>buildInputs</literal>. <literal>mathcomp</literal> as <literal>buildInputs</literal>. Its
Its <literal>Makefile</literal> has been generated using <literal>Makefile</literal> has been generated using
<literal>coq_makefile</literal> so we only have to <literal>coq_makefile</literal> so we only have to set the
set the <literal>$COQLIB</literal> variable at install time. <literal>$COQLIB</literal> variable at install time.
</para> </para>
<programlisting>
<programlisting>
{ stdenv, fetchFromGitHub, coq, mathcomp }: { stdenv, fetchFromGitHub, coq, mathcomp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

View file

@ -0,0 +1,185 @@
# User's Guide to Emscripten in Nixpkgs
[Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler
This section of the manual covers how to use `emscripten` in nixpkgs.
Minimal requirements:
* nix
* nixpkgs
Modes of use of `emscripten`:
* **Imperative usage** (on the command line):
If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions you can use these commands:
* `nix-env -i emscripten`
* `nix-shell -p emscripten`
* **Declarative usage**:
This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`.
* build and install all packages:
* `nix-env -iA emscriptenPackages`
* dev-shell for zlib implementation hacking:
* `nix-shell -A emscriptenPackages.zlib`
## Imperative usage
A few things to note:
* `export EMCC_DEBUG=2` is nice for debugging
* `~/.emscripten`, the build artifact cache sometimes creates issues and needs to be removed from time to time
## Declarative usage
Let's see two different examples from `pkgs/top-level/emscripten-packages.nix`:
* `pkgs.zlib.override`
* `pkgs.buildEmscriptenPackage`
Both are interesting concepts.
A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = true` is a default meaning that each emscriptenPackage requires a `checkPhase` implemented.
* Use `export EMCC_DEBUG=2` from within a emscriptenPackage's `phase` to get more detailed debug output what is going wrong.
* ~/.emscripten cache is requiring us to set `HOME=$TMPDIR` in individual phases. This makes compilation slower but also makes it more deterministic.
### Usage 1: pkgs.zlib.override
This example uses `zlib` from nixpkgs but instead of compiling **C** to **ELF** it compiles **C** to **JS** since we were using `pkgs.zlib.override` and changed stdenv to `pkgs.emscriptenStdenv`. A few adaptions and hacks were set in place to make it working. One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. However, this can also be the downside...
See the `zlib` example:
zlib = (pkgs.zlib.override {
stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation
(old: rec {
buildInputs = old.buildInputs ++ [ pkgconfig ];
# we need to reset this setting!
NIX_CFLAGS_COMPILE="";
configurePhase = ''
# FIXME: Some tests require writing at $HOME
HOME=$TMPDIR
runHook preConfigure
#export EMCC_DEBUG=2
emconfigure ./configure --prefix=$out --shared
runHook postConfigure
'';
dontStrip = true;
outputs = [ "out" ];
buildPhase = ''
emmake make
'';
installPhase = ''
emmake make install
'';
checkPhase = ''
echo "================= testing zlib using node ================="
echo "Compiling a custom test"
set -x
emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \
libz.so.${old.version} -I . -o example.js
echo "Using node to execute the test"
${pkgs.nodejs}/bin/node ./example.js
set +x
if [ $? -ne 0 ]; then
echo "test failed for some reason"
exit 1;
else
echo "it seems to work! very good."
fi
echo "================= /testing zlib using node ================="
'';
postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''
substituteInPlace configure \
--replace '/usr/bin/libtool' 'ar' \
--replace 'AR="libtool"' 'AR="ar"' \
--replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
'';
});
### Usage 2: pkgs.buildEmscriptenPackage
This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used.
xmlmirror = pkgs.buildEmscriptenPackage rec {
name = "xmlmirror";
buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
nativeBuildInputs = [ pkgconfig zlib ];
src = pkgs.fetchgit {
url = "https://gitlab.com/odfplugfest/xmlmirror.git";
rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd";
sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b";
};
configurePhase = ''
rm -f fastXmlLint.js*
# a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728
# https://gitlab.com/odfplugfest/xmlmirror/issues/8
sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv
# https://github.com/kripken/emscripten/issues/6344
# https://gitlab.com/odfplugfest/xmlmirror/issues/9
sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv
# https://gitlab.com/odfplugfest/xmlmirror/issues/11
sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv
'';
buildPhase = ''
HOME=$TMPDIR
make -f Makefile.emEnv
'';
outputs = [ "out" "doc" ];
installPhase = ''
mkdir -p $out/share
mkdir -p $doc/share/${name}
cp Demo* $out/share
cp -R codemirror-5.12 $out/share
cp fastXmlLint.js* $out/share
cp *.xsd $out/share
cp *.js $out/share
cp *.xhtml $out/share
cp *.html $out/share
cp *.json $out/share
cp *.rng $out/share
cp README.md $doc/share/${name}
'';
checkPhase = ''
'';
};
### Declarative debugging
Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project.
1. `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz`
2. `cd /tmp/`
3. `unpackPhase`
4. cd libz-1.2.3
5. `configurePhase`
6. `buildPhase`
7. ... happy hacking...
## Summary
Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from.
If in trouble, ask the maintainers.

View file

@ -1,14 +1,14 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-go"> xml:id="sec-language-go">
<title>Go</title>
<title>Go</title> <para>
The function <varname>buildGoPackage</varname> builds standard Go programs.
</para>
<para>The function <varname>buildGoPackage</varname> builds <example xml:id='ex-buildGoPackage'>
standard Go programs. <title>buildGoPackage</title>
</para>
<example xml:id='ex-buildGoPackage'><title>buildGoPackage</title>
<programlisting> <programlisting>
deis = buildGoPackage rec { deis = buildGoPackage rec {
name = "deis-${version}"; name = "deis-${version}";
@ -29,55 +29,56 @@ deis = buildGoPackage rec {
buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-4' /> buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-4' />
} }
</programlisting> </programlisting>
</example> </example>
<para><xref linkend='ex-buildGoPackage'/> is an example expression using buildGoPackage, <para>
the following arguments are of special significance to the function: <xref linkend='ex-buildGoPackage'/> is an example expression using
buildGoPackage, the following arguments are of special significance to the
<calloutlist> function:
<calloutlist>
<callout arearefs='ex-buildGoPackage-1'> <callout arearefs='ex-buildGoPackage-1'>
<para> <para>
<varname>goPackagePath</varname> specifies the package's canonical Go import path. <varname>goPackagePath</varname> specifies the package's canonical Go
import path.
</para> </para>
</callout> </callout>
<callout arearefs='ex-buildGoPackage-2'>
<callout arearefs='ex-buildGoPackage-2'>
<para> <para>
<varname>subPackages</varname> limits the builder from building child packages that <varname>subPackages</varname> limits the builder from building child
have not been listed. If <varname>subPackages</varname> is not specified, all child packages that have not been listed. If <varname>subPackages</varname> is
packages will be built. not specified, all child packages will be built.
</para> </para>
<para> <para>
In this example only <literal>github.com/deis/deis/client</literal> will be built. In this example only <literal>github.com/deis/deis/client</literal> will
be built.
</para> </para>
</callout> </callout>
<callout arearefs='ex-buildGoPackage-3'>
<callout arearefs='ex-buildGoPackage-3'>
<para> <para>
<varname>goDeps</varname> is where the Go dependencies of a Go program are listed <varname>goDeps</varname> is where the Go dependencies of a Go program are
as a list of package source identified by Go import path. listed as a list of package source identified by Go import path. It could
It could be imported as a separate <varname>deps.nix</varname> file for be imported as a separate <varname>deps.nix</varname> file for
readability. The dependency data structure is described below. readability. The dependency data structure is described below.
</para> </para>
</callout> </callout>
<callout arearefs='ex-buildGoPackage-4'>
<callout arearefs='ex-buildGoPackage-4'>
<para> <para>
<varname>buildFlags</varname> is a list of flags passed to the go build command. <varname>buildFlags</varname> is a list of flags passed to the go build
command.
</para> </para>
</callout> </callout>
</calloutlist>
</para>
</calloutlist> <para>
The <varname>goDeps</varname> attribute can be imported from a separate
<varname>nix</varname> file that defines which Go libraries are needed and
should be included in <varname>GOPATH</varname> for
<varname>buildPhase</varname>.
</para>
</para> <example xml:id='ex-goDeps'>
<title>deps.nix</title>
<para>The <varname>goDeps</varname> attribute can be imported from a separate
<varname>nix</varname> file that defines which Go libraries are needed and should
be included in <varname>GOPATH</varname> for <varname>buildPhase</varname>.
</para>
<example xml:id='ex-goDeps'><title>deps.nix</title>
<programlisting> <programlisting>
[ <co xml:id='ex-goDeps-1' /> [ <co xml:id='ex-goDeps-1' />
{ {
@ -100,67 +101,60 @@ the following arguments are of special significance to the function:
} }
] ]
</programlisting> </programlisting>
</example> </example>
<para> <para>
<calloutlist>
<calloutlist> <callout arearefs='ex-goDeps-1'>
<callout arearefs='ex-goDeps-1'>
<para> <para>
<varname>goDeps</varname> is a list of Go dependencies. <varname>goDeps</varname> is a list of Go dependencies.
</para> </para>
</callout> </callout>
<callout arearefs='ex-goDeps-2'>
<callout arearefs='ex-goDeps-2'>
<para> <para>
<varname>goPackagePath</varname> specifies Go package import path. <varname>goPackagePath</varname> specifies Go package import path.
</para> </para>
</callout> </callout>
<callout arearefs='ex-goDeps-3'>
<callout arearefs='ex-goDeps-3'>
<para> <para>
<varname>fetch type</varname> that needs to be used to get package source. If <varname>git</varname> <varname>fetch type</varname> that needs to be used to get package source.
is used there should be <varname>url</varname>, <varname>rev</varname> and <varname>sha256</varname> If <varname>git</varname> is used there should be <varname>url</varname>,
defined next to it. <varname>rev</varname> and <varname>sha256</varname> defined next to it.
</para> </para>
</callout> </callout>
</calloutlist>
</para>
</calloutlist> <para>
To extract dependency information from a Go package in automated way use
<link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>. It can
produce complete derivation and <varname>goDeps</varname> file for Go
programs.
</para>
</para> <para>
<varname>buildGoPackage</varname> produces
<para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>. <xref linkend='chap-multiple-output' xrefstyle="select: title" /> where
It can produce complete derivation and <varname>goDeps</varname> file for Go programs.</para> <varname>bin</varname> includes program binaries. You can test build a Go
binary as follows:
<para> <screen>
<varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" />
where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows:
<screen>
$ nix-build -A deis.bin $ nix-build -A deis.bin
</screen> </screen>
or build all outputs with: or build all outputs with:
<screen>
<screen>
$ nix-build -A deis.all $ nix-build -A deis.all
</screen> </screen>
<varname>bin</varname> output will be installed by default with
<varname>nix-env -i</varname> or <varname>systemPackages</varname>.
</para>
<varname>bin</varname> output will be installed by default with <varname>nix-env -i</varname> <para>
or <varname>systemPackages</varname>. You may use Go packages installed into the active Nix profiles by adding the
following to your ~/.bashrc:
</para>
<para>
You may use Go packages installed into the active Nix profiles by adding
the following to your ~/.bashrc:
<screen> <screen>
for p in $NIX_PROFILES; do for p in $NIX_PROFILES; do
GOPATH="$p/share/go:$GOPATH" GOPATH="$p/share/go:$GOPATH"
done done
</screen> </screen>
</para> </para>
</section> </section>

View file

@ -666,6 +666,56 @@ prefer one built with GHC 7.8.x in the first place. However, for users who
cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an
older version might be useful. older version might be useful.
### How to override packages in all compiler-specific package sets
In the previous section we learned how to override a package in a single
compiler-specific package set. You may have some overrides defined that you want
to use across multiple package sets. To accomplish this you could use the
technique that we learned in the previous section by repeating the overrides for
all the compiler-specific package sets. For example:
```nix
{
packageOverrides = super: let self = super.pkgs; in
{
haskell = super.haskell // {
packages = super.haskell.packages // {
ghc784 = super.haskell.packages.ghc784.override {
overrides = self: super: {
my-package = ...;
my-other-package = ...;
};
};
ghc822 = super.haskell.packages.ghc784.override {
overrides = self: super: {
my-package = ...;
my-other-package = ...;
};
};
...
};
};
};
}
```
However there's a more convenient way to override all compiler-specific package
sets at once:
```nix
{
packageOverrides = super: let self = super.pkgs; in
{
haskell = super.haskell // {
packageOverrides = self: super: {
my-package = ...;
my-other-package = ...;
};
};
};
}
```
### How to recover from GHC's infamous non-deterministic library ID bug ### How to recover from GHC's infamous non-deterministic library ID bug
GHC and distributed build farms don't get along well: GHC and distributed build farms don't get along well:
@ -689,9 +739,7 @@ might be necessary to purge the local caches that store data from those
machines to disable these binary channels for the duration of the previous machines to disable these binary channels for the duration of the previous
command, i.e. by running: command, i.e. by running:
```shell ```shell
rm /nix/var/nix/binary-cache-v3.sqlite rm ~/.cache/nix/binary-cache*.sqlite
rm /nix/var/nix/manifests/*
rm /nix/var/nix/channel-cache/*
``` ```
### Builds on Darwin fail with `math.h` not found ### Builds on Darwin fail with `math.h` not found

View file

@ -0,0 +1,39 @@
Idris packages
==============
This directory contains build rules for idris packages. In addition,
it contains several functions to build and compose those packages.
Everything is exposed to the user via the `idrisPackages` attribute.
callPackage
------------
This is like the normal nixpkgs callPackage function, specialized to
idris packages.
builtins
---------
This is a list of all of the libraries that come packaged with Idris
itself.
build-idris-package
--------------------
A function to build an idris package. Its sole argument is a set like
you might pass to `stdenv.mkDerivation`, except `build-idris-package`
sets several attributes for you. See `build-idris-package.nix` for
details.
build-builtin-package
----------------------
A version of `build-idris-package` specialized to builtin libraries.
Mostly for internal use.
with-packages
-------------
Bundle idris together with a list of packages. Because idris currently
only supports a single directory in its library path, you must include
all desired libraries here, including `prelude` and `base`.

View file

@ -1,35 +1,31 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="chap-language-support"> xml:id="chap-language-support">
<title>Support for specific programming languages and frameworks</title>
<title>Support for specific programming languages and frameworks</title> <para>
The <link linkend="chap-stdenv">standard build environment</link> makes it
<para>The <link linkend="chap-stdenv">standard build easy to build typical Autotools-based packages with very little code. Any
environment</link> makes it easy to build typical Autotools-based other kind of package can be accomodated by overriding the appropriate phases
packages with very little code. Any other kind of package can be of <literal>stdenv</literal>. However, there are specialised functions in
accomodated by overriding the appropriate phases of Nixpkgs to easily build packages for other programming languages, such as
<literal>stdenv</literal>. However, there are specialised functions Perl or Haskell. These are described in this chapter.
in Nixpkgs to easily build packages for other programming languages, </para>
such as Perl or Haskell. These are described in this chapter.</para> <xi:include href="beam.xml" />
<xi:include href="bower.xml" />
<xi:include href="coq.xml" />
<xi:include href="beam.xml" /> <xi:include href="go.xml" />
<xi:include href="bower.xml" /> <xi:include href="haskell.section.xml" />
<xi:include href="coq.xml" /> <xi:include href="idris.section.xml" />
<xi:include href="go.xml" /> <xi:include href="java.xml" />
<xi:include href="haskell.xml" /> <xi:include href="lua.xml" />
<xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md --> <xi:include href="node.section.xml" />
<xi:include href="java.xml" /> <xi:include href="perl.xml" />
<xi:include href="lua.xml" /> <xi:include href="python.section.xml" />
<xi:include href="node.xml" /> <!-- generated from ../../pkgs/development/node-packages/README.md --> <xi:include href="qt.xml" />
<xi:include href="perl.xml" /> <xi:include href="r.section.xml" />
<xi:include href="python.xml" /> <xi:include href="ruby.xml" />
<xi:include href="qt.xml" /> <xi:include href="rust.section.xml" />
<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md --> <xi:include href="texlive.xml" />
<xi:include href="ruby.xml" /> <xi:include href="vim.section.xml" />
<xi:include href="rust.xml" /> <xi:include href="emscripten.section.xml" />
<xi:include href="texlive.xml" />
<xi:include href="vim.xml" />
</chapter> </chapter>

View file

@ -1,11 +1,10 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-java"> xml:id="sec-language-java">
<title>Java</title>
<title>Java</title> <para>
Ant-based Java packages are typically built from source as follows:
<para>Ant-based Java packages are typically built from source as follows:
<programlisting> <programlisting>
stdenv.mkDerivation { stdenv.mkDerivation {
name = "..."; name = "...";
@ -16,33 +15,33 @@ stdenv.mkDerivation {
buildPhase = "ant"; buildPhase = "ant";
} }
</programlisting> </programlisting>
Note that <varname>jdk</varname> is an alias for the OpenJDK.
</para>
Note that <varname>jdk</varname> is an alias for the OpenJDK.</para> <para>
JAR files that are intended to be used by other packages should be installed
<para>JAR files that are intended to be used by other packages should in <filename>$out/share/java</filename>. The OpenJDK has a stdenv setup hook
be installed in <filename>$out/share/java</filename>. The OpenJDK has that adds any JARs in the <filename>share/java</filename> directories of the
a stdenv setup hook that adds any JARs in the build inputs to the <envar>CLASSPATH</envar> environment variable. For
<filename>share/java</filename> directories of the build inputs to the instance, if the package <literal>libfoo</literal> installs a JAR named
<envar>CLASSPATH</envar> environment variable. For instance, if the <filename>foo.jar</filename> in its <filename>share/java</filename>
package <literal>libfoo</literal> installs a JAR named directory, and another package declares the attribute
<filename>foo.jar</filename> in its <filename>share/java</filename>
directory, and another package declares the attribute
<programlisting> <programlisting>
buildInputs = [ jdk libfoo ]; buildInputs = [ jdk libfoo ];
</programlisting> </programlisting>
then <envar>CLASSPATH</envar> will be set to
<filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.
</para>
then <envar>CLASSPATH</envar> will be set to <para>
<filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.</para> Private JARs should be installed in a location like
<filename>$out/share/<replaceable>package-name</replaceable></filename>.
<para>Private JARs </para>
should be installed in a location like
<filename>$out/share/<replaceable>package-name</replaceable></filename>.</para>
<para>If your Java package provides a program, you need to generate a
wrapper script to run it using the OpenJRE. You can use
<literal>makeWrapper</literal> for this:
<para>
If your Java package provides a program, you need to generate a wrapper
script to run it using the OpenJRE. You can use
<literal>makeWrapper</literal> for this:
<programlisting> <programlisting>
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
@ -53,32 +52,20 @@ installPhase =
--add-flags "-cp $out/share/java/foo.jar org.foo.Main" --add-flags "-cp $out/share/java/foo.jar org.foo.Main"
''; '';
</programlisting> </programlisting>
Note the use of <literal>jre</literal>, which is the part of the OpenJDK
package that contains the Java Runtime Environment. By using
<literal>${jre}/bin/java</literal> instead of
<literal>${jdk}/bin/java</literal>, you prevent your package from depending
on the JDK at runtime.
</para>
Note the use of <literal>jre</literal>, which is the part of the <para>
OpenJDK package that contains the Java Runtime Environment. By using It is possible to use a different Java compiler than <command>javac</command>
<literal>${jre}/bin/java</literal> instead of from the OpenJDK. For instance, to use the GNU Java Compiler:
<literal>${jdk}/bin/java</literal>, you prevent your package from
depending on the JDK at runtime.</para>
<para>It is possible to use a different Java compiler than
<command>javac</command> from the OpenJDK. For instance, to use the
Eclipse Java Compiler:
<programlisting>
buildInputs = [ jre ant ecj ];
</programlisting>
(Note that here you dont need the full JDK as an input, but just the
JRE.) The ECJ has a stdenv setup hook that sets some environment
variables to cause Ant to use ECJ, but this doesnt work with all Ant
files. Similarly, you can use the GNU Java Compiler:
<programlisting> <programlisting>
buildInputs = [ gcj ant ]; buildInputs = [ gcj ant ];
</programlisting> </programlisting>
Here, Ant will automatically use <command>gij</command> (the GNU Java
Here, Ant will automatically use <command>gij</command> (the GNU Java Runtime) instead of the OpenJRE.
Runtime) instead of the OpenJRE.</para> </para>
</section> </section>

View file

@ -1,24 +1,22 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-lua"> xml:id="sec-language-lua">
<title>Lua</title>
<title>Lua</title> <para>
Lua packages are built by the <varname>buildLuaPackage</varname> function.
<para> This function is implemented in
Lua packages are built by the <varname>buildLuaPackage</varname> function. This function is <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix">
implemented
in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix">
<filename>pkgs/development/lua-modules/generic/default.nix</filename></link> <filename>pkgs/development/lua-modules/generic/default.nix</filename></link>
and works similarly to <varname>buildPerlPackage</varname>. (See and works similarly to <varname>buildPerlPackage</varname>. (See
<xref linkend="sec-language-perl"/> for details.) <xref linkend="sec-language-perl"/> for details.)
</para> </para>
<para> <para>
Lua packages are defined Lua packages are defined in
in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>. <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>.
Most of them are simple. For example: Most of them are simple. For example:
<programlisting>
<programlisting>
fileSystem = buildLuaPackage { fileSystem = buildLuaPackage {
name = "filesystem-1.6.2"; name = "filesystem-1.6.2";
src = fetchurl { src = fetchurl {
@ -32,20 +30,19 @@ fileSystem = buildLuaPackage {
}; };
}; };
</programlisting> </programlisting>
</para> </para>
<para> <para>
Though, more complicated package should be placed in a seperate file in Though, more complicated package should be placed in a seperate file in
<link <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules"><filename>pkgs/development/lua-modules</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules"><filename>pkgs/development/lua-modules</filename></link>.
</para> </para>
<para>
Lua packages accept additional parameter <varname>disabled</varname>, which defines
the condition of disabling package from luaPackages. For example, if package has
<varname>disabled</varname> assigned to <literal>lua.luaversion != "5.1"</literal>,
it will not be included in any luaPackages except lua51Packages, making it
only be built for lua 5.1.
</para>
<para>
Lua packages accept additional parameter <varname>disabled</varname>, which
defines the condition of disabling package from luaPackages. For example, if
package has <varname>disabled</varname> assigned to <literal>lua.luaversion
!= "5.1"</literal>, it will not be included in any luaPackages except
lua51Packages, making it only be built for lua 5.1.
</para>
</section> </section>

View file

@ -0,0 +1,51 @@
Node.js packages
================
The `pkgs/development/node-packages` folder contains a generated collection of
[NPM packages](https://npmjs.com/) that can be installed with the Nix package
manager.
As a rule of thumb, the package set should only provide *end user* software
packages, such as command-line utilities. Libraries should only be added to the
package set if there is a non-NPM package that requires it.
When it is desired to use NPM libraries in a development project, use the
`node2nix` generator directly on the `package.json` configuration file of the
project.
The package set also provides support for multiple Node.js versions. The policy
is that a new package should be added to the collection for the latest stable LTS
release (which is currently 6.x), unless there is an explicit reason to support
a different release.
If your package uses native addons, you need to examine what kind of native
build system it uses. Here are some examples:
* `node-gyp`
* `node-gyp-builder`
* `node-pre-gyp`
After you have identified the correct system, you need to override your package
expression while adding in build system as a build input. For example, `dat`
requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
```nix
dat = nodePackages.dat.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
});
```
To add a package from NPM to nixpkgs:
1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
for packages depending on Node.js 4.x)
2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
3. Build your new package to test your changes:
`cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
To build against a specific Node.js version (e.g. 4.x):
`nix-build -A nodePackages_4_x.<new-or-updated-package>`
4. Add and commit all modified and generated files.
For more information about the generation process, consult the
[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
tool.

View file

@ -1,24 +1,27 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-perl"> xml:id="sec-language-perl">
<title>Perl</title>
<title>Perl</title> <para>
Nixpkgs provides a function <varname>buildPerlPackage</varname>, a generic
package builder function for any Perl package that has a standard
<varname>Makefile.PL</varname>. Its implemented in
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.
</para>
<para>Nixpkgs provides a function <varname>buildPerlPackage</varname>, <para>
a generic package builder function for any Perl package that has a Perl packages from CPAN are defined in
standard <varname>Makefile.PL</varname>. Its implemented in <link <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
<para>Perl packages from CPAN are defined in <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>, xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>,
rather than <filename>pkgs/all-packages.nix</filename>. Most Perl rather than <filename>pkgs/all-packages.nix</filename>. Most Perl packages
packages are so straight-forward to build that they are defined here are so straight-forward to build that they are defined here directly, rather
directly, rather than having a separate function for each package than having a separate function for each package called from
called from <filename>perl-packages.nix</filename>. However, more <filename>perl-packages.nix</filename>. However, more complicated packages
complicated packages should be put in a separate file, typically in should be put in a separate file, typically in
<filename>pkgs/development/perl-modules</filename>. Here is an <filename>pkgs/development/perl-modules</filename>. Here is an example of the
example of the former: former:
<programlisting> <programlisting>
ClassC3 = buildPerlPackage rec { ClassC3 = buildPerlPackage rec {
name = "Class-C3-0.21"; name = "Class-C3-0.21";
@ -28,74 +31,72 @@ ClassC3 = buildPerlPackage rec {
}; };
}; };
</programlisting> </programlisting>
Note the use of <literal>mirror://cpan/</literal>, and the
Note the use of <literal>mirror://cpan/</literal>, and the <literal>${name}</literal> in the URL definition to ensure that the name
<literal>${name}</literal> in the URL definition to ensure that the attribute is consistent with the source that were actually downloading.
name attribute is consistent with the source that were actually Perl packages are made available in <filename>all-packages.nix</filename>
downloading. Perl packages are made available in through the variable <varname>perlPackages</varname>. For instance, if you
<filename>all-packages.nix</filename> through the variable have a package that needs <varname>ClassC3</varname>, you would typically
<varname>perlPackages</varname>. For instance, if you have a package write
that needs <varname>ClassC3</varname>, you would typically write
<programlisting> <programlisting>
foo = import ../path/to/foo.nix { foo = import ../path/to/foo.nix {
inherit stdenv fetchurl ...; inherit stdenv fetchurl ...;
inherit (perlPackages) ClassC3; inherit (perlPackages) ClassC3;
}; };
</programlisting> </programlisting>
in <filename>all-packages.nix</filename>. You can test building a Perl
in <filename>all-packages.nix</filename>. You can test building a package as follows:
Perl package as follows:
<screen> <screen>
$ nix-build -A perlPackages.ClassC3 $ nix-build -A perlPackages.ClassC3
</screen> </screen>
<varname>buildPerlPackage</varname> adds <literal>perl-</literal> to the
<varname>buildPerlPackage</varname> adds <literal>perl-</literal> to start of the name attribute, so the package above is actually called
the start of the name attribute, so the package above is actually <literal>perl-Class-C3-0.21</literal>. So to install it, you can say:
called <literal>perl-Class-C3-0.21</literal>. So to install it, you
can say:
<screen> <screen>
$ nix-env -i perl-Class-C3 $ nix-env -i perl-Class-C3
</screen> </screen>
(Of course you can also install using the attribute name: <literal>nix-env -i
-A perlPackages.ClassC3</literal>.)
</para>
(Of course you can also install using the attribute name: <para>
<literal>nix-env -i -A perlPackages.ClassC3</literal>.)</para> So what does <varname>buildPerlPackage</varname> do? It does the following:
<orderedlist>
<para>So what does <varname>buildPerlPackage</varname> do? It does <listitem>
the following: <para>
In the configure phase, it calls <literal>perl Makefile.PL</literal> to
<orderedlist> generate a Makefile. You can set the variable
<varname>makeMakerFlags</varname> to pass flags to
<listitem><para>In the configure phase, it calls <literal>perl <filename>Makefile.PL</filename>
Makefile.PL</literal> to generate a Makefile. You can set the </para>
variable <varname>makeMakerFlags</varname> to pass flags to </listitem>
<filename>Makefile.PL</filename></para></listitem> <listitem>
<para>
<listitem><para>It adds the contents of the <envar>PERL5LIB</envar> It adds the contents of the <envar>PERL5LIB</envar> environment variable
environment variable to <literal>#! .../bin/perl</literal> line of to <literal>#! .../bin/perl</literal> line of Perl scripts as
Perl scripts as <literal>-I<replaceable>dir</replaceable></literal> <literal>-I<replaceable>dir</replaceable></literal> flags. This ensures
flags. This ensures that a script can find its that a script can find its dependencies.
dependencies.</para></listitem> </para>
</listitem>
<listitem><para>In the fixup phase, it writes the propagated build <listitem>
inputs (<varname>propagatedBuildInputs</varname>) to the file <para>
<filename>$out/nix-support/propagated-user-env-packages</filename>. In the fixup phase, it writes the propagated build inputs
<command>nix-env</command> recursively installs all packages listed (<varname>propagatedBuildInputs</varname>) to the file
in this file when you install a package that has it. This ensures <filename>$out/nix-support/propagated-user-env-packages</filename>.
that a Perl package can find its dependencies.</para></listitem> <command>nix-env</command> recursively installs all packages listed in
this file when you install a package that has it. This ensures that a Perl
</orderedlist> package can find its dependencies.
</para>
</para> </listitem>
</orderedlist>
<para><varname>buildPerlPackage</varname> is built on top of </para>
<varname>stdenv</varname>, so everything can be customised in the
usual way. For instance, the <literal>BerkeleyDB</literal> module has
a <varname>preConfigure</varname> hook to generate a configuration
file used by <filename>Makefile.PL</filename>:
<para>
<varname>buildPerlPackage</varname> is built on top of
<varname>stdenv</varname>, so everything can be customised in the usual way.
For instance, the <literal>BerkeleyDB</literal> module has a
<varname>preConfigure</varname> hook to generate a configuration file used by
<filename>Makefile.PL</filename>:
<programlisting> <programlisting>
{ buildPerlPackage, fetchurl, db }: { buildPerlPackage, fetchurl, db }:
@ -113,18 +114,15 @@ buildPerlPackage rec {
''; '';
} }
</programlisting> </programlisting>
</para>
</para> <para>
Dependencies on other Perl packages can be specified in the
<para>Dependencies on other Perl packages can be specified in the <varname>buildInputs</varname> and <varname>propagatedBuildInputs</varname>
<varname>buildInputs</varname> and attributes. If something is exclusively a build-time dependency, use
<varname>propagatedBuildInputs</varname> attributes. If something is <varname>buildInputs</varname>; if its (also) a runtime dependency, use
exclusively a build-time dependency, use <varname>propagatedBuildInputs</varname>. For instance, this builds a Perl
<varname>buildInputs</varname>; if its (also) a runtime dependency, module that has runtime dependencies on a bunch of other modules:
use <varname>propagatedBuildInputs</varname>. For instance, this
builds a Perl module that has runtime dependencies on a bunch of other
modules:
<programlisting> <programlisting>
ClassC3Componentised = buildPerlPackage rec { ClassC3Componentised = buildPerlPackage rec {
name = "Class-C3-Componentised-1.0004"; name = "Class-C3-Componentised-1.0004";
@ -137,24 +135,26 @@ ClassC3Componentised = buildPerlPackage rec {
]; ];
}; };
</programlisting> </programlisting>
</para>
</para> <section xml:id="ssec-generation-from-CPAN">
<title>Generation from CPAN</title>
<section xml:id="ssec-generation-from-CPAN"><title>Generation from CPAN</title> <para>
Nix expressions for Perl packages can be generated (almost) automatically
<para>Nix expressions for Perl packages can be generated (almost) from CPAN. This is done by the program
automatically from CPAN. This is done by the program <command>nix-generate-from-cpan</command>, which can be installed as
<command>nix-generate-from-cpan</command>, which can be installed follows:
as follows:</para> </para>
<screen> <screen>
$ nix-env -i nix-generate-from-cpan $ nix-env -i nix-generate-from-cpan
</screen> </screen>
<para>This program takes a Perl module name, looks it up on CPAN, <para>
fetches and unpacks the corresponding package, and prints a Nix This program takes a Perl module name, looks it up on CPAN, fetches and
expression on standard output. For example: unpacks the corresponding package, and prints a Nix expression on standard
output. For example:
<screen> <screen>
$ nix-generate-from-cpan XML::Simple $ nix-generate-from-cpan XML::Simple
XMLSimple = buildPerlPackage rec { XMLSimple = buildPerlPackage rec {
@ -170,12 +170,23 @@ $ nix-generate-from-cpan XML::Simple
}; };
}; };
</screen> </screen>
The output can be pasted into
<filename>pkgs/top-level/perl-packages.nix</filename> or wherever else you
need it.
</para>
</section>
The output can be pasted into <section xml:id="ssec-perl-cross-compilation">
<filename>pkgs/top-level/perl-packages.nix</filename> or wherever else <title>Cross-compiling modules</title>
you need it.</para>
<para>
Nixpkgs has experimental support for cross-compiling Perl modules. In many
cases, it will just work out of the box, even for modules with native
extensions. Sometimes, however, the Makefile.PL for a module may
(indirectly) import a native module. In that case, you will need to make a
stub for that module that will satisfy the Makefile.PL and install it into
<filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>. See the
<varname>postInstall</varname> for <varname>DBI</varname> for an example.
</para>
</section>
</section> </section>
</section>

View file

@ -374,7 +374,7 @@ and `CFLAGS`.
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
homepage = http://hgomersall.github.com/pyFFTW/; homepage = http://hgomersall.github.com/pyFFTW/;
license = with licenses; [ bsd2 bsd3 ]; license = with licenses; [ bsd2 bsd3 ];
maintainer = with maintainers; [ fridh ]; maintainers = with maintainers; [ fridh ];
}; };
}; };
} }
@ -871,8 +871,10 @@ Executing `python setup.py bdist_wheel` in a `nix-shell `fails with
``` ```
ValueError: ZIP does not support timestamps before 1980 ValueError: ZIP does not support timestamps before 1980
``` ```
This is because files are included that depend on items in the Nix store which have a timestamp of, that is, it corresponds to January the 1st, 1970 at 00:00:00. And as the error informs you, ZIP does not support that.
The command `bdist_wheel` takes into account `SOURCE_DATE_EPOCH`, and `nix-shell` sets this to 1. By setting it to a value corresponding to 1980 or later, or by unsetting it, it is possible to build wheels. This is because files from the Nix store (which have a timestamp of the UNIX epoch of January 1, 1970) are included in the .ZIP, but .ZIP archives follow the DOS convention of counting timestamps from 1980.
The command `bdist_wheel` reads the `SOURCE_DATE_EPOCH` environment variable, which `nix-shell` sets to 1. Unsetting this variable or giving it a value corresponding to 1980 or later enables building wheels.
Use 1980 as timestamp: Use 1980 as timestamp:
```shell ```shell
@ -882,7 +884,7 @@ or the current time:
```shell ```shell
nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel" nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel"
``` ```
or unset: or unset `SOURCE_DATE_EPOCH`:
```shell ```shell
nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel" nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
``` ```

View file

@ -1,58 +1,74 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-qt"> xml:id="sec-language-qt">
<title>Qt</title>
<title>Qt</title> <para>
Qt is a comprehensive desktop and mobile application development toolkit for
C++. Legacy support is available for Qt 3 and Qt 4, but all current
development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to
take advantage of new features, but older versions are typically retained
until their support window ends. The most important consideration in
packaging Qt-based software is ensuring that each package and all its
dependencies use the same version of Qt 5; this consideration motivates most
of the tools described below.
</para>
<para> <section xml:id="ssec-qt-libraries">
Qt is a comprehensive desktop and mobile application development toolkit for C++. <title>Packaging Libraries for Nixpkgs</title>
Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5.
The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features,
but older versions are typically retained until their support window ends.
The most important consideration in packaging Qt-based software is ensuring that each package and all its dependencies use the same version of Qt 5;
this consideration motivates most of the tools described below.
</para>
<section xml:id="ssec-qt-libraries"><title>Packaging Libraries for Nixpkgs</title> <para>
Whenever possible, libraries that use Qt 5 should be built with each
available version. Packages providing libraries should be added to the
top-level function <varname>mkLibsForQt5</varname>, which is used to build a
set of libraries for every Qt 5 version. A special
<varname>callPackage</varname> function is used in this scope to ensure that
the entire dependency tree uses the same Qt 5 version. Import dependencies
unqualified, i.e., <literal>qtbase</literal> not
<literal>qt5.qtbase</literal>. <emphasis>Do not</emphasis> import a package
set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
</para>
<para> <para>
Whenever possible, libraries that use Qt 5 should be built with each available version. If a library does not support a particular version of Qt 5, it is best to
Packages providing libraries should be added to the top-level function <varname>mkLibsForQt5</varname>, mark it as broken by setting its <literal>meta.broken</literal> attribute. A
which is used to build a set of libraries for every Qt 5 version. package may be marked broken for certain versions by testing the
A special <varname>callPackage</varname> function is used in this scope to ensure that the entire dependency tree uses the same Qt 5 version. <literal>qtbase.version</literal> attribute, which will always give the
Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>. current Qt 5 version.
<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>. </para>
</para> </section>
<para> <section xml:id="ssec-qt-applications">
If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its <literal>meta.broken</literal> attribute. <title>Packaging Applications for Nixpkgs</title>
A package may be marked broken for certain versions by testing the <literal>qtbase.version</literal> attribute, which will always give the current Qt 5 version.
</para>
<para>
Call your application expression using
<literal>libsForQt5.callPackage</literal> instead of
<literal>callPackage</literal>. Import dependencies unqualified, i.e.,
<literal>qtbase</literal> not <literal>qt5.qtbase</literal>. <emphasis>Do
not</emphasis> import a package set such as <literal>qt5</literal> or
<literal>libsForQt5</literal>.
</para>
<para>
Qt 5 maintains strict backward compatibility, so it is generally best to
build an application package against the latest version using the
<varname>libsForQt5</varname> library set. In case a package does not build
with the latest Qt version, it is possible to pick a set pinned to a
particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that
is the latest version the package supports. If a package must be pinned to
an older Qt version, be sure to file a bug upstream; because Qt is strictly
backwards-compatible, any incompatibility is by definition a bug in the
application.
</para>
<para>
When testing applications in Nixpkgs, it is a common practice to build the
package with <literal>nix-build</literal> and run it using the created
symbolic link. This will not work with Qt applications, however, because
they have many hard runtime requirements that can only be guaranteed if the
package is actually installed. To test a Qt application, install it with
<literal>nix-env</literal> or run it inside <literal>nix-shell</literal>.
</para>
</section>
</section> </section>
<section xml:id="ssec-qt-applications"><title>Packaging Applications for Nixpkgs</title>
<para>
Call your application expression using <literal>libsForQt5.callPackage</literal> instead of <literal>callPackage</literal>.
Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>.
<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
</para>
<para>
Qt 5 maintains strict backward compatibility, so it is generally best to build an application package against the latest version using the <varname>libsForQt5</varname> library set.
In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.
If a package must be pinned to an older Qt version, be sure to file a bug upstream;
because Qt is strictly backwards-compatible, any incompatibility is by definition a bug in the application.
</para>
<para>
When testing applications in Nixpkgs, it is a common practice to build the package with <literal>nix-build</literal> and run it using the created symbolic link.
This will not work with Qt applications, however, because they have many hard runtime requirements that can only be guaranteed if the package is actually installed.
To test a Qt application, install it with <literal>nix-env</literal> or run it inside <literal>nix-shell</literal>.
</para>
</section>
</section>

View file

@ -0,0 +1,120 @@
R packages
==========
## Installation
Define an environment for R that contains all the libraries that you'd like to
use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
```nix
{
packageOverrides = super: let self = super.pkgs; in
{
rEnv = super.rWrapper.override {
packages = with self.rPackages; [
devtools
ggplot2
reshape2
yaml
optparse
];
};
};
}
```
Then you can use `nix-env -f "<nixpkgs>" -iA rEnv` to install it into your user
profile. The set of available libraries can be discovered by running the
command `nix-env -f "<nixpkgs>" -qaP -A rPackages`. The first column from that
output is the name that has to be passed to rWrapper in the code snipped above.
However, if you'd like to add a file to your project source to make the
environment available for other contributors, you can create a `default.nix`
file like so:
```nix
let
pkgs = import <nixpkgs> {};
stdenv = pkgs.stdenv;
in with pkgs; {
myProject = stdenv.mkDerivation {
name = "myProject";
version = "1";
src = if pkgs.lib.inNixShell then null else nix;
buildInputs = with rPackages; [
R
ggplot2
knitr
];
};
}
```
and then run `nix-shell .` to be dropped into a shell with those packages
available.
## RStudio
RStudio uses a standard set of packages and ignores any custom R
environments or installed packages you may have. To create a custom
environment, see `rstudioWrapper`, which functions similarly to
`rWrapper`:
```nix
{
packageOverrides = super: let self = super.pkgs; in
{
rstudioEnv = super.rstudioWrapper.override {
packages = with self.rPackages; [
dplyr
ggplot2
reshape2
];
};
};
}
```
Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
this into your user profile.
Alternatively, you can create a self-contained `shell.nix` without the need to
modify any configuration files:
```nix
{ pkgs ? import <nixpkgs> {}
}:
pkgs.rstudioWrapper.override {
packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ];
}
```
Executing `nix-shell` will then drop you into an environment equivalent to the
one above. If you need additional packages just add them to the list and
re-enter the shell.
## Updating the package set
```bash
nix-shell generate-shell.nix
Rscript generate-r-packages.R cran > cran-packages.nix.new
mv cran-packages.nix.new cran-packages.nix
Rscript generate-r-packages.R bioc > bioc-packages.nix.new
mv bioc-packages.nix.new bioc-packages.nix
```
`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefor the renaming.
## Testing if the Nix-expression could be evaluated
```bash
nix-build test-evaluation.nix --dry-run
```
If this exits fine, the expression is ok. If not, you have to edit `default.nix`

View file

@ -1,17 +1,19 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-ruby"> xml:id="sec-language-ruby">
<title>Ruby</title>
<title>Ruby</title> <para>
There currently is support to bundle applications that are packaged as Ruby
gems. The utility "bundix" allows you to write a
<filename>Gemfile</filename>, let bundler create a
<filename>Gemfile.lock</filename>, and then convert this into a nix
expression that contains all Gem dependencies automatically.
</para>
<para>There currently is support to bundle applications that are packaged as <para>
Ruby gems. The utility "bundix" allows you to write a For example, to package sensu, we did:
<filename>Gemfile</filename>, let bundler create a </para>
<filename>Gemfile.lock</filename>, and then convert this into a nix
expression that contains all Gem dependencies automatically.
</para>
<para>For example, to package sensu, we did:</para>
<screen> <screen>
<![CDATA[$ cd pkgs/servers/monitoring <![CDATA[$ cd pkgs/servers/monitoring
@ -42,17 +44,18 @@ bundlerEnv rec {
}]]> }]]>
</screen> </screen>
<para>Please check in the <filename>Gemfile</filename>, <para>
<filename>Gemfile.lock</filename> and the Please check in the <filename>Gemfile</filename>,
<filename>gemset.nix</filename> so future updates can be run easily. <filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so
</para> future updates can be run easily.
</para>
<para>For tools written in Ruby - i.e. where the desire is to install <para>
a package and then execute e.g. <command>rake</command> at the command For tools written in Ruby - i.e. where the desire is to install a package and
line, there is an alternative builder called <literal>bundlerApp</literal>. then execute e.g. <command>rake</command> at the command line, there is an
Set up the <filename>gemset.nix</filename> the same way, and then, for alternative builder called <literal>bundlerApp</literal>. Set up the
example: <filename>gemset.nix</filename> the same way, and then, for example:
</para> </para>
<screen> <screen>
<![CDATA[{ lib, bundlerApp }: <![CDATA[{ lib, bundlerApp }:
@ -72,31 +75,31 @@ bundlerApp {
}]]> }]]>
</screen> </screen>
<para>The chief advantage of <literal>bundlerApp</literal> over <para>
<literal>bundlerEnv</literal> is the executables introduced in the The chief advantage of <literal>bundlerApp</literal> over
environment are precisely those selected in the <literal>exes</literal> <literal>bundlerEnv</literal> is the executables introduced in the
list, as opposed to <literal>bundlerEnv</literal> which adds all the environment are precisely those selected in the <literal>exes</literal> list,
executables made available by gems in the gemset, which can mean e.g. as opposed to <literal>bundlerEnv</literal> which adds all the executables
<command>rspec</command> or <command>rake</command> in unpredictable made available by gems in the gemset, which can mean e.g.
versions available from various packages. <command>rspec</command> or <command>rake</command> in unpredictable versions
</para> available from various packages.
</para>
<para>Resulting derivations for both builders also have two helpful <para>
attributes, <literal>env</literal> and <literal>wrappedRuby</literal>. Resulting derivations for both builders also have two helpful attributes,
The first one allows one to quickly drop into <literal>env</literal> and <literal>wrappedRuby</literal>. The first one
<command>nix-shell</command> with the specified environment present. allows one to quickly drop into <command>nix-shell</command> with the
E.g. <command>nix-shell -A sensu.env</command> would give you an specified environment present. E.g. <command>nix-shell -A sensu.env</command>
environment with Ruby preset so it has all the libraries necessary would give you an environment with Ruby preset so it has all the libraries
for <literal>sensu</literal> in its paths. The second one can be necessary for <literal>sensu</literal> in its paths. The second one can be
used to make derivations from custom Ruby scripts which have used to make derivations from custom Ruby scripts which have
<filename>Gemfile</filename>s with their dependencies specified. It is <filename>Gemfile</filename>s with their dependencies specified. It is a
a derivation with <command>ruby</command> wrapped so it can find all derivation with <command>ruby</command> wrapped so it can find all the needed
the needed dependencies. For example, to make a derivation dependencies. For example, to make a derivation <literal>my-script</literal>
<literal>my-script</literal> for a <filename>my-script.rb</filename> for a <filename>my-script.rb</filename> (which should be placed in
(which should be placed in <filename>bin</filename>) you should run <filename>bin</filename>) you should run <command>bundix</command> as
<command>bundix</command> as specified above and then use specified above and then use <literal>bundlerEnv</literal> like this:
<literal>bundlerEnv</literal> like this: </para>
</para>
<programlisting> <programlisting>
<![CDATA[let env = bundlerEnv { <![CDATA[let env = bundlerEnv {
@ -118,5 +121,4 @@ in stdenv.mkDerivation {
''; '';
}]]> }]]>
</programlisting> </programlisting>
</section> </section>

View file

@ -16,6 +16,12 @@ cargo
into the `environment.systemPackages` or bring them into into the `environment.systemPackages` or bring them into
scope with `nix-shell -p rustc cargo`. scope with `nix-shell -p rustc cargo`.
> If you are using NixOS and you want to use rust without a nix expression you
> probably want to add the following in your `configuration.nix` to build
> crates with C dependencies.
>
> environment.systemPackages = [binutils gcc gnumake openssl pkgconfig]
For daily builds (beta and nightly) use either rustup from For daily builds (beta and nightly) use either rustup from
nixpkgs or use the [Rust nightlies nixpkgs or use the [Rust nightlies
overlay](#using-the-rust-nightlies-overlay). overlay](#using-the-rust-nightlies-overlay).
@ -76,7 +82,7 @@ an example for a minimal `hello` crate:
Compiling hello v0.1.0 (file:///tmp/hello) Compiling hello v0.1.0 (file:///tmp/hello)
Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
$ carnix -o hello.nix --src ./. Cargo.lock --standalone $ carnix -o hello.nix --src ./. Cargo.lock --standalone
$ nix-build hello.nix $ nix-build hello.nix -A hello_0_1_0
Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
@ -276,6 +282,84 @@ features, we would write:
Where `diesel.nix` is the file generated by Carnix, as explained above. Where `diesel.nix` is the file generated by Carnix, as explained above.
## Setting Up `nix-shell`
Oftentimes you want to develop code from within `nix-shell`. Unfortunately
`buildRustCrate` does not support common `nix-shell` operations directly
(see [this issue](https://github.com/NixOS/nixpkgs/issues/37945))
so we will use `stdenv.mkDerivation` instead.
Using the example `hello` project above, we want to do the following:
- Have access to `cargo` and `rustc`
- Have the `openssl` library available to a crate through it's _normal_
compilation mechanism (`pkg-config`).
A typical `shell.nix` might look like:
```
with import <nixpkgs> {};
stdenv.mkDerivation {
name = "rust-env";
buildInputs = [
rustc cargo
# Example Additional Dependencies
pkgconfig openssl
];
# Set Environment Variables
RUST_BACKTRACE = 1;
}
```
You should now be able to run the following:
```
$ nix-shell --pure
$ cargo build
$ cargo test
```
### Controlling Rust Version Inside `nix-shell`
To control your rust version (i.e. use nightly) from within `shell.nix` (or
other nix expressions) you can use the following `shell.nix`
```
# Latest Nightly
with import <nixpkgs> {};
let src = fetchFromGitHub {
owner = "mozilla";
repo = "nixpkgs-mozilla";
# commit from: 2018-03-27
rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe";
sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw";
};
in
with import "${src.out}/rust-overlay.nix" pkgs pkgs;
stdenv.mkDerivation {
name = "rust-env";
buildInputs = [
# Note: to use use stable, just replace `nightly` with `stable`
latest.rustChannels.nightly.rust
# Add some extra dependencies from `pkgs`
pkgconfig openssl
];
# Set Environment Variables
RUST_BACKTRACE = 1;
}
```
Now run:
```
$ rustc --version
rustc 1.26.0-nightly (188e693b3 2018-03-26)
```
To see that you are using nightly.
## Using the Rust nightlies overlay ## Using the Rust nightlies overlay
Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.

View file

@ -1,27 +1,42 @@
<section xmlns="http://docbook.org/ns/docbook" <section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-texlive"> xml:id="sec-language-texlive">
<title>TeX Live</title>
<title>TeX Live</title> <para>
Since release 15.09 there is a new TeX Live packaging that lives entirely
under attribute <varname>texlive</varname>.
</para>
<section>
<title>User's guide</title>
<para>Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute <varname>texlive</varname>.</para>
<section><title>User's guide</title>
<itemizedlist> <itemizedlist>
<listitem><para> <listitem>
For basic usage just pull <varname>texlive.combined.scheme-basic</varname> for an environment with basic LaTeX support.</para></listitem> <para>
<listitem><para> For basic usage just pull <varname>texlive.combined.scheme-basic</varname>
It typically won't work to use separately installed packages together. for an environment with basic LaTeX support.
Instead, you can build a custom set of packages like this: </para>
<programlisting> </listitem>
<listitem>
<para>
It typically won't work to use separately installed packages together.
Instead, you can build a custom set of packages like this:
<programlisting>
texlive.combine { texlive.combine {
inherit (texlive) scheme-small collection-langkorean algorithms cm-super; inherit (texlive) scheme-small collection-langkorean algorithms cm-super;
} }
</programlisting> </programlisting>
There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences). There are all the schemes, collections and a few thousand packages, as
</para></listitem> defined upstream (perhaps with tiny differences).
<listitem><para> </para>
By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add <varname>pkgFilter</varname> function to <varname>combine</varname>. </listitem>
<programlisting> <listitem>
<para>
By default you only get executables and files needed during runtime, and a
little documentation for the core packages. To change that, you need to
add <varname>pkgFilter</varname> function to <varname>combine</varname>.
<programlisting>
texlive.combine { texlive.combine {
# inherit (texlive) whatever-you-want; # inherit (texlive) whatever-you-want;
pkgFilter = pkg: pkgFilter = pkg:
@ -30,31 +45,55 @@ texlive.combine {
# there are also other attributes: version, name # there are also other attributes: version, name
} }
</programlisting> </programlisting>
</para></listitem> </para>
<listitem><para> </listitem>
You can list packages e.g. by <command>nix-repl</command>. <listitem>
<programlisting> <para>
You can list packages e.g. by <command>nix-repl</command>.
<programlisting>
$ nix-repl $ nix-repl
nix-repl> :l &lt;nixpkgs> nix-repl> :l &lt;nixpkgs>
nix-repl> texlive.collection-&lt;TAB> nix-repl> texlive.collection-&lt;TAB>
</programlisting> </programlisting>
</para></listitem> </para>
</listitem>
<listitem>
<para>
Note that the wrapper assumes that the result has a chance to be useful.
For example, the core executables should be present, as well as some core
data files. The supported way of ensuring this is by including some
scheme, for example <varname>scheme-basic</varname>, into the combination.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section>
<title>Known problems</title>
<section><title>Known problems</title>
<itemizedlist> <itemizedlist>
<listitem><para> <listitem>
Some tools are still missing, e.g. luajittex;</para></listitem> <para>
<listitem><para> Some tools are still missing, e.g. luajittex;
some apps aren't packaged/tested yet (asymptote, biber, etc.);</para></listitem> </para>
<listitem><para> </listitem>
feature/bug: when a package is rejected by <varname>pkgFilter</varname>, its dependencies are still propagated;</para></listitem> <listitem>
<listitem><para> <para>
in case of any bugs or feature requests, file a github issue or better a pull request and /cc @vcunat.</para></listitem> some apps aren't packaged/tested yet (asymptote, biber, etc.);
</para>
</listitem>
<listitem>
<para>
feature/bug: when a package is rejected by <varname>pkgFilter</varname>,
its dependencies are still propagated;
</para>
</listitem>
<listitem>
<para>
in case of any bugs or feature requests, file a github issue or better a
pull request and /cc @vcunat.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section>
</section> </section>
</section>

View file

@ -1,29 +1,24 @@
<book xmlns="http://docbook.org/ns/docbook" <book xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<info>
<info> <title>Nixpkgs Contributors Guide</title>
<subtitle>Version <xi:include href=".version" parse="text" />
<title>Nixpkgs Contributors Guide</title> </subtitle>
</info>
<subtitle>Version <xi:include href=".version" parse="text" /></subtitle> <xi:include href="introduction.chapter.xml" />
<xi:include href="quick-start.xml" />
</info> <xi:include href="stdenv.xml" />
<xi:include href="multiple-output.xml" />
<xi:include href="introduction.xml" /> <xi:include href="cross-compilation.xml" />
<xi:include href="quick-start.xml" /> <xi:include href="configuration.xml" />
<xi:include href="stdenv.xml" /> <xi:include href="functions.xml" />
<xi:include href="multiple-output.xml" /> <xi:include href="meta.xml" />
<xi:include href="cross-compilation.xml" /> <xi:include href="languages-frameworks/index.xml" />
<xi:include href="configuration.xml" /> <xi:include href="platform-notes.xml" />
<xi:include href="functions.xml" /> <xi:include href="package-notes.xml" />
<xi:include href="meta.xml" /> <xi:include href="overlays.xml" />
<xi:include href="languages-frameworks/index.xml" /> <xi:include href="coding-conventions.xml" />
<xi:include href="platform-notes.xml" /> <xi:include href="submitting-changes.xml" />
<xi:include href="package-notes.xml" /> <xi:include href="reviewing-contributions.xml" />
<xi:include href="overlays.xml" /> <xi:include href="contributing.xml" />
<xi:include href="coding-conventions.xml" />
<xi:include href="submitting-changes.xml" />
<xi:include href="reviewing-contributions.xml" />
<xi:include href="contributing.xml" />
</book> </book>

View file

@ -1,14 +1,12 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-meta"> xml:id="chap-meta">
<title>Meta-attributes</title>
<title>Meta-attributes</title> <para>
Nix packages can declare <emphasis>meta-attributes</emphasis> that contain
<para>Nix packages can declare <emphasis>meta-attributes</emphasis> information about a package such as a description, its homepage, its license,
that contain information about a package such as a description, its and so on. For instance, the GNU Hello package has a <varname>meta</varname>
homepage, its license, and so on. For instance, the GNU Hello package declaration like this:
has a <varname>meta</varname> declaration like this:
<programlisting> <programlisting>
meta = { meta = {
description = "A program that produces a familiar, friendly greeting"; description = "A program that produces a familiar, friendly greeting";
@ -22,16 +20,15 @@ meta = {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
</programlisting> </programlisting>
</para>
</para> <para>
Meta-attributes are not passed to the builder of the package. Thus, a change
<para>Meta-attributes are not passed to the builder of the package. to a meta-attribute doesnt trigger a recompilation of the package. The
Thus, a change to a meta-attribute doesnt trigger a recompilation of value of a meta-attribute must be a string.
the package. The value of a meta-attribute must be a string.</para> </para>
<para>
<para>The meta-attributes of a package can be queried from the The meta-attributes of a package can be queried from the command-line using
command-line using <command>nix-env</command>: <command>nix-env</command>:
<screen> <screen>
$ nix-env -qa hello --json $ nix-env -qa hello --json
{ {
@ -70,252 +67,299 @@ $ nix-env -qa hello --json
</screen> </screen>
<command>nix-env</command> knows about the <varname>description</varname>
<command>nix-env</command> knows about the field specifically:
<varname>description</varname> field specifically:
<screen> <screen>
$ nix-env -qa hello --description $ nix-env -qa hello --description
hello-2.3 A program that produces a familiar, friendly greeting hello-2.3 A program that produces a familiar, friendly greeting
</screen> </screen>
</para>
<section xml:id="sec-standard-meta-attributes">
<title>Standard meta-attributes</title>
</para> <para>
It is expected that each meta-attribute is one of the following:
</para>
<variablelist>
<section xml:id="sec-standard-meta-attributes"><title>Standard <varlistentry>
meta-attributes</title> <term><varname>description</varname>
</term>
<para>It is expected that each meta-attribute is one of the following:</para>
<variablelist>
<varlistentry>
<term><varname>description</varname></term>
<listitem><para>A short (one-line) description of the package.
This is shown by <command>nix-env -q --description</command> and
also on the Nixpkgs release pages.</para>
<para>Dont include a period at the end. Dont include newline
characters. Capitalise the first character. For brevity, dont
repeat the name of package — just describe what it does.</para>
<para>Wrong: <literal>"libpng is a library that allows you to decode PNG images."</literal></para>
<para>Right: <literal>"A library for decoding PNG images"</literal></para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>longDescription</varname></term>
<listitem><para>An arbitrarily long description of the
package.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>branch</varname></term>
<listitem><para>Release branch. Used to specify that a package is not
going to receive updates that are not in this branch; for example, Linux
kernel 3.0 is supposed to be updated to 3.0.X, not 3.1.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>homepage</varname></term>
<listitem><para>The packages homepage. Example:
<literal>http://www.gnu.org/software/hello/manual/</literal></para></listitem>
</varlistentry>
<varlistentry>
<term><varname>downloadPage</varname></term>
<listitem><para>The page where a link to the current version can be found. Example:
<literal>http://ftp.gnu.org/gnu/hello/</literal></para></listitem>
</varlistentry>
<varlistentry>
<term><varname>license</varname></term>
<listitem> <listitem>
<para> <para>
The license, or licenses, for the package. One from the attribute set A short (one-line) description of the package. This is shown by
defined in <link <command>nix-env -q --description</command> and also on the Nixpkgs
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix"> release pages.
<filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment </para>
using both a list of licenses and a single license is valid. If the <para>
license field is in the form of a list representation, then it means Dont include a period at the end. Dont include newline characters.
that parts of the package are licensed differently. Each license Capitalise the first character. For brevity, dont repeat the name of
should preferably be referenced by their attribute. The non-list package — just describe what it does.
attribute value can also be a space delimited string representation of </para>
the contained attribute shortNames or spdxIds. The following are all valid <para>
examples: Wrong: <literal>"libpng is a library that allows you to decode PNG
<itemizedlist> images."</literal>
<listitem><para>Single license referenced by attribute (preferred) </para>
<literal>stdenv.lib.licenses.gpl3</literal>. <para>
</para></listitem> Right: <literal>"A library for decoding PNG images"</literal>
<listitem><para>Single license referenced by its attribute shortName (frowned upon) </para>
<literal>"gpl3"</literal>.
</para></listitem>
<listitem><para>Single license referenced by its attribute spdxId (frowned upon)
<literal>"GPL-3.0"</literal>.
</para></listitem>
<listitem><para>Multiple licenses referenced by attribute (preferred)
<literal>with stdenv.lib.licenses; [ asl20 free ofl ]</literal>.
</para></listitem>
<listitem><para>Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon)
<literal>"asl20 free ofl"</literal>.
</para></listitem>
</itemizedlist>
For details, see <xref linkend='sec-meta-license'/>.
</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<varlistentry> <term><varname>longDescription</varname>
<term><varname>maintainers</varname></term> </term>
<listitem><para>A list of names and e-mail addresses of the <listitem>
maintainers of this Nix expression. If <para>
you would like to be a maintainer of a package, you may want to add An arbitrarily long description of the package.
yourself to <link </para>
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/maintainers.nix"><filename>nixpkgs/lib/maintainers.nix</filename></link> </listitem>
and write something like <literal>[ stdenv.lib.maintainers.alice </varlistentry>
stdenv.lib.maintainers.bob ]</literal>.</para></listitem> <varlistentry>
</varlistentry> <term><varname>branch</varname>
</term>
<varlistentry> <listitem>
<term><varname>priority</varname></term> <para>
<listitem><para>The <emphasis>priority</emphasis> of the package, Release branch. Used to specify that a package is not going to receive
used by <command>nix-env</command> to resolve file name conflicts updates that are not in this branch; for example, Linux kernel 3.0 is
between packages. See the Nix manual page for supposed to be updated to 3.0.X, not 3.1.
<command>nix-env</command> for details. Example: </para>
<literal>"10"</literal> (a low-priority </listitem>
package).</para></listitem> </varlistentry>
</varlistentry> <varlistentry>
<term><varname>homepage</varname>
<varlistentry> </term>
<term><varname>platforms</varname></term> <listitem>
<listitem><para>The list of Nix platform types on which the <para>
package is supported. Hydra builds packages according to the The packages homepage. Example:
platform specified. If no platform is specified, the package does <literal>http://www.gnu.org/software/hello/manual/</literal>
not have prebuilt binaries. An example is: </para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>downloadPage</varname>
</term>
<listitem>
<para>
The page where a link to the current version can be found. Example:
<literal>http://ftp.gnu.org/gnu/hello/</literal>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>license</varname>
</term>
<listitem>
<para>
The license, or licenses, for the package. One from the attribute set
defined in
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
<filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment
using both a list of licenses and a single license is valid. If the
license field is in the form of a list representation, then it means that
parts of the package are licensed differently. Each license should
preferably be referenced by their attribute. The non-list attribute value
can also be a space delimited string representation of the contained
attribute shortNames or spdxIds. The following are all valid examples:
<itemizedlist>
<listitem>
<para>
Single license referenced by attribute (preferred)
<literal>stdenv.lib.licenses.gpl3</literal>.
</para>
</listitem>
<listitem>
<para>
Single license referenced by its attribute shortName (frowned upon)
<literal>"gpl3"</literal>.
</para>
</listitem>
<listitem>
<para>
Single license referenced by its attribute spdxId (frowned upon)
<literal>"GPL-3.0"</literal>.
</para>
</listitem>
<listitem>
<para>
Multiple licenses referenced by attribute (preferred) <literal>with
stdenv.lib.licenses; [ asl20 free ofl ]</literal>.
</para>
</listitem>
<listitem>
<para>
Multiple licenses referenced as a space delimited string of attribute
shortNames (frowned upon) <literal>"asl20 free ofl"</literal>.
</para>
</listitem>
</itemizedlist>
For details, see <xref linkend='sec-meta-license'/>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>maintainers</varname>
</term>
<listitem>
<para>
A list of names and e-mail addresses of the maintainers of this Nix
expression. If you would like to be a maintainer of a package, you may
want to add yourself to
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link>
and write something like <literal>[ stdenv.lib.maintainers.alice
stdenv.lib.maintainers.bob ]</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>priority</varname>
</term>
<listitem>
<para>
The <emphasis>priority</emphasis> of the package, used by
<command>nix-env</command> to resolve file name conflicts between
packages. See the Nix manual page for <command>nix-env</command> for
details. Example: <literal>"10"</literal> (a low-priority package).
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>platforms</varname>
</term>
<listitem>
<para>
The list of Nix platform types on which the package is supported. Hydra
builds packages according to the platform specified. If no platform is
specified, the package does not have prebuilt binaries. An example is:
<programlisting> <programlisting>
meta.platforms = stdenv.lib.platforms.linux; meta.platforms = stdenv.lib.platforms.linux;
</programlisting> </programlisting>
Attribute Set <varname>stdenv.lib.platforms</varname> defines
Attribute Set <varname>stdenv.lib.platforms</varname> defines <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix">
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix"> various common lists</link> of platforms types.
various common lists</link> of platforms types.</para></listitem> </para>
</varlistentry> </listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>hydraPlatforms</varname></term> <term><varname>hydraPlatforms</varname>
<listitem><para>The list of Nix platform types for which the Hydra </term>
instance at <literal>hydra.nixos.org</literal> will build the <listitem>
package. (Hydra is the Nix-based continuous build system.) It <para>
defaults to the value of <varname>meta.platforms</varname>. Thus, The list of Nix platform types for which the Hydra instance at
the only reason to set <varname>meta.hydraPlatforms</varname> is <literal>hydra.nixos.org</literal> will build the package. (Hydra is the
if you want <literal>hydra.nixos.org</literal> to build the Nix-based continuous build system.) It defaults to the value of
package on a subset of <varname>meta.platforms</varname>, or not <varname>meta.platforms</varname>. Thus, the only reason to set
at all, e.g. <varname>meta.hydraPlatforms</varname> is if you want
<literal>hydra.nixos.org</literal> to build the package on a subset of
<varname>meta.platforms</varname>, or not at all, e.g.
<programlisting> <programlisting>
meta.platforms = stdenv.lib.platforms.linux; meta.platforms = stdenv.lib.platforms.linux;
meta.hydraPlatforms = []; meta.hydraPlatforms = [];
</programlisting> </programlisting>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>broken</varname>
</term>
<listitem>
<para>
If set to <literal>true</literal>, the package is marked as “broken”,
meaning that it wont show up in <literal>nix-env -qa</literal>, and
cannot be built or installed. Such packages should be removed from
Nixpkgs eventually unless they are fixed.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>updateWalker</varname>
</term>
<listitem>
<para>
If set to <literal>true</literal>, the package is tested to be updated
correctly by the <literal>update-walker.sh</literal> script without
additional settings. Such packages have <varname>meta.version</varname>
set and their homepage (or the page specified by
<varname>meta.downloadPage</varname>) contains a direct link to the
package tarball.
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section xml:id="sec-meta-license">
<title>Licenses</title>
</para></listitem> <para>
</varlistentry> The <varname>meta.license</varname> attribute should preferrably contain a
value from <varname>stdenv.lib.licenses</varname> defined in
<varlistentry> <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
<term><varname>broken</varname></term> <filename>nixpkgs/lib/licenses.nix</filename></link>, or in-place license
<listitem><para>If set to <literal>true</literal>, the package is description of the same format if the license is unlikely to be useful in
marked as “broken”, meaning that it wont show up in another expression.
<literal>nix-env -qa</literal>, and cannot be built or installed. </para>
Such packages should be removed from Nixpkgs eventually unless
they are fixed.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>updateWalker</varname></term>
<listitem><para>If set to <literal>true</literal>, the package is
tested to be updated correctly by the <literal>update-walker.sh</literal>
script without additional settings. Such packages have
<varname>meta.version</varname> set and their homepage (or
the page specified by <varname>meta.downloadPage</varname>) contains
a direct link to the package tarball.</para></listitem>
</varlistentry>
</variablelist>
</section>
<section xml:id="sec-meta-license"><title>Licenses</title>
<para>The <varname>meta.license</varname> attribute should preferrably contain
a value from <varname>stdenv.lib.licenses</varname> defined in
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
<filename>nixpkgs/lib/licenses.nix</filename></link>,
or in-place license description of the same format if the license is
unlikely to be useful in another expression.</para>
<para>Although it's typically better to indicate the specific license,
a few generic options are available:
<variablelist>
<varlistentry>
<term><varname>stdenv.lib.licenses.free</varname>,
<varname>"free"</varname></term>
<listitem><para>Catch-all for free software licenses not listed
above.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>,
<varname>"unfree-redistributable"</varname></term>
<listitem><para>Unfree package that can be redistributed in binary
form. That is, its legal to redistribute the
<emphasis>output</emphasis> of the derivation. This means that
the package can be included in the Nixpkgs
channel.</para>
<para>Sometimes proprietary software can only be redistributed
unmodified. Make sure the builder doesnt actually modify the
original binaries; otherwise were breaking the license. For
instance, the NVIDIA X11 drivers can be redistributed unmodified,
but our builder applies <command>patchelf</command> to make them
work. Thus, its license is <varname>"unfree"</varname> and it
cannot be included in the Nixpkgs channel.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>stdenv.lib.licenses.unfree</varname>,
<varname>"unfree"</varname></term>
<listitem><para>Unfree package that cannot be redistributed. You
can build it yourself, but you cannot redistribute the output of
the derivation. Thus it cannot be included in the Nixpkgs
channel.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>,
<varname>"unfree-redistributable-firmware"</varname></term>
<listitem><para>This package supplies unfree, redistributable
firmware. This is a separate value from
<varname>unfree-redistributable</varname> because not everybody
cares whether firmware is free.</para></listitem>
</varlistentry>
</variablelist>
</para>
</section>
<para>
Although it's typically better to indicate the specific license, a few
generic options are available:
<variablelist>
<varlistentry>
<term><varname>stdenv.lib.licenses.free</varname>,
<varname>"free"</varname>
</term>
<listitem>
<para>
Catch-all for free software licenses not listed above.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>,
<varname>"unfree-redistributable"</varname>
</term>
<listitem>
<para>
Unfree package that can be redistributed in binary form. That is, its
legal to redistribute the <emphasis>output</emphasis> of the derivation.
This means that the package can be included in the Nixpkgs channel.
</para>
<para>
Sometimes proprietary software can only be redistributed unmodified.
Make sure the builder doesnt actually modify the original binaries;
otherwise were breaking the license. For instance, the NVIDIA X11
drivers can be redistributed unmodified, but our builder applies
<command>patchelf</command> to make them work. Thus, its license is
<varname>"unfree"</varname> and it cannot be included in the Nixpkgs
channel.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>stdenv.lib.licenses.unfree</varname>,
<varname>"unfree"</varname>
</term>
<listitem>
<para>
Unfree package that cannot be redistributed. You can build it yourself,
but you cannot redistribute the output of the derivation. Thus it cannot
be included in the Nixpkgs channel.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>,
<varname>"unfree-redistributable-firmware"</varname>
</term>
<listitem>
<para>
This package supplies unfree, redistributable firmware. This is a
separate value from <varname>unfree-redistributable</varname> because
not everybody cares whether firmware is free.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</section>
</chapter> </chapter>

View file

@ -5,99 +5,319 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-multiple-output"> xml:id="chap-multiple-output">
<title>Multiple-output packages</title>
<section>
<title>Introduction</title>
<title>Multiple-output packages</title> <para>
The Nix language allows a derivation to produce multiple outputs, which is
similar to what is utilized by other Linux distribution packaging systems.
The outputs reside in separate nix store paths, so they can be mostly
handled independently of each other, including passing to build inputs,
garbage collection or binary substitution. The exception is that building
from source always produces all the outputs.
</para>
<section><title>Introduction</title> <para>
<para>The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs.</para> The main motivation is to save disk space by reducing runtime closure sizes;
<para>The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less.</para> consequently also sizes of substituted binaries get reduced. Splitting can
<note><para>The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.</para></note> be used to have more granular runtime dependencies, for example the typical
</section> reduction is to split away development-only files, as those are typically
not needed during runtime. As a result, closure sizes of many packages can
get reduced to a half or even much less.
</para>
<note>
<para>
The reduction effects could be instead achieved by building the parts in
completely separate derivations. That would often additionally reduce
build-time closures, but it tends to be much harder to write such
derivations, as build systems typically assume all parts are being built at
once. This compromise approach of single source package producing multiple
binary packages is also utilized often by rpm and deb.
</para>
</note>
</section>
<section>
<title>Installing a split package</title>
<para>
When installing a package via <varname>systemPackages</varname> or
<command>nix-env</command> you have several options:
</para>
<section><title>Installing a split package</title>
<para>When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options:</para>
<itemizedlist> <itemizedlist>
<listitem><para>You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The <varname>outputs</varname> attribute contains a list of output names.</para></listitem> <listitem>
<listitem><para>You can let it use the default outputs. These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names.</para> <para>
<para>TODO: more about tweaking the attribute, etc.</para></listitem> You can install particular outputs explicitly, as each is available in the
<listitem><para>NixOS provides configuration option <varname>environment.extraOutputsToInstall</varname> that allows adding extra outputs of <varname>environment.systemPackages</varname> atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options.</para> Nix language as an attribute of the package. The
<note><para>At this moment there is no similar configurability for packages installed by <command>nix-env</command>. You can still use approach from <xref linkend="sec-modify-via-packageOverrides" /> to override <varname>meta.outputsToInstall</varname> attributes, but that's a rather inconvenient way.</para></note> <varname>outputs</varname> attribute contains a list of output names.
</listitem> </para>
</listitem>
<listitem>
<para>
You can let it use the default outputs. These are handled by
<varname>meta.outputsToInstall</varname> attribute that contains a list of
output names.
</para>
<para>
TODO: more about tweaking the attribute, etc.
</para>
</listitem>
<listitem>
<para>
NixOS provides configuration option
<varname>environment.extraOutputsToInstall</varname> that allows adding
extra outputs of <varname>environment.systemPackages</varname> atop the
default ones. It's mainly meant for documentation and debug symbols, and
it's also modified by specific options.
</para>
<note>
<para>
At this moment there is no similar configurability for packages installed
by <command>nix-env</command>. You can still use approach from
<xref linkend="sec-modify-via-packageOverrides" /> to override
<varname>meta.outputsToInstall</varname> attributes, but that's a rather
inconvenient way.
</para>
</note>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section>
<title>Using a split package</title>
<section><title>Using a split package</title> <para>
<para>In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs.</para> In the Nix language the individual outputs can be reached explicitly as
<para>When a multiple-output derivation gets into a build input of another derivation, the <varname>dev</varname> output is added if it exists, otherwise the first output is added. In addition to that, <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are also added. (See <xref linkend="multiple-output-file-type-groups" />.)</para> attributes, e.g. <varname>coreutils.info</varname>, but the typical case is
</section> just using packages as build inputs.
</para>
<para>
When a multiple-output derivation gets into a build input of another
derivation, the <varname>dev</varname> output is added if it exists,
otherwise the first output is added. In addition to that,
<varname>propagatedBuildOutputs</varname> of that package which by default
contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are
also added. (See <xref linkend="multiple-output-file-type-groups" />.)
</para>
</section>
<section>
<title>Writing a split derivation</title>
<section><title>Writing a split derivation</title> <para>
<para>Here you find how to write a derivation that produces multiple outputs.</para> Here you find how to write a derivation that produces multiple outputs.
<para>In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in &lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;; it's relatively well-readable. The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings).</para> </para>
<programlisting>outputs = [ "bin" "dev" "out" "doc" ];</programlisting>
<para>Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should contain the executable programs provided by the package as that output is used by Nix in string conversions, allowing references to binaries like <literal>${pkgs.perl}/bin/perl</literal> to always work. Typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para>
<note><para>There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />.</para></note> <para>
In nixpkgs there is a framework supporting multiple-output derivations. It
tries to cover most cases by default behavior. You can find the source
separated in
&lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;;
it's relatively well-readable. The whole machinery is triggered by defining
the <varname>outputs</varname> attribute to contain the list of desired
output names (strings).
</para>
<programlisting>outputs = [ "bin" "dev" "out" "doc" ];</programlisting>
<para>
Often such a single line is enough. For each output an equally named
environment variable is passed to the builder and contains the path in nix
store for that output. Typically you also want to have the main
<varname>out</varname> output, as it catches any files that didn't get
elsewhere.
</para>
<note>
<para>
There is a special handling of the <varname>debug</varname> output,
described at <xref linkend="stdenv-separateDebugInfo" />.
</para>
</note>
<section xml:id="multiple-output-file-binaries-first-convention">
<title><quote>Binaries first</quote></title>
<para>
A commonly adopted convention in <literal>nixpkgs</literal> is that
executables provided by the package are contained within its first output.
This convention allows the dependent packages to reference the executables
provided by packages in a uniform manner. For instance, provided with the
knowledge that the <literal>perl</literal> package contains a
<literal>perl</literal> executable it can be referenced as
<literal>${pkgs.perl}/bin/perl</literal> within a Nix derivation that needs
to execute a Perl script.
</para>
<para>
The <literal>glibc</literal> package is a deliberate single exception to
the <quote>binaries first</quote> convention. The <literal>glibc</literal>
has <literal>libs</literal> as its first output allowing the libraries
provided by <literal>glibc</literal> to be referenced directly (e.g.
<literal>${stdenv.glibc}/lib/ld-linux-x86-64.so.2</literal>). The
executables provided by <literal>glibc</literal> can be accessed via its
<literal>bin</literal> attribute (e.g.
<literal>${stdenv.glibc.bin}/bin/ldd</literal>).
</para>
<para>
The reason for why <literal>glibc</literal> deviates from the convention is
because referencing a library provided by <literal>glibc</literal> is a
very common operation among Nix packages. For instance, third-party
executables packaged by Nix are typically patched and relinked with the
relevant version of <literal>glibc</literal> libraries from Nix packages
(please see the documentation on
<link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more
details).
</para>
</section>
<section xml:id="multiple-output-file-type-groups"> <section xml:id="multiple-output-file-type-groups">
<title>File type groups</title> <title>File type groups</title>
<para>The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an <varname>outputFoo</varname> variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed &ndash; a default output name is defined, falling back to other possibilities if the output isn't defined.</para>
<variablelist>
<varlistentry><term><varname> <para>
$outputDev</varname></term><listitem><para> The support code currently recognizes some particular kinds of outputs and
is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to <varname>dev</varname> or <varname>out</varname> by default. either instructs the build system of the package to put files into their
</para></listitem> desired outputs or it moves the files during the fixup phase. Each group of
</varlistentry> file types has an <varname>outputFoo</varname> variable specifying the
output name where they should go. If that variable isn't defined by the
derivation writer, it is guessed &ndash; a default output name is defined,
falling back to other possibilities if the output isn't defined.
</para>
<varlistentry><term><varname> <variablelist>
$outputBin</varname></term><listitem><para> <varlistentry>
is meant for user-facing binaries, typically residing in bin/. They go to <varname>bin</varname> or <varname>out</varname> by default. <term><varname>
</para></listitem></varlistentry> $outputDev</varname>
</term>
<varlistentry><term><varname> <listitem>
$outputLib</varname></term><listitem><para> <para>
is meant for libraries, typically residing in <filename>lib/</filename> and <filename>libexec/</filename>. They go to <varname>lib</varname> or <varname>out</varname> by default. is for development-only files. These include C(++) headers, pkg-config,
</para></listitem></varlistentry> cmake and aclocal files. They go to <varname>dev</varname> or
<varname>out</varname> by default.
<varlistentry><term><varname> </para>
$outputDoc</varname></term><listitem><para> </listitem>
is for user documentation, typically residing in <filename>share/doc/</filename>. It goes to <varname>doc</varname> or <varname>out</varname> by default. </varlistentry>
</para></listitem></varlistentry> <varlistentry>
<term><varname>
<varlistentry><term><varname> $outputBin</varname>
$outputDevdoc</varname></term><listitem><para> </term>
is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. <listitem>
</para></listitem></varlistentry> <para>
is meant for user-facing binaries, typically residing in bin/. They go
<varlistentry><term><varname> to <varname>bin</varname> or <varname>out</varname> by default.
$outputMan</varname></term><listitem><para> </para>
is for man pages (except for section 3). They go to <varname>man</varname> or <varname>$outputBin</varname> by default. </listitem>
</para></listitem></varlistentry> </varlistentry>
<varlistentry>
<varlistentry><term><varname> <term><varname>
$outputDevman</varname></term><listitem><para> $outputLib</varname>
is for section 3 man pages. They go to <varname>devman</varname> or <varname>$outputMan</varname> by default. </term>
</para></listitem></varlistentry> <listitem>
<para>
<varlistentry><term><varname> is meant for libraries, typically residing in <filename>lib/</filename>
$outputInfo</varname></term><listitem><para> and <filename>libexec/</filename>. They go to <varname>lib</varname> or
is for info pages. They go to <varname>info</varname> or <varname>$outputBin</varname> by default. <varname>out</varname> by default.
</para></listitem></varlistentry> </para>
</listitem>
</variablelist> </varlistentry>
<varlistentry>
<term><varname>
$outputDoc</varname>
</term>
<listitem>
<para>
is for user documentation, typically residing in
<filename>share/doc/</filename>. It goes to <varname>doc</varname> or
<varname>out</varname> by default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>
$outputDevdoc</varname>
</term>
<listitem>
<para>
is for <emphasis>developer</emphasis> documentation. Currently we count
gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname>
or is removed (!) by default. This is because e.g. gtk-doc tends to be
rather large and completely unused by nixpkgs users.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>
$outputMan</varname>
</term>
<listitem>
<para>
is for man pages (except for section 3). They go to
<varname>man</varname> or <varname>$outputBin</varname> by default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>
$outputDevman</varname>
</term>
<listitem>
<para>
is for section 3 man pages. They go to <varname>devman</varname> or
<varname>$outputMan</varname> by default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>
$outputInfo</varname>
</term>
<listitem>
<para>
is for info pages. They go to <varname>info</varname> or
<varname>$outputBin</varname> by default.
</para>
</listitem>
</varlistentry>
</variablelist>
</section> </section>
<section><title>Common caveats</title> <section>
<itemizedlist> <title>Common caveats</title>
<listitem><para>Some configure scripts don't like some of the parameters passed by default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You can disable this by setting <literal>setOutputFlags = false;</literal>.</para></listitem>
<listitem><para>The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.)</para></listitem> <itemizedlist>
<listitem><para>Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into <varname>out</varname>, e.g. locale strings, so there is often no advantage in separating the libraries into <varname>lib</varname>, as keeping them in <varname>out</varname> is easier.</para></listitem> <listitem>
<listitem><para>Some packages have hidden assumptions on install paths, which complicates splitting.</para></listitem> <para>
</itemizedlist> Some configure scripts don't like some of the parameters passed by
default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You
can disable this by setting <literal>setOutputFlags = false;</literal>.
</para>
</listitem>
<listitem>
<para>
The outputs of a single derivation can retain references to each other,
but note that circular references are not allowed. (And each
strongly-connected component would act as a single output anyway.)
</para>
</listitem>
<listitem>
<para>
Most of split packages contain their core functionality in libraries.
These libraries tend to refer to various kind of data that typically gets
into <varname>out</varname>, e.g. locale strings, so there is often no
advantage in separating the libraries into <varname>lib</varname>, as
keeping them in <varname>out</varname> is easier.
</para>
</listitem>
<listitem>
<para>
Some packages have hidden assumptions on install paths, which complicates
splitting.
</para>
</listitem>
</itemizedlist>
</section> </section>
</section>
</section><!--Writing a split derivation--> <!--Writing a split derivation-->
</chapter> </chapter>

View file

@ -1,95 +1,117 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-overlays"> xml:id="chap-overlays">
<title>Overlays</title>
<title>Overlays</title> <para>
This chapter describes how to extend and change Nixpkgs packages using
<para>This chapter describes how to extend and change Nixpkgs packages using overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to
overlays. Overlays are used to add layers in the fix-point used by Nixpkgs compose the set of all packages.
to compose the set of all packages.</para> </para>
<para>
<para>Nixpkgs can be configured with a list of overlays, which are Nixpkgs can be configured with a list of overlays, which are applied in
applied in order. This means that the order of the overlays can be significant order. This means that the order of the overlays can be significant if
if multiple layers override the same package.</para> multiple layers override the same package.
</para>
<!--============================================================--> <!--============================================================-->
<section xml:id="sec-overlays-install">
<title>Installing overlays</title>
<section xml:id="sec-overlays-install"> <para>
<title>Installing overlays</title> The list of overlays is determined as follows.
</para>
<para>The list of overlays is determined as follows.</para> <para>
If the <varname>overlays</varname> argument is not provided explicitly, we
look for overlays in a path. The path is determined as follows:
<orderedlist>
<listitem>
<para>
First, if an <varname>overlays</varname> argument to the nixpkgs function
itself is given, then that is used.
</para>
<para>
This can be passed explicitly when importing nipxkgs, for example
<literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ];
}</literal>.
</para>
</listitem>
<listitem>
<para>
Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal>
exists, we look for overlays at that path, as described below.
</para>
<para>
See the section on <literal>NIX_PATH</literal> in the Nix manual for more
details on how to set a value for
<literal>&lt;nixpkgs-overlays>.</literal>
</para>
</listitem>
<listitem>
<para>
If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
<filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for
overlays at that path, as described below. It is an error if both exist.
</para>
</listitem>
</orderedlist>
</para>
<para>If the <varname>overlays</varname> argument is not provided explicitly, we look for overlays in a path. The path <para>
is determined as follows: If we are looking for overlays at a path, then there are two cases:
<itemizedlist>
<listitem>
<para>
If the path is a file, then the file is imported as a Nix expression and
used as the list of overlays.
</para>
</listitem>
<listitem>
<para>
If the path is a directory, then we take the content of the directory,
order it lexicographically, and attempt to interpret each as an overlay
by:
<itemizedlist>
<listitem>
<para>
Importing the file, if it is a <literal>.nix</literal> file.
</para>
</listitem>
<listitem>
<para>
Importing a top-level <filename>default.nix</filename> file, if it is
a directory.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</para>
<orderedlist> <para>
On a NixOS system the value of the <literal>nixpkgs.overlays</literal>
<listitem> option, if present, is passed to the system Nixpkgs directly as an argument.
<para>First, if an <varname>overlays</varname> argument to the nixpkgs function itself is given, Note that this does not affect the overlays for non-NixOS operations (e.g.
then that is used.</para> <literal>nix-env</literal>), which are looked up independently.
</para>
<para>This can be passed explicitly when importing nipxkgs, for example
<literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ]; }</literal>.</para>
</listitem>
<listitem>
<para>Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal> exists, we look for overlays
at that path, as described below.</para>
<para>See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to
set a value for <literal>&lt;nixpkgs-overlays>.</literal></para>
</listitem>
<listitem>
<para>If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
<filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for overlays at that path, as
described below. It is an error if both exist.</para>
</listitem>
</orderedlist>
</para>
<para>If we are looking for overlays at a path, then there are two cases:
<itemizedlist>
<listitem>
<para>If the path is a file, then the file is imported as a Nix expression and used as the list of
overlays.</para>
</listitem>
<listitem>
<para>If the path is a directory, then we take the content of the directory, order it
lexicographically, and attempt to interpret each as an overlay by:
<itemizedlist>
<listitem>
<para>Importing the file, if it is a <literal>.nix</literal> file.</para>
</listitem>
<listitem>
<para>Importing a top-level <filename>default.nix</filename> file, if it is a directory.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</para>
<para>On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present,
is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for
non-NixOS operations (e.g. <literal>nix-env</literal>), which are looked up independently.</para>
<para>The <filename>overlays.nix</filename> option therefore provides a convenient way to use the same
overlays for a NixOS system configuration and user configuration: the same file can be used
as <filename>overlays.nix</filename> and imported as the value of <literal>nixpkgs.overlays</literal>.</para>
</section>
<para>
The <filename>overlays.nix</filename> option therefore provides a convenient
way to use the same overlays for a NixOS system configuration and user
configuration: the same file can be used as
<filename>overlays.nix</filename> and imported as the value of
<literal>nixpkgs.overlays</literal>.
</para>
</section>
<!--============================================================--> <!--============================================================-->
<section xml:id="sec-overlays-definition">
<title>Defining overlays</title>
<section xml:id="sec-overlays-definition"> <para>
<title>Defining overlays</title> Overlays are Nix functions which accept two arguments, conventionally called
<varname>self</varname> and <varname>super</varname>, and return a set of
<para>Overlays are Nix functions which accept two arguments, packages. For example, the following is a valid overlay.
conventionally called <varname>self</varname> and <varname>super</varname>, </para>
and return a set of packages. For example, the following is a valid overlay.</para>
<programlisting> <programlisting>
self: super: self: super:
@ -104,31 +126,39 @@ self: super:
} }
</programlisting> </programlisting>
<para>The first argument (<varname>self</varname>) corresponds to the final package <para>
set. You should use this set for the dependencies of all packages specified in your The first argument (<varname>self</varname>) corresponds to the final
overlay. For example, all the dependencies of <varname>rr</varname> in the example above come package set. You should use this set for the dependencies of all packages
from <varname>self</varname>, as well as the overridden dependencies used in the specified in your overlay. For example, all the dependencies of
<varname>boost</varname> override.</para> <varname>rr</varname> in the example above come from
<varname>self</varname>, as well as the overridden dependencies used in the
<varname>boost</varname> override.
</para>
<para>The second argument (<varname>super</varname>) <para>
corresponds to the result of the evaluation of the previous stages of The second argument (<varname>super</varname>) corresponds to the result of
Nixpkgs. It does not contain any of the packages added by the current the evaluation of the previous stages of Nixpkgs. It does not contain any of
overlay, nor any of the following overlays. This set should be used either the packages added by the current overlay, nor any of the following
to refer to packages you wish to override, or to access functions defined overlays. This set should be used either to refer to packages you wish to
in Nixpkgs. For example, the original recipe of <varname>boost</varname> override, or to access functions defined in Nixpkgs. For example, the
in the above example, comes from <varname>super</varname>, as well as the original recipe of <varname>boost</varname> in the above example, comes from
<varname>callPackage</varname> function.</para> <varname>super</varname>, as well as the <varname>callPackage</varname>
function.
</para>
<para>The value returned by this function should be a set similar to <para>
<filename>pkgs/top-level/all-packages.nix</filename>, containing The value returned by this function should be a set similar to
overridden and/or new packages.</para> <filename>pkgs/top-level/all-packages.nix</filename>, containing overridden
and/or new packages.
<para>Overlays are similar to other methods for customizing Nixpkgs, in particular </para>
the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>.
Indeed, <literal>packageOverrides</literal> acts as an overlay with only the
<varname>super</varname> argument. It is therefore appropriate for basic use,
but overlays are more powerful and easier to distribute.</para>
</section>
<para>
Overlays are similar to other methods for customizing Nixpkgs, in particular
the <literal>packageOverrides</literal> attribute described in
<xref linkend="sec-modify-via-packageOverrides"/>. Indeed,
<literal>packageOverrides</literal> acts as an overlay with only the
<varname>super</varname> argument. It is therefore appropriate for basic
use, but overlays are more powerful and easier to distribute.
</para>
</section>
</chapter> </chapter>

9
doc/overrides.css Normal file
View file

@ -0,0 +1,9 @@
.docbook .xref img[src^=images\/callouts\/],
.screen img,
.programlisting img {
width: 1em;
}
.calloutlist img {
width: 1.5em;
}

File diff suppressed because it is too large Load diff

View file

@ -1,27 +1,25 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-platform-nodes"> xml:id="chap-platform-nodes">
<title>Platform Notes</title>
<section xml:id="sec-darwin">
<title>Darwin (macOS)</title>
<title>Platform Notes</title> <para>
Some common issues when packaging software for darwin:
</para>
<section xml:id="sec-darwin"> <itemizedlist>
<listitem>
<title>Darwin (macOS)</title>
<para>Some common issues when packaging software for darwin:</para>
<itemizedlist>
<listitem>
<para> <para>
The darwin <literal>stdenv</literal> uses clang instead of gcc. The darwin <literal>stdenv</literal> uses clang instead of gcc. When
When referring to the compiler <varname>$CC</varname> or <command>cc</command> referring to the compiler <varname>$CC</varname> or <command>cc</command>
will work in both cases. Some builds hardcode gcc/g++ in their will work in both cases. Some builds hardcode gcc/g++ in their build
build scripts, that can usually be fixed with using something scripts, that can usually be fixed with using something like
like <literal>makeFlags = [ "CC=cc" ];</literal> or by patching <literal>makeFlags = [ "CC=cc" ];</literal> or by patching the build
the build scripts. scripts.
</para> </para>
<programlisting>
<programlisting>
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libfoo-1.2.3"; name = "libfoo-1.2.3";
# ... # ...
@ -30,36 +28,33 @@
''; '';
} }
</programlisting> </programlisting>
</listitem> </listitem>
<listitem>
<listitem>
<para> <para>
On darwin libraries are linked using absolute paths, libraries On darwin libraries are linked using absolute paths, libraries are
are resolved by their <literal>install_name</literal> at link resolved by their <literal>install_name</literal> at link time. Sometimes
time. Sometimes packages won't set this correctly causing the packages won't set this correctly causing the library lookups to fail at
library lookups to fail at runtime. This can be fixed by adding runtime. This can be fixed by adding extra linker flags or by running
extra linker flags or by running <command>install_name_tool -id</command> <command>install_name_tool -id</command> during the
during the <function>fixupPhase</function>. <function>fixupPhase</function>.
</para> </para>
<programlisting>
<programlisting>
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libfoo-1.2.3"; name = "libfoo-1.2.3";
# ... # ...
makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
} }
</programlisting> </programlisting>
</listitem> </listitem>
<listitem>
<listitem>
<para> <para>
Some packages assume xcode is available and use <command>xcrun</command> Some packages assume xcode is available and use <command>xcrun</command>
to resolve build tools like <command>clang</command>, etc. to resolve build tools like <command>clang</command>, etc. This causes
This causes errors like <code>xcode-select: error: no developer tools were found at '/Applications/Xcode.app'</code> errors like <code>xcode-select: error: no developer tools were found at
while the build doesn't actually depend on xcode. '/Applications/Xcode.app'</code> while the build doesn't actually depend
on xcode.
</para> </para>
<programlisting>
<programlisting>
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libfoo-1.2.3"; name = "libfoo-1.2.3";
# ... # ...
@ -69,15 +64,12 @@
''; '';
} }
</programlisting> </programlisting>
<para> <para>
The package <literal>xcbuild</literal> can be used to build projects The package <literal>xcbuild</literal> can be used to build projects that
that really depend on Xcode, however projects that build some kind of really depend on Xcode, however projects that build some kind of graphical
graphical interface won't work without using Xcode in an impure way. interface won't work without using Xcode in an impure way.
</para> </para>
</listitem> </listitem>
</itemizedlist>
</itemizedlist> </section>
</section>
</chapter> </chapter>

View file

@ -1,223 +1,219 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-quick-start"> xml:id="chap-quick-start">
<title>Quick Start to Adding a Package</title>
<title>Quick Start to Adding a Package</title> <para>
To add a package to Nixpkgs:
<para>To add a package to Nixpkgs: <orderedlist>
<listitem>
<orderedlist> <para>
Checkout the Nixpkgs source tree:
<listitem>
<para>Checkout the Nixpkgs source tree:
<screen> <screen>
$ git clone git://github.com/NixOS/nixpkgs.git $ git clone git://github.com/NixOS/nixpkgs.git
$ cd nixpkgs</screen> $ cd nixpkgs</screen>
</para> </para>
</listitem> </listitem>
<listitem>
<listitem> <para>
<para>Find a good place in the Nixpkgs tree to add the Nix Find a good place in the Nixpkgs tree to add the Nix expression for your
expression for your package. For instance, a library package package. For instance, a library package typically goes into
typically goes into <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>,
<filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>, while a web browser goes into
while a web browser goes into <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>.
<filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>. See <xref linkend="sec-organisation" /> for some hints on the tree
See <xref linkend="sec-organisation" /> for some hints on the tree organisation. Create a directory for your package, e.g.
organisation. Create a directory for your package, e.g.
<screen> <screen>
$ mkdir pkgs/development/libraries/libfoo</screen> $ mkdir pkgs/development/libraries/libfoo</screen>
</para> </para>
</listitem> </listitem>
<listitem>
<listitem> <para>
<para>In the package directory, create a Nix expression — a piece In the package directory, create a Nix expression — a piece of code that
of code that describes how to build the package. In this case, it describes how to build the package. In this case, it should be a
should be a <emphasis>function</emphasis> that is called with the <emphasis>function</emphasis> that is called with the package dependencies
package dependencies as arguments, and returns a build of the as arguments, and returns a build of the package in the Nix store. The
package in the Nix store. The expression should usually be called expression should usually be called <filename>default.nix</filename>.
<filename>default.nix</filename>.
<screen> <screen>
$ emacs pkgs/development/libraries/libfoo/default.nix $ emacs pkgs/development/libraries/libfoo/default.nix
$ git add pkgs/development/libraries/libfoo/default.nix</screen> $ git add pkgs/development/libraries/libfoo/default.nix</screen>
</para> </para>
<para>
<para>You can have a look at the existing Nix expressions under You can have a look at the existing Nix expressions under
<filename>pkgs/</filename> to see how its done. Here are some <filename>pkgs/</filename> to see how its done. Here are some good
good ones: ones:
<itemizedlist>
<itemizedlist> <listitem>
<para>
<listitem> GNU Hello:
<para>GNU Hello: <link <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>.
Trivial package, which specifies some <varname>meta</varname> Trivial package, which specifies some <varname>meta</varname>
attributes which is good practice.</para> attributes which is good practice.
</listitem> </para>
</listitem>
<listitem> <listitem>
<para>GNU cpio: <link <para>
GNU cpio:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
Also a simple package. The generic builder in Also a simple package. The generic builder in <varname>stdenv</varname>
<varname>stdenv</varname> does everything for you. It has does everything for you. It has no dependencies beyond
no dependencies beyond <varname>stdenv</varname>.</para> <varname>stdenv</varname>.
</listitem> </para>
</listitem>
<listitem> <listitem>
<para>GNU Multiple Precision arithmetic library (GMP): <link <para>
GNU Multiple Precision arithmetic library (GMP):
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>.
Also done by the generic builder, but has a dependency on Also done by the generic builder, but has a dependency on
<varname>m4</varname>.</para> <varname>m4</varname>.
</listitem> </para>
</listitem>
<listitem> <listitem>
<para>Pan, a GTK-based newsreader: <link <para>
Pan, a GTK-based newsreader:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
Has an optional dependency on <varname>gtkspell</varname>, Has an optional dependency on <varname>gtkspell</varname>, which is
which is only built if <varname>spellCheck</varname> is only built if <varname>spellCheck</varname> is <literal>true</literal>.
<literal>true</literal>.</para> </para>
</listitem> </listitem>
<listitem>
<listitem> <para>
<para>Apache HTTPD: <link Apache HTTPD:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix"><filename>pkgs/servers/http/apache-httpd/2.4.nix</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix"><filename>pkgs/servers/http/apache-httpd/2.4.nix</filename></link>.
A bunch of optional features, variable substitutions in the A bunch of optional features, variable substitutions in the configure
configure flags, a post-install hook, and miscellaneous flags, a post-install hook, and miscellaneous hackery.
hackery.</para> </para>
</listitem> </listitem>
<listitem>
<listitem> <para>
<para>Thunderbird: <link Thunderbird:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>.
Lots of dependencies.</para> Lots of dependencies.
</listitem> </para>
</listitem>
<listitem> <listitem>
<para>JDiskReport, a Java utility: <link <para>
JDiskReport, a Java utility:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link> xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
(and the <link (and the
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>). xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
Nixpkgs doesnt have a decent <varname>stdenv</varname> for Nixpkgs doesnt have a decent <varname>stdenv</varname> for Java yet
Java yet so this is pretty ad-hoc.</para> so this is pretty ad-hoc.
</listitem> </para>
</listitem>
<listitem> <listitem>
<para>XML::Simple, a Perl module: <link <para>
XML::Simple, a Perl module:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link> xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
(search for the <varname>XMLSimple</varname> attribute). (search for the <varname>XMLSimple</varname> attribute). Most Perl
Most Perl modules are so simple to build that they are modules are so simple to build that they are defined directly in
defined directly in <filename>perl-packages.nix</filename>; <filename>perl-packages.nix</filename>; no need to make a separate file
no need to make a separate file for them.</para> for them.
</listitem> </para>
</listitem>
<listitem> <listitem>
<para>Adobe Reader: <link <para>
Adobe Reader:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
Shows how binary-only packages can be supported. In Shows how binary-only packages can be supported. In particular the
particular the <link <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link> xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
uses <command>patchelf</command> to set the RUNPATH and ELF uses <command>patchelf</command> to set the RUNPATH and ELF interpreter
interpreter of the executables so that the right libraries of the executables so that the right libraries are found at runtime.
are found at runtime.</para> </para>
</listitem> </listitem>
</itemizedlist>
</itemizedlist>
</para> </para>
<para>
<para>Some notes: Some notes:
<itemizedlist>
<itemizedlist> <listitem>
<para>
<listitem> All <varname linkend="chap-meta">meta</varname> attributes are
<para>All <varname linkend="chap-meta">meta</varname> optional, but its still a good idea to provide at least the
attributes are optional, but its still a good idea to <varname>description</varname>, <varname>homepage</varname> and
provide at least the <varname>description</varname>, <varname
<varname>homepage</varname> and <varname linkend="sec-meta-license">license</varname>.
linkend="sec-meta-license">license</varname>.</para> </para>
</listitem> </listitem>
<listitem>
<listitem> <para>
<para>You can use <command>nix-prefetch-url</command> (or similar nix-prefetch-git, etc) You can use <command>nix-prefetch-url</command> (or similar
<replaceable>url</replaceable> to get the SHA-256 hash of nix-prefetch-git, etc) <replaceable>url</replaceable> to get the
source distributions. There are similar commands as <command>nix-prefetch-git</command> and SHA-256 hash of source distributions. There are similar commands as
<command>nix-prefetch-hg</command> available in <literal>nix-prefetch-scripts</literal> package.</para> <command>nix-prefetch-git</command> and
</listitem> <command>nix-prefetch-hg</command> available in
<literal>nix-prefetch-scripts</literal> package.
<listitem> </para>
<para>A list of schemes for <literal>mirror://</literal> </listitem>
URLs can be found in <link <listitem>
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para> <para>
</listitem> A list of schemes for <literal>mirror://</literal> URLs can be found in
<link
</itemizedlist> xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.
</para>
</listitem>
</itemizedlist>
</para> </para>
<para>
<para>The exact syntax and semantics of the Nix expression The exact syntax and semantics of the Nix expression language, including
language, including the built-in function, are described in the the built-in function, are described in the Nix manual in the
Nix manual in the <link <link
xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
on writing Nix expressions</link>.</para> on writing Nix expressions</link>.
</para>
</listitem> </listitem>
<listitem>
<listitem> <para>
<para>Add a call to the function defined in the previous step to Add a call to the function defined in the previous step to
<link <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link> xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
with some descriptive name for the variable, with some descriptive name for the variable, e.g.
e.g. <varname>libfoo</varname>. <varname>libfoo</varname>.
<screen>
<screen>
$ emacs pkgs/top-level/all-packages.nix</screen> $ emacs pkgs/top-level/all-packages.nix</screen>
</para> </para>
<para>
<para>The attributes in that file are sorted by category (like The attributes in that file are sorted by category (like “Development /
“Development / Libraries”) that more-or-less correspond to the Libraries”) that more-or-less correspond to the directory structure of
directory structure of Nixpkgs, and then by attribute name.</para> Nixpkgs, and then by attribute name.
</listitem> </para>
</listitem>
<listitem> <listitem>
<para>To test whether the package builds, run the following command <para>
from the root of the nixpkgs source tree: To test whether the package builds, run the following command from the
root of the nixpkgs source tree:
<screen> <screen>
$ nix-build -A libfoo</screen> $ nix-build -A libfoo</screen>
where <varname>libfoo</varname> should be the variable name defined in the
where <varname>libfoo</varname> should be the variable name previous step. You may want to add the flag <option>-K</option> to keep
defined in the previous step. You may want to add the flag the temporary build directory in case something fails. If the build
<option>-K</option> to keep the temporary build directory in case succeeds, a symlink <filename>./result</filename> to the package in the
something fails. If the build succeeds, a symlink Nix store is created.
<filename>./result</filename> to the package in the Nix store is
created.</para>
</listitem>
<listitem>
<para>If you want to install the package into your profile
(optional), do
<screen>
$ nix-env -f . -iA libfoo</screen>
</para> </para>
</listitem> </listitem>
<listitem>
<listitem> <para>
<para>Optionally commit the new package and open a pull request, or send a patch to If you want to install the package into your profile (optional), do
<literal>https://groups.google.com/forum/#!forum/nix-devel</literal>.</para> <screen>
</listitem> $ nix-env -f . -iA libfoo</screen>
</para>
</listitem>
</orderedlist> <listitem>
<para>
</para> Optionally commit the new package and open a pull request, or send a patch
to <literal>https://groups.google.com/forum/#!forum/nix-devel</literal>.
</para>
</listitem>
</orderedlist>
</para>
</chapter> </chapter>

File diff suppressed because it is too large Load diff

View file

@ -3,93 +3,148 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-reviewing-contributions"> xml:id="sec-reviewing-contributions">
<title>Reviewing contributions</title>
<title>Reviewing contributions</title> <warning>
<para>
<warning> The following section is a draft and reviewing policy is still being
<para>The following section is a draft and reviewing policy is still being discussed.
discussed.</para> </para>
</warning> </warning>
<para>
<para>The nixpkgs projects receives a fairly high number of contributions via The nixpkgs projects receives a fairly high number of contributions via
GitHub pull-requests. Reviewing and approving these is an important task and a GitHub pull-requests. Reviewing and approving these is an important task and
way to contribute to the project.</para> a way to contribute to the project.
</para>
<para>The high change rate of nixpkgs make any pull request that is open for <para>
long enough subject to conflicts that will require extra work from the The high change rate of nixpkgs make any pull request that is open for long
submitter or the merger. Reviewing pull requests in a timely manner and being enough subject to conflicts that will require extra work from the submitter
or the merger. Reviewing pull requests in a timely manner and being
responsive to the comments is the key to avoid these. GitHub provides sort responsive to the comments is the key to avoid these. GitHub provides sort
filters that can be used to see the <link filters that can be used to see the
<link
xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
recently</link> and the <link recently</link> and the
<link
xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least
recently</link> updated pull-requests.</para> recently</link> updated pull-requests. We highly encourage looking at
<link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone">
<para>When reviewing a pull request, please always be nice and polite. this list of ready to merge, unreviewed pull requests</link>.
</para>
<para>
When reviewing a pull request, please always be nice and polite.
Controversial changes can lead to controversial opinions, but it is important Controversial changes can lead to controversial opinions, but it is important
to respect every community members and their work.</para> to respect every community members and their work.
</para>
<para>GitHub provides reactions, they are a simple and quick way to provide <para>
GitHub provides reactions, they are a simple and quick way to provide
feedback to pull-requests or any comments. The thumb-down reaction should be feedback to pull-requests or any comments. The thumb-down reaction should be
used with care and if possible accompanied with some explanations so the used with care and if possible accompanied with some explanations so the
submitter has directions to improve his contribution.</para> submitter has directions to improve his contribution.
</para>
<para>Pull-requests reviews should include a list of what has been reviewed in a <para>
comment, so other reviewers and mergers can know the state of the Pull-requests reviews should include a list of what has been reviewed in a
review.</para> comment, so other reviewers and mergers can know the state of the review.
</para>
<para>All the review template samples provided in this section are generic and <para>
All the review template samples provided in this section are generic and
meant as examples. Their usage is optional and the reviewer is free to adapt meant as examples. Their usage is optional and the reviewer is free to adapt
them to his liking.</para> them to his liking.
</para>
<section>
<title>Package updates</title>
<section><title>Package updates</title> <para>
A package update is the most trivial and common type of pull-request. These
pull-requests mainly consist in updating the version part of the package
name and the source hash.
</para>
<para>A package update is the most trivial and common type of pull-request. <para>
These pull-requests mainly consist in updating the version part of the package It can happen that non trivial updates include patches or more complex
name and the source hash.</para> changes.
<para>It can happen that non trivial updates include patches or more complex </para>
changes.</para>
<para>Reviewing process:</para> <para>
Reviewing process:
</para>
<itemizedlist> <itemizedlist>
<listitem><para>Add labels to the pull-request. (Requires commit <listitem>
rights)</para> <para>
Add labels to the pull-request. (Requires commit rights)
</para>
<itemizedlist> <itemizedlist>
<listitem><para><literal>8.has: package (update)</literal> and any topic <listitem>
label that fit the updated package.</para></listitem> <para>
<literal>8.has: package (update)</literal> and any topic label that fit
the updated package.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Ensure that the package versioning is fitting the <listitem>
guidelines.</para></listitem> <para>
<listitem><para>Ensure that the commit text is fitting the Ensure that the package versioning is fitting the guidelines.
guidelines.</para></listitem> </para>
<listitem><para>Ensure that the package maintainers are notified.</para> </listitem>
<listitem>
<para>
Ensure that the commit text is fitting the guidelines.
</para>
</listitem>
<listitem>
<para>
Ensure that the package maintainers are notified.
</para>
<itemizedlist> <itemizedlist>
<listitem><para>mention-bot usually notify GitHub users based on the <listitem>
submitted changes, but it can happen that it misses some of the <para>
package maintainers.</para></listitem> mention-bot usually notify GitHub users based on the submitted changes,
but it can happen that it misses some of the package maintainers.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Ensure that the meta field contains correct <listitem>
information.</para> <para>
Ensure that the meta field contains correct information.
</para>
<itemizedlist> <itemizedlist>
<listitem><para>License can change with version updates, so it should be <listitem>
checked to be fitting upstream license.</para></listitem> <para>
<listitem><para>If the package has no maintainer, a maintainer must be License can change with version updates, so it should be checked to be
set. This can be the update submitter or a community member that fitting upstream license.
accepts to take maintainership of the package.</para></listitem> </para>
</listitem>
<listitem>
<para>
If the package has no maintainer, a maintainer must be set. This can be
the update submitter or a community member that accepts to take
maintainership of the package.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Ensure that the code contains no typos.</para></listitem> <listitem>
<listitem><para>Building the package locally.</para> <para>
Ensure that the code contains no typos.
</para>
</listitem>
<listitem>
<para>
Building the package locally.
</para>
<itemizedlist> <itemizedlist>
<listitem><para>Pull-requests are often targeted to the master or staging <listitem>
branch so building the pull-request locally as it is submitted can <para>
trigger a large amount of source builds.</para> Pull-requests are often targeted to the master or staging branch so
<para>It is possible to rebase the changes on nixos-unstable or building the pull-request locally as it is submitted can trigger a large
nixpkgs-unstable for easier review by running the following commands amount of source builds.
from a nixpkgs clone. </para>
<para>
It is possible to rebase the changes on nixos-unstable or
nixpkgs-unstable for easier review by running the following commands
from a nixpkgs clone.
<screen> <screen>
$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git <co $ git remote add channels https://github.com/NixOS/nixpkgs-channels.git <co
xml:id='reviewing-rebase-1' /> xml:id='reviewing-rebase-1' />
@ -98,43 +153,56 @@ $ git fetch origin pull/PRNUMBER/head <co xml:id='reviewing-rebase-3' />
$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co
xml:id='reviewing-rebase-4' /> xml:id='reviewing-rebase-4' />
</screen> </screen>
<calloutlist> <calloutlist>
<callout arearefs='reviewing-rebase-1'> <callout arearefs='reviewing-rebase-1'>
<para>This should be done only once to be able to fetch channel <para>
branches from the nixpkgs-channels repository.</para> This should be done only once to be able to fetch channel branches
</callout> from the nixpkgs-channels repository.
<callout arearefs='reviewing-rebase-2'> </para>
<para>Fetching the nixos-unstable branch.</para> </callout>
</callout> <callout arearefs='reviewing-rebase-2'>
<callout arearefs='reviewing-rebase-3'> <para>
<para>Fetching the pull-request changes, <varname>PRNUMBER</varname> Fetching the nixos-unstable branch.
is the number at the end of the pull-request title and </para>
<varname>BASEBRANCH</varname> the base branch of the </callout>
pull-request.</para> <callout arearefs='reviewing-rebase-3'>
</callout> <para>
<callout arearefs='reviewing-rebase-3'> Fetching the pull-request changes, <varname>PRNUMBER</varname> is the
<para>Rebasing the pull-request changes to the nixos-unstable number at the end of the pull-request title and
branch.</para> <varname>BASEBRANCH</varname> the base branch of the pull-request.
</callout> </para>
</calloutlist> </callout>
</para> <callout arearefs='reviewing-rebase-4'>
</listitem> <para>
<listitem> Rebasing the pull-request changes to the nixos-unstable branch.
<para>The <link xlink:href="https://github.com/madjar/nox">nox</link> </para>
tool can be used to review a pull-request content in a single command. </callout>
It doesn't rebase on a channel branch so it might trigger multiple </calloutlist>
source builds. <varname>PRNUMBER</varname> should be replaced by the </para>
number at the end of the pull-request title.</para> </listitem>
<listitem>
<para>
The <link xlink:href="https://github.com/madjar/nox">nox</link> tool can
be used to review a pull-request content in a single command. It doesn't
rebase on a channel branch so it might trigger multiple source builds.
<varname>PRNUMBER</varname> should be replaced by the number at the end
of the pull-request title.
</para>
<screen> <screen>
$ nix-shell -p nox --run "nox-review -k pr PRNUMBER" $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</screen> </screen>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Running every binary.</para></listitem> <listitem>
</itemizedlist> <para>
Running every binary.
</para>
</listitem>
</itemizedlist>
<example><title>Sample template for a package update review</title> <example>
<title>Sample template for a package update review</title>
<screen> <screen>
##### Reviewed points ##### Reviewed points
@ -148,55 +216,105 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
##### Comments ##### Comments
</screen></example> </screen>
</section> </example>
</section>
<section>
<title>New packages</title>
<section><title>New packages</title> <para>
New packages are a common type of pull-requests. These pull requests
consists in adding a new nix-expression for a package.
</para>
<para>New packages are a common type of pull-requests. These pull requests <para>
consists in adding a new nix-expression for a package.</para> Reviewing process:
</para>
<para>Reviewing process:</para> <itemizedlist>
<listitem>
<itemizedlist> <para>
<listitem><para>Add labels to the pull-request. (Requires commit Add labels to the pull-request. (Requires commit rights)
rights)</para> </para>
<itemizedlist> <itemizedlist>
<listitem><para><literal>8.has: package (new)</literal> and any topic <listitem>
label that fit the new package.</para></listitem> <para>
<literal>8.has: package (new)</literal> and any topic label that fit the
new package.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Ensure that the package versioning is fitting the <listitem>
guidelines.</para></listitem> <para>
<listitem><para>Ensure that the commit name is fitting the Ensure that the package versioning is fitting the guidelines.
guidelines.</para></listitem> </para>
<listitem><para>Ensure that the meta field contains correct </listitem>
information.</para> <listitem>
<para>
Ensure that the commit name is fitting the guidelines.
</para>
</listitem>
<listitem>
<para>
Ensure that the meta field contains correct information.
</para>
<itemizedlist> <itemizedlist>
<listitem><para>License must be checked to be fitting upstream <listitem>
license.</para></listitem> <para>
<listitem><para>Platforms should be set or the package will not get binary License must be checked to be fitting upstream license.
substitutes.</para></listitem> </para>
<listitem><para>A maintainer must be set, this can be the package </listitem>
submitter or a community member that accepts to take maintainership of <listitem>
the package.</para></listitem> <para>
Platforms should be set or the package will not get binary substitutes.
</para>
</listitem>
<listitem>
<para>
A maintainer must be set, this can be the package submitter or a
community member that accepts to take maintainership of the package.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Ensure that the code contains no typos.</para></listitem> <listitem>
<listitem><para>Ensure the package source.</para> <para>
Ensure that the code contains no typos.
</para>
</listitem>
<listitem>
<para>
Ensure the package source.
</para>
<itemizedlist> <itemizedlist>
<listitem><para>Mirrors urls should be used when <listitem>
available.</para></listitem> <para>
<listitem><para>The most appropriate function should be used (e.g. Mirrors urls should be used when available.
packages from GitHub should use </para>
<literal>fetchFromGitHub</literal>).</para></listitem> </listitem>
<listitem>
<para>
The most appropriate function should be used (e.g. packages from GitHub
should use <literal>fetchFromGitHub</literal>).
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Building the package locally.</para></listitem> <listitem>
<listitem><para>Running every binary.</para></listitem> <para>
</itemizedlist> Building the package locally.
</para>
</listitem>
<listitem>
<para>
Running every binary.
</para>
</listitem>
</itemizedlist>
<example><title>Sample template for a new package review</title> <example>
<title>Sample template for a new package review</title>
<screen> <screen>
##### Reviewed points ##### Reviewed points
@ -218,58 +336,107 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
##### Comments ##### Comments
</screen></example> </screen>
</section> </example>
</section>
<section>
<title>Module updates</title>
<section><title>Module updates</title> <para>
Module updates are submissions changing modules in some ways. These often
contains changes to the options or introduce new options.
</para>
<para>Module updates are submissions changing modules in some ways. These often <para>
contains changes to the options or introduce new options.</para> Reviewing process
</para>
<para>Reviewing process</para> <itemizedlist>
<listitem>
<itemizedlist> <para>
<listitem><para>Add labels to the pull-request. (Requires commit Add labels to the pull-request. (Requires commit rights)
rights)</para> </para>
<itemizedlist> <itemizedlist>
<listitem><para><literal>8.has: module (update)</literal> and any topic <listitem>
label that fit the module.</para></listitem> <para>
<literal>8.has: module (update)</literal> and any topic label that fit
the module.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Ensure that the module maintainers are notified.</para> <listitem>
<para>
Ensure that the module maintainers are notified.
</para>
<itemizedlist> <itemizedlist>
<listitem><para>Mention-bot notify GitHub users based on the submitted <listitem>
changes, but it can happen that it miss some of the package <para>
maintainers.</para></listitem> Mention-bot notify GitHub users based on the submitted changes, but it
can happen that it miss some of the package maintainers.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Ensure that the module tests, if any, are <listitem>
succeeding.</para></listitem> <para>
<listitem><para>Ensure that the introduced options are correct.</para> Ensure that the module tests, if any, are succeeding.
</para>
</listitem>
<listitem>
<para>
Ensure that the introduced options are correct.
</para>
<itemizedlist> <itemizedlist>
<listitem><para>Type should be appropriate (string related types differs <listitem>
in their merging capabilities, <literal>optionSet</literal> and <para>
<literal>string</literal> types are deprecated).</para></listitem> Type should be appropriate (string related types differs in their
<listitem><para>Description, default and example should be merging capabilities, <literal>optionSet</literal> and
provided.</para></listitem> <literal>string</literal> types are deprecated).
</para>
</listitem>
<listitem>
<para>
Description, default and example should be provided.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Ensure that option changes are backward compatible.</para> <listitem>
<para>
Ensure that option changes are backward compatible.
</para>
<itemizedlist> <itemizedlist>
<listitem><para><literal>mkRenamedOptionModule</literal> and <listitem>
<literal>mkAliasOptionModule</literal> functions provide way to make <para>
option changes backward compatible.</para></listitem> <literal>mkRenamedOptionModule</literal> and
<literal>mkAliasOptionModule</literal> functions provide way to make
option changes backward compatible.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>Ensure that removed options are declared with <listitem>
<literal>mkRemovedOptionModule</literal></para></listitem> <para>
<listitem><para>Ensure that changes that are not backward compatible are Ensure that removed options are declared with
mentioned in release notes.</para></listitem> <literal>mkRemovedOptionModule</literal>
<listitem><para>Ensure that documentations affected by the change is </para>
updated.</para></listitem> </listitem>
</itemizedlist> <listitem>
<para>
Ensure that changes that are not backward compatible are mentioned in
release notes.
</para>
</listitem>
<listitem>
<para>
Ensure that documentations affected by the change is updated.
</para>
</listitem>
</itemizedlist>
<example><title>Sample template for a module update review</title> <example>
<title>Sample template for a module update review</title>
<screen> <screen>
##### Reviewed points ##### Reviewed points
@ -286,51 +453,89 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
##### Comments ##### Comments
</screen></example> </screen>
</section> </example>
</section>
<section>
<title>New modules</title>
<section><title>New modules</title> <para>
New modules submissions introduce a new module to NixOS.
</para>
<para>New modules submissions introduce a new module to NixOS.</para> <itemizedlist>
<listitem>
<para>
Add labels to the pull-request. (Requires commit rights)
</para>
<itemizedlist>
<listitem>
<para>
<literal>8.has: module (new)</literal> and any topic label that fit the
module.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Ensure that the module tests, if any, are succeeding.
</para>
</listitem>
<listitem>
<para>
Ensure that the introduced options are correct.
</para>
<itemizedlist>
<listitem>
<para>
Type should be appropriate (string related types differs in their
merging capabilities, <literal>optionSet</literal> and
<literal>string</literal> types are deprecated).
</para>
</listitem>
<listitem>
<para>
Description, default and example should be provided.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Ensure that module <literal>meta</literal> field is present
</para>
<itemizedlist>
<listitem>
<para>
Maintainers should be declared in <literal>meta.maintainers</literal>.
</para>
</listitem>
<listitem>
<para>
Module documentation should be declared with
<literal>meta.doc</literal>.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Ensure that the module respect other modules functionality.
</para>
<itemizedlist>
<listitem>
<para>
For example, enabling a module should not open firewall ports by
default.
</para>
</listitem>
</itemizedlist>
</listitem>
</itemizedlist>
<itemizedlist> <example>
<listitem><para>Add labels to the pull-request. (Requires commit <title>Sample template for a new module review</title>
rights)</para>
<itemizedlist>
<listitem><para><literal>8.has: module (new)</literal> and any topic label
that fit the module.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the module tests, if any, are
succeeding.</para></listitem>
<listitem><para>Ensure that the introduced options are correct.</para>
<itemizedlist>
<listitem><para>Type should be appropriate (string related types differs
in their merging capabilities, <literal>optionSet</literal> and
<literal>string</literal> types are deprecated).</para></listitem>
<listitem><para>Description, default and example should be
provided.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that module <literal>meta</literal> field is
present</para>
<itemizedlist>
<listitem><para>Maintainers should be declared in
<literal>meta.maintainers</literal>.</para></listitem>
<listitem><para>Module documentation should be declared with
<literal>meta.doc</literal>.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the module respect other modules
functionality.</para>
<itemizedlist>
<listitem><para>For example, enabling a module should not open firewall
ports by default.</para></listitem>
</itemizedlist>
</listitem>
</itemizedlist>
<example><title>Sample template for a new module review</title>
<screen> <screen>
##### Reviewed points ##### Reviewed points
@ -348,32 +553,41 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
##### Comments ##### Comments
</screen></example> </screen>
</section> </example>
</section>
<section>
<title>Other submissions</title>
<section><title>Other submissions</title> <para>
Other type of submissions requires different reviewing steps.
</para>
<para>Other type of submissions requires different reviewing steps.</para> <para>
If you consider having enough knowledge and experience in a topic and would
like to be a long-term reviewer for related submissions, please contact the
current reviewers for that topic. They will give you information about the
reviewing process. The main reviewers for a topic can be hard to find as
there is no list, but checking past pull-requests to see who reviewed or
git-blaming the code to see who committed to that topic can give some hints.
</para>
<para>If you consider having enough knowledge and experience in a topic and <para>
would like to be a long-term reviewer for related submissions, please contact Container system, boot system and library changes are some examples of the
the current reviewers for that topic. They will give you information about the pull requests fitting this category.
reviewing process. </para>
The main reviewers for a topic can be hard to find as there is no list, but </section>
checking past pull-requests to see who reviewed or git-blaming the code to see <section>
who committed to that topic can give some hints.</para> <title>Merging pull-requests</title>
<para>Container system, boot system and library changes are some examples of the <para>
pull requests fitting this category.</para> It is possible for community members that have enough knowledge and
experience on a special topic to contribute by merging pull requests.
</para>
</section> <para>
TODO: add the procedure to request merging rights.
<section><title>Merging pull-requests</title> </para>
<para>It is possible for community members that have enough knowledge and
experience on a special topic to contribute by merging pull requests.</para>
<para>TODO: add the procedure to request merging rights.</para>
<!-- <!--
The following paragraph about how to deal with unactive contributors is just a The following paragraph about how to deal with unactive contributors is just a
@ -384,10 +598,11 @@ policy.
three months will have their commit rights revoked.</para> three months will have their commit rights revoked.</para>
--> -->
<para>In a case a contributor leaves definitively the Nix community, he should <para>
create an issue or notify the mailing list with references of packages and In a case a contributor leaves definitively the Nix community, he should
modules he maintains so the maintainership can be taken over by other create an issue or notify the mailing list with references of packages and
contributors.</para> modules he maintains so the maintainership can be taken over by other
contributors.
</section> </para>
</section>
</chapter> </chapter>

5
doc/shell.nix Normal file
View file

@ -0,0 +1,5 @@
{ pkgs ? import ../. {} }:
(import ./default.nix).overrideAttrs (x: {
buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ];
})

View file

@ -4,6 +4,8 @@ author: zimbatm
date: 2017-10-30 date: 2017-10-30
--- ---
# mkShell
pkgs.mkShell is a special kind of derivation that is only useful when using pkgs.mkShell is a special kind of derivation that is only useful when using
it combined with nix-shell. It will in fact fail to instantiate when invoked it combined with nix-shell. It will in fact fail to instantiate when invoked
with nix-build. with nix-build.

File diff suppressed because it is too large Load diff

View file

@ -29,8 +29,8 @@ h2 /* chapters, appendices, subtitle */
} }
/* Extra space between chapters, appendices. */ /* Extra space between chapters, appendices. */
div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
{ {
margin-top: 1.5em; margin-top: 1.5em;
} }
@ -104,7 +104,7 @@ pre.screen, pre.programlisting
padding: 3px 3px; padding: 3px 3px;
margin-left: 1.5em; margin-left: 1.5em;
margin-right: 1.5em; margin-right: 1.5em;
color: #600000;
background: #f4f4f8; background: #f4f4f8;
font-family: monospace; font-family: monospace;
border-radius: 0.4em; border-radius: 0.4em;
@ -118,7 +118,6 @@ div.example pre.programlisting
margin: 0 0 0 0; margin: 0 0 0 0;
} }
/*************************************************************************** /***************************************************************************
Notes, warnings etc: Notes, warnings etc:
***************************************************************************/ ***************************************************************************/
@ -172,7 +171,7 @@ div.navfooter *
/*************************************************************************** /***************************************************************************
Links colors and highlighting: Links colors and highlighting:
***************************************************************************/ ***************************************************************************/
a { text-decoration: none; } a { text-decoration: none; }
@ -209,7 +208,7 @@ tt, code
.term .term
{ {
font-weight: bold; font-weight: bold;
} }
div.variablelist dd p, div.glosslist dd p div.variablelist dd p, div.glosslist dd p
@ -249,7 +248,24 @@ table
box-shadow: 0.4em 0.4em 0.5em #e0e0e0; box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
} }
table.simplelist
{
text-align: left;
color: #005aa0;
border: 0;
padding: 5px;
background: #fffff5;
font-weight: normal;
font-style: italic;
box-shadow: none;
margin-bottom: 1em;
}
div.navheader table, div.navfooter table {
box-shadow: none;
}
div.affiliation div.affiliation
{ {
font-style: italic; font-style: italic;
} }

View file

@ -1,447 +1,513 @@
<chapter xmlns="http://docbook.org/ns/docbook" <chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-submitting-changes"> xml:id="chap-submitting-changes">
<title>Submitting changes</title>
<section>
<title>Making patches</title>
<title>Submitting changes</title> <itemizedlist>
<listitem>
<section> <para>
<title>Making patches</title> Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to
write packages for Nix)</link>.
<itemizedlist> </para>
<listitem> </listitem>
<para>Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to write packages for Nix)</link>.</para> <listitem>
</listitem> <para>
Fork the repository on GitHub.
<listitem> </para>
<para>Fork the repository on GitHub.</para> </listitem>
</listitem> <listitem>
<para>
<listitem> Create a branch for your future fix.
<para>Create a branch for your future fix. <itemizedlist>
<listitem>
<itemizedlist> <para>
<listitem> You can make branch from a commit of your local
<para>You can make branch from a commit of your local <command>nixos-version</command>. That will help you to avoid additional local compilations. Because you will receive packages from binary cache. <command>nixos-version</command>. That will help you to avoid
additional local compilations. Because you will receive packages from
<itemizedlist> binary cache.
<listitem> <itemizedlist>
<para>For example: <command>nixos-version</command> returns <command>15.05.git.0998212 (Dingo)</command>. So you can do:</para> <listitem>
</listitem> <para>
</itemizedlist> For example: <command>nixos-version</command> returns
<command>15.05.git.0998212 (Dingo)</command>. So you can do:
</para>
</listitem>
</itemizedlist>
<screen> <screen>
$ git checkout 0998212 $ git checkout 0998212
$ git checkout -b 'fix/pkg-name-update' $ git checkout -b 'fix/pkg-name-update'
</screen> </screen>
</para> </para>
</listitem> </listitem>
<listitem>
<listitem> <para>
<para>Please avoid working directly on the <command>master</command> branch.</para> Please avoid working directly on the <command>master</command> branch.
</listitem> </para>
</itemizedlist> </listitem>
</para> </itemizedlist>
</listitem> </para>
</listitem>
<listitem> <listitem>
<para>Make commits of logical units. <para>
Make commits of logical units.
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>If you removed pkgs, made some major NixOS changes etc., write about them in <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.</para> <para>
</listitem> If you removed pkgs, made some major NixOS changes etc., write about
</itemizedlist> them in
</para> <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.
</listitem> </para>
</listitem>
<listitem> </itemizedlist>
<para>Check for unnecessary whitespace with <command>git diff --check</command> before committing.</para> </para>
</listitem> </listitem>
<listitem>
<listitem> <para>
<para>Format the commit in a following way:</para> Check for unnecessary whitespace with <command>git diff --check</command>
before committing.
</para>
</listitem>
<listitem>
<para>
Format the commit in a following way:
</para>
<programlisting> <programlisting>
(pkg-name | nixos/&lt;module>): (from -> to | init at version | refactor | etc) (pkg-name | nixos/&lt;module>): (from -> to | init at version | refactor | etc)
Additional information. Additional information.
</programlisting> </programlisting>
<itemizedlist>
<listitem>
<para>
Examples:
<itemizedlist>
<listitem>
<para>
<command>nginx: init at 2.0.1</command>
</para>
</listitem>
<listitem>
<para>
<command>firefox: 54.0.1 -> 55.0</command>
</para>
</listitem>
<listitem>
<para>
<command>nixos/hydra: add bazBaz option</command>
</para>
</listitem>
<listitem>
<para>
<command>nixos/nginx: refactor config generation</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Test your changes. If you work with
<itemizedlist>
<listitem>
<para>
nixpkgs:
<itemizedlist>
<listitem>
<para>
update pkg ->
<itemizedlist>
<listitem>
<para>
<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs
folder&gt;</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
add pkg ->
<itemizedlist>
<listitem>
<para>
Make sure it's in
<command>pkgs/top-level/all-packages.nix</command>
</para>
</listitem>
<listitem>
<para>
<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs
folder&gt;</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
<emphasis>If you don't want to install pkg in you
profile</emphasis>.
<itemizedlist>
<listitem>
<para>
<command>nix-build -A pkg-attribute-name &lt;path to your local
nixpkgs folder&gt;/default.nix</command> and check results in the
folder <command>result</command>. It will appear in the same
directory where you did <command>nix-build</command>.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
If you did <command>nix-env -i pkg-name</command> you can do
<command>nix-env -e pkg-name</command> to uninstall it from your
system.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
NixOS and its modules:
<itemizedlist>
<listitem>
<para>
You can add new module to your NixOS configuration file (usually
it's <command>/etc/nixos/configuration.nix</command>). And do
<command>sudo nixos-rebuild test -I nixpkgs=&lt;path to your local
nixpkgs folder&gt; --fast</command>.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
If you have commits <command>pkg-name: oh, forgot to insert
whitespace</command>: squash commits in this case. Use <command>git rebase
-i</command>.
</para>
</listitem>
<listitem>
<para>
Rebase you branch against current <command>master</command>.
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Submitting changes</title>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Examples: <para>
Push your changes to your fork of nixpkgs.
<itemizedlist> </para>
<listitem> </listitem>
<para> <listitem>
<command>nginx: init at 2.0.1</command> <para>
</para> Create pull request:
</listitem> <itemizedlist>
<listitem>
<listitem> <para>
<para> Write the title in format <command>(pkg-name | nixos/&lt;module>):
<command>firefox: 54.0.1 -> 55.0</command> improvement</command>.
</para> <itemizedlist>
</listitem> <listitem>
<para>
<listitem> If you update the pkg, write versions <command>from -> to</command>.
<para> </para>
<command>nixos/hydra: add bazBaz option</command> </listitem>
</para> </itemizedlist>
</listitem> </para>
</listitem>
<listitem> <listitem>
<para> <para>
<command>nixos/nginx: refactor config generation</command> Write in comment if you have tested your patch. Do not rely much on
</para> <command>TravisCI</command>.
</listitem> </para>
</itemizedlist> </listitem>
</para> <listitem>
</listitem> <para>
</itemizedlist> If you make an improvement, write about your motivation.
</listitem> </para>
</listitem>
<listitem> <listitem>
<para>Test your changes. If you work with <para>
Notify maintainers of the package. For example add to the message:
<itemizedlist> <command>cc @jagajaga @domenkozar</command>.
<listitem> </para>
<para>nixpkgs: </listitem>
</itemizedlist>
<itemizedlist> </para>
<listitem> </listitem>
<para>update pkg -> </itemizedlist>
</section>
<itemizedlist> <section>
<listitem>
<para>
<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>add pkg ->
<itemizedlist>
<listitem>
<para>Make sure it's in <command>pkgs/top-level/all-packages.nix</command>
</para>
</listitem>
<listitem>
<para>
<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
<emphasis>If you don't want to install pkg in you profile</emphasis>.
<itemizedlist>
<listitem>
<para>
<command>nix-build -A pkg-attribute-name &lt;path to your local nixpkgs folder&gt;/default.nix</command> and check results in the folder <command>result</command>. It will appear in the same directory where you did <command>nix-build</command>.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>If you did <command>nix-env -i pkg-name</command> you can do <command>nix-env -e pkg-name</command> to uninstall it from your system.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>NixOS and its modules:
<itemizedlist>
<listitem>
<para>You can add new module to your NixOS configuration file (usually it's <command>/etc/nixos/configuration.nix</command>).
And do <command>sudo nixos-rebuild test -I nixpkgs=&lt;path to your local nixpkgs folder&gt; --fast</command>.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>If you have commits <command>pkg-name: oh, forgot to insert whitespace</command>: squash commits in this case. Use <command>git rebase -i</command>.</para>
</listitem>
<listitem>
<para>Rebase you branch against current <command>master</command>.</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Submitting changes</title>
<itemizedlist>
<listitem>
<para>Push your changes to your fork of nixpkgs.</para>
</listitem>
<listitem>
<para>Create pull request:
<itemizedlist>
<listitem>
<para>Write the title in format <command>(pkg-name | nixos/&lt;module>): improvement</command>.
<itemizedlist>
<listitem>
<para>If you update the pkg, write versions <command>from -> to</command>.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>Write in comment if you have tested your patch. Do not rely much on <command>TravisCI</command>.</para>
</listitem>
<listitem>
<para>If you make an improvement, write about your motivation.</para>
</listitem>
<listitem>
<para>Notify maintainers of the package. For example add to the message: <command>cc @jagajaga @domenkozar</command>.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Pull Request Template</title> <title>Pull Request Template</title>
<para> <para>
The pull request template helps determine what steps have been made for a The pull request template helps determine what steps have been made for a
contribution so far, and will help guide maintainers on the status of a contribution so far, and will help guide maintainers on the status of a
change. The motivation section of the PR should include any extra details change. The motivation section of the PR should include any extra details
the title does not address and link any existing issues related to the pull the title does not address and link any existing issues related to the pull
request. request.
</para> </para>
<para>When a PR is created, it will be pre-populated with some checkboxes detailed below:
<para>
When a PR is created, it will be pre-populated with some checkboxes detailed
below:
</para> </para>
<section> <section>
<title>Tested using sandboxing</title> <title>Tested using sandboxing</title>
<para>
When sandbox builds are enabled, Nix will setup an isolated environment <para>
for each build process. It is used to remove further hidden dependencies When sandbox builds are enabled, Nix will setup an isolated environment for
set by the build environment to improve reproducibility. This includes each build process. It is used to remove further hidden dependencies set by
access to the network during the build outside of the build environment to improve reproducibility. This includes access to
<function>fetch*</function> functions and files outside the Nix store. the network during the build outside of <function>fetch*</function>
Depending on the operating system access to other resources are blocked functions and files outside the Nix store. Depending on the operating
as well (ex. inter process communication is isolated on Linux); see <link system access to other resources are blocked as well (ex. inter process
communication is isolated on Linux); see
<link
xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link> xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link>
in Nix manual for details. in Nix manual for details.
</para> </para>
<para>
Sandboxing is not enabled by default in Nix due to a small performance <para>
hit on each build. In pull requests for <link Sandboxing is not enabled by default in Nix due to a small performance hit
xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link> people on each build. In pull requests for
are asked to test builds with sandboxing enabled (see <literal>Tested <link
using sandboxing</literal> in the pull request template) because xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link>
in<link people are asked to test builds with sandboxing enabled (see
<literal>Tested using sandboxing</literal> in the pull request template)
because
in<link
xlink:href="https://nixos.org/hydra/">https://nixos.org/hydra/</link> xlink:href="https://nixos.org/hydra/">https://nixos.org/hydra/</link>
sandboxing is also used. sandboxing is also used.
</para> </para>
<para>
Depending if you use NixOS or other platforms you can use one of the <para>
following methods to enable sandboxing <emphasis role="bold">before</emphasis> building the package: Depending if you use NixOS or other platforms you can use one of the
<itemizedlist> following methods to enable sandboxing
<listitem> <emphasis role="bold">before</emphasis> building the package:
<para> <itemizedlist>
<emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>: <listitem>
add the following to <para>
<filename>configuration.nix</filename> <emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>:
<screen>nix.useSandbox = true;</screen> add the following to <filename>configuration.nix</filename>
</para> <screen>nix.useSandbox = true;</screen>
</listitem> </para>
<listitem> </listitem>
<para> <listitem>
<emphasis role="bold">Globally enable sandboxing on non-NixOS platforms</emphasis>: <para>
add the following to: <filename>/etc/nix/nix.conf</filename> <emphasis role="bold">Globally enable sandboxing on non-NixOS
<screen>build-use-sandbox = true</screen> platforms</emphasis>: add the following to:
</para> <filename>/etc/nix/nix.conf</filename>
</listitem> <screen>build-use-sandbox = true</screen>
</itemizedlist> </para>
</para> </listitem>
</itemizedlist>
</para>
</section> </section>
<section> <section>
<title>Built on platform(s)</title> <title>Built on platform(s)</title>
<para>
Many Nix packages are designed to run on multiple <para>
platforms. As such, it's important to let the maintainer know which Many Nix packages are designed to run on multiple platforms. As such, it's
platforms your changes have been tested on. It's not always practical to important to let the maintainer know which platforms your changes have been
test a change on all platforms, and is not required for a pull request to tested on. It's not always practical to test a change on all platforms, and
be merged. Only check the systems you tested the build on in this is not required for a pull request to be merged. Only check the systems you
section. tested the build on in this section.
</para> </para>
</section> </section>
<section> <section>
<title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title> <title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title>
<para>
Packages with automated tests are much more likely to be merged in a <para>
timely fashion because it doesn't require as much manual testing by the Packages with automated tests are much more likely to be merged in a timely
maintainer to verify the functionality of the package. If there are fashion because it doesn't require as much manual testing by the maintainer
existing tests for the package, they should be run to verify your changes to verify the functionality of the package. If there are existing tests for
do not break the tests. Tests only apply to packages with NixOS modules the package, they should be run to verify your changes do not break the
defined and can only be run on Linux. For more details on writing and tests. Tests only apply to packages with NixOS modules defined and can only
running tests, see the <link be run on Linux. For more details on writing and running tests, see the
<link
xlink:href="https://nixos.org/nixos/manual/index.html#sec-nixos-tests">section xlink:href="https://nixos.org/nixos/manual/index.html#sec-nixos-tests">section
in the NixOS manual</link>. in the NixOS manual</link>.
</para> </para>
</section> </section>
<section> <section>
<title>Tested compilation of all pkgs that depend on this change using <command>nox-review</command></title> <title>Tested compilation of all pkgs that depend on this change using <command>nox-review</command></title>
<para>
If you are updating a package's version, you can use nox to make sure all <para>
packages that depend on the updated package still compile correctly. This If you are updating a package's version, you can use nox to make sure all
can be done using the nox utility. The <command>nox-review</command> packages that depend on the updated package still compile correctly. This
utility can look for and build all dependencies either based on can be done using the nox utility. The <command>nox-review</command>
uncommited changes with the <literal>wip</literal> option or specifying a utility can look for and build all dependencies either based on uncommited
github pull request number. changes with the <literal>wip</literal> option or specifying a github pull
</para> request number.
<para> </para>
review uncommitted changes:
<screen>nix-shell -p nox --run nox-review wip</screen> <para>
</para> review uncommitted changes:
<para> <screen>nix-shell -p nox --run "nox-review wip"</screen>
review changes from pull request number 12345: </para>
<screen>nix-shell -p nox --run nox-review pr 12345</screen>
</para> <para>
review changes from pull request number 12345:
<screen>nix-shell -p nox --run "nox-review pr 12345"</screen>
</para>
</section> </section>
<section> <section>
<title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title> <title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title>
<para>
It's important to test any executables generated by a build when you <para>
change or create a package in nixpkgs. This can be done by looking in It's important to test any executables generated by a build when you change
<filename>./result/bin</filename> and running any files in there, or at a or create a package in nixpkgs. This can be done by looking in
minimum, the main executable for the package. For example, if you make a change <filename>./result/bin</filename> and running any files in there, or at a
to <package>texlive</package>, you probably would only check the binaries minimum, the main executable for the package. For example, if you make a
associated with the change you made rather than testing all of them. change to <package>texlive</package>, you probably would only check the
</para> binaries associated with the change you made rather than testing all of
them.
</para>
</section> </section>
<section> <section>
<title>Meets nixpkgs contribution standards</title> <title>Meets nixpkgs contribution standards</title>
<para>
The last checkbox is fits <link <para>
The last checkbox is fits
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md">CONTRIBUTING.md</link>. xlink:href="https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md">CONTRIBUTING.md</link>.
The contributing document has detailed information on standards the Nix The contributing document has detailed information on standards the Nix
community has for commit messages, reviews, licensing of contributions community has for commit messages, reviews, licensing of contributions you
you make to the project, etc... Everyone should read and understand the make to the project, etc... Everyone should read and understand the
standards the community has for contributing before submitting a pull standards the community has for contributing before submitting a pull
request. request.
</para> </para>
</section> </section>
</section> </section>
<section>
<section> <title>Hotfixing pull requests</title>
<title>Hotfixing pull requests</title>
<itemizedlist>
<listitem>
<para>Make the appropriate changes in you branch.</para>
</listitem>
<listitem>
<para>Don't create additional commits, do
<itemizedlist>
<listitem>
<para><command>git rebase -i</command></para>
</listitem>
<listitem>
<para>
<command>git push --force</command> to your branch.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Commit policy</title>
<itemizedlist>
<listitem>
<para>Commits must be sufficiently tested before being merged, both for the master and staging branches.</para>
</listitem>
<listitem>
<para>Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested.</para>
</listitem>
<listitem>
<para>When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.</para>
</listitem>
</itemizedlist>
<section>
<title>Master branch</title>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para> <para>
It should only see non-breaking commits that do not cause mass rebuilds. Make the appropriate changes in you branch.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Don't create additional commits, do
<itemizedlist>
<listitem>
<para>
<command>git rebase -i</command>
</para>
</listitem>
<listitem>
<para>
<command>git push --force</command> to your branch.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section>
<section> <title>Commit policy</title>
<title>Staging branch</title>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para> <para>
It's only for non-breaking mass-rebuild commits. That means it's not to Commits must be sufficiently tested before being merged, both for the
be used for testing, and changes must have been well tested already. master and staging branches.
<link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read policy here</link>. </para>
</para> </listitem>
</listitem> <listitem>
<listitem> <para>
<para> Hydra builds for master and staging should not be used as testing
If the branch is already in a broken state, please refrain from adding platform, it's a build farm for changes that have been already tested.
extra new breakages. Stabilize it for a few days, merge into master, </para>
then resume development on staging. </listitem>
<link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>. <listitem>
If any fixes for staging happen to be already in master, then master can <para>
be merged into staging. When changing the bootloader installation process, extra care must be
</para> taken. Grub installations cannot be rolled back, hence changes may break
</listitem> people's installations forever. For any non-trivial change to the
bootloader please file a PR asking for review, especially from @edolstra.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section>
<section> <section>
<title>Stable release branches</title> <title>Master branch</title>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para> <para>
If you're cherry-picking a commit to a stable release branch, always use It should only see non-breaking commits that do not cause mass rebuilds.
<command>git cherry-pick -xe</command> and ensure the message contains a </para>
clear description about why this needs to be included in the stable </listitem>
branch. </itemizedlist>
</para> </section>
<para>An example of a cherry-picked commit would look like this:</para>
<screen> <section>
<title>Staging branch</title>
<itemizedlist>
<listitem>
<para>
It's only for non-breaking mass-rebuild commits. That means it's not to
be used for testing, and changes must have been well tested already.
<link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
policy here</link>.
</para>
</listitem>
<listitem>
<para>
If the branch is already in a broken state, please refrain from adding
extra new breakages. Stabilize it for a few days, merge into master, then
resume development on staging.
<link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep
an eye on the staging evaluations here</link>. If any fixes for staging
happen to be already in master, then master can be merged into staging.
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Stable release branches</title>
<itemizedlist>
<listitem>
<para>
If you're cherry-picking a commit to a stable release branch, always use
<command>git cherry-pick -xe</command> and ensure the message contains a
clear description about why this needs to be included in the stable
branch.
</para>
<para>
An example of a cherry-picked commit would look like this:
</para>
<screen>
nixos: Refactor the world. nixos: Refactor the world.
The original commit message describing the reason why the world was torn apart. The original commit message describing the reason why the world was torn apart.
@ -451,9 +517,7 @@ Reason: I just had a gut feeling that this would also be wanted by people from
the stone age. the stone age.
</screen> </screen>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section>
</section>
</chapter> </chapter>

View file

@ -1,34 +1,67 @@
/* Collection of functions useful for debugging
broken nix expressions.
* `trace`-like functions take two values, print
the first to stderr and return the second.
* `traceVal`-like functions take one argument
which both printed and returned.
* `traceSeq`-like functions fully evaluate their
traced value before printing (not just to weak
head normal form like trace does by default).
* Functions that end in `-Fn` take an additional
function as their first argument, which is applied
to the traced value before it is printed.
*/
{ lib }: { lib }:
let let
inherit (builtins) trace isAttrs isList isInt
inherit (builtins) trace attrNamesToStr isAttrs isList isInt head substring attrNames;
isString isBool head substring attrNames; inherit (lib) id elem isFunction;
inherit (lib) all id mapAttrsFlatten elem isFunction;
in in
rec { rec {
inherit (builtins) addErrorContext; # -- TRACING --
addErrorContextToAttrs = lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v); /* Trace msg, but only if pred is true.
traceIf = p: msg: x: if p then trace msg x else x; Example:
traceIf true "hello" 3
trace: hello
=> 3
*/
traceIf = pred: msg: x: if pred then trace msg x else x;
traceVal = x: trace x x; /* Trace the value and also return it.
traceXMLVal = x: trace (builtins.toXML x) x;
traceXMLValMarked = str: x: trace (str + builtins.toXML x) x;
# strict trace functions (traced structure is fully evaluated and printed) Example:
traceValFn (v: "mystring ${v}") "foo"
trace: mystring foo
=> "foo"
*/
traceValFn = f: x: trace (f x) x;
traceVal = traceValFn id;
/* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */ /* `builtins.trace`, but the value is `builtins.deepSeq`ed first.
Example:
trace { a.b.c = 3; } null
trace: { a = <CODE>; }
=> null
traceSeq { a.b.c = 3; } null
trace: { a = { b = { c = 3; }; }; }
=> null
*/
traceSeq = x: y: trace (builtins.deepSeq x x) y; traceSeq = x: y: trace (builtins.deepSeq x x) y;
/* Like `traceSeq`, but only down to depth n. /* Like `traceSeq`, but only evaluate down to depth n.
* This is very useful because lots of `traceSeq` usages This is very useful because lots of `traceSeq` usages
* lead to an infinite recursion. lead to an infinite recursion.
Example:
traceSeqN 2 { a.b.c = 3; } null
trace: { a = { b = {}; }; }
=> null
*/ */
traceSeqN = depth: x: y: with lib; traceSeqN = depth: x: y: with lib;
let snip = v: if isList v then noQuotes "[]" v let snip = v: if isList v then noQuotes "[]" v
@ -43,39 +76,16 @@ rec {
in trace (generators.toPretty { allowPrettyValues = true; } in trace (generators.toPretty { allowPrettyValues = true; }
(modify depth snip x)) y; (modify depth snip x)) y;
/* `traceSeq`, but the same value is traced and returned */ /* A combination of `traceVal` and `traceSeq` */
traceValSeq = v: traceVal (builtins.deepSeq v v); traceValSeqFn = f: v: traceVal f (builtins.deepSeq v v);
/* `traceValSeq` but with fixed depth */ traceValSeq = traceValSeqFn id;
traceValSeqN = depth: v: traceSeqN depth v v;
/* A combination of `traceVal` and `traceSeqN`. */
traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v;
traceValSeqN = traceValSeqNFn id;
# this can help debug your code as well - designed to not produce thousands of lines # -- TESTING --
traceShowVal = x: trace (showVal x) x;
traceShowValMarked = str: x: trace (str + showVal x) x;
attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a));
showVal = x:
if isAttrs x then
if x ? outPath then "x is a derivation, name ${if x ? name then x.name else "<no name>"}, { ${attrNamesToStr x} }"
else "x is attr set { ${attrNamesToStr x} }"
else if isFunction x then "x is a function"
else if x == [] then "x is an empty list"
else if isList x then "x is a list, first element is: ${showVal (head x)}"
else if x == true then "x is boolean true"
else if x == false then "x is boolean false"
else if x == null then "x is null"
else if isInt x then "x is an integer `${toString x}'"
else if isString x then "x is a string `${substring 0 50 x}...'"
else "x is probably a path `${substring 0 50 (toString x)}...'";
# trace the arguments passed to function and its result
# maybe rewrite these functions in a traceCallXml like style. Then one function is enough
traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a));
traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b));
traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c));
# FIXME: rename this?
traceValIfNot = c: x:
if c x then true else trace (showVal x) false;
/* Evaluate a set of tests. A test is an attribute set {expr, /* Evaluate a set of tests. A test is an attribute set {expr,
expected}, denoting an expression and its expected result. The expected}, denoting an expression and its expected result. The
@ -99,9 +109,68 @@ rec {
# usage: { testX = allTrue [ true ]; } # usage: { testX = allTrue [ true ]; }
testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
strict = v:
trace "Warning: strict is deprecated and will be removed in the next release" # -- DEPRECATED --
(builtins.seq v v);
traceShowVal = x: trace (showVal x) x;
traceShowValMarked = str: x: trace (str + showVal x) x;
attrNamesToStr = a:
trace ( "Warning: `attrNamesToStr` is deprecated "
+ "and will be removed in the next release. "
+ "Please use more specific concatenation "
+ "for your uses (`lib.concat(Map)StringsSep`)." )
(lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)));
showVal = with lib;
trace ( "Warning: `showVal` is deprecated "
+ "and will be removed in the next release, "
+ "please use `traceSeqN`" )
(let
modify = v:
let pr = f: { __pretty = f; val = v; };
in if isDerivation v then pr
(drv: "<δ:${drv.name}:${concatStringsSep ","
(attrNames drv)}>")
else if [] == v then pr (const "[]")
else if isList v then pr (l: "[ ${go (head l)}, ]")
else if isAttrs v then pr
(a: "{ ${ concatStringsSep ", " (attrNames a)} }")
else v;
go = x: generators.toPretty
{ allowPrettyValues = true; }
(modify x);
in go);
traceXMLVal = x:
trace ( "Warning: `traceXMLVal` is deprecated "
+ "and will be removed in the next release. "
+ "Please use `traceValFn builtins.toXML`." )
(trace (builtins.toXML x) x);
traceXMLValMarked = str: x:
trace ( "Warning: `traceXMLValMarked` is deprecated "
+ "and will be removed in the next release. "
+ "Please use `traceValFn (x: str + builtins.toXML x)`." )
(trace (str + builtins.toXML x) x);
# trace the arguments passed to function and its result
# maybe rewrite these functions in a traceCallXml like style. Then one function is enough
traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a));
traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b));
traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c));
traceValIfNot = c: x:
trace ( "Warning: `traceValIfNot` is deprecated "
+ "and will be removed in the next release. "
+ "Please use `if/then/else` and `traceValSeq 1`.")
(if c x then true else traceSeq (showVal x) false);
addErrorContextToAttrs = attrs:
trace ( "Warning: `addErrorContextToAttrs` is deprecated "
+ "and will be removed in the next release. "
+ "Please use `builtins.addErrorContext` directly." )
(lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs);
# example: (traceCallXml "myfun" id 3) will output something like # example: (traceCallXml "myfun" id 3) will output something like
# calling myfun arg 1: 3 result: 3 # calling myfun arg 1: 3 result: 3
@ -109,17 +178,20 @@ rec {
# note: if result doesn't evaluate you'll get no trace at all (FIXME) # note: if result doesn't evaluate you'll get no trace at all (FIXME)
# args should be printed in any case # args should be printed in any case
traceCallXml = a: traceCallXml = a:
if !isInt a then trace ( "Warning: `traceCallXml` is deprecated "
+ "and will be removed in the next release. "
+ "Please complain if you use the function regularly." )
(if !isInt a then
traceCallXml 1 "calling ${a}\n" traceCallXml 1 "calling ${a}\n"
else else
let nr = a; let nr = a;
in (str: expr: in (str: expr:
if isFunction expr then if isFunction expr then
(arg: (arg:
traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (strict arg)}" (expr arg) traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg)
) )
else else
let r = strict expr; let r = builtins.seq expr expr;
in trace "${str}\n result:\n${builtins.toXML r}" r in trace "${str}\n result:\n${builtins.toXML r}" r
); ));
} }

View file

@ -5,9 +5,11 @@
*/ */
let let
callLibs = file: import file { inherit lib; }; inherit (import ./fixed-points.nix {}) makeExtensible;
lib = rec { lib = makeExtensible (self: let
callLibs = file: import file { lib = self; };
in with self; {
# often used, or depending on very little # often used, or depending on very little
trivial = callLibs ./trivial.nix; trivial = callLibs ./trivial.nix;
@ -21,7 +23,7 @@ let
# packaging # packaging
customisation = callLibs ./customisation.nix; customisation = callLibs ./customisation.nix;
maintainers = import ./maintainers-list.nix; maintainers = import ../maintainers/maintainer-list.nix;
meta = callLibs ./meta.nix; meta = callLibs ./meta.nix;
sources = callLibs ./sources.nix; sources = callLibs ./sources.nix;
versions = callLibs ./versions.nix; versions = callLibs ./versions.nix;
@ -56,7 +58,7 @@ let
replaceStrings seq stringLength sub substring tail; replaceStrings seq stringLength sub substring tail;
inherit (trivial) id const concat or and boolToString mergeAttrs inherit (trivial) id const concat or and boolToString mergeAttrs
flip mapNullable inNixShell min max importJSON warn info flip mapNullable inNixShell min max importJSON warn info
nixpkgsVersion mod compare splitByAndCompare nixpkgsVersion version mod compare splitByAndCompare
functionArgs setFunctionArgs isFunction; functionArgs setFunctionArgs isFunction;
inherit (fixedPoints) fix fix' extends composeExtensions inherit (fixedPoints) fix fix' extends composeExtensions
@ -72,7 +74,7 @@ let
inherit (lists) singleton foldr fold foldl foldl' imap0 imap1 inherit (lists) singleton foldr fold foldl foldl' imap0 imap1
concatMap flatten remove findSingle findFirst any all count concatMap flatten remove findSingle findFirst any all count
optional optionals toList range partition zipListsWith zipLists optional optionals toList range partition zipListsWith zipLists
reverseList listDfs toposort sort compareLists take drop sublist reverseList listDfs toposort sort naturalSort compareLists take drop sublist
last init crossLists unique intersectLists subtractLists last init crossLists unique intersectLists subtractLists
mutuallyExclusive; mutuallyExclusive;
inherit (strings) concatStrings concatMapStrings concatImapStrings inherit (strings) concatStrings concatMapStrings concatImapStrings
@ -113,11 +115,12 @@ let
unknownModule mkOption; unknownModule mkOption;
inherit (types) isType setType defaultTypeMerge defaultFunctor inherit (types) isType setType defaultTypeMerge defaultFunctor
isOptionType mkOptionType; isOptionType mkOptionType;
inherit (debug) addErrorContextToAttrs traceIf traceVal inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn
traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
traceValSeqN traceShowVal traceShowValMarked traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
showVal traceCall traceCall2 traceCall3 traceValIfNot runTests traceShowValMarked showVal traceCall traceCall2 traceCall3
testAllTrue strict traceCallXml attrNamesToStr; traceValIfNot runTests testAllTrue traceCallXml
attrNamesToStr;
inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs
defaultOverridableDelayableArgs composedArgsAndFun defaultOverridableDelayableArgs composedArgsAndFun
maybeAttrNullable maybeAttr ifEnable checkFlag getValue maybeAttrNullable maybeAttr ifEnable checkFlag getValue
@ -128,5 +131,5 @@ let
mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults
mergeAttrsByFuncDefaultsClean mergeAttrBy mergeAttrsByFuncDefaultsClean mergeAttrBy
prepareDerivationArgs nixType imap overridableDelayableArgs; prepareDerivationArgs nixType imap overridableDelayableArgs;
}; });
in lib in lib

View file

@ -4,6 +4,12 @@
* They all follow a similar interface: * They all follow a similar interface:
* generator { config-attrs } data * generator { config-attrs } data
* *
* `config-attrs` are holes in the generators
* with sensible default implementations that
* can be overwritten. The default implementations
* are mostly generators themselves, called with
* their respective default values; they can be reused.
*
* Tests can be found in ./tests.nix * Tests can be found in ./tests.nix
* Documentation in the manual, #sec-generators * Documentation in the manual, #sec-generators
*/ */
@ -20,6 +26,32 @@ in
rec { rec {
## -- HELPER FUNCTIONS & DEFAULTS --
/* Convert a value to a sensible default string representation.
* The builtin `toString` function has some strange defaults,
* suitable for bash scripts but not much else.
*/
mkValueStringDefault = {}: v: with builtins;
let err = t: v: abort
("generators.mkValueStringDefault: " +
"${t} not supported: ${toPretty {} v}");
in if isInt v then toString v
# we default to not quoting strings
else if isString v then v
# isString returns "1", which is not a good default
else if true == v then "true"
# here it returns to "", which is even less of a good default
else if false == v then "false"
else if null == v then "null"
# if you have lists you probably want to replace this
else if isList v then err "lists" v
# same as for lists, might want to replace
else if isAttrs v then err "attrsets" v
else if isFunction v then err "functions" v
else err "this value is" (toString v);
/* Generate a line of key k and value v, separated by /* Generate a line of key k and value v, separated by
* character sep. If sep appears in k, it is escaped. * character sep. If sep appears in k, it is escaped.
* Helper for synaxes with different separators. * Helper for synaxes with different separators.
@ -30,11 +62,14 @@ rec {
* > "f\:oo:bar" * > "f\:oo:bar"
*/ */
mkKeyValueDefault = { mkKeyValueDefault = {
mkValueString ? toString mkValueString ? mkValueStringDefault {}
}: sep: k: v: }: sep: k: v:
"${libStr.escape [sep] k}${sep}${mkValueString v}"; "${libStr.escape [sep] k}${sep}${mkValueString v}";
## -- FILE FORMAT GENERATORS --
/* Generate a key-value-style config file from an attrset. /* Generate a key-value-style config file from an attrset.
* *
* mkKeyValue is the same as in toINI. * mkKeyValue is the same as in toINI.
@ -98,6 +133,7 @@ rec {
*/ */
toYAML = {}@args: toJSON args; toYAML = {}@args: toJSON args;
/* Pretty print a value, akin to `builtins.trace`. /* Pretty print a value, akin to `builtins.trace`.
* Should probably be a builtin as well. * Should probably be a builtin as well.
*/ */
@ -107,17 +143,13 @@ rec {
(This means fn is type Val -> String.) */ (This means fn is type Val -> String.) */
allowPrettyValues ? false allowPrettyValues ? false
}@args: v: with builtins; }@args: v: with builtins;
if isInt v then toString v let isPath = v: typeOf v == "path";
else if isBool v then (if v == true then "true" else "false") in if isInt v then toString v
else if isString v then "\"" + v + "\"" else if isString v then ''"${libStr.escape [''"''] v}"''
else if null == v then "null" else if true == v then "true"
else if isFunction v then else if false == v then "false"
let fna = lib.functionArgs v; else if null == v then "null"
showFnas = concatStringsSep "," (libAttr.mapAttrsToList else if isPath v then toString v
(name: hasDefVal: if hasDefVal then "(${name})" else name)
fna);
in if fna == {} then "<λ>"
else "<λ:{${showFnas}}>"
else if isList v then "[ " else if isList v then "[ "
+ libStr.concatMapStringsSep " " (toPretty args) v + libStr.concatMapStringsSep " " (toPretty args) v
+ " ]" + " ]"
@ -126,12 +158,21 @@ rec {
if attrNames v == [ "__pretty" "val" ] && allowPrettyValues if attrNames v == [ "__pretty" "val" ] && allowPrettyValues
then v.__pretty v.val then v.__pretty v.val
# TODO: there is probably a better representation? # TODO: there is probably a better representation?
else if v ? type && v.type == "derivation" then "<δ>" else if v ? type && v.type == "derivation" then
"<δ:${v.name}>"
# "<δ:${concatStringsSep "," (builtins.attrNames v)}>"
else "{ " else "{ "
+ libStr.concatStringsSep " " (libAttr.mapAttrsToList + libStr.concatStringsSep " " (libAttr.mapAttrsToList
(name: value: (name: value:
"${toPretty args name} = ${toPretty args value};") v) "${toPretty args name} = ${toPretty args value};") v)
+ " }" + " }"
else if isFunction v then
let fna = lib.functionArgs v;
showFnas = concatStringsSep "," (libAttr.mapAttrsToList
(name: hasDefVal: if hasDefVal then "(${name})" else name)
fna);
in if fna == {} then "<λ>"
else "<λ:{${showFnas}}>"
else abort "toPretty: should never happen (v = ${v})"; else abort "toPretty: should never happen (v = ${v})";
} }

View file

@ -179,6 +179,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "CeCILL-C Free Software License Agreement"; fullName = "CeCILL-C Free Software License Agreement";
}; };
cpal10 = spdx {
spdxId = "CPAL-1.0";
fullName = "Common Public Attribution License 1.0";
};
cpl10 = spdx { cpl10 = spdx {
spdxId = "CPL-1.0"; spdxId = "CPL-1.0";
fullName = "Common Public License 1.0"; fullName = "Common Public License 1.0";
@ -279,7 +284,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
gpl2Oss = { gpl2Oss = {
fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)"; fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
url = http://www.mysql.com/about/legal/licensing/foss-exception; url = https://www.mysql.com/about/legal/licensing/foss-exception;
}; };
gpl2Plus = spdx { gpl2Plus = spdx {

View file

@ -1,7 +1,9 @@
# General list operations. # General list operations.
{ lib }: { lib }:
with lib.trivial; with lib.trivial;
let
inherit (lib.strings) toInt;
in
rec { rec {
inherit (builtins) head tail length isList elemAt concatLists filter elem genList; inherit (builtins) head tail length isList elemAt concatLists filter elem genList;
@ -409,6 +411,25 @@ rec {
then compareLists cmp (tail a) (tail b) then compareLists cmp (tail a) (tail b)
else rel; else rel;
/* Sort list using "Natural sorting".
Numeric portions of strings are sorted in numeric order.
Example:
naturalSort ["disk11" "disk8" "disk100" "disk9"]
=> ["disk8" "disk9" "disk11" "disk100"]
naturalSort ["10.46.133.149" "10.5.16.62" "10.54.16.25"]
=> ["10.5.16.62" "10.46.133.149" "10.54.16.25"]
naturalSort ["v0.2" "v0.15" "v0.0.9"]
=> [ "v0.0.9" "v0.2" "v0.15" ]
*/
naturalSort = lst:
let
vectorise = s: map (x: if isList x then toInt (head x) else x) (builtins.split "(0|[1-9][0-9]*)" s);
prepared = map (x: [ (vectorise x) x ]) lst; # remember vectorised version for O(n) regex splits
less = a: b: (compareLists compare (head a) (head b)) < 0;
in
map (x: elemAt x 1) (sort less prepared);
/* Return the first (at most) N elements of a list. /* Return the first (at most) N elements of a list.
Example: Example:

View file

@ -86,4 +86,6 @@ rec {
then { system = elem; } then { system = elem; }
else { parsed = elem; }; else { parsed = elem; };
in lib.matchAttrs pattern platform; in lib.matchAttrs pattern platform;
enableIfAvailable = p: if p.meta.available or true then [ p ] else [];
} }

View file

@ -59,7 +59,7 @@ rec {
}; };
}; };
closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs); closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options lib; } // specialArgs);
options = mergeModules prefix (reverseList (filterModules (specialArgs.modulesPath or "") closed)); options = mergeModules prefix (reverseList (filterModules (specialArgs.modulesPath or "") closed));
@ -159,7 +159,7 @@ rec {
context = name: ''while evaluating the module argument `${name}' in "${key}":''; context = name: ''while evaluating the module argument `${name}' in "${key}":'';
extraArgs = builtins.listToAttrs (map (name: { extraArgs = builtins.listToAttrs (map (name: {
inherit name; inherit name;
value = addErrorContext (context name) value = builtins.addErrorContext (context name)
(args.${name} or config._module.args.${name}); (args.${name} or config._module.args.${name});
}) requiredArgs); }) requiredArgs);
@ -309,7 +309,7 @@ rec {
res.mergedValue; res.mergedValue;
in opt // in opt //
{ value = addErrorContext "while evaluating the option `${showOption loc}':" value; { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
definitions = map (def: def.value) res.defsFinal; definitions = map (def: def.value) res.defsFinal;
files = map (def: def.file) res.defsFinal; files = map (def: def.file) res.defsFinal;
inherit (res) isDefined; inherit (res) isDefined;
@ -660,7 +660,7 @@ rec {
doRename = { from, to, visible, warn, use }: doRename = { from, to, visible, warn, use }:
let let
toOf = attrByPath to toOf = attrByPath to
(abort "Renaming error: option `${showOption to}' does not exists."); (abort "Renaming error: option `${showOption to}' does not exist.");
in in
{ config, options, ... }: { config, options, ... }:
{ options = setAttrByPath from (mkOption { { options = setAttrByPath from (mkOption {

View file

@ -437,6 +437,13 @@ rec {
*/ */
fixedWidthNumber = width: n: fixedWidthString width "0" (toString n); fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
/* Check whether a value can be coerced to a string */
isCoercibleToString = x:
builtins.elem (builtins.typeOf x) [ "path" "string" "null" "int" "float" "bool" ] ||
(builtins.isList x && lib.all isCoercibleToString x) ||
x ? outPath ||
x ? __toString;
/* Check whether a value is a store path. /* Check whether a value is a store path.
Example: Example:
@ -450,7 +457,7 @@ rec {
=> false => false
*/ */
isStorePath = x: isStorePath = x:
builtins.isString x isCoercibleToString x
&& builtins.substring 0 1 (toString x) == "/" && builtins.substring 0 1 (toString x) == "/"
&& dirOf (builtins.toPath x) == builtins.storeDir; && dirOf (builtins.toPath x) == builtins.storeDir;

View file

@ -45,6 +45,8 @@ rec {
}; };
# Misc boolean options # Misc boolean options
useAndroidPrebuilt = false; useAndroidPrebuilt = false;
useiOSPrebuilt = false;
isiPhoneSimulator = false;
} // mapAttrs (n: v: v final.parsed) inspect.predicates } // mapAttrs (n: v: v final.parsed) inspect.predicates
// args; // args;
in assert final.useAndroidPrebuilt -> final.isAndroid; in assert final.useAndroidPrebuilt -> final.isAndroid;

View file

@ -102,16 +102,36 @@ rec {
# #
iphone64 = { iphone64 = {
config = "aarch64-apple-darwin14"; config = "aarch64-apple-ios";
arch = "arm64"; # config = "aarch64-apple-darwin14";
libc = "libSystem"; sdkVer = "10.2";
useiOSPrebuilt = true;
platform = {}; platform = {};
}; };
iphone32 = { iphone32 = {
config = "arm-apple-darwin10"; config = "armv7a-apple-ios";
arch = "armv7-a"; # config = "arm-apple-darwin10";
libc = "libSystem"; sdkVer = "10.2";
useiOSPrebuilt = true;
platform = {};
};
iphone64-simulator = {
config = "x86_64-apple-ios";
# config = "x86_64-apple-darwin14";
sdkVer = "10.2";
useiOSPrebuilt = true;
isiPhoneSimulator = true;
platform = {};
};
iphone32-simulator = {
config = "i686-apple-ios";
# config = "i386-apple-darwin11";
sdkVer = "10.2";
useiOSPrebuilt = true;
isiPhoneSimulator = true;
platform = {}; platform = {};
}; };

View file

@ -4,8 +4,8 @@ let
inherit (lib.systems.inspect) patterns; inherit (lib.systems.inspect) patterns;
in rec { in rec {
inherit (lib.systems.doubles) all mesaPlatforms; all = [ {} ]; # `{}` matches anything
none = []; none = [];
arm = [ patterns.isAarch32 ]; arm = [ patterns.isAarch32 ];
aarch64 = [ patterns.isAarch64 ]; aarch64 = [ patterns.isAarch64 ];
@ -13,6 +13,7 @@ in rec {
i686 = [ patterns.isi686 ]; i686 = [ patterns.isi686 ];
x86_64 = [ patterns.isx86_64 ]; x86_64 = [ patterns.isx86_64 ];
mips = [ patterns.isMips ]; mips = [ patterns.isMips ];
riscv = [ patterns.isRiscV ];
cygwin = [ patterns.isCygwin ]; cygwin = [ patterns.isCygwin ];
darwin = [ patterns.isDarwin ]; darwin = [ patterns.isDarwin ];
@ -24,4 +25,7 @@ in rec {
netbsd = [ patterns.isNetBSD ]; netbsd = [ patterns.isNetBSD ];
openbsd = [ patterns.isOpenBSD ]; openbsd = [ patterns.isOpenBSD ];
unix = patterns.isUnix; # Actually a list unix = patterns.isUnix; # Actually a list
windows = [ patterns.isWindows ];
inherit (lib.systems.doubles) mesaPlatforms;
} }

View file

@ -21,9 +21,11 @@ rec {
isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; }; isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; }; isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
isDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; };
isUnix = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ]; isUnix = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ];
isDarwin = { kernel = kernels.darwin; }; isMacOS = { kernel = kernels.macos; };
isiOS = { kernel = kernels.ios; };
isLinux = { kernel = kernels.linux; }; isLinux = { kernel = kernels.linux; };
isSunOS = { kernel = kernels.solaris; }; isSunOS = { kernel = kernels.solaris; };
isFreeBSD = { kernel = kernels.freebsd; }; isFreeBSD = { kernel = kernels.freebsd; };
@ -38,12 +40,8 @@ rec {
isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
isKexecable = map (family: { kernel = kernels.linux; cpu.family = family; })
[ "x86" "arm" "aarch64" "mips" ];
isEfi = map (family: { cpu.family = family; }) isEfi = map (family: { cpu.family = family; })
[ "x86" "arm" "aarch64" ]; [ "x86" "arm" "aarch64" ];
isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
[ "x86" "arm" "aarch64" "mips" ];
# Deprecated after 18.03 # Deprecated after 18.03
isArm = isAarch32; isArm = isAarch32;

View file

@ -34,7 +34,7 @@ rec {
################################################################################ ################################################################################
types.openSignifiantByte = mkOptionType { types.openSignificantByte = mkOptionType {
name = "significant-byte"; name = "significant-byte";
description = "Endianness"; description = "Endianness";
merge = mergeOneOption; merge = mergeOneOption;
@ -42,7 +42,7 @@ rec {
types.significantByte = enum (attrValues significantBytes); types.significantByte = enum (attrValues significantBytes);
significantBytes = setTypes types.openSignifiantByte { significantBytes = setTypes types.openSignificantByte {
bigEndian = {}; bigEndian = {};
littleEndian = {}; littleEndian = {};
}; };
@ -140,6 +140,7 @@ rec {
kernelFamilies = setTypes types.openKernelFamily { kernelFamilies = setTypes types.openKernelFamily {
bsd = {}; bsd = {};
darwin = {};
}; };
################################################################################ ################################################################################
@ -155,7 +156,10 @@ rec {
types.kernel = enum (attrValues kernels); types.kernel = enum (attrValues kernels);
kernels = with execFormats; with kernelFamilies; setTypes types.openKernel { kernels = with execFormats; with kernelFamilies; setTypes types.openKernel {
darwin = { execFormat = macho; families = { }; }; # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as
# the nnormalized name for macOS.
macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; };
ios = { execFormat = macho; families = { inherit darwin; }; };
freebsd = { execFormat = elf; families = { inherit bsd; }; }; freebsd = { execFormat = elf; families = { inherit bsd; }; };
hurd = { execFormat = elf; families = { }; }; hurd = { execFormat = elf; families = { }; };
linux = { execFormat = elf; families = { }; }; linux = { execFormat = elf; families = { }; };
@ -165,9 +169,13 @@ rec {
solaris = { execFormat = elf; families = { }; }; solaris = { execFormat = elf; families = { }; };
windows = { execFormat = pe; families = { }; }; windows = { execFormat = pe; families = { }; };
} // { # aliases } // { # aliases
# 'darwin' is the kernel for all of them. We choose macOS by default.
darwin = kernels.macos;
# TODO(@Ericson2314): Handle these Darwin version suffixes more generally. # TODO(@Ericson2314): Handle these Darwin version suffixes more generally.
darwin10 = kernels.darwin; darwin10 = kernels.macos;
darwin14 = kernels.darwin; darwin14 = kernels.macos;
watchos = kernels.ios;
tvos = kernels.ios;
win32 = kernels.windows; win32 = kernels.windows;
}; };
@ -202,7 +210,7 @@ rec {
################################################################################ ################################################################################
types.system = mkOptionType { types.parsedPlatform = mkOptionType {
name = "system"; name = "system";
description = "fully parsed representation of llvm- or nix-style platform tuple"; description = "fully parsed representation of llvm- or nix-style platform tuple";
merge = mergeOneOption; merge = mergeOneOption;
@ -216,7 +224,7 @@ rec {
isSystem = isType "system"; isSystem = isType "system";
mkSystem = components: mkSystem = components:
assert types.system.check components; assert types.parsedPlatform.check components;
setType "system" components; setType "system" components;
mkSkeletonFromList = l: { mkSkeletonFromList = l: {
@ -272,8 +280,8 @@ rec {
mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s)); mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
doubleFromSystem = { cpu, vendor, kernel, abi, ... }: doubleFromSystem = { cpu, vendor, kernel, abi, ... }:
if abi == abis.cygnus /**/ if abi == abis.cygnus then "${cpu.name}-cygwin"
then "${cpu.name}-cygwin" else if kernel.families ? darwin then "${cpu.name}-darwin"
else "${cpu.name}-${kernel.name}"; else "${cpu.name}-${kernel.name}";
tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let

View file

@ -93,6 +93,7 @@ runTests {
"${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11"; "${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11";
in { in {
storePath = isStorePath goodPath; storePath = isStorePath goodPath;
storePathDerivation = isStorePath (import ../.. {}).hello;
storePathAppendix = isStorePath storePathAppendix = isStorePath
"${goodPath}/bin/python"; "${goodPath}/bin/python";
nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath))); nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
@ -106,6 +107,7 @@ runTests {
}; };
expected = { expected = {
storePath = true; storePath = true;
storePathDerivation = true;
storePathAppendix = false; storePathAppendix = false;
nonAbsolute = false; nonAbsolute = false;
asPath = true; asPath = true;
@ -205,6 +207,29 @@ runTests {
expected = ''f\:oo:bar''; expected = ''f\:oo:bar'';
}; };
testMkValueString = {
expr = let
vals = {
int = 42;
string = ''fo"o'';
bool = true;
bool2 = false;
null = null;
# float = 42.23; # floats are strange
};
in mapAttrs
(const (generators.mkValueStringDefault {}))
vals;
expected = {
int = "42";
string = ''fo"o'';
bool = "true";
bool2 = "false";
null = "null";
# float = "42.23" true false [ "bar" ] ]'';
};
};
testToKeyValue = { testToKeyValue = {
expr = generators.toKeyValue {} { expr = generators.toKeyValue {} {
key = "value"; key = "value";
@ -247,6 +272,8 @@ runTests {
"section 1" = { "section 1" = {
attribute1 = 5; attribute1 = 5;
x = "Me-se JarJar Binx"; x = "Me-se JarJar Binx";
# booleans are converted verbatim by default
boolean = false;
}; };
"foo[]" = { "foo[]" = {
"he\\h=he" = "this is okay"; "he\\h=he" = "this is okay";
@ -258,6 +285,7 @@ runTests {
[section 1] [section 1]
attribute1=5 attribute1=5
boolean=false
x=Me-se JarJar Binx x=Me-se JarJar Binx
''; '';
}; };
@ -289,7 +317,8 @@ runTests {
expr = mapAttrs (const (generators.toPretty {})) rec { expr = mapAttrs (const (generators.toPretty {})) rec {
int = 42; int = 42;
bool = true; bool = true;
string = "fnord"; string = ''fno"rd'';
path = /. + "/foo"; # toPath returns a string
null_ = null; null_ = null;
function = x: x; function = x: x;
functionArgs = { arg ? 4, foo }: arg; functionArgs = { arg ? 4, foo }: arg;
@ -300,13 +329,14 @@ runTests {
expected = rec { expected = rec {
int = "42"; int = "42";
bool = "true"; bool = "true";
string = "\"fnord\""; string = ''"fno\"rd"'';
path = "/foo";
null_ = "null"; null_ = "null";
function = "<λ>"; function = "<λ>";
functionArgs = "<λ:{(arg),foo}>"; functionArgs = "<λ:{(arg),foo}>";
list = "[ 3 4 ${function} [ false ] ]"; list = "[ 3 4 ${function} [ false ] ]";
attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }"; attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }";
drv = "<δ>"; drv = "<δ:test>";
}; };
}; };

View file

@ -136,7 +136,18 @@ checkConfigOutput "true" "$@" ./define-module-check.nix
# Check coerced value. # Check coerced value.
checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix
# Check coerced value with unsound coercion
checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
# Check loaOf with long list.
checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix
# Check loaOf with many merges of lists.
checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix
cat <<EOF cat <<EOF
====== module tests ====== ====== module tests ======

View file

@ -0,0 +1,10 @@
{ lib, ... }:
{
options = {
value = lib.mkOption {
default = "12";
type = lib.types.coercedTo lib.types.str lib.toInt lib.types.ints.s8;
};
};
}

View file

@ -0,0 +1,3 @@
{
value = "foobar";
}

View file

@ -0,0 +1,3 @@
{
value = "1000";
}

View file

@ -0,0 +1,19 @@
{ config, lib, ... }:
{
options = {
loaOfInt = lib.mkOption {
type = lib.types.loaOf lib.types.int;
};
result = lib.mkOption {
type = lib.types.str;
};
};
config = {
loaOfInt = [ 1 2 3 4 5 6 7 8 9 10 ];
result = toString (lib.attrValues config.loaOfInt);
};
}

View file

@ -0,0 +1,19 @@
{ config, lib, ... }:
{
options = {
loaOfInt = lib.mkOption {
type = lib.types.loaOf lib.types.int;
};
result = lib.mkOption {
type = lib.types.str;
};
};
config = {
loaOfInt = lib.mkMerge (map lib.singleton [ 1 2 3 4 5 6 7 8 9 10 ]);
result = toString (lib.attrValues config.loaOfInt);
};
}

View file

@ -13,7 +13,6 @@ pkgs.stdenv.mkDerivation {
export NIX_DB_DIR=$TEST_ROOT/db export NIX_DB_DIR=$TEST_ROOT/db
export NIX_LOCALSTATE_DIR=$TEST_ROOT/var export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
export NIX_LOG_DIR=$TEST_ROOT/var/log/nix export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_STATE_DIR=$TEST_ROOT/var/nix
export NIX_STORE_DIR=$TEST_ROOT/store export NIX_STORE_DIR=$TEST_ROOT/store
export PAGER=cat export PAGER=cat
@ -21,7 +20,7 @@ pkgs.stdenv.mkDerivation {
nix-store --init nix-store --init
cd ${pkgs.path}/lib/tests cd ${pkgs.path}/lib/tests
./modules.sh bash ./modules.sh
[[ "$(nix-instantiate --eval --strict misc.nix)" == "[ ]" ]] [[ "$(nix-instantiate --eval --strict misc.nix)" == "[ ]" ]]

View file

@ -58,11 +58,14 @@ rec {
inherit (lib.strings) fileContents; inherit (lib.strings) fileContents;
release = fileContents ../.version;
versionSuffix = let suffixFile = ../.version-suffix; in
if pathExists suffixFile then fileContents suffixFile else "pre-git";
# Return the Nixpkgs version number. # Return the Nixpkgs version number.
nixpkgsVersion = version = release + versionSuffix;
let suffixFile = ../.version-suffix; in
fileContents ../.version nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
+ (if pathExists suffixFile then fileContents suffixFile else "pre-git");
# Whether we're being called by nix-shell. # Whether we're being called by nix-shell.
inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";

View file

@ -256,7 +256,7 @@ rec {
functor = (defaultFunctor name) // { wrapped = elemType; }; functor = (defaultFunctor name) // { wrapped = elemType; };
}; };
nonEmptyListOf = elemType: nonEmptyListOf = elemType:
let list = addCheck (types.listOf elemType) (l: l != []); let list = addCheck (types.listOf elemType) (l: l != []);
in list // { description = "non-empty " + list.description; }; in list // { description = "non-empty " + list.description; };
@ -280,15 +280,26 @@ rec {
# List or attribute set of ... # List or attribute set of ...
loaOf = elemType: loaOf = elemType:
let let
convertIfList = defIdx: def: convertAllLists = defs:
let
padWidth = stringLength (toString (length defs));
unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + ".";
in
imap1 (i: convertIfList (unnamedPrefix i)) defs;
convertIfList = unnamedPrefix: def:
if isList def.value then if isList def.value then
{ inherit (def) file; let
value = listToAttrs ( padWidth = stringLength (toString (length def.value));
imap1 (elemIdx: elem: unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i;
{ name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}"; in
value = elem; { inherit (def) file;
}) def.value); value = listToAttrs (
} imap1 (elemIdx: elem:
{ name = elem.name or (unnamed elemIdx);
value = elem;
}) def.value);
}
else else
def; def;
listOnly = listOf elemType; listOnly = listOf elemType;
@ -297,7 +308,7 @@ rec {
name = "loaOf"; name = "loaOf";
description = "list or attribute set of ${elemType.description}s"; description = "list or attribute set of ${elemType.description}s";
check = x: isList x || isAttrs x; check = x: isList x || isAttrs x;
merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs); merge = loc: defs: attrOnly.merge loc (convertAllLists defs);
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]); getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
getSubModules = elemType.getSubModules; getSubModules = elemType.getSubModules;
substSubModules = m: loaOf (elemType.substSubModules m); substSubModules = m: loaOf (elemType.substSubModules m);
@ -419,16 +430,13 @@ rec {
assert coercedType.getSubModules == null; assert coercedType.getSubModules == null;
mkOptionType rec { mkOptionType rec {
name = "coercedTo"; name = "coercedTo";
description = "${finalType.description} or ${coercedType.description}"; description = "${finalType.description} or ${coercedType.description} convertible to it";
check = x: finalType.check x || coercedType.check x; check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x));
merge = loc: defs: merge = loc: defs:
let let
coerceVal = val: coerceVal = val:
if finalType.check val then val if finalType.check val then val
else let else coerceFunc val;
coerced = coerceFunc val;
in assert finalType.check coerced; coerced;
in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs); in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs);
getSubOptions = finalType.getSubOptions; getSubOptions = finalType.getSubOptions;
getSubModules = finalType.getSubModules; getSubModules = finalType.getSubModules;

View file

@ -28,6 +28,11 @@
github = "AndersonTorres"; github = "AndersonTorres";
name = "Anderson Torres"; name = "Anderson Torres";
}; };
Anton-Latukha = {
email = "anton.latuka+nixpkgs@gmail.com";
github = "Anton-Latukha";
name = "Anton Latukha";
};
Baughn = { Baughn = {
email = "sveina@gmail.com"; email = "sveina@gmail.com";
github = "Baughn"; github = "Baughn";
@ -63,11 +68,20 @@
github = "DmitryTsygankov"; github = "DmitryTsygankov";
name = "Dmitry Tsygankov"; name = "Dmitry Tsygankov";
}; };
Esteth = {
email = "adam.copp@gmail.com";
name = "Adam Copp";
};
FireyFly = { FireyFly = {
email = "nix@firefly.nu"; email = "nix@firefly.nu";
github = "FireyFly"; github = "FireyFly";
name = "Jonas Höglund"; name = "Jonas Höglund";
}; };
Fresheyeball = {
email = "fresheyeball@gmail.com";
github = "fresheyeball";
name = "Isaac Shapira";
};
Gonzih = { Gonzih = {
email = "gonzih@gmail.com"; email = "gonzih@gmail.com";
github = "Gonzih"; github = "Gonzih";
@ -87,6 +101,11 @@
github = "MP2E"; github = "MP2E";
name = "Cray Elliott"; name = "Cray Elliott";
}; };
Mogria = {
email = "m0gr14@gmail.com";
github = "mogria";
name = "Mogria";
};
MostAwesomeDude = { MostAwesomeDude = {
email = "cds@corbinsimpson.com"; email = "cds@corbinsimpson.com";
github = "MostAwesomeDude"; github = "MostAwesomeDude";
@ -111,6 +130,11 @@
github = "Profpatsch"; github = "Profpatsch";
name = "Profpatsch"; name = "Profpatsch";
}; };
roosemberth = {
email = "roosembert.palacios+nixpkgs@gmail.com";
github = "roosemberth";
name = "Roosembert (Roosemberth) Palacios";
};
SShrike = { SShrike = {
email = "severen@shrike.me"; email = "severen@shrike.me";
github = "severen"; github = "severen";
@ -176,6 +200,11 @@
github = "abigailbuccaneer"; github = "abigailbuccaneer";
name = "Abigail Bunyan"; name = "Abigail Bunyan";
}; };
aborsu = {
email = "a.borsu@gmail.com";
github = "aborsu";
name = "Augustin Borsu";
};
aboseley = { aboseley = {
email = "adam.boseley@gmail.com"; email = "adam.boseley@gmail.com";
github = "aboseley"; github = "aboseley";
@ -276,6 +305,21 @@
github = "akc"; github = "akc";
name = "Anders Claesson"; name = "Anders Claesson";
}; };
akru = {
email = "mail@akru.me";
github = "akru";
name = "Alexander Krupenkin ";
};
alexchapman = {
name = "Alex Chapman";
email = "alex@farfromthere.net";
github = "AJChapman";
};
alexfmpe = {
email = "alexandre.fmp.esteves@gmail.com";
github = "alexfmpe";
name = "Alexandre Esteves";
};
alexvorobiev = { alexvorobiev = {
email = "alexander.vorobiev@gmail.com"; email = "alexander.vorobiev@gmail.com";
github = "alexvorobiev"; github = "alexvorobiev";
@ -314,6 +358,11 @@
github = "amiloradovsky"; github = "amiloradovsky";
name = "Andrew Miloradovsky"; name = "Andrew Miloradovsky";
}; };
aminechikhaoui = {
email = "amine.chikhaoui91@gmail.com";
github = "AmineChikhaoui";
name = "Amine Chikhaoui";
};
amorsillo = { amorsillo = {
email = "andrew.morsillo@gmail.com"; email = "andrew.morsillo@gmail.com";
github = "AndrewMorsillo"; github = "AndrewMorsillo";
@ -483,6 +532,11 @@
email = "sivaraman.balaji@gmail.com"; email = "sivaraman.balaji@gmail.com";
name = "Balaji Sivaraman"; name = "Balaji Sivaraman";
}; };
bandresen = {
email = "bandresen@gmail.com";
github = "bandresen";
name = "Benjamin Andresen";
};
barrucadu = { barrucadu = {
email = "mike@barrucadu.co.uk"; email = "mike@barrucadu.co.uk";
github = "barrucadu"; github = "barrucadu";
@ -543,6 +597,16 @@
github = "bergey"; github = "bergey";
name = "Daniel Bergey"; name = "Daniel Bergey";
}; };
bfortz = {
email = "bernard.fortz@gmail.com";
github = "bfortz";
name = "Bernard Fortz";
};
bgamari = {
email = "ben@smart-cactus.org";
github = "bgamari";
name = "Ben Gamari";
};
bhipple = { bhipple = {
email = "bhipple@protonmail.com"; email = "bhipple@protonmail.com";
github = "bhipple"; github = "bhipple";
@ -555,7 +619,6 @@
}; };
bjg = { bjg = {
email = "bjg@gnu.org"; email = "bjg@gnu.org";
github = "civodul";
name = "Brian Gough"; name = "Brian Gough";
}; };
bjornfor = { bjornfor = {
@ -563,6 +626,11 @@
github = "bjornfor"; github = "bjornfor";
name = "Bjørn Forsman"; name = "Bjørn Forsman";
}; };
bkchr = {
email = "nixos@kchr.de";
github = "bkchr";
name = "Bastian Köcher";
};
bluescreen303 = { bluescreen303 = {
email = "mathijs@bluescreen303.nl"; email = "mathijs@bluescreen303.nl";
github = "bluescreen303"; github = "bluescreen303";
@ -598,6 +666,11 @@
github = "bradediger"; github = "bradediger";
name = "Brad Ediger"; name = "Brad Ediger";
}; };
brainrape = {
email = "martonboros@gmail.com";
github = "brainrape";
name = "Marton Boros";
};
bramd = { bramd = {
email = "bram@bramd.nl"; email = "bram@bramd.nl";
github = "bramd"; github = "bramd";
@ -632,11 +705,6 @@
github = "calbrecht"; github = "calbrecht";
name = "Christian Albrecht"; name = "Christian Albrecht";
}; };
calrama = {
email = "moritz@ucworks.org";
github = "MoritzMaxeiner";
name = "Moritz Maxeiner";
};
calvertvl = { calvertvl = {
email = "calvertvl@gmail.com"; email = "calvertvl@gmail.com";
github = "calvertvl"; github = "calvertvl";
@ -652,11 +720,21 @@
github = "canndrew"; github = "canndrew";
name = "Andrew Cann"; name = "Andrew Cann";
}; };
carlosdagos = {
email = "m@cdagostino.io";
github = "carlosdagos";
name = "Carlos D'Agostino";
};
carlsverre = { carlsverre = {
email = "accounts@carlsverre.com"; email = "accounts@carlsverre.com";
github = "carlsverre"; github = "carlsverre";
name = "Carl Sverre"; name = "Carl Sverre";
}; };
cartr = {
email = "carter.sande@duodecima.technology";
github = "cartr";
name = "Carter Sande";
};
casey = { casey = {
email = "casey@rodarmor.net"; email = "casey@rodarmor.net";
github = "casey"; github = "casey";
@ -920,6 +998,11 @@
github = "demin-dmitriy"; github = "demin-dmitriy";
name = "Dmitriy Demin"; name = "Dmitriy Demin";
}; };
demyanrogozhin = {
email = "demyan.rogozhin@gmail.com";
github = "demyanrogozhin";
name = "Demyan Rogozhin";
};
derchris = { derchris = {
email = "derchris@me.com"; email = "derchris@me.com";
github = "derchrisuk"; github = "derchrisuk";
@ -1034,11 +1117,6 @@
github = "dtzWill"; github = "dtzWill";
name = "Will Dietz"; name = "Will Dietz";
}; };
dupgit = {
email = "olivier.delhomme@free.fr";
github = "dupgit";
name = "Olivier Delhomme";
};
dywedir = { dywedir = {
email = "dywedir@protonmail.ch"; email = "dywedir@protonmail.ch";
github = "dywedir"; github = "dywedir";
@ -1143,6 +1221,16 @@
github = "ellis"; github = "ellis";
name = "Ellis Whitehead"; name = "Ellis Whitehead";
}; };
elvishjerricco = {
email = "elvishjerricco@gmail.com";
github = "ElvishJerricco";
name = "Will Fancher";
};
endgame = {
email = "jack@jackkelly.name";
github = "endgame";
name = "Jack Kelly";
};
enzime = { enzime = {
email = "enzime@users.noreply.github.com"; email = "enzime@users.noreply.github.com";
github = "enzime"; github = "enzime";
@ -1158,7 +1246,7 @@
name = "Mabry Cervin"; name = "Mabry Cervin";
}; };
eqyiel = { eqyiel = {
email = "r@rkm.id.au"; email = "ruben@maher.fyi";
github = "eqyiel"; github = "eqyiel";
name = "Ruben Maher"; name = "Ruben Maher";
}; };
@ -1247,6 +1335,11 @@
github = "fare"; github = "fare";
name = "Francois-Rene Rideau"; name = "Francois-Rene Rideau";
}; };
fdns = {
email = "fdns02@gmail.com";
github = "fdns";
name = "Felipe Espinoza";
};
fgaz = { fgaz = {
email = "francygazz@gmail.com"; email = "francygazz@gmail.com";
github = "fgaz"; github = "fgaz";
@ -1524,6 +1617,11 @@
github = "hrdinka"; github = "hrdinka";
name = "Christoph Hrdinka"; name = "Christoph Hrdinka";
}; };
hschaeidt = {
email = "he.schaeidt@gmail.com";
github = "hschaeidt";
name = "Hendrik Schaeidt";
};
htr = { htr = {
email = "hugo@linux.com"; email = "hugo@linux.com";
github = "htr"; github = "htr";
@ -1549,6 +1647,11 @@
github = "iblech"; github = "iblech";
name = "Ingo Blechschmidt"; name = "Ingo Blechschmidt";
}; };
idontgetoutmuch = {
email = "dominic@steinitz.org";
github = "idontgetoutmuch";
name = "Dominic Steinitz";
};
igsha = { igsha = {
email = "igor.sharonov@gmail.com"; email = "igor.sharonov@gmail.com";
github = "igsha"; github = "igsha";
@ -1628,6 +1731,11 @@
github = "jbedo"; github = "jbedo";
name = "Justin Bedő"; name = "Justin Bedő";
}; };
jbgi = {
email = "jb@giraudeau.info";
github = "jbgi";
name = "Jean-Baptiste Giraudeau";
};
jcumming = { jcumming = {
email = "jack@mudshark.org"; email = "jack@mudshark.org";
name = "Jack Cummings"; name = "Jack Cummings";
@ -1637,13 +1745,18 @@
github = "jdagilliland"; github = "jdagilliland";
name = "Jason Gilliland"; name = "Jason Gilliland";
}; };
jD91mZM2 = {
email = "me@krake.one";
github = "jD91mZM2";
name = "jD91mZM2";
};
jefdaj = { jefdaj = {
email = "jefdaj@gmail.com"; email = "jefdaj@gmail.com";
github = "jefdaj"; github = "jefdaj";
name = "Jeffrey David Johnson"; name = "Jeffrey David Johnson";
}; };
jensbin = { jensbin = {
email = "jensbin@protonmail.com"; email = "jensbin+git@pm.me";
github = "jensbin"; github = "jensbin";
name = "Jens Binkert"; name = "Jens Binkert";
}; };
@ -1657,13 +1770,18 @@
github = "tftio"; github = "tftio";
name = "James Felix Black"; name = "James Felix Black";
}; };
jflanglois = {
email = "yourstruly@julienlanglois.me";
github = "jflanglois";
name = "Julien Langlois";
};
jfrankenau = { jfrankenau = {
email = "johannes@frankenau.net"; email = "johannes@frankenau.net";
github = "jfrankenau"; github = "jfrankenau";
name = "Johannes Frankenau"; name = "Johannes Frankenau";
}; };
jgeerds = { jgeerds = {
email = "jascha@jgeerds.name"; email = "jascha@geerds.org";
github = "jgeerds"; github = "jgeerds";
name = "Jascha Geerds"; name = "Jascha Geerds";
}; };
@ -1707,6 +1825,11 @@
github = "joamaki"; github = "joamaki";
name = "Jussi Maki"; name = "Jussi Maki";
}; };
joelburget = {
email = "joelburget@gmail.com";
github = "joelburget";
name = "Joel Burget";
};
joelmo = { joelmo = {
email = "joel.moberg@gmail.com"; email = "joel.moberg@gmail.com";
github = "joelmo"; github = "joelmo";
@ -1726,6 +1849,11 @@
github = "johnazoidberg"; github = "johnazoidberg";
name = "Daniel Schäfer"; name = "Daniel Schäfer";
}; };
johnchildren = {
email = "john.a.children@gmail.com";
github = "johnchildren";
name = "John Children";
};
johnmh = { johnmh = {
email = "johnmh@openblox.org"; email = "johnmh@openblox.org";
github = "johnmh"; github = "johnmh";
@ -1819,6 +1947,11 @@
email = "info+nix@chmist.com"; email = "info+nix@chmist.com";
name = "karolchmist"; name = "karolchmist";
}; };
kazcw = {
email = "kaz@lambdaverse.org";
github = "kazcw";
name = "Kaz Wesley";
};
kentjames = { kentjames = {
email = "jameschristopherkent@gmail.com"; email = "jameschristopherkent@gmail.com";
github = "kentjames"; github = "kentjames";
@ -1883,6 +2016,11 @@
github = "kragniz"; github = "kragniz";
name = "Louis Taylor"; name = "Louis Taylor";
}; };
krav = {
email = "kristoffer@microdisko.no";
github = "krav";
name = "Kristoffer Thømt Ravneberg";
};
kristoff3r = { kristoff3r = {
email = "k.soeholm@gmail.com"; email = "k.soeholm@gmail.com";
github = "kristoff3r"; github = "kristoff3r";
@ -1948,6 +2086,11 @@
github = "leenaars"; github = "leenaars";
name = "Michiel Leenaars"; name = "Michiel Leenaars";
}; };
leo60228 = {
email = "iakornfeld@gmail.com";
github = "leo60228";
name = "leo60228";
};
leonardoce = { leonardoce = {
email = "leonardo.cecchi@gmail.com"; email = "leonardo.cecchi@gmail.com";
github = "leonardoce"; github = "leonardoce";
@ -2013,6 +2156,11 @@
github = "lo1tuma"; github = "lo1tuma";
name = "Mathias Schreck"; name = "Mathias Schreck";
}; };
lopsided98 = {
email = "benwolsieffer@gmail.com";
github = "lopsided98";
name = "Ben Wolsieffer";
};
loskutov = { loskutov = {
email = "ignat.loskutov@gmail.com"; email = "ignat.loskutov@gmail.com";
github = "loskutov"; github = "loskutov";
@ -2140,6 +2288,11 @@
github = "markuskowa"; github = "markuskowa";
name = "Markus Kowalewski"; name = "Markus Kowalewski";
}; };
marsam = {
email = "marsam@users.noreply.github.com";
github = "marsam";
name = "Mario Rodas";
};
martijnvermaat = { martijnvermaat = {
email = "martijn@vermaat.name"; email = "martijn@vermaat.name";
github = "martijnvermaat"; github = "martijnvermaat";
@ -2393,6 +2546,11 @@
github = "fstamour"; github = "fstamour";
name = "Francis St-Amour"; name = "Francis St-Amour";
}; };
mrkkrp = {
email = "markkarpov92@gmail.com";
github = "mrkkrp";
name = "Mark Karpov";
};
mrVanDalo = { mrVanDalo = {
email = "contact@ingolf-wagner.de"; email = "contact@ingolf-wagner.de";
github = "mrVanDalo"; github = "mrVanDalo";
@ -2407,6 +2565,11 @@
github = "mschristiansen"; github = "mschristiansen";
name = "Mikkel Christiansen"; name = "Mikkel Christiansen";
}; };
msiedlarek = {
email = "mikolaj@siedlarek.pl";
github = "msiedlarek";
name = "Mikołaj Siedlarek";
};
mstarzyk = { mstarzyk = {
email = "mstarzyk@gmail.com"; email = "mstarzyk@gmail.com";
github = "mstarzyk"; github = "mstarzyk";
@ -2422,6 +2585,11 @@
github = "mt-caret"; github = "mt-caret";
name = "Masayuki Takeda"; name = "Masayuki Takeda";
}; };
MtP = {
email = "marko.nixos@poikonen.de";
github = "MtP76";
name = "Marko Poikonen";
};
mtreskin = { mtreskin = {
email = "zerthurd@gmail.com"; email = "zerthurd@gmail.com";
github = "Zert"; github = "Zert";
@ -2517,6 +2685,11 @@
github = "ninjatrappeur"; github = "ninjatrappeur";
name = "Félix Baylac-Jacqué"; name = "Félix Baylac-Jacqué";
}; };
nioncode = {
email = "nioncode+github@gmail.com";
github = "nioncode";
name = "Nicolas Schneider";
};
nipav = { nipav = {
email = "niko.pavlinek@gmail.com"; email = "niko.pavlinek@gmail.com";
github = "nipav"; github = "nipav";
@ -2532,6 +2705,11 @@
github = "nmattia"; github = "nmattia";
name = "Nicolas Mattia"; name = "Nicolas Mattia";
}; };
nocent = {
email = "nocent@protonmail.ch";
github = "nocent";
name = "nocent";
};
nocoolnametom = { nocoolnametom = {
email = "nocoolnametom@gmail.com"; email = "nocoolnametom@gmail.com";
github = "nocoolnametom"; github = "nocoolnametom";
@ -2556,6 +2734,11 @@
github = "nthorne"; github = "nthorne";
name = "Niklas Thörne"; name = "Niklas Thörne";
}; };
nyanloutre = {
email = "paul@nyanlout.re";
github = "nyanloutre";
name = "Paul Trehiou";
};
nyarly = { nyarly = {
email = "nyarly@gmail.com"; email = "nyarly@gmail.com";
github = "nyarly"; github = "nyarly";
@ -2896,11 +3079,21 @@
github = "rbasso"; github = "rbasso";
name = "Rafael Basso"; name = "Rafael Basso";
}; };
rdnetto = {
email = "rdnetto@gmail.com";
github = "rdnetto";
name = "Reuben D'Netto";
};
redbaron = { redbaron = {
email = "ivanov.maxim@gmail.com"; email = "ivanov.maxim@gmail.com";
github = "redbaron"; github = "redbaron";
name = "Maxim Ivanov"; name = "Maxim Ivanov";
}; };
redfish64 = {
email = "engler@gmail.com";
github = "redfish64";
name = "Tim Engler";
};
redvers = { redvers = {
email = "red@infect.me"; email = "red@infect.me";
github = "redvers"; github = "redvers";
@ -2956,6 +3149,16 @@
github = "risicle"; github = "risicle";
name = "Robert Scott"; name = "Robert Scott";
}; };
rittelle = {
email = "rittelle@posteo.de";
github = "rittelle";
name = "Lennart Rittel";
};
rkoe = {
email = "rk@simple-is-better.org";
github = "rkoe";
name = "Roland Koebler";
};
rlupton20 = { rlupton20 = {
email = "richard.lupton@gmail.com"; email = "richard.lupton@gmail.com";
github = "rlupton20"; github = "rlupton20";
@ -3016,6 +3219,11 @@
github = "rongcuid"; github = "rongcuid";
name = "Rongcui Dong"; name = "Rongcui Dong";
}; };
rprospero = {
email = "rprospero+nix@gmail.com";
github = "rprospero";
name = "Adam Washington";
};
rszibele = { rszibele = {
email = "richard@szibele.com"; email = "richard@szibele.com";
github = "rszibele"; github = "rszibele";
@ -3155,6 +3363,16 @@
github = "sellout"; github = "sellout";
name = "Greg Pfeil"; name = "Greg Pfeil";
}; };
sengaya = {
email = "tlo@sengaya.de";
github = "sengaya";
name = "Thilo Uttendorfer";
};
sephalon = {
email = "me@sephalon.net";
github = "sephalon";
name = "Stefan Wiehler";
};
sepi = { sepi = {
email = "raffael@mancini.lu"; email = "raffael@mancini.lu";
github = "sepi"; github = "sepi";
@ -3258,6 +3476,11 @@
github = "grwlf"; github = "grwlf";
name = "Sergey Mironov"; name = "Sergey Mironov";
}; };
sna = {
email = "abouzahra.9@wright.edu";
github = "s-na";
name = "S. Nordin Abouzahra";
};
snyh = { snyh = {
email = "snyh@snyh.org"; email = "snyh@snyh.org";
github = "snyh"; github = "snyh";
@ -3303,6 +3526,11 @@
github = "spwhitt"; github = "spwhitt";
name = "Spencer Whitt"; name = "Spencer Whitt";
}; };
srghma = {
email = "srghma@gmail.com";
github = "srghma";
name = "Sergei Khoma";
};
srhb = { srhb = {
email = "sbrofeldt@gmail.com"; email = "sbrofeldt@gmail.com";
github = "srhb"; github = "srhb";
@ -3338,6 +3566,11 @@
github = "suvash"; github = "suvash";
name = "Suvash Thapaliya"; name = "Suvash Thapaliya";
}; };
sveitser = {
email = "sveitser@gmail.com";
github = "sveitser";
name = "Mathis Antony";
};
svsdep = { svsdep = {
email = "svsdep@gmail.com"; email = "svsdep@gmail.com";
github = "svsdep"; github = "svsdep";
@ -3363,6 +3596,11 @@
github = "symphorien"; github = "symphorien";
name = "Guillaume Girol"; name = "Guillaume Girol";
}; };
synthetica = {
email = "nix@hilhorst.be";
github = "Synthetica9";
name = "Patrick Hilhorst";
};
szczyp = { szczyp = {
email = "qb@szczyp.com"; email = "qb@szczyp.com";
github = "szczyp"; github = "szczyp";
@ -3418,6 +3656,11 @@
github = "tavyc"; github = "tavyc";
name = "Octavian Cerna"; name = "Octavian Cerna";
}; };
tazjin = {
email = "mail@tazj.in";
github = "tazjin";
name = "Vincent Ambo";
};
teh = { teh = {
email = "tehunger@gmail.com"; email = "tehunger@gmail.com";
github = "teh"; github = "teh";
@ -3513,6 +3756,11 @@
github = "tnias"; github = "tnias";
name = "Philipp Bartsch"; name = "Philipp Bartsch";
}; };
tobim = {
email = "nix@tobim.fastmail.fm";
github = "tobimpub";
name = "Tobias Mayer";
};
tohl = { tohl = {
email = "tom@logand.com"; email = "tom@logand.com";
github = "tohl"; github = "tohl";
@ -3592,6 +3840,11 @@
github = "twey"; github = "twey";
name = "James Twey Kay"; name = "James Twey Kay";
}; };
typetetris = {
email = "ericwolf42@mail.com";
github = "typetetris";
name = "Eric Wolf";
};
unode = { unode = {
email = "alves.rjc@gmail.com"; email = "alves.rjc@gmail.com";
github = "unode"; github = "unode";
@ -3607,6 +3860,11 @@
github = "utdemir"; github = "utdemir";
name = "Utku Demir"; name = "Utku Demir";
}; };
uvnikita = {
email = "uv.nikita@gmail.com";
github = "uvNikita";
name = "Nikita Uvarov";
};
uwap = { uwap = {
email = "me@uwap.name"; email = "me@uwap.name";
github = "uwap"; github = "uwap";
@ -3746,6 +4004,11 @@
github = "vyp"; github = "vyp";
name = "vyp"; name = "vyp";
}; };
wchresta = {
email = "wchresta.nix@chrummibei.ch";
github = "wchresta";
name = "wchresta";
};
wedens = { wedens = {
email = "kirill.wedens@gmail.com"; email = "kirill.wedens@gmail.com";
name = "wedens"; name = "wedens";
@ -3793,6 +4056,11 @@
github = "womfoo"; github = "womfoo";
name = "Kranium Gikos Mendoza"; name = "Kranium Gikos Mendoza";
}; };
worldofpeace = {
email = "worldofpeace@users.noreply.github.com";
github = "worldofpeace";
name = "Worldofpeace";
};
wscott = { wscott = {
email = "wsc9tt@gmail.com"; email = "wsc9tt@gmail.com";
github = "wscott"; github = "wscott";
@ -3811,7 +4079,7 @@
xeji = { xeji = {
email = "xeji@cat3.de"; email = "xeji@cat3.de";
github = "xeji"; github = "xeji";
name = "xeji"; name = "Uli Baum";
}; };
xnaveira = { xnaveira = {
email = "xnaveira@gmail.com"; email = "xnaveira@gmail.com";
@ -3883,6 +4151,11 @@
github = "yrashk"; github = "yrashk";
name = "Yurii Rashkovskii"; name = "Yurii Rashkovskii";
}; };
ysndr = {
email = "me@ysndr.de";
github = "ysndr";
name = "Yannik Sander";
};
yuriaisaka = { yuriaisaka = {
email = "yuri.aisaka+nix@gmail.com"; email = "yuri.aisaka+nix@gmail.com";
github = "yuriaisaka"; github = "yuriaisaka";

View file

@ -100,7 +100,10 @@ sub uploadFile {
sub redirect { sub redirect {
my ($name, $dest) = @_; my ($name, $dest) = @_;
#print STDERR "linking $name to $dest...\n"; #print STDERR "linking $name to $dest...\n";
$bucket->add_key($name, "", { 'x-amz-website-redirect-location' => "/" . $dest }) $bucket->add_key($name, "", {
'x-amz-website-redirect-location' => "/" . $dest,
'x-amz-acl' => "public-read"
})
or die "failed to create redirect from $name to $dest\n"; or die "failed to create redirect from $name to $dest\n";
$cache{$name} = 1; $cache{$name} = 1;
} }
@ -112,7 +115,10 @@ sub uploadFile {
# Upload the file as sha512/<hash-in-base-16>. # Upload the file as sha512/<hash-in-base-16>.
print STDERR "uploading $fn to $mainKey...\n"; print STDERR "uploading $fn to $mainKey...\n";
$bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name }) $bucket->add_key_filename($mainKey, $fn, {
'x-amz-meta-original-name' => $name,
'x-amz-acl' => "public-read"
})
or die "failed to upload $fn to $mainKey\n"; or die "failed to upload $fn to $mainKey\n";
$cache{$mainKey} = 1; $cache{$mainKey} = 1;
} }

View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i python -p pythonFull pythonPackages.requests pythonPackages.pyquery pythonPackages.click #!nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests pyquery click ])'
# To use, just execute this script with --help to display help. # To use, just execute this script with --help to display help.
@ -13,10 +13,10 @@ from pyquery import PyQuery as pq
maintainers_json = subprocess.check_output([ maintainers_json = subprocess.check_output([
'nix-instantiate', '-E', 'import ./lib/maintainers.nix {}', '--eval', '--json' 'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json'
]) ])
maintainers = json.loads(maintainers_json) maintainers = json.loads(maintainers_json)
MAINTAINERS = {v: k for k, v in maintainers.iteritems()} MAINTAINERS = {v: k for k, v in maintainers.items()}
def get_response_text(url): def get_response_text(url):
@ -45,6 +45,17 @@ def get_maintainers(attr_name):
except: except:
return [] return []
def print_build(table_row):
a = pq(table_row)('a')[1]
print("- [ ] [{}]({})".format(a.text, a.get('href')), flush=True)
maintainers = get_maintainers(a.text)
if maintainers:
print(" - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers))))
# TODO: print last three persons that touched this file
# TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked?
sys.stdout.flush()
@click.command() @click.command()
@click.option( @click.option(
@ -73,23 +84,17 @@ def cli(jobset):
# TODO: aborted evaluations # TODO: aborted evaluations
# TODO: dependency failed without propagated builds # TODO: dependency failed without propagated builds
print('\nFailures:')
for tr in d('img[alt="Failed"]').parents('tr'): for tr in d('img[alt="Failed"]').parents('tr'):
a = pq(tr)('a')[1] print_build(tr)
print("- [ ] [{}]({})".format(a.text, a.get('href')))
sys.stdout.flush() print('\nDependency failures:')
for tr in d('img[alt="Dependency failed"]').parents('tr'):
maintainers = get_maintainers(a.text) print_build(tr)
if maintainers:
print(" - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers))))
# TODO: print last three persons that touched this file
# TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked?
sys.stdout.flush()
if __name__ == "__main__": if __name__ == "__main__":
try: try:
cli() cli()
except: except Exception as e:
import pdb;pdb.post_mortem() import pdb;pdb.post_mortem()

View file

@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell #! /usr/bin/env nix-shell
#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ packaging requests toolz ])' -p git #! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git
""" """
Update a Python package expression by passing in the `.nix` file, or the directory containing it. Update a Python package expression by passing in the `.nix` file, or the directory containing it.
@ -358,4 +358,4 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
main() main()

View file

@ -6,11 +6,22 @@
# TODO: add assert statements # TODO: add assert statements
let let
/* Remove duplicate elements from the list based on some extracted value. O(n^2) complexity.
*/
nubOn = f: list:
if list == [] then
[]
else
let
x = pkgs.lib.head list;
xs = pkgs.lib.filter (p: f x != f p) (pkgs.lib.drop 1 list);
in
[x] ++ nubOn f xs;
pkgs = import ./../../default.nix { }; pkgs = import ./../../default.nix { };
packagesWith = cond: return: set: packagesWith = cond: return: set:
pkgs.lib.unique nubOn (pkg: pkg.updateScript)
(pkgs.lib.flatten (pkgs.lib.flatten
(pkgs.lib.mapAttrsToList (pkgs.lib.mapAttrsToList
(name: pkg: (name: pkg:
@ -34,7 +45,7 @@ let
let let
maintainer = maintainer =
if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then
builtins.throw "Maintainer with name `${maintainer'} does not exist in `lib/maintainers.nix`." builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`."
else else
builtins.getAttr maintainer' pkgs.lib.maintainers; builtins.getAttr maintainer' pkgs.lib.maintainers;
in in
@ -65,7 +76,7 @@ let
if package == null then if package == null then
builtins.throw "Package with an attribute name `${name}` does not exists." builtins.throw "Package with an attribute name `${name}` does not exists."
else if ! builtins.hasAttr "updateScript" package then else if ! builtins.hasAttr "updateScript" package then
builtins.throw "Package with an attribute name `${name}` does have an `passthru.updateScript` defined." builtins.throw "Package with an attribute name `${name}` does not have a `passthru.updateScript` attribute defined."
else else
package; package;

View file

@ -10,7 +10,7 @@ git_data="$(echo "$raw_git_log" | grep 'Author:' |
# Name - nick - email correspondence from log and from maintainer list # Name - nick - email correspondence from log and from maintainer list
# Also there are a few manual entries # Also there are a few manual entries
maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" | maintainers="$(cat "$(dirname "$0")/../maintainer-list.nix" |
grep '=' | sed -re 's/\\"/''/g; grep '=' | sed -re 's/\\"/''/g;
s/[ ]*([^ =]*)[ ]*=[ ]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')" s/[ ]*([^ =]*)[ ]*=[ ]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')"
git_lines="$( ( echo "$git_data"; git_lines="$( ( echo "$git_data";

2
nixos/doc/manual/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
generated
manual-combined.xml

24
nixos/doc/manual/Makefile Normal file
View file

@ -0,0 +1,24 @@
.PHONY: all
all: manual-combined.xml format
.PHONY: debug
debug: generated manual-combined.xml
manual-combined.xml: generated *.xml
rm -f ./manual-combined.xml
nix-shell --packages xmloscopy \
--run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml"
.PHONY: format
format:
find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
xmlformat --config-file "../xmlformat.conf" -i {}
.PHONY: clean
clean:
rm -f manual-combined.xml generated
generated: ./options-to-docbook.xsl
nix-build ../../release.nix \
--attr manualGeneratedSources.x86_64-linux \
--out-link ./generated

View file

@ -3,63 +3,83 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-boot-problems"> xml:id="sec-boot-problems">
<title>Boot Problems</title>
<title>Boot Problems</title> <para>
If NixOS fails to boot, there are a number of kernel command line parameters
that may help you to identify or fix the issue. You can add these parameters
in the GRUB boot menu by pressing “e” to modify the selected boot entry
and editing the line starting with <literal>linux</literal>. The following
are some useful kernel command line parameters that are recognised by the
NixOS boot scripts or by systemd:
<variablelist>
<varlistentry>
<term><literal>boot.shell_on_fail</literal>
</term>
<listitem>
<para>
Start a root shell if something goes wrong in stage 1 of the boot process
(the initial ramdisk). This is disabled by default because there is no
authentication for the root shell.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>boot.debug1</literal>
</term>
<listitem>
<para>
Start an interactive shell in stage 1 before anything useful has been
done. That is, no modules have been loaded and no file systems have been
mounted, except for <filename>/proc</filename> and
<filename>/sys</filename>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>boot.trace</literal>
</term>
<listitem>
<para>
Print every shell command executed by the stage 1 and 2 boot scripts.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>single</literal>
</term>
<listitem>
<para>
Boot into rescue mode (a.k.a. single user mode). This will cause systemd
to start nothing but the unit <literal>rescue.target</literal>, which
runs <command>sulogin</command> to prompt for the root password and start
a root login shell. Exiting the shell causes the system to continue with
the normal boot process.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>systemd.log_level=debug systemd.log_target=console</literal>
</term>
<listitem>
<para>
Make systemd very verbose and send log messages to the console instead of
the journal.
</para>
</listitem>
</varlistentry>
</variablelist>
For more parameters recognised by systemd, see <citerefentry>
<refentrytitle>systemd</refentrytitle>
<manvolnum>1</manvolnum></citerefentry>.
</para>
<para>If NixOS fails to boot, there are a number of kernel command <para>
line parameters that may help you to identify or fix the issue. You If no login prompts or X11 login screens appear (e.g. due to hanging
can add these parameters in the GRUB boot menu by pressing “e” to dependencies), you can press Alt+ArrowUp. If youre lucky, this will start
modify the selected boot entry and editing the line starting with rescue mode (described above). (Also note that since most units have a
<literal>linux</literal>. The following are some useful kernel command 90-second timeout before systemd gives up on them, the
line parameters that are recognised by the NixOS boot scripts or by <command>agetty</command> login prompts should appear eventually unless
systemd: something is very wrong.)
</para>
<variablelist> </section>
<varlistentry><term><literal>boot.shell_on_fail</literal></term>
<listitem><para>Start a root shell if something goes wrong in
stage 1 of the boot process (the initial ramdisk). This is
disabled by default because there is no authentication for the
root shell.</para></listitem>
</varlistentry>
<varlistentry><term><literal>boot.debug1</literal></term>
<listitem><para>Start an interactive shell in stage 1 before
anything useful has been done. That is, no modules have been
loaded and no file systems have been mounted, except for
<filename>/proc</filename> and
<filename>/sys</filename>.</para></listitem>
</varlistentry>
<varlistentry><term><literal>boot.trace</literal></term>
<listitem><para>Print every shell command executed by the stage 1
and 2 boot scripts.</para></listitem>
</varlistentry>
<varlistentry><term><literal>single</literal></term>
<listitem><para>Boot into rescue mode (a.k.a. single user mode).
This will cause systemd to start nothing but the unit
<literal>rescue.target</literal>, which runs
<command>sulogin</command> to prompt for the root password and
start a root login shell. Exiting the shell causes the system to
continue with the normal boot process.</para></listitem>
</varlistentry>
<varlistentry><term><literal>systemd.log_level=debug systemd.log_target=console</literal></term>
<listitem><para>Make systemd very verbose and send log messages to
the console instead of the journal.</para></listitem>
</varlistentry>
</variablelist>
For more parameters recognised by systemd, see
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
<para>If no login prompts or X11 login screens appear (e.g. due to
hanging dependencies), you can press Alt+ArrowUp. If youre lucky,
this will start rescue mode (described above). (Also note that since
most units have a 90-second timeout before systemd gives up on them,
the <command>agetty</command> login prompts should appear eventually
unless something is very wrong.)</para>
</section>

View file

@ -3,60 +3,51 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-nix-gc"> xml:id="sec-nix-gc">
<title>Cleaning the Nix Store</title>
<title>Cleaning the Nix Store</title> <para>
Nix has a purely functional model, meaning that packages are never upgraded
<para>Nix has a purely functional model, meaning that packages are in place. Instead new versions of packages end up in a different location in
never upgraded in place. Instead new versions of packages end up in a the Nix store (<filename>/nix/store</filename>). You should periodically run
different location in the Nix store (<filename>/nix/store</filename>). Nixs <emphasis>garbage collector</emphasis> to remove old, unreferenced
You should periodically run Nixs <emphasis>garbage packages. This is easy:
collector</emphasis> to remove old, unreferenced packages. This is
easy:
<screen> <screen>
$ nix-collect-garbage $ nix-collect-garbage
</screen> </screen>
Alternatively, you can use a systemd unit that does the same in the
Alternatively, you can use a systemd unit that does the same in the background:
background:
<screen> <screen>
# systemctl start nix-gc.service # systemctl start nix-gc.service
</screen> </screen>
You can tell NixOS in <filename>configuration.nix</filename> to run this unit
You can tell NixOS in <filename>configuration.nix</filename> to run automatically at certain points in time, for instance, every night at 03:15:
this unit automatically at certain points in time, for instance, every
night at 03:15:
<programlisting> <programlisting>
nix.gc.automatic = true; <xref linkend="opt-nix.gc.automatic"/> = true;
nix.gc.dates = "03:15"; <xref linkend="opt-nix.gc.dates"/> = "03:15";
</programlisting> </programlisting>
</para>
</para> <para>
The commands above do not remove garbage collector roots, such as old system
<para>The commands above do not remove garbage collector roots, such configurations. Thus they do not remove the ability to roll back to previous
as old system configurations. Thus they do not remove the ability to configurations. The following command deletes old roots, removing the ability
roll back to previous configurations. The following command deletes to roll back to them:
old roots, removing the ability to roll back to them:
<screen> <screen>
$ nix-collect-garbage -d $ nix-collect-garbage -d
</screen> </screen>
You can also do this for specific profiles, e.g. You can also do this for specific profiles, e.g.
<screen> <screen>
$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old $ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
</screen> </screen>
Note that NixOS system configurations are stored in the profile Note that NixOS system configurations are stored in the profile
<filename>/nix/var/nix/profiles/system</filename>.</para> <filename>/nix/var/nix/profiles/system</filename>.
</para>
<para>Another way to reclaim disk space (often as much as 40% of the <para>
size of the Nix store) is to run Nixs store optimiser, which seeks Another way to reclaim disk space (often as much as 40% of the size of the
out identical files in the store and replaces them with hard links to Nix store) is to run Nixs store optimiser, which seeks out identical files
a single copy. in the store and replaces them with hard links to a single copy.
<screen> <screen>
$ nix-store --optimise $ nix-store --optimise
</screen> </screen>
Since this command needs to read the entire Nix store, it can take Since this command needs to read the entire Nix store, it can take quite a
quite a while to finish.</para> while to finish.
</para>
</chapter> </chapter>

View file

@ -3,15 +3,13 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-container-networking"> xml:id="sec-container-networking">
<title>Container Networking</title>
<para>
<title>Container Networking</title> When you create a container using <literal>nixos-container create</literal>,
it gets it own private IPv4 address in the range
<para>When you create a container using <literal>nixos-container <literal>10.233.0.0/16</literal>. You can get the containers IPv4 address
create</literal>, it gets it own private IPv4 address in the range as follows:
<literal>10.233.0.0/16</literal>. You can get the containers IPv4
address as follows:
<screen> <screen>
# nixos-container show-ip foo # nixos-container show-ip foo
10.233.4.2 10.233.4.2
@ -19,40 +17,39 @@ address as follows:
$ ping -c1 10.233.4.2 $ ping -c1 10.233.4.2
64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms 64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms
</screen> </screen>
</para>
</para> <para>
Networking is implemented using a pair of virtual Ethernet devices. The
<para>Networking is implemented using a pair of virtual Ethernet network interface in the container is called <literal>eth0</literal>, while
devices. The network interface in the container is called the matching interface in the host is called
<literal>eth0</literal>, while the matching interface in the host is <literal>ve-<replaceable>container-name</replaceable></literal> (e.g.,
called <literal>ve-<replaceable>container-name</replaceable></literal> <literal>ve-foo</literal>). The container has its own network namespace and
(e.g., <literal>ve-foo</literal>). The container has its own network the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary
namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it network configuration such as setting up firewall rules, without affecting or
can perform arbitrary network configuration such as setting up having access to the hosts network.
firewall rules, without affecting or having access to the hosts </para>
network.</para>
<para>By default, containers cannot talk to the outside network. If
you want that, you should set up Network Address Translation (NAT)
rules on the host to rewrite container traffic to use your external
IP address. This can be accomplished using the following configuration
on the host:
<para>
By default, containers cannot talk to the outside network. If you want that,
you should set up Network Address Translation (NAT) rules on the host to
rewrite container traffic to use your external IP address. This can be
accomplished using the following configuration on the host:
<programlisting> <programlisting>
networking.nat.enable = true; <xref linkend="opt-networking.nat.enable"/> = true;
networking.nat.internalInterfaces = ["ve-+"]; <xref linkend="opt-networking.nat.internalInterfaces"/> = ["ve-+"];
networking.nat.externalInterface = "eth0"; <xref linkend="opt-networking.nat.externalInterface"/> = "eth0";
</programlisting> </programlisting>
where <literal>eth0</literal> should be replaced with the desired where <literal>eth0</literal> should be replaced with the desired external
external interface. Note that <literal>ve-+</literal> is a wildcard interface. Note that <literal>ve-+</literal> is a wildcard that matches all
that matches all container interfaces.</para> container interfaces.
</para>
<para>If you are using Network Manager, you need to explicitly prevent
it from managing container interfaces:
<para>
If you are using Network Manager, you need to explicitly prevent it from
managing container interfaces:
<programlisting> <programlisting>
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
</programlisting> </programlisting>
</para> </para>
</section> </section>

View file

@ -3,32 +3,32 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="ch-containers"> xml:id="ch-containers">
<title>Container Management</title>
<title>Container Management</title> <para>
NixOS allows you to easily run other NixOS instances as
<para>NixOS allows you to easily run other NixOS instances as <emphasis>containers</emphasis>. Containers are a light-weight approach to
<emphasis>containers</emphasis>. Containers are a light-weight virtualisation that runs software in the container at the same speed as in
approach to virtualisation that runs software in the container at the the host system. NixOS containers share the Nix store of the host, making
same speed as in the host system. NixOS containers share the Nix store container creation very efficient.
of the host, making container creation very efficient.</para> </para>
<warning>
<warning><para>Currently, NixOS containers are not perfectly isolated <para>
from the host system. This means that a user with root access to the Currently, NixOS containers are not perfectly isolated from the host system.
container can do things that affect the host. So you should not give This means that a user with root access to the container can do things that
container root access to untrusted users.</para></warning> affect the host. So you should not give container root access to untrusted
users.
<para>NixOS containers can be created in two ways: imperatively, using </para>
the command <command>nixos-container</command>, and declaratively, by </warning>
specifying them in your <filename>configuration.nix</filename>. The <para>
declarative approach implies that containers get upgraded along with NixOS containers can be created in two ways: imperatively, using the command
your host system when you run <command>nixos-rebuild</command>, which <command>nixos-container</command>, and declaratively, by specifying them in
is often not what you want. By contrast, in the imperative approach, your <filename>configuration.nix</filename>. The declarative approach implies
containers are configured and updated independently from the host that containers get upgraded along with your host system when you run
system.</para> <command>nixos-rebuild</command>, which is often not what you want. By
contrast, in the imperative approach, containers are configured and updated
<xi:include href="imperative-containers.xml" /> independently from the host system.
<xi:include href="declarative-containers.xml" /> </para>
<xi:include href="container-networking.xml" /> <xi:include href="imperative-containers.xml" />
<xi:include href="declarative-containers.xml" />
<xi:include href="container-networking.xml" />
</chapter> </chapter>

View file

@ -3,20 +3,18 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-cgroups"> xml:id="sec-cgroups">
<title>Control Groups</title>
<title>Control Groups</title> <para>
To keep track of the processes in a running system, systemd uses
<para>To keep track of the processes in a running system, systemd uses <emphasis>control groups</emphasis> (cgroups). A control group is a set of
<emphasis>control groups</emphasis> (cgroups). A control group is a processes used to allocate resources such as CPU, memory or I/O bandwidth.
set of processes used to allocate resources such as CPU, memory or I/O There can be multiple control group hierarchies, allowing each kind of
bandwidth. There can be multiple control group hierarchies, allowing resource to be managed independently.
each kind of resource to be managed independently.</para> </para>
<para>
<para>The command <command>systemd-cgls</command> lists all control The command <command>systemd-cgls</command> lists all control groups in the
groups in the <literal>systemd</literal> hierarchy, which is what <literal>systemd</literal> hierarchy, which is what systemd uses to keep
systemd uses to keep track of the processes belonging to each service track of the processes belonging to each service or user session:
or user session:
<screen> <screen>
$ systemd-cgls $ systemd-cgls
├─user ├─user
@ -34,40 +32,34 @@ $ systemd-cgls
│ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
└─ <replaceable>...</replaceable> └─ <replaceable>...</replaceable>
</screen> </screen>
Similarly, <command>systemd-cgls cpu</command> shows the cgroups in the CPU
Similarly, <command>systemd-cgls cpu</command> shows the cgroups in hierarchy, which allows per-cgroup CPU scheduling priorities. By default,
the CPU hierarchy, which allows per-cgroup CPU scheduling priorities. every systemd service gets its own CPU cgroup, while all user sessions are in
By default, every systemd service gets its own CPU cgroup, while all the top-level CPU cgroup. This ensures, for instance, that a thousand
user sessions are in the top-level CPU cgroup. This ensures, for run-away processes in the <literal>httpd.service</literal> cgroup cannot
instance, that a thousand run-away processes in the starve the CPU for one process in the <literal>postgresql.service</literal>
<literal>httpd.service</literal> cgroup cannot starve the CPU for one cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL
process in the <literal>postgresql.service</literal> cgroup. (By process would get 1/1001 of the cgroups CPU time.) You can limit a
contrast, it they were in the same cgroup, then the PostgreSQL process services CPU share in <filename>configuration.nix</filename>:
would get 1/1001 of the cgroups CPU time.) You can limit a services
CPU share in <filename>configuration.nix</filename>:
<programlisting> <programlisting>
systemd.services.httpd.serviceConfig.CPUShares = 512; <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.CPUShares = 512;
</programlisting> </programlisting>
By default, every cgroup has 1024 CPU shares, so this will halve the CPU
By default, every cgroup has 1024 CPU shares, so this will halve the allocation of the <literal>httpd.service</literal> cgroup.
CPU allocation of the <literal>httpd.service</literal> cgroup.</para> </para>
<para>
<para>There also is a <literal>memory</literal> hierarchy that There also is a <literal>memory</literal> hierarchy that controls memory
controls memory allocation limits; by default, all processes are in allocation limits; by default, all processes are in the top-level cgroup, so
the top-level cgroup, so any service or session can exhaust all any service or session can exhaust all available memory. Per-cgroup memory
available memory. Per-cgroup memory limits can be specified in limits can be specified in <filename>configuration.nix</filename>; for
<filename>configuration.nix</filename>; for instance, to limit instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM
<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap): (excluding swap):
<programlisting> <programlisting>
systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.MemoryLimit = "512M";
</programlisting> </programlisting>
</para>
</para> <para>
The command <command>systemd-cgtop</command> shows a continuously updated
<para>The command <command>systemd-cgtop</command> shows a list of all cgroups with their CPU and memory usage.
continuously updated list of all cgroups with their CPU and memory </para>
usage.</para>
</chapter> </chapter>

View file

@ -3,58 +3,58 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-declarative-containers"> xml:id="sec-declarative-containers">
<title>Declarative Container Specification</title>
<title>Declarative Container Specification</title> <para>
You can also specify containers and their configuration in the hosts
<para>You can also specify containers and their configuration in the <filename>configuration.nix</filename>. For example, the following specifies
hosts <filename>configuration.nix</filename>. For example, the that there shall be a container named <literal>database</literal> running
following specifies that there shall be a container named PostgreSQL:
<literal>database</literal> running PostgreSQL:
<programlisting> <programlisting>
containers.database = containers.database =
{ config = { config =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { <xref linkend="opt-services.postgresql.enable"/> = true;
services.postgresql.package = pkgs.postgresql96; <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql96;
}; };
}; };
</programlisting> </programlisting>
If you run <literal>nixos-rebuild switch</literal>, the container will be
built. If the container was already running, it will be updated in place,
without rebooting. The container can be configured to start automatically by
setting <literal>containers.database.autoStart = true</literal> in its
configuration.
</para>
If you run <literal>nixos-rebuild switch</literal>, the container will <para>
be built. If the container was already running, it will be By default, declarative containers share the network namespace of the host,
updated in place, without rebooting. The container can be configured to meaning that they can listen on (privileged) ports. However, they cannot
start automatically by setting <literal>containers.database.autoStart = true</literal> change the network configuration. You can give a container its own network as
in its configuration.</para> follows:
<para>By default, declarative containers share the network namespace
of the host, meaning that they can listen on (privileged)
ports. However, they cannot change the network configuration. You can
give a container its own network as follows:
<programlisting> <programlisting>
containers.database = containers.database = {
{ privateNetwork = true; <link linkend="opt-containers._name_.privateNetwork">privateNetwork</link> = true;
hostAddress = "192.168.100.10"; <link linkend="opt-containers._name_.hostAddress">hostAddress</link> = "192.168.100.10";
localAddress = "192.168.100.11"; <link linkend="opt-containers._name_.localAddress">localAddress</link> = "192.168.100.11";
}; };
</programlisting> </programlisting>
This gives the container a private virtual Ethernet interface with IP address
<literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet
interface on the host with IP address <literal>192.168.100.10</literal>. (See
the next section for details on container networking.)
</para>
This gives the container a private virtual Ethernet interface with IP <para>
address <literal>192.168.100.11</literal>, which is hooked up to a To disable the container, just remove it from
virtual Ethernet interface on the host with IP address <filename>configuration.nix</filename> and run <literal>nixos-rebuild
<literal>192.168.100.10</literal>. (See the next section for details switch</literal>. Note that this will not delete the root directory of the
on container networking.)</para> container in <literal>/var/lib/containers</literal>. Containers can be
destroyed using the imperative method: <literal>nixos-container destroy
<para>To disable the container, just remove it from foo</literal>.
<filename>configuration.nix</filename> and run <literal>nixos-rebuild </para>
switch</literal>. Note that this will not delete the root directory of
the container in <literal>/var/lib/containers</literal>. Containers can be
destroyed using the imperative method: <literal>nixos-container destroy
foo</literal>.</para>
<para>Declarative containers can be started and stopped using the
corresponding systemd service, e.g. <literal>systemctl start
container@database</literal>.</para>
<para>
Declarative containers can be started and stopped using the corresponding
systemd service, e.g. <literal>systemctl start container@database</literal>.
</para>
</section> </section>

View file

@ -3,131 +3,114 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-imperative-containers"> xml:id="sec-imperative-containers">
<title>Imperative Container Management</title>
<title>Imperative Container Management</title> <para>
Well cover imperative container management using
<para>Well cover imperative container management using <command>nixos-container</command> first. Be aware that container management
<command>nixos-container</command> first. is currently only possible as <literal>root</literal>.
Be aware that container management is currently only possible </para>
as <literal>root</literal>.</para>
<para>You create a container with
identifier <literal>foo</literal> as follows:
<para>
You create a container with identifier <literal>foo</literal> as follows:
<screen> <screen>
# nixos-container create foo # nixos-container create foo
</screen> </screen>
This creates the containers root directory in
This creates the containers root directory in <filename>/var/lib/containers/foo</filename> and a small configuration file
<filename>/var/lib/containers/foo</filename> and a small configuration in <filename>/etc/containers/foo.conf</filename>. It also builds the
file in <filename>/etc/containers/foo.conf</filename>. It also builds containers initial system configuration and stores it in
the containers initial system configuration and stores it in <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can
<filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You modify the initial configuration of the container on the command line. For
can modify the initial configuration of the container on the command instance, to create a container that has <command>sshd</command> running,
line. For instance, to create a container that has with the given public key for <literal>root</literal>:
<command>sshd</command> running, with the given public key for
<literal>root</literal>:
<screen> <screen>
# nixos-container create foo --config ' # nixos-container create foo --config '
services.openssh.enable = true; <xref linkend="opt-services.openssh.enable"/> = true;
users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
' '
</screen> </screen>
</para>
</para> <para>
Creating a container does not start it. To start the container, run:
<para>Creating a container does not start it. To start the container,
run:
<screen> <screen>
# nixos-container start foo # nixos-container start foo
</screen> </screen>
This command will return as soon as the container has booted and has reached
This command will return as soon as the container has booted and has <literal>multi-user.target</literal>. On the host, the container runs within
reached <literal>multi-user.target</literal>. On the host, the a systemd unit called
container runs within a systemd unit called <literal>container@<replaceable>container-name</replaceable>.service</literal>.
<literal>container@<replaceable>container-name</replaceable>.service</literal>. Thus, if something went wrong, you can get status info using
Thus, if something went wrong, you can get status info using <command>systemctl</command>:
<command>systemctl</command>:
<screen> <screen>
# systemctl status container@foo # systemctl status container@foo
</screen> </screen>
</para>
</para> <para>
If the container has started successfully, you can log in as root using the
<para>If the container has started successfully, you can log in as <command>root-login</command> operation:
root using the <command>root-login</command> operation:
<screen> <screen>
# nixos-container root-login foo # nixos-container root-login foo
[root@foo:~]# [root@foo:~]#
</screen> </screen>
Note that only root on the host can do this (since there is no
Note that only root on the host can do this (since there is no authentication). You can also get a regular login prompt using the
authentication). You can also get a regular login prompt using the <command>login</command> operation, which is available to all users on the
<command>login</command> operation, which is available to all users on host:
the host:
<screen> <screen>
# nixos-container login foo # nixos-container login foo
foo login: alice foo login: alice
Password: *** Password: ***
</screen> </screen>
With <command>nixos-container run</command>, you can execute arbitrary
With <command>nixos-container run</command>, you can execute arbitrary commands in the container:
commands in the container:
<screen> <screen>
# nixos-container run foo -- uname -a # nixos-container run foo -- uname -a
Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
</screen> </screen>
</para>
</para> <para>
There are several ways to change the configuration of the container. First,
<para>There are several ways to change the configuration of the on the host, you can edit
container. First, on the host, you can edit <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
<literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>, and run
and run
<screen> <screen>
# nixos-container update foo # nixos-container update foo
</screen> </screen>
This will build and activate the new configuration. You can also specify a
This will build and activate the new configuration. You can also new configuration on the command line:
specify a new configuration on the command line:
<screen> <screen>
# nixos-container update foo --config ' # nixos-container update foo --config '
services.httpd.enable = true; <xref linkend="opt-services.httpd.enable"/> = true;
services.httpd.adminAddr = "foo@example.org"; <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ]; <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
' '
# curl http://$(nixos-container show-ip foo)/ # curl http://$(nixos-container show-ip foo)/
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
</screen> </screen>
However, note that this will overwrite the containers
<filename>/etc/nixos/configuration.nix</filename>.
</para>
However, note that this will overwrite the containers <para>
<filename>/etc/nixos/configuration.nix</filename>.</para> Alternatively, you can change the configuration from within the container
itself by running <command>nixos-rebuild switch</command> inside the
<para>Alternatively, you can change the configuration from within the container. Note that the container by default does not have a copy of the
container itself by running <command>nixos-rebuild switch</command> NixOS channel, so you should run <command>nix-channel --update</command>
inside the container. Note that the container by default does not have first.
a copy of the NixOS channel, so you should run <command>nix-channel </para>
--update</command> first.</para>
<para>Containers can be stopped and started using
<literal>nixos-container stop</literal> and <literal>nixos-container
start</literal>, respectively, or by using
<command>systemctl</command> on the containers service unit. To
destroy a container, including its file system, do
<para>
Containers can be stopped and started using <literal>nixos-container
stop</literal> and <literal>nixos-container start</literal>, respectively, or
by using <command>systemctl</command> on the containers service unit. To
destroy a container, including its file system, do
<screen> <screen>
# nixos-container destroy foo # nixos-container destroy foo
</screen> </screen>
</para>
</para>
</section> </section>

View file

@ -3,26 +3,20 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-logging"> xml:id="sec-logging">
<title>Logging</title>
<title>Logging</title> <para>
System-wide logging is provided by systemds <emphasis>journal</emphasis>,
<para>System-wide logging is provided by systemds which subsumes traditional logging daemons such as syslogd and klogd. Log
<emphasis>journal</emphasis>, which subsumes traditional logging entries are kept in binary files in <filename>/var/log/journal/</filename>.
daemons such as syslogd and klogd. Log entries are kept in binary The command <literal>journalctl</literal> allows you to see the contents of
files in <filename>/var/log/journal/</filename>. The command the journal. For example,
<literal>journalctl</literal> allows you to see the contents of the
journal. For example,
<screen> <screen>
$ journalctl -b $ journalctl -b
</screen> </screen>
shows all journal entries since the last reboot. (The output of
shows all journal entries since the last reboot. (The output of <command>journalctl</command> is piped into <command>less</command> by
<command>journalctl</command> is piped into <command>less</command> by default.) You can use various options and match operators to restrict output
default.) You can use various options and match operators to restrict to messages of interest. For instance, to get all messages from PostgreSQL:
output to messages of interest. For instance, to get all messages
from PostgreSQL:
<screen> <screen>
$ journalctl -u postgresql.service $ journalctl -u postgresql.service
-- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- -- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
@ -32,21 +26,18 @@ Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down
Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET
Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections
</screen> </screen>
Or to get all messages since the last reboot that have at least a
Or to get all messages since the last reboot that have at least a “critical” severity level:
“critical” severity level:
<screen> <screen>
$ journalctl -b -p crit $ journalctl -b -p crit
Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice]
Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1)
</screen> </screen>
</para>
</para> <para>
The system journal is readable by root and by users in the
<para>The system journal is readable by root and by users in the <literal>wheel</literal> and <literal>systemd-journal</literal> groups. All
<literal>wheel</literal> and <literal>systemd-journal</literal> users have a private journal that can be read using
groups. All users have a private journal that can be read using <command>journalctl</command>.
<command>journalctl</command>.</para> </para>
</chapter>
</chapter>

View file

@ -3,16 +3,14 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-maintenance-mode"> xml:id="sec-maintenance-mode">
<title>Maintenance Mode</title>
<title>Maintenance Mode</title> <para>
You can enter rescue mode by running:
<para>You can enter rescue mode by running:
<screen> <screen>
# systemctl rescue</screen> # systemctl rescue</screen>
This will eventually give you a single-user root shell. Systemd will stop
This will eventually give you a single-user root shell. Systemd will (almost) all system services. To get out of maintenance mode, just exit from
stop (almost) all system services. To get out of maintenance mode, the rescue shell.
just exit from the rescue shell.</para> </para>
</section> </section>

View file

@ -3,31 +3,25 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-nix-network-issues"> xml:id="sec-nix-network-issues">
<title>Network Problems</title>
<title>Network Problems</title> <para>
Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a
<para>Nix uses a so-called <emphasis>binary cache</emphasis> to package from source into downloading it as a pre-built binary. That is,
optimise building a package from source into downloading it as a whenever a command like <command>nixos-rebuild</command> needs a path in the
pre-built binary. That is, whenever a command like Nix store, Nix will try to download that path from the Internet rather than
<command>nixos-rebuild</command> needs a path in the Nix store, Nix build it from source. The default binary cache is
will try to download that path from the Internet rather than build it <uri>https://cache.nixos.org/</uri>. If this cache is unreachable, Nix
from source. The default binary cache is operations may take a long time due to HTTP connection timeouts. You can
<uri>https://cache.nixos.org/</uri>. If this cache is unreachable, disable the use of the binary cache by adding <option>--option
Nix operations may take a long time due to HTTP connection timeouts. use-binary-caches false</option>, e.g.
You can disable the use of the binary cache by adding <option>--option
use-binary-caches false</option>, e.g.
<screen> <screen>
# nixos-rebuild switch --option use-binary-caches false # nixos-rebuild switch --option use-binary-caches false
</screen> </screen>
If you have an alternative binary cache at your disposal, you can use it
If you have an alternative binary cache at your disposal, you can use instead:
it instead:
<screen> <screen>
# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ # nixos-rebuild switch --option binary-caches http://my-cache.example.org/
</screen> </screen>
</para>
</para>
</section> </section>

View file

@ -3,42 +3,33 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-rebooting"> xml:id="sec-rebooting">
<title>Rebooting and Shutting Down</title>
<title>Rebooting and Shutting Down</title> <para>
The system can be shut down (and automatically powered off) by doing:
<para>The system can be shut down (and automatically powered off) by
doing:
<screen> <screen>
# shutdown # shutdown
</screen> </screen>
This is equivalent to running <command>systemctl poweroff</command>.
This is equivalent to running <command>systemctl </para>
poweroff</command>.</para> <para>
To reboot the system, run
<para>To reboot the system, run
<screen> <screen>
# reboot # reboot
</screen> </screen>
which is equivalent to <command>systemctl reboot</command>. Alternatively,
which is equivalent to <command>systemctl reboot</command>. you can quickly reboot the system using <literal>kexec</literal>, which
Alternatively, you can quickly reboot the system using bypasses the BIOS by directly loading the new kernel into memory:
<literal>kexec</literal>, which bypasses the BIOS by directly loading
the new kernel into memory:
<screen> <screen>
# systemctl kexec # systemctl kexec
</screen> </screen>
</para>
</para> <para>
The machine can be suspended to RAM (if supported) using <command>systemctl
<para>The machine can be suspended to RAM (if supported) using suspend</command>, and suspended to disk using <command>systemctl
<command>systemctl suspend</command>, and suspended to disk using hibernate</command>.
<command>systemctl hibernate</command>.</para> </para>
<para>
<para>These commands can be run by any user who is logged in locally, These commands can be run by any user who is logged in locally, i.e. on a
i.e. on a virtual console or in X11; otherwise, the user is asked for virtual console or in X11; otherwise, the user is asked for authentication.
authentication.</para> </para>
</chapter> </chapter>

View file

@ -3,46 +3,39 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-rollback"> xml:id="sec-rollback">
<title>Rolling Back Configuration Changes</title>
<title>Rolling Back Configuration Changes</title> <para>
After running <command>nixos-rebuild</command> to switch to a new
<para>After running <command>nixos-rebuild</command> to switch to a configuration, you may find that the new configuration doesnt work very
new configuration, you may find that the new configuration doesnt well. In that case, there are several ways to return to a previous
work very well. In that case, there are several ways to return to a configuration.
previous configuration.</para> </para>
<para>First, the GRUB boot manager allows you to boot into any
previous configuration that hasnt been garbage-collected. These
configurations can be found under the GRUB submenu “NixOS - All
configurations”. This is especially useful if the new configuration
fails to boot. After the system has booted, you can make the selected
configuration the default for subsequent boots:
<para>
First, the GRUB boot manager allows you to boot into any previous
configuration that hasnt been garbage-collected. These configurations can
be found under the GRUB submenu “NixOS - All configurations”. This is
especially useful if the new configuration fails to boot. After the system
has booted, you can make the selected configuration the default for
subsequent boots:
<screen> <screen>
# /run/current-system/bin/switch-to-configuration boot</screen> # /run/current-system/bin/switch-to-configuration boot</screen>
</para>
</para> <para>
Second, you can switch to the previous configuration in a running system:
<para>Second, you can switch to the previous configuration in a running
system:
<screen> <screen>
# nixos-rebuild switch --rollback</screen> # nixos-rebuild switch --rollback</screen>
This is equivalent to running:
This is equivalent to running:
<screen> <screen>
# /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen> # /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>
where <replaceable>N</replaceable> is the number of the NixOS system
where <replaceable>N</replaceable> is the number of the NixOS system configuration. To get a list of the available configurations, do:
configuration. To get a list of the available configurations, do:
<screen> <screen>
$ ls -l /nix/var/nix/profiles/system-*-link $ ls -l /nix/var/nix/profiles/system-*-link
<replaceable>...</replaceable> <replaceable>...</replaceable>
lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055
</screen> </screen>
</para>
</para>
</section> </section>

View file

@ -3,22 +3,19 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="ch-running"> xml:id="ch-running">
<title>Administration</title>
<title>Administration</title> <partintro>
<para>
<partintro> This chapter describes various aspects of managing a running NixOS system,
<para>This chapter describes various aspects of managing a running such as how to use the <command>systemd</command> service manager.
NixOS system, such as how to use the <command>systemd</command> </para>
service manager.</para> </partintro>
</partintro> <xi:include href="service-mgmt.xml" />
<xi:include href="rebooting.xml" />
<xi:include href="service-mgmt.xml" /> <xi:include href="user-sessions.xml" />
<xi:include href="rebooting.xml" /> <xi:include href="control-groups.xml" />
<xi:include href="user-sessions.xml" /> <xi:include href="logging.xml" />
<xi:include href="control-groups.xml" /> <xi:include href="cleaning-store.xml" />
<xi:include href="logging.xml" /> <xi:include href="containers.xml" />
<xi:include href="cleaning-store.xml" /> <xi:include href="troubleshooting.xml" />
<xi:include href="containers.xml" />
<xi:include href="troubleshooting.xml" />
</part> </part>

View file

@ -3,26 +3,23 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-systemctl"> xml:id="sec-systemctl">
<title>Service Management</title>
<title>Service Management</title> <para>
In NixOS, all system services are started and monitored using the systemd
<para>In NixOS, all system services are started and monitored using program. Systemd is the “init” process of the system (i.e. PID 1), the
the systemd program. Systemd is the “init” process of the system parent of all other processes. It manages a set of so-called “units”,
(i.e. PID 1), the parent of all other processes. It manages a set of which can be things like system services (programs), but also mount points,
so-called “units”, which can be things like system services swap files, devices, targets (groups of units) and more. Units can have
(programs), but also mount points, swap files, devices, targets complex dependencies; for instance, one unit can require that another unit
(groups of units) and more. Units can have complex dependencies; for must be successfully started before the first unit can be started. When the
instance, one unit can require that another unit must be successfully system boots, it starts a unit named <literal>default.target</literal>; the
started before the first unit can be started. When the system boots, dependencies of this unit cause all system services to be started, file
it starts a unit named <literal>default.target</literal>; the systems to be mounted, swap files to be activated, and so on.
dependencies of this unit cause all system services to be started, </para>
file systems to be mounted, swap files to be activated, and so <para>
on.</para> The command <command>systemctl</command> is the main way to interact with
<command>systemd</command>. Without any arguments, it shows the status of
<para>The command <command>systemctl</command> is the main way to active units:
interact with <command>systemd</command>. Without any arguments, it
shows the status of active units:
<screen> <screen>
$ systemctl $ systemctl
-.mount loaded active mounted / -.mount loaded active mounted /
@ -31,12 +28,10 @@ sshd.service loaded active running SSH Daemon
graphical.target loaded active active Graphical Interface graphical.target loaded active active Graphical Interface
<replaceable>...</replaceable> <replaceable>...</replaceable>
</screen> </screen>
</para>
</para> <para>
You can ask for detailed status information about a unit, for instance, the
<para>You can ask for detailed status information about a unit, for PostgreSQL database service:
instance, the PostgreSQL database service:
<screen> <screen>
$ systemctl status postgresql.service $ systemctl status postgresql.service
postgresql.service - PostgreSQL Server postgresql.service - PostgreSQL Server
@ -56,28 +51,22 @@ Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to
Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started
Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
</screen> </screen>
Note that this shows the status of the unit (active and running), all the
Note that this shows the status of the unit (active and running), all processes belonging to the service, as well as the most recent log messages
the processes belonging to the service, as well as the most recent log from the service.
messages from the service. </para>
<para>
</para> Units can be stopped, started or restarted:
<para>Units can be stopped, started or restarted:
<screen> <screen>
# systemctl stop postgresql.service # systemctl stop postgresql.service
# systemctl start postgresql.service # systemctl start postgresql.service
# systemctl restart postgresql.service # systemctl restart postgresql.service
</screen> </screen>
These operations are synchronous: they wait until the service has finished
These operations are synchronous: they wait until the service has starting or stopping (or has failed). Starting a unit will cause the
finished starting or stopping (or has failed). Starting a unit will dependencies of that unit to be started as well (if necessary).
cause the dependencies of that unit to be started as well (if </para>
necessary).</para>
<!-- - cgroups: each service and user session is a cgroup <!-- - cgroups: each service and user session is a cgroup
- cgroup resource management --> - cgroup resource management -->
</chapter> </chapter>

View file

@ -3,35 +3,34 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-nix-store-corruption"> xml:id="sec-nix-store-corruption">
<title>Nix Store Corruption</title>
<title>Nix Store Corruption</title> <para>
After a system crash, its possible for files in the Nix store to become
<para>After a system crash, its possible for files in the Nix store corrupted. (For instance, the Ext4 file system has the tendency to replace
to become corrupted. (For instance, the Ext4 file system has the un-synced files with zero bytes.) NixOS tries hard to prevent this from
tendency to replace un-synced files with zero bytes.) NixOS tries happening: it performs a <command>sync</command> before switching to a new
hard to prevent this from happening: it performs a configuration, and Nixs database is fully transactional. If corruption
<command>sync</command> before switching to a new configuration, and still occurs, you may be able to fix it automatically.
Nixs database is fully transactional. If corruption still occurs, </para>
you may be able to fix it automatically.</para>
<para>If the corruption is in a path in the closure of the NixOS
system configuration, you can fix it by doing
<para>
If the corruption is in a path in the closure of the NixOS system
configuration, you can fix it by doing
<screen> <screen>
# nixos-rebuild switch --repair # nixos-rebuild switch --repair
</screen> </screen>
This will cause Nix to check every path in the closure, and if its
cryptographic hash differs from the hash recorded in Nixs database, the
path is rebuilt or redownloaded.
</para>
This will cause Nix to check every path in the closure, and if its <para>
cryptographic hash differs from the hash recorded in Nixs database, You can also scan the entire Nix store for corrupt paths:
the path is rebuilt or redownloaded.</para>
<para>You can also scan the entire Nix store for corrupt paths:
<screen> <screen>
# nix-store --verify --check-contents --repair # nix-store --verify --check-contents --repair
</screen> </screen>
Any corrupt paths will be redownloaded if theyre available in a binary
Any corrupt paths will be redownloaded if theyre available in a cache; otherwise, they cannot be repaired.
binary cache; otherwise, they cannot be repaired.</para> </para>
</section> </section>

View file

@ -3,16 +3,14 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="ch-troubleshooting"> xml:id="ch-troubleshooting">
<title>Troubleshooting</title>
<title>Troubleshooting</title> <para>
This chapter describes solutions to common problems you might encounter when
<para>This chapter describes solutions to common problems you might you manage your NixOS system.
encounter when you manage your NixOS system.</para> </para>
<xi:include href="boot-problems.xml" />
<xi:include href="boot-problems.xml" /> <xi:include href="maintenance-mode.xml" />
<xi:include href="maintenance-mode.xml" /> <xi:include href="rollback.xml" />
<xi:include href="rollback.xml" /> <xi:include href="store-corruption.xml" />
<xi:include href="store-corruption.xml" /> <xi:include href="network-problems.xml" />
<xi:include href="network-problems.xml" />
</chapter> </chapter>

View file

@ -3,14 +3,12 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-user-sessions"> xml:id="sec-user-sessions">
<title>User Sessions</title>
<title>User Sessions</title> <para>
Systemd keeps track of all users who are logged into the system (e.g. on a
<para>Systemd keeps track of all users who are logged into the system virtual console or remotely via SSH). The command <command>loginctl</command>
(e.g. on a virtual console or remotely via SSH). The command allows querying and manipulating user sessions. For instance, to list all
<command>loginctl</command> allows querying and manipulating user user sessions:
sessions. For instance, to list all user sessions:
<screen> <screen>
$ loginctl $ loginctl
SESSION UID USER SEAT SESSION UID USER SEAT
@ -18,12 +16,10 @@ $ loginctl
c3 0 root seat0 c3 0 root seat0
c4 500 alice c4 500 alice
</screen> </screen>
This shows that two users are logged in locally, while another is logged in
This shows that two users are logged in locally, while another is remotely. (“Seats” are essentially the combinations of displays and input
logged in remotely. (“Seats” are essentially the combinations of devices attached to the system; usually, there is only one seat.) To get
displays and input devices attached to the system; usually, there is information about a session:
only one seat.) To get information about a session:
<screen> <screen>
$ loginctl session-status c3 $ loginctl session-status c3
c3 - root (0) c3 - root (0)
@ -38,16 +34,12 @@ c3 - root (0)
├─10339 -bash ├─10339 -bash
└─10355 w3m nixos.org └─10355 w3m nixos.org
</screen> </screen>
This shows that the user is logged in on virtual console 3. It also lists the
This shows that the user is logged in on virtual console 3. It also processes belonging to this session. Since systemd keeps track of this, you
lists the processes belonging to this session. Since systemd keeps can terminate a session in a way that ensures that all the sessions
track of this, you can terminate a session in a way that ensures that processes are gone:
all the sessions processes are gone:
<screen> <screen>
# loginctl terminate-session c3 # loginctl terminate-session c3
</screen> </screen>
</para>
</para>
</chapter> </chapter>

View file

@ -3,15 +3,14 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-module-abstractions"> xml:id="sec-module-abstractions">
<title>Abstractions</title>
<title>Abstractions</title> <para>
If you find yourself repeating yourself over and over, its time to
<para>If you find yourself repeating yourself over and over, its time abstract. Take, for instance, this Apache HTTP Server configuration:
to abstract. Take, for instance, this Apache HTTP Server configuration:
<programlisting> <programlisting>
{ {
services.httpd.virtualHosts = <xref linkend="opt-services.httpd.virtualHosts"/> =
[ { hostName = "example.org"; [ { hostName = "example.org";
documentRoot = "/webroot"; documentRoot = "/webroot";
adminAddr = "alice@example.org"; adminAddr = "alice@example.org";
@ -28,11 +27,9 @@ to abstract. Take, for instance, this Apache HTTP Server configuration:
]; ];
} }
</programlisting> </programlisting>
It defines two virtual hosts with nearly identical configuration; the only
It defines two virtual hosts with nearly identical configuration; the difference is that the second one has SSL enabled. To prevent this
only difference is that the second one has SSL enabled. To prevent duplication, we can use a <literal>let</literal>:
this duplication, we can use a <literal>let</literal>:
<programlisting> <programlisting>
let let
exampleOrgCommon = exampleOrgCommon =
@ -43,7 +40,7 @@ let
}; };
in in
{ {
services.httpd.virtualHosts = <xref linkend="opt-services.httpd.virtualHosts"/> =
[ exampleOrgCommon [ exampleOrgCommon
(exampleOrgCommon // { (exampleOrgCommon // {
enableSSL = true; enableSSL = true;
@ -53,40 +50,38 @@ in
]; ];
} }
</programlisting> </programlisting>
The <literal>let exampleOrgCommon = <replaceable>...</replaceable></literal>
defines a variable named <literal>exampleOrgCommon</literal>. The
<literal>//</literal> operator merges two attribute sets, so the
configuration of the second virtual host is the set
<literal>exampleOrgCommon</literal> extended with the SSL options.
</para>
The <literal>let exampleOrgCommon = <para>
<replaceable>...</replaceable></literal> defines a variable named You can write a <literal>let</literal> wherever an expression is allowed.
<literal>exampleOrgCommon</literal>. The <literal>//</literal> Thus, you also could have written:
operator merges two attribute sets, so the configuration of the second
virtual host is the set <literal>exampleOrgCommon</literal> extended
with the SSL options.</para>
<para>You can write a <literal>let</literal> wherever an expression is
allowed. Thus, you also could have written:
<programlisting> <programlisting>
{ {
services.httpd.virtualHosts = <xref linkend="opt-services.httpd.virtualHosts"/> =
let exampleOrgCommon = <replaceable>...</replaceable>; in let exampleOrgCommon = <replaceable>...</replaceable>; in
[ exampleOrgCommon [ exampleOrgCommon
(exampleOrgCommon // { <replaceable>...</replaceable> }) (exampleOrgCommon // { <replaceable>...</replaceable> })
]; ];
} }
</programlisting> </programlisting>
but not <literal>{ let exampleOrgCommon = <replaceable>...</replaceable>; in
<replaceable>...</replaceable>; }</literal> since attributes (as opposed to
attribute values) are not expressions.
</para>
but not <literal>{ let exampleOrgCommon = <para>
<replaceable>...</replaceable>; in <replaceable>...</replaceable>; <emphasis>Functions</emphasis> provide another method of abstraction. For
}</literal> since attributes (as opposed to attribute values) are not instance, suppose that we want to generate lots of different virtual hosts,
expressions.</para> all with identical configuration except for the host name. This can be done
as follows:
<para><emphasis>Functions</emphasis> provide another method of
abstraction. For instance, suppose that we want to generate lots of
different virtual hosts, all with identical configuration except for
the host name. This can be done as follows:
<programlisting> <programlisting>
{ {
services.httpd.virtualHosts = <xref linkend="opt-services.httpd.virtualHosts"/> =
let let
makeVirtualHost = name: makeVirtualHost = name:
{ hostName = name; { hostName = name;
@ -101,38 +96,36 @@ the host name. This can be done as follows:
]; ];
} }
</programlisting> </programlisting>
Here, <varname>makeVirtualHost</varname> is a function that takes a single
argument <literal>name</literal> and returns the configuration for a virtual
host. That function is then called for several names to produce the list of
virtual host configurations.
</para>
Here, <varname>makeVirtualHost</varname> is a function that takes a <para>
single argument <literal>name</literal> and returns the configuration We can further improve on this by using the function <varname>map</varname>,
for a virtual host. That function is then called for several names to which applies another function to every element in a list:
produce the list of virtual host configurations.</para>
<para>We can further improve on this by using the function
<varname>map</varname>, which applies another function to every
element in a list:
<programlisting> <programlisting>
{ {
services.httpd.virtualHosts = <xref linkend="opt-services.httpd.virtualHosts"/> =
let let
makeVirtualHost = <replaceable>...</replaceable>; makeVirtualHost = <replaceable>...</replaceable>;
in map makeVirtualHost in map makeVirtualHost
[ "example.org" "example.com" "example.gov" "example.nl" ]; [ "example.org" "example.com" "example.gov" "example.nl" ];
} }
</programlisting> </programlisting>
(The function <literal>map</literal> is called a <emphasis>higher-order
function</emphasis> because it takes another function as an argument.)
</para>
(The function <literal>map</literal> is called a <para>
<emphasis>higher-order function</emphasis> because it takes another What if you need more than one argument, for instance, if we want to use a
function as an argument.)</para> different <literal>documentRoot</literal> for each virtual host? Then we can
make <varname>makeVirtualHost</varname> a function that takes a
<para>What if you need more than one argument, for instance, if we <emphasis>set</emphasis> as its argument, like this:
want to use a different <literal>documentRoot</literal> for each
virtual host? Then we can make <varname>makeVirtualHost</varname> a
function that takes a <emphasis>set</emphasis> as its argument, like this:
<programlisting> <programlisting>
{ {
services.httpd.virtualHosts = <xref linkend="opt-services.httpd.virtualHosts"/> =
let let
makeVirtualHost = { name, root }: makeVirtualHost = { name, root }:
{ hostName = name; { hostName = name;
@ -147,10 +140,9 @@ function that takes a <emphasis>set</emphasis> as its argument, like this:
]; ];
} }
</programlisting> </programlisting>
But in this case (where every root is a subdirectory of
But in this case (where every root is a subdirectory of <filename>/sites</filename> named after the virtual host), it would have been
<filename>/sites</filename> named after the virtual host), it would shorter to define <varname>makeVirtualHost</varname> as
have been shorter to define <varname>makeVirtualHost</varname> as
<programlisting> <programlisting>
makeVirtualHost = name: makeVirtualHost = name:
{ hostName = name; { hostName = name;
@ -158,9 +150,7 @@ makeVirtualHost = name:
adminAddr = "alice@example.org"; adminAddr = "alice@example.org";
}; };
</programlisting> </programlisting>
Here, the construct <literal>${<replaceable>...</replaceable>}</literal>
Here, the construct allows the result of an expression to be spliced into a string.
<literal>${<replaceable>...</replaceable>}</literal> allows the result </para>
of an expression to be spliced into a string.</para>
</section> </section>

View file

@ -3,22 +3,18 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="ad-hoc-network-config"> xml:id="ad-hoc-network-config">
<title>Ad-Hoc Configuration</title>
<title>Ad-Hoc Configuration</title> <para>
You can use <xref linkend="opt-networking.localCommands"/> to specify shell
<para>You can use <option>networking.localCommands</option> to specify commands to be run at the end of <literal>network-setup.service</literal>.
shell commands to be run at the end of This is useful for doing network configuration not covered by the existing
<literal>network-setup.service</literal>. This is useful for doing NixOS modules. For instance, to statically configure an IPv6 address:
network configuration not covered by the existing NixOS modules. For
instance, to statically configure an IPv6 address:
<programlisting> <programlisting>
networking.localCommands = <xref linkend="opt-networking.localCommands"/> =
'' ''
ip -6 addr add 2001:610:685:1::1/64 dev eth0 ip -6 addr add 2001:610:685:1::1/64 dev eth0
''; '';
</programlisting> </programlisting>
</para>
</para>
</section> </section>

View file

@ -3,61 +3,59 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-ad-hoc-packages"> xml:id="sec-ad-hoc-packages">
<title>Ad-Hoc Package Management</title>
<title>Ad-Hoc Package Management</title> <para>
With the command <command>nix-env</command>, you can install and uninstall
<para>With the command <command>nix-env</command>, you can install and packages from the command line. For instance, to install Mozilla Thunderbird:
uninstall packages from the command line. For instance, to install
Mozilla Thunderbird:
<screen> <screen>
$ nix-env -iA nixos.thunderbird</screen> $ nix-env -iA nixos.thunderbird</screen>
If you invoke this as root, the package is installed in the Nix profile
<filename>/nix/var/nix/profiles/default</filename> and visible to all users
of the system; otherwise, the package ends up in
<filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
and is not visible to other users. The <option>-A</option> flag specifies the
package by its attribute name; without it, the package is installed by
matching against its package name (e.g. <literal>thunderbird</literal>). The
latter is slower because it requires matching against all available Nix
packages, and is ambiguous if there are multiple matching packages.
</para>
If you invoke this as root, the package is installed in the Nix <para>
profile <filename>/nix/var/nix/profiles/default</filename> and visible Packages come from the NixOS channel. You typically upgrade a package by
to all users of the system; otherwise, the package ends up in updating to the latest version of the NixOS channel:
<filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
and is not visible to other users. The <option>-A</option> flag
specifies the package by its attribute name; without it, the package
is installed by matching against its package name
(e.g. <literal>thunderbird</literal>). The latter is slower because
it requires matching against all available Nix packages, and is
ambiguous if there are multiple matching packages.</para>
<para>Packages come from the NixOS channel. You typically upgrade a
package by updating to the latest version of the NixOS channel:
<screen> <screen>
$ nix-channel --update nixos $ nix-channel --update nixos
</screen> </screen>
and then running <literal>nix-env -i</literal> again. Other packages and then running <literal>nix-env -i</literal> again. Other packages in the
in the profile are <emphasis>not</emphasis> affected; this is the profile are <emphasis>not</emphasis> affected; this is the crucial difference
crucial difference with the declarative style of package management, with the declarative style of package management, where running
where running <command>nixos-rebuild switch</command> causes all <command>nixos-rebuild switch</command> causes all packages to be updated to
packages to be updated to their current versions in the NixOS channel. their current versions in the NixOS channel. You can however upgrade all
You can however upgrade all packages for which there is a newer packages for which there is a newer version by doing:
version by doing:
<screen> <screen>
$ nix-env -u '*' $ nix-env -u '*'
</screen> </screen>
</para> </para>
<para>A package can be uninstalled using the <option>-e</option> <para>
flag: A package can be uninstalled using the <option>-e</option> flag:
<screen> <screen>
$ nix-env -e thunderbird $ nix-env -e thunderbird
</screen> </screen>
</para> </para>
<para>Finally, you can roll back an undesirable <para>
<command>nix-env</command> action: Finally, you can roll back an undesirable <command>nix-env</command> action:
<screen> <screen>
$ nix-env --rollback $ nix-env --rollback
</screen> </screen>
</para> </para>
<para><command>nix-env</command> has many more flags. For details,
see the
<citerefentry><refentrytitle>nix-env</refentrytitle><manvolnum>1</manvolnum></citerefentry>
manpage or the Nix manual.</para>
<para>
<command>nix-env</command> has many more flags. For details, see the
<citerefentry>
<refentrytitle>nix-env</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> manpage or the Nix manual.
</para>
</section> </section>

View file

@ -3,45 +3,38 @@
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0" version="5.0"
xml:id="sec-custom-packages"> xml:id="sec-custom-packages">
<title>Adding Custom Packages</title>
<title>Adding Custom Packages</title> <para>
Its possible that a package you need is not available in NixOS. In that
<para>Its possible that a package you need is not available in NixOS. case, you can do two things. First, you can clone the Nixpkgs repository, add
In that case, you can do two things. First, you can clone the Nixpkgs the package to your clone, and (optionally) submit a patch or pull request to
repository, add the package to your clone, and (optionally) submit a have it accepted into the main Nixpkgs repository. This is described in
patch or pull request to have it accepted into the main Nixpkgs detail in the <link
repository. This is described in detail in the <link xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs
xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. manual</link>. In short, you clone Nixpkgs:
In short, you clone Nixpkgs:
<screen> <screen>
$ git clone git://github.com/NixOS/nixpkgs.git $ git clone git://github.com/NixOS/nixpkgs.git
$ cd nixpkgs $ cd nixpkgs
</screen> </screen>
Then you write and test the package as described in the Nixpkgs manual.
Then you write and test the package as described in the Nixpkgs Finally, you add it to <literal>environment.systemPackages</literal>, e.g.
manual. Finally, you add it to
<literal>environment.systemPackages</literal>, e.g.
<programlisting> <programlisting>
environment.systemPackages = [ pkgs.my-package ]; <xref linkend="opt-environment.systemPackages"/> = [ pkgs.my-package ];
</programlisting> </programlisting>
and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs
and you run <command>nixos-rebuild</command>, specifying your own tree:
Nixpkgs tree:
<screen> <screen>
# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen> # nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>
</para>
</para> <para>
The second possibility is to add the package outside of the Nixpkgs tree. For
<para>The second possibility is to add the package outside of the instance, here is how you specify a build of the
Nixpkgs tree. For instance, here is how you specify a build of the <link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
<link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link> package directly in <filename>configuration.nix</filename>:
package directly in <filename>configuration.nix</filename>:
<programlisting> <programlisting>
environment.systemPackages = <xref linkend="opt-environment.systemPackages"/> =
let let
my-hello = with pkgs; stdenv.mkDerivation rec { my-hello = with pkgs; stdenv.mkDerivation rec {
name = "hello-2.8"; name = "hello-2.8";
@ -53,13 +46,12 @@ environment.systemPackages =
in in
[ my-hello ]; [ my-hello ];
</programlisting> </programlisting>
Of course, you can also move the definition of <literal>my-hello</literal>
Of course, you can also move the definition of into a separate Nix expression, e.g.
<literal>my-hello</literal> into a separate Nix expression, e.g.
<programlisting> <programlisting>
environment.systemPackages = [ (import ./my-hello.nix) ]; <xref linkend="opt-environment.systemPackages"/> = [ (import ./my-hello.nix) ];
</programlisting> </programlisting>
where <filename>my-hello.nix</filename> contains: where <filename>my-hello.nix</filename> contains:
<programlisting> <programlisting>
with import &lt;nixpkgs> {}; # bring all of Nixpkgs into scope with import &lt;nixpkgs> {}; # bring all of Nixpkgs into scope
@ -71,14 +63,11 @@ stdenv.mkDerivation rec {
}; };
} }
</programlisting> </programlisting>
This allows testing the package easily:
This allows testing the package easily:
<screen> <screen>
$ nix-build my-hello.nix $ nix-build my-hello.nix
$ ./result/bin/hello $ ./result/bin/hello
Hello, world! Hello, world!
</screen> </screen>
</para>
</para>
</section> </section>

Some files were not shown because too many files have changed in this diff Show more