diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-19 12:33:04 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-19 12:33:04 +0200 |
commit | e75740455546f85cbf9849907b1f6520fdb487d8 (patch) | |
tree | 02ab162a81b88bcf1e116b6cbb180557c33ba9b9 /doc | |
parent | a02e5ad9263e508b4df6a3e5841e95bace0e787b (diff) | |
parent | 410aad942fc82bbeb9c30a4fdf826ed33998a593 (diff) | |
download | nixlib-e75740455546f85cbf9849907b1f6520fdb487d8.tar nixlib-e75740455546f85cbf9849907b1f6520fdb487d8.tar.gz nixlib-e75740455546f85cbf9849907b1f6520fdb487d8.tar.bz2 nixlib-e75740455546f85cbf9849907b1f6520fdb487d8.tar.lz nixlib-e75740455546f85cbf9849907b1f6520fdb487d8.tar.xz nixlib-e75740455546f85cbf9849907b1f6520fdb487d8.tar.zst nixlib-e75740455546f85cbf9849907b1f6520fdb487d8.zip |
Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
Diffstat (limited to 'doc')
-rw-r--r-- | doc/functions.xml | 84 | ||||
-rw-r--r-- | doc/languages-frameworks/go.xml | 140 | ||||
-rw-r--r-- | doc/languages-frameworks/haskell.md | 19 | ||||
-rw-r--r-- | doc/languages-frameworks/python.md | 1 |
4 files changed, 148 insertions, 96 deletions
diff --git a/doc/functions.xml b/doc/functions.xml index e6bb6b7deefb..73b178b061f9 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -171,42 +171,18 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> <section xml:id="sec-fhs-environments"> - <title>buildFHSChrootEnv/buildFHSUserEnv</title> + <title>buildFHSUserEnv</title> <para> - <function>buildFHSChrootEnv</function> and - <function>buildFHSUserEnv</function> provide a way to build and run - FHS-compatible lightweight sandboxes. They get their own isolated root with - binded <filename>/nix/store</filename>, so their footprint in terms of disk + <function>buildFHSUserEnv</function> provides a way to build and run + FHS-compatible lightweight sandboxes. It creates an isolated root with + bound <filename>/nix/store</filename>, so its footprint in terms of disk space needed is quite small. This allows one to run software which is hard or unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external - self-updated binaries. - </para> - - <para> - <function>buildFHSChrootEnv</function> allows to create persistent - environments, which can be constructed, deconstructed and entered by - multiple users at once. A downside is that it requires - <literal>root</literal> access for both those who create and destroy and - those who enter it. It can be useful to create environments for daemons that - one can enter and observe. - </para> - - <para> - <function>buildFHSUserEnv</function> uses Linux namespaces feature to create + self-updated binaries. It uses Linux namespaces feature to create temporary lightweight environments which are destroyed after all child - processes exit. It does not require root access, and can be useful to create - sandboxes and wrap applications. - </para> - - <para> - Those functions both rely on <function>buildFHSEnv</function>, which creates - an actual directory structure given a list of necessary packages and extra - build commands. - <function>buildFHSChrootEnv</function> and <function>buildFHSUserEnv</function> - both accept those arguments which are passed to - <function>buildFHSEnv</function>: + processes exit, without root user rights requirement. Accepted arguments are: </para> <variablelist> @@ -220,14 +196,16 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> <term><literal>targetPkgs</literal></term> <listitem><para>Packages to be installed for the main host's architecture - (i.e. x86_64 on x86_64 installations).</para></listitem> + (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also + installed.</para></listitem> </varlistentry> <varlistentry> <term><literal>multiPkgs</literal></term> <listitem><para>Packages to be installed for all architectures supported by - a host (i.e. i686 and x86_64 on x86_64 installations).</para></listitem> + a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are + installed by default.</para></listitem> </varlistentry> <varlistentry> @@ -240,30 +218,34 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting> <varlistentry> <term><literal>extraBuildCommandsMulti</literal></term> - <listitem><para>Like <literal>extraBuildCommandsMulti</literal>, but + <listitem><para>Like <literal>extraBuildCommands</literal>, but executed only on multilib architectures.</para></listitem> </varlistentry> + + <varlistentry> + <term><literal>extraOutputsToInstall</literal></term> + + <listitem><para>Additional derivation outputs to be linked for both + target and multi-architecture packages.</para></listitem> + </varlistentry> + + <varlistentry> + <term><literal>extraInstallCommands</literal></term> + + <listitem><para>Additional commands to be executed for finalizing the + derivation with runner script.</para></listitem> + </varlistentry> + + <varlistentry> + <term><literal>runScript</literal></term> + + <listitem><para>A command that would be executed inside the sandbox and + passed all the command line arguments. It defaults to + <literal>bash</literal>.</para></listitem> + </varlistentry> </variablelist> <para> - Additionally, <function>buildFHSUserEnv</function> accepts - <literal>runScript</literal> parameter, which is a command that would be - executed inside the sandbox and passed all the command line arguments. It - default to <literal>bash</literal>. - </para> - <para> - It also uses <literal>CHROOTENV_EXTRA_BINDS</literal> environment variable - for binding extra directories in the sandbox to outside places. The format of - the variable is <literal>/mnt=test-mnt:/data</literal>, where - <literal>/mnt</literal> would be mounted as <literal>/test-mnt</literal> - and <literal>/data</literal> would be mounted as <literal>/data</literal>. - <literal>extraBindMounts</literal> array argument to - <function>buildFHSUserEnv</function> function is prepended to this variable. - Latter entries take priority if defined several times -- i.e. in case of - <literal>/data=data1:/data=data2</literal> the actual bind path would be - <literal>/data2</literal>. - </para> - <para> One can create a simple environment using a <literal>shell.nix</literal> like that: </para> diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index d715765f6a14..7365f5abe681 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -5,27 +5,29 @@ <title>Go</title> <para>The function <varname>buildGoPackage</varname> builds -standard Go packages. +standard Go programs. </para> <example xml:id='ex-buildGoPackage'><title>buildGoPackage</title> <programlisting> -net = buildGoPackage rec { - name = "go.net-${rev}"; - goPackagePath = "golang.org/x/net"; <co xml:id='ex-buildGoPackage-1' /> - subPackages = [ "ipv4" "ipv6" ]; <co xml:id='ex-buildGoPackage-2' /> - rev = "e0403b4e005"; +deis = buildGoPackage rec { + name = "deis-${version}"; + version = "1.13.0"; + + goPackagePath = "github.com/deis/deis"; <co xml:id='ex-buildGoPackage-1' /> + subPackages = [ "client" ]; <co xml:id='ex-buildGoPackage-2' /> + src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "net"; - sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp"; + owner = "deis"; + repo = "deis"; + rev = "v${version}"; + sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goPackageAliases = [ "code.google.com/p/go.net" ]; <co xml:id='ex-buildGoPackage-3' /> - propagatedBuildInputs = [ goPackages.text ]; <co xml:id='ex-buildGoPackage-4' /> - buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-5' /> - disabled = isGo13;<co xml:id='ex-buildGoPackage-6' /> -}; + + goDeps = ./deps.json; <co xml:id='ex-buildGoPackage-3' /> + + buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-4' /> +} </programlisting> </example> @@ -47,50 +49,90 @@ the following arguments are of special significance to the function: packages will be built. </para> <para> - In this example only <literal>code.google.com/p/go.net/ipv4</literal> and - <literal>code.google.com/p/go.net/ipv6</literal> will be built. + In this example only <literal>github.com/deis/deis/client</literal> will be built. </para> </callout> <callout arearefs='ex-buildGoPackage-3'> <para> - <varname>goPackageAliases</varname> is a list of alternative import paths - that are valid for this library. - Packages that depend on this library will automatically rename - import paths that match any of the aliases to <literal>goPackagePath</literal>. + <varname>goDeps</varname> is where the Go dependencies of a Go program are listed + in a JSON format described below. </para> + </callout> + + <callout arearefs='ex-buildGoPackage-4'> <para> - In this example imports will be renamed from - <literal>code.google.com/p/go.net</literal> to - <literal>golang.org/x/net</literal> in every package that depend on the - <literal>go.net</literal> library. + <varname>buildFlags</varname> is a list of flags passed to the go build command. </para> </callout> - <callout arearefs='ex-buildGoPackage-4'> +</calloutlist> + +</para> + +<para>The <varname>goDeps</varname> attribute should point to a JSON 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.json</title> +<programlisting> +[ <co xml:id='ex-goDeps-1' /> + { + "goPackagePath": "gopkg.in/yaml.v2", <co xml:id='ex-goDeps-2' /> + "fetch": { + "type": "git", <co xml:id='ex-goDeps-3' /> + "url": "https://gopkg.in/yaml.v2", + "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", + "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" + } + }, + { + "include": "../../libs.json", <co xml:id='ex-goDeps-4' /> + "packages": [ <co xml:id='ex-goDeps-5' /> + "github.com/docopt/docopt-go", + "golang.org/x/crypto", + ] + } +] +</programlisting> +</example> + +<para> + +<calloutlist> + + <callout arearefs='ex-goDeps-1'> <para> - <varname>propagatedBuildInputs</varname> is where the dependencies of a Go library are - listed. Only libraries should list <varname>propagatedBuildInputs</varname>. If a standalone - program is being built instead, use <varname>buildInputs</varname>. If a library's tests require - additional dependencies that are not propagated, they should be listed in <varname>buildInputs</varname>. + <varname>goDeps</varname> is a list of Go dependencies. </para> </callout> - <callout arearefs='ex-buildGoPackage-5'> + <callout arearefs='ex-goDeps-2'> <para> - <varname>buildFlags</varname> is a list of flags passed to the go build command. + <varname>goPackagePath</varname> specifies Go package import path. </para> </callout> - <callout arearefs='ex-buildGoPackage-6'> + <callout arearefs='ex-goDeps-3'> <para> - If <varname>disabled</varname> is <literal>true</literal>, - nix will refuse to build this package. + <varname>fetch type</varname> that needs to be used to get package source. If <varname>git</varname> + is used there should be <varname>url</varname>, <varname>rev</varname> and <varname>sha256</varname> + defined next to it. </para> + </callout> + + <callout arearefs='ex-goDeps-4'> <para> - In this example the package will not be built for go 1.3. The <literal>isGo13</literal> - is an utility function that returns <literal>true</literal> if go used to build the - package has version 1.3.x. + <varname>include</varname> could be used to reuse <varname>goDeps</varname> between Go programs. + There is a common libs set in <varname><nixpkgs/pkgs/development/go-modules/libs.json></varname> + with pinned versions of many packages that you can reuse. + </para> + </callout> + + <callout arearefs='ex-goDeps-5'> + <para> + <varname>packages</varname> enumerates all Go packages that will be imported from included file. </para> </callout> @@ -99,12 +141,21 @@ the following arguments are of special significance to the function: </para> <para> -Reusable Go libraries may be found in the <varname>goPackages</varname> set. You can test -build a Go package as follows: + <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 goPackages.net -</screen> + <screen> + $ nix-build -A deis.bin + </screen> + + or build all outputs with: + + <screen> + $ nix-build -A deis.all + </screen> + + <varname>bin</varname> output will be installed by default with <varname>nix-env -i</varname> + or <varname>systemPackages</varname>. </para> @@ -119,6 +170,7 @@ done </screen> </para> - <para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.</para> +<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> </section> diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index e066ad110bec..3da13dd9ed64 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -378,6 +378,23 @@ special options turned on: buildInputs = [ R zeromq zlib ]; } +You can select a particular GHC version to compile with by setting the +`ghc` attribute as an argument to `buildStackProject`. Better yet, let +Stack choose what GHC version it wants based on the snapshot specified +in `stack.yaml` (only works with Stack >= 1.1.3): + + {nixpkgs ? import <nixpkgs> { }, ghc ? nixpkgs.ghc} + + with nixpkgs; + + let R = pkgs.R.override { enableStrictBarrier = true; }; + in + haskell.lib.buildStackProject { + name = "HaskellR"; + buildInputs = [ R zeromq zlib ]; + inherit ghc; + } + [stack-nix-doc]: http://docs.haskellstack.org/en/stable/nix_integration.html ### How to create ad hoc environments for `nix-shell` @@ -636,7 +653,7 @@ then you have to download and re-install `foo` and all its dependents from scratch: # nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \ - | xargs -L 1 nix-store --repair-path --option binary-caches http://hydra.nixos.org + | xargs -L 1 nix-store --repair-path If you're using additional Hydra servers other than `hydra.nixos.org`, then it might be necessary to purge the local caches that store data from those diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 50acc7f28f78..809e51460848 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -532,6 +532,7 @@ All parameters from `mkDerivation` function are still supported. * `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. * `format`: Format of the source. Options are `setup` for when the source has a `setup.py` and `setuptools` is used to build a wheel, and `wheel` in case the source is already a binary wheel. The default value is `setup`. +* `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. #### `buildPythonApplication` function |