about summary refs log tree commit diff
AgeCommit message (Collapse)AuthorFilesLines
2017-01-26 Add support for passing structured data to buildersEelco Dolstra4-58/+130
Previously, all derivation attributes had to be coerced into strings so that they could be passed via the environment. This is lossy (e.g. lists get flattened, necessitating configureFlags vs. configureFlagsArray, of which the latter cannot be specified as an attribute), doesn't support attribute sets at all, and has size limitations (necessitating hacks like passAsFile). This patch adds a new mode for passing attributes to builders, namely encoded as a JSON file ".attrs.json" in the current directory of the builder. This mode is activated via the special attribute __structuredAttrs = true; (The idea is that one day we can set this in stdenv.mkDerivation.) For example, stdenv.mkDerivation { __structuredAttrs = true; name = "foo"; buildInputs = [ pkgs.hello pkgs.cowsay ]; doCheck = true; hardening.format = false; } results in a ".attrs.json" file containing (sans the indentation): { "buildInputs": [], "builder": "/nix/store/ygl61ycpr2vjqrx775l1r2mw1g2rb754-bash-4.3-p48/bin/bash", "configureFlags": [ "--with-foo", "--with-bar=1 2" ], "doCheck": true, "hardening": { "format": false }, "name": "foo", "nativeBuildInputs": [ "/nix/store/10h6li26i7g6z3mdpvra09yyf10mmzdr-hello-2.10", "/nix/store/4jnvjin0r6wp6cv1hdm5jbkx3vinlcvk-cowsay-3.03" ], "propagatedBuildInputs": [], "propagatedNativeBuildInputs": [], "stdenv": "/nix/store/f3hw3p8armnzy6xhd4h8s7anfjrs15n2-stdenv", "system": "x86_64-linux" } "passAsFile" is ignored in this mode because it's not needed - large strings are included directly in the JSON representation. It is up to the builder to do something with the JSON representation. For example, in bash-based builders, lists/attrsets of string values could be mapped to bash (associative) arrays.
2017-01-26 Bindings: Add a method for iterating in lexicographically sorted orderEelco Dolstra4-28/+28
2017-01-26 Fix assertion failure when a path is lockedEelco Dolstra1-0/+1
Fixes: nix-store: src/libstore/build.cc:3649: void nix::Worker::run(const Goals&): Assertion `!awake.empty()' failed.
2017-01-26 Fix interrupt handlingEelco Dolstra4-14/+42
2017-01-26 UserLock: Fix multi-threaded access to a global variableEelco Dolstra1-30/+40
2017-01-26 openLockFile: Return an AutoCloseFDEelco Dolstra3-7/+7
2017-01-26 UserLock: Make more RAII-ishEelco Dolstra1-53/+38
2017-01-26 Moving more code out of DerivationGoal::startBuilder()Eelco Dolstra1-100/+111
2017-01-26 On HTTP errors, also show the curl errorEelco Dolstra1-1/+1
This is a hopefully temporary measure to diagnose the intermittent "HTTP error 200" failures.
2017-01-26 Move exportReferencesGraph into a separate methodEelco Dolstra1-44/+55
startBuilder() is getting rather obese.
2017-01-25 Merge pull request #1202 from trofi/no-bsddiff_compat_includeDomen Kožar1-1/+0
Makefile.config.in: drop unused bsddiff_compat_include
2017-01-25 Merge pull request #1199 from NixOS/osx-minimal-versionDomen Kožar1-0/+7
Bail out if MacOS 10.9 or lower is used during installer
2017-01-25 bail out if macOS 10.9 or lower is used during installerDomen Kožar1-0/+7
2017-01-24 Makefile.config.in: drop unused bsddiff_compat_includeSergei Trofimovich1-1/+0
bsddiff_compat_include configure.ac substitution was removed in commit 16d9c872e41eb39248d88a3ba7c5706267676153 Signed-off-by: Sergei Trofimovich <siarheit@google.com>
2017-01-24 Revert "Propagate path context via builtins.readFile"Eelco Dolstra1-1/+1
This reverts commit f7f0116dd727ac954fb04d9ef9b9fe7ec034e563. Issue #1174.
2017-01-24 Revert "builtins.readFile: Put the references of the file, not those needed ↵Eelco Dolstra1-3/+0
to realize the file, into the context" Reverting commit 451c223deea17918454ae083dcfc0ea2b6103cab for now because it breaks http://hydra.nixos.org/build/46805136, not clear why.
2017-01-24 Hopefully fix build on older GCCEelco Dolstra1-3/+5
http://hydra.nixos.org/build/46805140
2017-01-24 Fix typoEelco Dolstra1-1/+1
2017-01-24 Enable verbose curl outputEelco Dolstra1-1/+14
Closes #1182.
2017-01-24 build-remote: Use futimes instead of futimens on APPLEShea Levy1-0/+7
2017-01-24 Work around a bug in clang and older versions of gccEelco Dolstra1-1/+1
http://hydra.nixos.org/build/46597440 https://llvm.org/bugs/show_bug.cgi?id=28096
2017-01-24 shell.nix: Add a flag for using clangEelco Dolstra1-1/+3
2017-01-19 Merge pull request #981 from shlevy/build-remote-c++Eelco Dolstra12-30/+334
build-remote: Implement in C++
2017-01-19 Kill builds when we get EOF on the log FDEelco Dolstra6-40/+40
This closes a long-time bug that allowed builds to hang Nix indefinitely (regardless of timeouts) simply by doing exec > /dev/null 2>&1; while true; do true; done Now, on EOF, we just send SIGKILL to the child to make sure it's really gone.
2017-01-19 CleanupEelco Dolstra1-5/+4
2017-01-19 Use std::unique_ptr for HookInstanceEelco Dolstra1-5/+4
2017-01-19 Add a test for --max-silent-timeEelco Dolstra3-7/+24
2017-01-17 Handle SIGINT etc. via a sigwait() signal handler threadEelco Dolstra4-27/+100
This allows other threads to install callbacks that run in a regular, non-signal context. In particular, we can use this to signal the downloader thread to quit. Closes #1183.
2017-01-16 assign environ to a temp variable to ensure livenessJude Taylor1-3/+6
2017-01-16 AutoCloseDir: Use std::unique_ptrEelco Dolstra4-65/+20
2017-01-16 AutoDeleteArray -> std::unique_ptrEelco Dolstra5-24/+10
Also, switch to C++14 for std::make_unique.
2017-01-16 nix-build: Use showManPage() and printVersion()Eelco Dolstra1-7/+3
2017-01-10 builtins.readFile: Put the references of the file, not those needed to ↵Shea Levy1-0/+3
realize the file, into the context
2017-01-10 build-remote: Don't use C++ streams to read the conf fileShea Levy1-29/+29
2017-01-10 build-remote: Use std::set for feature setsShea Levy1-18/+14
2017-01-09 Merge pull request #1139 from Mic92/masterEelco Dolstra1-6/+2
Simplify remouting with MS_PRIVATE in sandbox build
2017-01-09 Merge pull request #1177 from dezgeg/bash-env-breakageEelco Dolstra1-1/+2
nix-shell: Fix 'nix-shell --command' doing nothing without TTY
2017-01-07 nix-shell: Fix 'nix-shell --command' doing nothing without TTYTuomas Tynkkynen1-1/+2
Regression from a5f2750e ("Fix early removal of rc-file for nix-shell"). The removal of BASH_ENV causes nothing to be executed by bash if it detects itself in a non-interactive context. Instead, just use the same condition used by bash to launch bash differently. According to bash sources, the condition (stdin and stder both must be TTYs) is specified by POSIX so this should be pretty safe to rely on. Fixes #1171 on master, needs a backport to the Perl code in 1.11.
2017-01-03 Drop a few more references to all-packages.nixEelco Dolstra2-13/+6
And also don't refer to f-spot, which apparently no longer exists. Issue #1170.
2017-01-03 Update upload-release scriptEelco Dolstra1-0/+4
2017-01-03 nix-shell: In #! mode, pass the last argumentEelco Dolstra3-16/+14
"i < argc - 1" should be "i < argc".
2017-01-03 Merge pull request #1169 from dezgeg/fix-shell-shebangEelco Dolstra5-2/+74
Fix nix-shell shebang usage
2017-01-03 tests: Add simple tests for nix-shellTuomas Tynkkynen4-1/+72
nix-shell -A, -p and -i are lightly tested.
2017-01-03 nix-shell: Don't act interactive in shebangsTuomas Tynkkynen1-0/+1
I had observed that 'bash --rcfile' would do nothing in a non-interactive context and cause nothing to be executed if a script using nix-shell shebangs were run in a non-interactive context.
2017-01-03 nix-shell: Fix 'nix-shell -i'Tuomas Tynkkynen1-1/+1
The 'args' variable here is shadowing one in the outer scope and its contents end up unused. This causes any '#! nix-shell' lines to effectively be ignored. The intention here was to clear the args vector, as far as I can tell (and it seems to work).
2017-01-02 Provide /var/run/nscd/socket in the sandboxEelco Dolstra1-0/+1
Otherwise sandbox builds can fail, e.g. $ NIX_REMOTE=local?root=/tmp/nix nix-build '<nixpkgs>' -A hello --option build-use-substitutes false ... downloading ‘http://ftpmirror.gnu.org/bash/bash-4.3-patches/bash43-047’... error: unable to download ‘http://ftpmirror.gnu.org/bash/bash-4.3-patches/bash43-047’: Couldn't resolve host name (6)
2017-01-01 Merge pull request #1168 from itsN1X/patch-1Domen Kožar1-1/+1
Readme semantics.
2017-01-01 Readme semantics.N1X1-1/+1
2016-12-28 Merge pull request #1165 from zimbatm/document-no-build-hookDomen Kožar1-0/+17
Document the common --no-build-hook option
2016-12-28 Document the common --no-build-hook optionzimbatm1-0/+17
generated by cgit-pink 1.4.1 (git 2.44.2) at 2024-11-06T02·50+0000