[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
29/118: Merge branch 'shlevy-import-native'
From: |
Ludovic Courtès |
Subject: |
29/118: Merge branch 'shlevy-import-native' |
Date: |
Tue, 19 May 2015 14:45:24 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit d7be6d45d97e89653b77686bdb39b833afbcf6ca
Merge: 9d0709e d62f46e
Author: Eelco Dolstra <address@hidden>
Date: Fri Jun 27 11:18:54 2014 +0200
Merge branch 'shlevy-import-native'
src/libexpr/local.mk | 2 ++
src/libexpr/primops.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
src/libstore/globals.cc | 2 ++
src/libstore/globals.hh | 3 +++
4 files changed, 50 insertions(+), 0 deletions(-)
- 09/118: Make the Nix search path declarative, (continued)
- 09/118: Make the Nix search path declarative, Ludovic Courtès, 2015/05/19
- 04/118: Ugly hack to allow --argstr values starting with a dash, Ludovic Courtès, 2015/05/19
- 19/118: Report daemon OOM better, Ludovic Courtès, 2015/05/19
- 06/118: Add primop ‘scopedImport’, Ludovic Courtès, 2015/05/19
- 21/118: Add autoloads, make code more concise & idiomatic, Ludovic Courtès, 2015/05/19
- 25/118: Fix bogus warnings about dumping large paths, Ludovic Courtès, 2015/05/19
- 20/118: == operator: Ignore string context, Ludovic Courtès, 2015/05/19
- 17/118: nix-env -qa --json: Generate valid JSON even if there are invalid meta attrs, Ludovic Courtès, 2015/05/19
- 23/118: findFile: Realise the context of the path attributes, Ludovic Courtès, 2015/05/19
- 11/118: Rephrase @ operator description, Ludovic Courtès, 2015/05/19
- 29/118: Merge branch 'shlevy-import-native',
Ludovic Courtès <=
- 12/118: dev-shell is a bash script, not sh, Ludovic Courtès, 2015/05/19
- 22/118: Share code between scopedImport and import, Ludovic Courtès, 2015/05/19
- 26/118: Don't use member initialisers, Ludovic Courtès, 2015/05/19
- 31/118: Add `--json` argument to `nix-instantiate`, Ludovic Courtès, 2015/05/19
- 18/118: Print a warning when loading a large path into memory, Ludovic Courtès, 2015/05/19
- 27/118: Add importNative primop, Ludovic Courtès, 2015/05/19
- 24/118: Drop ImportError and FindError, Ludovic Courtès, 2015/05/19
- 28/118: Only add the importNative primop if the allow-arbitrary-code-during-evaluation option is true (default false), Ludovic Courtès, 2015/05/19
- 30/118: allow-arbitrary-code-during-evaluation -> allow-unsafe-native-code-during-evaluation, Ludovic Courtès, 2015/05/19
- 34/118: Add builtin function ‘fromJSON’, Ludovic Courtès, 2015/05/19