Commit graph

12379 commits

Author SHA1 Message Date
Eelco Dolstra
1ca8e95178
Merge pull request #1722 from bhipple/fix-for-older-libcurl
Fix for builds with system libcurl < 7.30
2017-12-12 11:48:08 +01:00
Eelco Dolstra
de38fa9987
Merge pull request #1724 from dtzWill/fix/minor-warnings
fix minor warnings
2017-12-12 11:47:47 +01:00
Eelco Dolstra
e3c19ff9bc
Merge pull request #1725 from chris-martin/pr/concatStringsSep
Add builtins.concatStringSep to the manual
2017-12-12 11:46:10 +01:00
Vincent Ambo
9286e70da3 docs(cluster-config): 'context' key optional for template command
Thanks to @christopher376 on the Kubernetes Slack for pointing out this mistake.
2017-12-11 20:57:07 +01:00
Chris Martin
2a8f09a8c1 Add builtins.concatStringSep to the manual 2017-12-11 14:28:03 -05:00
Abseil Team
dc0282d098 Changes imported from Abseil "staging" branch:
- 53eebc8dc5730f42b1cda71bc55a5097d330b484 This changes the value base_internal::kOnceDone from 32-b... by Abseil Team <absl-team@google.com>
  - e34af839e2062e9ed6639803186811be23e6fb80 This changes the value base_internal::kOnceDone from 32-b... by Abseil Team <absl-team@google.com>
  - dfb395ba062168eeb15237724b628a1b2494052c Remove unnecessary dependency. by Abseil Team <absl-team@google.com>

GitOrigin-RevId: 53eebc8dc5730f42b1cda71bc55a5097d330b484
Change-Id: Ide088c81d660c4be900b2456d57a8dcbdb349cc7
2017-12-11 14:02:39 -05:00
Will Dietz
00e0c416ff Mark comparison call operator as const 2017-12-11 12:08:40 -06:00
Will Dietz
e4d43f1f94 logging.cc: add missing 'override' 2017-12-11 12:08:40 -06:00
Will Dietz
c800f47395 Fix forward-decl of Bindings as "class", match definition.
(appease clang -Wmismatched-tags warning)
2017-12-11 11:51:55 -06:00
Eelco Dolstra
06d4566c2d
Merge pull request #1721 from expipiplus1/patch-2
Escape left angle brackets in XML documentation
2017-12-11 17:29:36 +01:00
Shea Levy
5ba5ca7888
Merge branch 'feature/linenoise-ng' of git://github.com/dtzWill/nix 2017-12-11 07:52:20 -05:00
Chris Feng
a145445da6 ; Eliminate a compilation warning. 2017-12-10 17:58:13 +08:00
Benjamin Hipple
d76c4fe770 Fix for builds with system libcurl < 7.30
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 20:02:21 -05:00
Joe Hermaszewski
35a49f1d7f
Escape left angle brackets in XML documentation 2017-12-09 15:31:03 +00:00
Abseil Team
ecc56367b8 Changes imported from Abseil "staging" branch:
- af7f910500f810f04b5e9835a0655ed509ffb60c Correct comment to refer to simple_pair instead of std::p... by Alex Strelnikov <strel@google.com>

