diff options
author | Mark H Weaver <mhw@netris.org> | 2014-08-28 14:22:15 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-08-28 14:22:15 -0400 |
commit | c00a9fbfef75d2fc08485f8158ec331bfa99d5ec (patch) | |
tree | 4737817ee787c4ec8222ea13d3cfecb2ac98b673 /README | |
parent | 83291101c39c1cd1bf472280c24ad68d94248c2e (diff) | |
parent | dd16424466196616b99c13526537a89aaee27f88 (diff) | |
download | guix-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar guix-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/base.scm
Diffstat (limited to 'README')
-rw-r--r-- | README | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -70,7 +70,7 @@ To do so: Guix does the high-level preparation of a /derivation/. A derivation is the promise of a build; it is stored as a text file under -=/nix/store/xxx.drv=. The (guix derivations) module provides the +=/gnu/store/xxx.drv=. The (guix derivations) module provides the `derivation' primitive, as well as higher-level wrappers such as `build-expression->derivation'. |