From bdd4646338da296fdf3a8f9dc3cf5aff1dafa163 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Mar 2013 01:24:59 +0100 Subject: Revert "Prevent config.h from being clobbered" This reverts commit 28bba8c44f484eae38e8a15dcec73cfa999156f6. --- doc/dev/release-procedures.txt | 33 ------------------------ doc/manual/builtins.xml | 12 +++++++++ doc/manual/opt-common.xml | 9 ++++--- doc/manual/release-notes.xml | 57 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 37 deletions(-) delete mode 100644 doc/dev/release-procedures.txt (limited to 'doc') diff --git a/doc/dev/release-procedures.txt b/doc/dev/release-procedures.txt deleted file mode 100644 index 1e95a9ee9aca..000000000000 --- a/doc/dev/release-procedures.txt +++ /dev/null @@ -1,33 +0,0 @@ -To produce a `stable' release from the trunk: - --1. Update the release notes; make sure that the release date is - correct. - -0. Make sure that the trunk builds in the release supervisor. - -1. Branch the trunk, e.g., `svn cp .../trunk - .../branches/0.5-release'. - -2. Switch to the branch, e.g., `svn switch .../branches/0.5-release'. - -3. In `configure.ac', change `STABLE=0' into `STABLE=1' and commit. - -4. In the release supervisor, add a one-time job to build - `.../branches/0.5-release'. - -5. Make sure that the release succeeds. - -6. Move the branch to a tag, e.g., `svn mv .../branches/0.5-release - .../tags/0.5'. - - Note that the branch should not be used for maintenance; it should - be deleted after the release has been created. A maintenance - branch (e.g., `.../branches/0.5') should be created from the - original revision of the trunk (since maintenance releases should - also be tested first; hence, we cannot have `STABLE=1'). The same - procedure can then be followed to produce maintenance releases; - just substitute `.../branches/VERSION' for the trunk. - -7. Switch back to the trunk. - -8. Bump the version number in `configure.ac' (in AC_INIT). diff --git a/doc/manual/builtins.xml b/doc/manual/builtins.xml index 9f5f4438ce55..b75f58e21f1b 100644 --- a/doc/manual/builtins.xml +++ b/doc/manual/builtins.xml @@ -302,6 +302,18 @@ stdenv.mkDerivation { + builtins.hashString + type s + + Return a base-16 representation of the + cryptographic hash of string s. The + hash algorithm specified by type must + be one of "md5", "sha1" or + "sha256". + + + + builtins.head list diff --git a/doc/manual/opt-common.xml b/doc/manual/opt-common.xml index 72971bd6a7d5..329345773dd8 100644 --- a/doc/manual/opt-common.xml +++ b/doc/manual/opt-common.xml @@ -343,10 +343,11 @@ path - Add a path to the Nix expression search path. See - the NIX_PATH environment variable for details. Paths - added through take precedence over - NIX_PATH. + Add a path to the Nix expression search path. This + option may be given multiple times. See the NIX_PATH + environment variable for information on the semantics of the Nix + search path. Paths added through take + precedence over NIX_PATH. diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml index e7e9bf3c5b43..a078be83d5ab 100644 --- a/doc/manual/release-notes.xml +++ b/doc/manual/release-notes.xml @@ -6,6 +6,63 @@ + + +
Release 1.5.1 (February 28, 2013) + +The bug fix to the bug fix had a bug itself, of course. But +this time it will work for sure! + +
+ + + + +
Release 1.5 (February 27, 2013) + +This is a brown paper bag release to fix a regression introduced +by the hard link security fix in 1.4. + +
+ + + + +
Release 1.4 (February 26, 2013) + +This release fixes a security bug in multi-user operation. It +was possible for derivations to cause the mode of files outside of the +Nix store to be changed to 444 (read-only but world-readable) by +creating hard links to those files (details). + +There are also the following improvements: + + + + New built-in function: + builtins.hashString. + + Build logs are now stored in + /nix/var/log/nix/drvs/XX/, + where XX is the first two characters of + the derivation. This is useful on machines that keep a lot of build + logs (such as Hydra servers). + + The function corepkgs/fetchurl + can now make the downloaded file executable. This will allow + getting rid of all bootstrap binaries in the Nixpkgs source + tree. + + Language change: The expression "${./path} + ..." now evaluates to a string instead of a + path. + + + +
+ +
Release 1.3 (January 4, 2013) -- cgit 1.4.1