GitOrigin-RevId: af7f910500f810f04b5e9835a0655ed509ffb60c
Change-Id: I5829533b8ef07e40f2bb89a6a4b2f9a6128d4f3e
2017-12-08 10:06:26 -05:00
Eelco Dolstra
0b59882fe3
Merge pull request #1717 from grahamc/upload-release-aarch64
upload-release.pl: support aarch64-linux
2017-12-08 14:00:06 +01:00
Eelco Dolstra
d73e16df05
Merge pull request #1718 from markus1189/nix-hash-doc
nix-hash: Add sentence and example for nix-prefetch-url hash
2017-12-08 13:59:41 +01:00
Eelco Dolstra
82e6275a7b
Merge pull request #1719 from grahamc/fixup-darwin-hs-master
Fixup darwin hs master
2017-12-08 13:58:54 +01:00
Graham Christensen
1db034364a
replace lolcat with nix-info 2017-12-08 07:19:32 -05:00
Graham Christensen
be79d1f189
darwin installer: fix on High Sierra 2017-12-08 07:19:26 -05:00
Markus Hauck
0af668426d nix-hash: Add sentence and example for nix-prefetch-url hash 2017-12-08 10:27:34 +01:00
Graham Christensen
fbab9ed01e
upload-release.pl: support aarch64-linux 2017-12-07 19:02:35 -05:00
Abseil Team
bff9423150 Changes imported from Abseil "staging" branch:
- 221bfcc1d2583d8bdf1f3745fa0496f92338d38a Update type_traits_test to avoid depending on triviality ... by Matt Calabrese <calabrese@google.com>

GitOrigin-RevId: 221bfcc1d2583d8bdf1f3745fa0496f92338d38a
Change-Id: I7db0f32479673d21b6976f43baaf3c18f0b73e47
2017-12-07 09:51:37 -05:00
Eelco Dolstra
e3013543d3 Fix test 2017-12-07 01:07:07 +01:00
Eelco Dolstra
2df9cbeb47 Provide random access to cached NARs
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 01:07:07 +01:00
Eelco Dolstra
338f29dbd4 nix ls-{nar,store}: Return offset of files in the NAR if known
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-07 01:07:07 +01:00
Abseil Team
1b8dacca62 Changes imported from Abseil "staging" branch:
- 536d004b7e2d48927a5f82e71e9e3a0a9afedbc8 Change uint128 parameters to pass by value. by Alex Strelnikov <strel@google.com>

GitOrigin-RevId: 536d004b7e2d48927a5f82e71e9e3a0a9afedbc8
Change-Id: I9c5e73ce06c8423a27ec7bff2c4accc434e99cb2
2017-12-06 10:09:02 -05:00
Eelco Dolstra
ba334bd6f7
Merge pull request #1714 from LnL7/fix-ssh-store-nar
ssh-store: fix length when writing nar
2017-12-06 13:11:36 +01:00
Daiderd Jordan
2cb8aaa610
ssh-store: fix length when writing nar
This fixes nix copy and other things that use copyStorePath.
2017-12-06 11:41:08 +01:00
Shea Levy
11a7f8ce14
Merge branch 'fetchGit-fast-revision-update' 2017-12-05 11:16:39 -05:00
Eelco Dolstra
7f2c324ed1
Simplify build by including nlohmann/json.hpp 2017-12-04 17:11:36 +01:00
Abseil Team
f4f91f4216 Changes imported from Abseil "staging" branch:
- 1dde8a2a1868c32b32d62fba62eb37974f656948 Correct usage of CUnescape() in example. by Abseil Team <absl-team@google.com>

GitOrigin-RevId: 1dde8a2a1868c32b32d62fba62eb37974f656948
Change-Id: I5183a74a3c682ac55b2bf4be0d871375e1302aae
2017-12-04 09:58:18 -05:00
Eelco Dolstra
f1efb97075
Fix #1635. 2017-12-04 13:19:16 +01:00
Vincent Ambo
443e8ea995 feat(look-and-feel): Font-size based on host
My desktop is currently connected to a 4K screen and needs *slightly*
larger fonts for readability.
2017-12-03 18:37:28 +01:00
Abseil Team
8b727aa7ab Changes imported from Abseil "staging" branch:
- 5d8235b05f4ea2b33a138712f463a30b6ae75719 Incorporate PR https://github.com/abseil/abseil-cpp/pull/... by Xiaoyi Zhang <zhangxy@google.com>
  - f2bc653acdaa983aa2765693476c17cd1142d59b Run the StrSplit WorksWithLargeStrings test in all configs. by Matt Armstrong <marmstrong@google.com>
  - 43aed1ea7dffcd656e1916c2d5637650fc3a8de3 Incorporate PR https://github.com/abseil/abseil-cpp/pull/... by Xiaoyi Zhang <zhangxy@google.com>
  - d58511d60904c7090e44638339ba63b97ca96f1a Add a new simple Mutex lifetime test, to be extended later. by Greg Falcon <gfalcon@google.com>
  - db5c86c186c09ad57963bcbd2b6182f62bce8ed0 Actually use the exception in TestCheckerAtCountdown by Jon Cohen <cohenjon@google.com>
  - 29c01a72b62d9a4b90f9bd935e3575adbafd85ed Use factories instead of explicitly passing pointers to T... by Jon Cohen <cohenjon@google.com>
  - 54d5526ee6ab7784992845f6e6e2c7d48ba008a5 Fix uint128 ostream operator and improve ostream test. by Alex Strelnikov <strel@google.com>
  - 4e49abe7e569cf6bd0eae95ce2b2fe2faa051fa2 Fix documentation: strings::PairFormatter -> absl::PairFo... by Derek Mauro <dmauro@google.com>
  - 4044297f0e1a8a6c6ae3f781a65080e0d57c6751 Cut the memory used by the StrSplit WorksWithLargeStrings... by Jorg Brown <jorg@google.com>

