aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-26Add support for passing structured data to buildersEelco Dolstra
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-26Bindings: Add a method for iterating in lexicographically sorted orderEelco Dolstra
2017-01-26Fix assertion failure when a path is lockedEelco Dolstra
Fixes: nix-store: src/libstore/build.cc:3649: void nix::Worker::run(const Goals&): Assertion `!awake.empty()' failed.
2017-01-26Fix interrupt handlingEelco Dolstra
2017-01-26UserLock: Fix multi-threaded access to a global variableEelco Dolstra
2017-01-26openLockFile: Return an AutoCloseFDEelco Dolstra
2017-01-26UserLock: Make more RAII-ishEelco Dolstra
2017-01-26Moving more code out of DerivationGoal::startBuilder()Eelco Dolstra
2017-01-26On HTTP errors, also show the curl errorEelco Dolstra
This is a hopefully temporary measure to diagnose the intermittent "HTTP error 200" failures.
2017-01-26Move exportReferencesGraph into a separate methodEelco Dolstra
startBuilder() is getting rather obese.
2017-01-25Merge pull request #1202 from trofi/no-bsddiff_compat_includeDomen Kožar
Makefile.config.in: drop unused bsddiff_compat_include
2017-01-25Merge pull request #1199 from NixOS/osx-minimal-versionDomen Kožar
Bail out if MacOS 10.9 or lower is used during installer
2017-01-25bail out if macOS 10.9 or lower is used during installerDomen Kožar
2017-01-24Makefile.config.in: drop unused bsddiff_compat_includeSergei Trofimovich
bsddiff_compat_include configure.ac substitution was removed in commit 16d9c872e41eb39248d88a3ba7c5706267676153 Signed-off-by: Sergei Trofimovich <siarheit@google.com>
2017-01-24Revert "Propagate path context via builtins.readFile"Eelco Dolstra
This reverts commit f7f0116dd727ac954fb04d9ef9b9fe7ec034e563. Issue #1174.
2017-01-24Revert "builtins.readFile: Put the references of the file, not those needed ↵Eelco Dolstra
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-24Hopefully fix build on older GCCEelco Dolstra
http://hydra.nixos.org/build/46805140
2017-01-24Fix typoEelco Dolstra
2017-01-24Enable verbose curl outputEelco Dolstra
Closes #1182.
2017-01-24build-remote: Use futimes instead of futimens on APPLEShea Levy
2017-01-24Work around a bug in clang and older versions of gccEelco Dolstra
http://hydra.nixos.org/build/46597440 https://llvm.org/bugs/show_bug.cgi?id=28096
2017-01-24shell.nix: Add a flag for using clangEelco Dolstra
2017-01-19Merge pull request #981 from shlevy/build-remote-c++Eelco Dolstra
build-remote: Implement in C++
2017-01-19Kill builds when we get EOF on the log FDEelco Dolstra
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-19CleanupEelco Dolstra
2017-01-19Use std::unique_ptr for HookInstanceEelco Dolstra
2017-01-19Add a test for --max-silent-timeEelco Dolstra
2017-01-17Handle SIGINT etc. via a sigwait() signal handler threadEelco Dolstra
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-16assign environ to a temp variable to ensure livenessJude Taylor
2017-01-16AutoCloseDir: Use std::unique_ptrEelco Dolstra
2017-01-16AutoDeleteArray -> std::unique_ptrEelco Dolstra
Also, switch to C++14 for std::make_unique.
2017-01-16nix-build: Use showManPage() and printVersion()Eelco Dolstra
2017-01-10builtins.readFile: Put the references of the file, not those needed to ↵Shea Levy
realize the file, into the context
2017-01-10build-remote: Don't use C++ streams to read the conf fileShea Levy
2017-01-10build-remote: Use std::set for feature setsShea Levy
2017-01-09Merge pull request #1139 from Mic92/masterEelco Dolstra
Simplify remouting with MS_PRIVATE in sandbox build
2017-01-09Merge pull request #1177 from dezgeg/bash-env-breakageEelco Dolstra
nix-shell: Fix 'nix-shell --command' doing nothing without TTY
2017-01-07nix-shell: Fix 'nix-shell --command' doing nothing without TTYTuomas Tynkkynen
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-03Drop a few more references to all-packages.nixEelco Dolstra
And also don't refer to f-spot, which apparently no longer exists. Issue #1170.
2017-01-03Update upload-release scriptEelco Dolstra
2017-01-03nix-shell: In #! mode, pass the last argumentEelco Dolstra
"i < argc - 1" should be "i < argc".
2017-01-03Merge pull request #1169 from dezgeg/fix-shell-shebangEelco Dolstra
Fix nix-shell shebang usage
2017-01-03tests: Add simple tests for nix-shellTuomas Tynkkynen
nix-shell -A, -p and -i are lightly tested.
2017-01-03nix-shell: Don't act interactive in shebangsTuomas Tynkkynen
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-03nix-shell: Fix 'nix-shell -i'Tuomas Tynkkynen
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-02Provide /var/run/nscd/socket in the sandboxEelco Dolstra
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-01Merge pull request #1168 from itsN1X/patch-1Domen Kožar
Readme semantics.
2017-01-01Readme semantics.N1X
2016-12-28Merge pull request #1165 from zimbatm/document-no-build-hookDomen Kožar
Document the common --no-build-hook option
2016-12-28Document the common --no-build-hook optionzimbatm
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 00:37:37 +0000