about summary refs log tree commit diff
AgeCommit message (Collapse)AuthorFilesLines
2017-12-20 Merge branch 'fix/issue-1742-empty-completions' of git://github.com/dtzWill/nixShea Levy1-7/+0
2017-12-20 Merge pull request #1753 from FRidh/fix/escapingEelco Dolstra1-2/+2
Fix escaping, fixes build
2017-12-20 Fix escaping, fixes buildFrederik Rietdijk1-2/+2
2017-12-19 linenoise.cpp: allow completions from empty inputWill Dietz1-7/+0
Fixes #1742.
2017-12-17 Add an issue template to cut down on the confusionDan Peebles1-0/+27
2017-12-16 Fix build on gcc 7Eelco Dolstra1-0/+2
Fixes #1738.
2017-12-15 Merge pull request #1736 from bgamari/stoi-exceptionsEelco Dolstra2-5/+16
Gracefully handle exceptions from stoi
2017-12-14 edit: Catch stoi exceptions from line number parsingBen Gamari1-1/+6
2017-12-14 json-to-value: Throw sensible error message on invalid numbersBen Gamari1-4/+10
2017-12-14 Fix build against current aws-sdk-cppEelco Dolstra1-1/+1
2017-12-12 Merge pull request #1722 from bhipple/fix-for-older-libcurlEelco Dolstra1-1/+3
Fix for builds with system libcurl < 7.30
2017-12-12 Merge pull request #1724 from dtzWill/fix/minor-warningsEelco Dolstra3-3/+4
fix minor warnings
2017-12-12 Merge pull request #1725 from chris-martin/pr/concatStringsSepEelco Dolstra1-0/+8
Add builtins.concatStringSep to the manual
2017-12-11 Add builtins.concatStringSep to the manualChris Martin1-0/+8
2017-12-11 Mark comparison call operator as constWill Dietz1-2/+2
2017-12-11 logging.cc: add missing 'override'Will Dietz1-0/+1
2017-12-11 Fix forward-decl of Bindings as "class", match definition.Will Dietz1-1/+1
(appease clang -Wmismatched-tags warning)
2017-12-11 Merge pull request #1721 from expipiplus1/patch-2Eelco Dolstra1-2/+2
Escape left angle brackets in XML documentation
2017-12-11 Merge branch 'feature/linenoise-ng' of git://github.com/dtzWill/nixShea Levy10-1262/+4580
2017-12-09 Fix for builds with system libcurl < 7.30Benjamin Hipple1-1/+3
CentOS 7.4 and RHEL 7.4 ship with libcurl-devel-7.29.0-42.el7.x86_64; this flag was added in 7.30.0 https://curl.haxx.se/libcurl/c/CURLMOPT_MAX_TOTAL_CONNECTIONS.html
2017-12-09 Escape left angle brackets in XML documentationJoe Hermaszewski1-2/+2
2017-12-08 Merge pull request #1717 from grahamc/upload-release-aarch64Eelco Dolstra1-0/+3
upload-release.pl: support aarch64-linux
2017-12-08 Merge pull request #1718 from markus1189/nix-hash-docEelco Dolstra1-1/+12
nix-hash: Add sentence and example for nix-prefetch-url hash
2017-12-08 Merge pull request #1719 from grahamc/fixup-darwin-hs-masterEelco Dolstra1-7/+21
Fixup darwin hs master
2017-12-08 replace lolcat with nix-infoGraham Christensen1-1/+1
2017-12-08 darwin installer: fix on High SierraGraham Christensen1-6/+20
2017-12-08 nix-hash: Add sentence and example for nix-prefetch-url hashMarkus Hauck1-1/+12
2017-12-07 upload-release.pl: support aarch64-linuxGraham Christensen1-0/+3
2017-12-07 Fix testEelco Dolstra1-1/+1
2017-12-07 Provide random access to cached NARsEelco Dolstra5-104/+198
E.g. $ time nix cat-store --store https://cache.nixos.org?local-nar-cache=/tmp/nars \ /nix/store/b0w2hafndl09h64fhb86kw6bmhbmnpm1-blender-2.79/share/icons/hicolor/scalable/apps/blender.svg > /dev/null real 0m4.139s $ time nix cat-store --store https://cache.nixos.org?local-nar-cache=/tmp/nars \ /nix/store/b0w2hafndl09h64fhb86kw6bmhbmnpm1-blender-2.79/share/icons/hicolor/scalable/apps/blender.svg > /dev/null real 0m0.024s (Before, the second call took ~0.220s.) This will use a NAR listing in /tmp/nars/b0w2hafndl09h64fhb86kw6bmhbmnpm1.ls containing all metadata, including the offsets of regular files inside the NAR. Thus, we don't need to read the entire NAR. (We do read the entire listing, but that's generally pretty small. We could use a SQLite DB by borrowing some more code from nixos-channel-scripts/file-cache.hh.) This is primarily useful when Hydra is serving files from an S3 binary cache, in particular when you have giant NARs. E.g. we had some 12 GiB NARs, so accessing individuals files was pretty slow.
2017-12-07 nix ls-{nar,store}: Return offset of files in the NAR if knownEelco Dolstra3-9/+12
E.g. $ nix ls-store --json --recursive --store https://cache.nixos.org /nix/store/b0w2hafndl09h64fhb86kw6bmhbmnpm1-blender-2.79 \ | jq .entries.bin.entries.blender.narOffset 400
2017-12-06 Merge pull request #1714 from LnL7/fix-ssh-store-narEelco Dolstra1-3/+3
ssh-store: fix length when writing nar
2017-12-06 ssh-store: fix length when writing narDaiderd Jordan1-3/+3
This fixes nix copy and other things that use copyStorePath.
2017-12-05 Merge branch 'fetchGit-fast-revision-update'Shea Levy3-24/+43
2017-12-04 Simplify build by including nlohmann/json.hppEelco Dolstra4-4/+14724
2017-12-04 Fix #1635.Eelco Dolstra1-3/+18
2017-11-29 Merge pull request #1704 from lheckemann/buildenv-eol-fixEelco Dolstra1-2/+2
Fix "Unexpected EOF reading a line" error
2017-11-29 Fix "Unexpected EOF reading a line" errorLinus Heckemann1-2/+2
propagated-user-env-packages files in nixpkgs aren't all terminated by newlines, as buildenv expected. Now it does not require a terminating newline; note that this introduces a behaviour change: propagated user env packages may now be spread across multiple lines. However, nix 1.11.x still expects them to be on a single line so this shouldn't be used in nixpkgs for now.
2017-11-28 Show log tail when a remote build failsEelco Dolstra1-2/+2
2017-11-27 doc: linenoise -> linenoise-ngWill Dietz1-1/+1
2017-11-27 no "linenoiseFree" in linenoise-ngWill Dietz1-1/+1
2017-11-27 replace vendored linenoise with linenoise-ngWill Dietz8-1260/+4578
2017-11-27 Merge pull request #1699 from aszlig/fix-remote-build-logEelco Dolstra2-2/+5
build-remote: Fix missing log output
2017-11-25 build-remote: Fix missing log outputaszlig2-2/+5
The storeUri variable in the build-remote hook is declared very much to the start of the main function and a bunch of lines later, the same variable gets checked via hasPrefix() but it gets assigned *after* that check when the most suitable machine for the build was choosen. So I guess this was just a typo in d16fd2497374671c92cb877f9570d65783a7 and what we really want is to either checkd the prefix *after* assigning storeUri or use bestMachine->storeUri directly. I choose the latter, because the former could introduce even more regressions if the try block where the variable gets assigned terminates early. Nevertheless, the reason why the log output didn't work is because hasPrefix() checked for "ssh://" in front of storeUri, but if the storeUri isn't set correctly (or at all), we don't get the log file descriptor set up properly, leading to no log output. I've adjusted the remote-builds test to include a regression test for this, so that we can make sure we get a build output when using remote builds. In addition to that I've tested this with two of my build farms and the build logs are emitted correctly again. Signed-off-by: aszlig <aszlig@nix.build>
2017-11-24 nix path-info: Show URL of NARs in binary cachesEelco Dolstra1-0/+2
2017-11-24 nix-shell/nix-build: Support .drv files againEelco Dolstra6-4/+61
Fixes #1663. Also handle '!<output-name>' (#1694).
2017-11-24 fetchGit: Ignore tarballTtl if rev is set and not in the repo.Shea Levy3-24/+43
Fixes #1697.
2017-11-21 tests/run.sh: Fix /build conflict when building in a sandboxEelco Dolstra1-1/+3
https://hydra.nixos.org/build/64519355
2017-11-21 fetchGit/fetchMercurial: Fix directory inclusion checkEelco Dolstra4-6/+12
E.g. the existence of .gitignore would cause .git to be included.
2017-11-21 Propagate flags like --sandbox to the daemon properlyEelco Dolstra3-6/+12