GitOrigin-RevId: 5d8235b05f4ea2b33a138712f463a30b6ae75719
Change-Id: Ib6b6b0161c26e5326b53a126454754e33678eefc
2017-12-01 15:25:15 -05:00
zhangxy988
579f2879ac
Merge pull request #51 from behrenhoff/master
Fix CMakeLists.txt for ostringstream_test
2017-12-01 15:20:20 -05:00
zhangxy988
3562f9bb79
Merge pull request #55 from rongjiecomputer/master
MSVC fixes
2017-12-01 13:55:00 -05:00
Will Dietz
79f5c296c0 ignore "interrupted" exception in progress callback
Context/discusson:

https://github.com/NixOS/nix/issues/1692#issuecomment-348282301
2017-11-30 12:45:54 -06:00
Eelco Dolstra
cd74a55afc
Merge pull request #1704 from lheckemann/buildenv-eol-fix
Fix "Unexpected EOF reading a line" error
2017-11-29 15:27:57 +01:00
Linus Heckemann
f986a44980 Fix "Unexpected EOF reading a line" error
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-29 11:56:15 +00:00
Loo Rong Jie
e98380282f Add comments about warning flags 2017-11-29 08:37:53 +08:00
Eelco Dolstra
b52846ab5b
Show log tail when a remote build fails 2017-11-28 15:36:28 +01:00
Loo Rong Jie
79ae60ed97 MSVC fixes 2017-11-28 13:36:16 +08:00
Will Dietz
e50d7335bf doc: linenoise -> linenoise-ng 2017-11-27 18:36:20 -06:00
Will Dietz
964349e44d no "linenoiseFree" in linenoise-ng 2017-11-27 18:30:05 -06:00
Will Dietz
21f515724c replace vendored linenoise with linenoise-ng 2017-11-27 18:27:28 -06:00
Abseil Team
79610733f4 Changes imported from Abseil "staging" branch:
- 5c323578d5492e9fd6f24d049ed3f55c9dc136f8 Fix typo. by Abseil Team <absl-team@google.com>

GitOrigin-RevId: 5c323578d5492e9fd6f24d049ed3f55c9dc136f8
Change-Id: I75af467a356ac6037738aadbffe93cbcd7a1a747
2017-11-27 14:53:53 -05:00
Eelco Dolstra
3c470c97a1
Merge pull request #1699 from aszlig/fix-remote-build-log
build-remote: Fix missing log output
2017-11-27 13:59:51 +01:00
Wolf Behrenhoff
56d970fd0e Fix CMakeLists.txt for ostringstream_test
After commit 99b92c87 compiling with CMake stopped working. This commit fixes the issue.
2017-11-27 12:05:25 +01:00
Sergey Bogatyrets
9ff6fa817b Checking device arg too for defining dev instance (#129) 2017-11-26 11:10:19 -08:00