Eelco Dolstra
9b67f234c9
Merge pull request #1768 from dtzWill/feature/brotli
...
use libbrotli directly when available
2018-01-02 11:31:29 +01:00
Eelco Dolstra
099ba37820
Merge pull request #1766 from FRidh/aspell
...
Do not export ASPELL_CONF
2018-01-02 11:29:13 +01:00
Will Dietz
5afee18726
run.sh: include lib64 in sandbox-paths to fix on ubuntu 16.XX
...
(cc #1769 )
2017-12-30 22:41:49 -06:00
Will Dietz
9dd2b8ac7b
use libbrotli directly when available
...
* Look for both 'brotli' and 'bro' as external command,
since upstream has renamed it in newer versions.
If neither are found, current runtime behavior
is preserved: try to find 'bro' on PATH.
* Limit amount handed to BrotliEncoderCompressStream
to ensure interrupts are processed in a timely manner.
Testing shows negligible performance impact.
(Other compression sinks don't seem to require this)
2017-12-30 20:26:33 -06:00
Frederik Rietdijk
ab8ba71205
Do not export ASPELL_CONF
...
This does not belong in Nix. Setting this env var is already done by the aspell derivation found in Nixpkgs.
2017-12-29 13:45:54 +01:00
Shea Levy
6a0dd63508
Merge branch 'fix/issue-1757' of git://github.com/dtzWill/nix
2017-12-27 18:51:05 -05:00
Shea Levy
25196d0d26
Merge branch 'fix/fetchGit-clean-branch' of git://github.com/dtzWill/nix
2017-12-27 18:50:08 -05:00
Will Dietz
bd17ccf1d8
nix repl: use linenoiseKeyType to differentiate ^C and ^D
...
Fixes #1757 .
2017-12-26 19:25:50 -06:00
Eelco Dolstra
4801420893
Remove debug line
2017-12-25 14:53:15 +01:00
Will Dietz
2e6f06c37e
fetchGit: Fix handling of local repo when not using 'master' branch
...
Add tests checking this behavior.
2017-12-22 15:29:52 -06:00
Eelco Dolstra
aa43cbb764
Check aws-sdk-cpp version
2017-12-22 12:05:13 +01:00
Eelco Dolstra
6d80870832
release.nix: Use fetchTarball and fetchGit
...
In particular, using fetchGit means we don't need hackery to clean the
source tree when building from an unclean tree.
2017-12-22 11:35:32 +01:00
Shea Levy
62e214fa6f
Merge branch 'fix/issue-1742-empty-completions' of git://github.com/dtzWill/nix
2017-12-20 13:18:36 -05:00
Eelco Dolstra
576abaa650
Merge pull request #1753 from FRidh/fix/escaping
...
Fix escaping, fixes build
2017-12-20 16:23:18 +01:00
Frederik Rietdijk
af1e2ffca1
Fix escaping, fixes build
2017-12-20 13:24:39 +01:00
Will Dietz
71987b18d4
linenoise.cpp: allow completions from empty input
...
Fixes #1742 .
2017-12-19 12:52:10 -06:00
Dan Peebles
ca40fbdc50
Add an issue template to cut down on the confusion
2017-12-17 11:08:28 -05:00
Eelco Dolstra
8efe937a35
Fix build on gcc 7
...
Fixes #1738 .
2017-12-16 00:49:31 +01:00
Eelco Dolstra
1dffbff57d
Merge pull request #1736 from bgamari/stoi-exceptions
...
Gracefully handle exceptions from stoi
2017-12-15 11:39:43 +01:00
Ben Gamari
626a94d70e
edit: Catch stoi exceptions from line number parsing
2017-12-14 19:11:56 -05:00
Ben Gamari
f9bcbddef2
json-to-value: Throw sensible error message on invalid numbers
2017-12-14 19:09:45 -05:00
Eelco Dolstra
5d5b931fb1
Fix build against current aws-sdk-cpp
2017-12-14 16:45:40 +01:00
Graham Christensen
e4ece83b1a
tests.setuid: only on i686 and x86_64 linuxs
2017-12-12 08:31:31 -05:00
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
Chris Martin
2a8f09a8c1
Add builtins.concatStringSep to the manual
2017-12-11 14:28:03 -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
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
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
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
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
Eelco Dolstra
f1efb97075
Fix #1635 .
2017-12-04 13:19:16 +01: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