guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,824 Commits 37 Branches 40 Tags
d9e23bfee2f1995b3047d67e578e2cfd4e94dea6
Commit Graph
87 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Will DietzandEelco Dolstra 15edd2349e local.mk: fix user-env.cc dep on buildenv.nix.gen.hh, resolve occasional build failure 2020-03-12 00:51:56 +01:00
Will Dietz 0e9b72e097 minor: fix mismatch of struct/class forward decl of 'Source' 
Fixes the following warning and the indicate potential issue:

src/libstore/worker-protocol.hh:66:1: warning: class 'Source' was previously declared as a struct; this is valid, but may result in linker errors
under the Microsoft C++ ABI [-Wmismatched-tags]

(cherry picked from commit 6e1bb04870b1b723282d32182af286646f13bf3c)
 2019-10-30 14:39:01 -05:00
Will Dietz c3fefd1a6e pathlocks: add include to fcntl.h for O_CLOEXEC 2019-08-07 07:41:22 -05:00
Will DietzandEelco Dolstra a834861876 fix hashfile test that wasn't failing due to eval laziness 
See:
https://github.com/NixOS/nix/commit/7becb1bf1c2ec1544a5374580a97b36273506baf#r33450554
 2019-05-08 10:04:54 +02:00
Will DietzandEelco Dolstra 63e7fc5096 perl/configure.ac: fix for new version location too 2019-03-25 09:18:30 +01:00
Will DietzandEelco Dolstra 1f9c8cd68b configure.ac: update for new version file location 2019-03-25 09:18:30 +01:00
Will DietzandEelco Dolstra 42e2d5e7b7 store-api.hh: add missing include for unordered_map 2019-03-25 09:18:30 +01:00
Will DietzandEelco Dolstra 0bebca402a version -> .version, avoid conflict with C++20 <version> 2019-03-25 09:18:30 +01:00
Will DietzandEelco Dolstra 0963479741 archive.cc: ignore more posix_fallocate "not supported" error codes 
Fixes w/musl.
 2019-03-01 10:31:17 +08:00
Will Dietz 21ea00d3ec EvalState::resetFileCache: clear parse cache as well as eval cache 
Fixes #2546.

(at least the basic reproduction I've been testing)
 2018-12-31 10:18:28 -06:00
Will Dietz 3f8b78a84d nlohmann-json: 3.4.0 -> 3.5.0 
https://github.com/nlohmann/json/releases/tag/v3.5.0
 2018-12-21 22:38:06 -06:00
Will Dietz e78511743e nlohmann: 3.0.1 -> 3.4.0 
```
$ curl -L
"https://github.com/nlohmann/json/releases/download/v3.4.0/json.hpp" -o
src/nlohmann/json.hpp
```
 2018-12-21 22:36:53 -06:00
Will Dietz c1112ae9a2 nix-store: remove debugging print 2018-12-15 09:59:47 -06:00
Will Dietz aa7e52abff tests/fetchurl: fix after changing default hash from 512 to 256 2018-12-14 22:37:20 -06:00
Will Dietz 2a8bdfd31a editline: 1.15.3 -> 1.16.0 
Bump fallback editline expression to latest in nixpkgs.
 2018-10-29 08:47:46 -05:00
Will Dietz 9f998096d2 repl: complete if all matches share prefix 2018-10-29 08:45:04 -05:00
Will Dietz 3d974d31fa editline: wip 2018-10-29 08:44:58 -05:00
Will Dietz 9d24b5d56e nix-prefetch-url: progressbar 2018-10-26 13:19:10 -05:00
Will Dietz 3283c0dc45 remote-store.hh: ConnectionHandle is struct, minor fix warning 2018-10-26 13:15:48 -05:00
Will Dietz 27c2fcd4c0 src/nix/local.mk: fix typos in names of symlinks 2018-10-26 13:15:07 -05:00
Will Dietz d4f78a6b64 bump base nixpkgs used by default 18.03 -> 18.09 2018-09-26 15:37:13 -05:00
Will Dietz 8df367a92d nix-daemon: allow setting builders to "" by any user (untrusted) 
(cherry picked from commit a94a2eb1cb1c81e90a7529be5fecac27899a3442)
 2018-09-25 03:22:08 -05:00
Will Dietz 28418af920 download: fix size reported to progress bar 2018-09-03 14:12:54 -05:00
Will Dietz 0d72f4e0ca search: include version 2018-07-27 10:45:35 -05:00
Will Dietz 4495560d6d Revert "progress-bar: re-draw last update if nothing new for 1sec." 
Not ready for this yet, causes the prompt to disappear in nix repl
and more generally can overwrite non-progress-bar messages.

This reverts commit 44de71a396.
 2018-07-19 10:29:31 -05:00
Will Dietz cb9ef85852 tests/search.sh: minor fix to unbreak tests after search ux merge 2018-07-03 15:37:06 -05:00
Will Dietz 6a24e49ba8 repl: use nix build for building instead of nix-store -r 
progress bar!
 2018-06-23 07:56:26 -05:00
Will Dietz 44de71a396 progress-bar: re-draw last update if nothing new for 1sec. 
Slightly nicer behavior when updates are somewhat far apart
(during a long linking step, perhaps) ensuring things
don't appear unresponsive.

If we wait the maximum amount for the update,
don't bother waiting another 50ms (for rate-limiting purposes)
and just check if we should quit.

This also ensures we'll notice the request to quit within 1s
if quit is signalled but there is not an udpate.
(I'm not sure if this happens or not)
 2018-06-18 17:54:09 -05:00
Will Dietz f601bc0492 sync.hh: return cv_status instead of dropping it, in case useful. 2018-06-18 17:31:00 -05:00
Will Dietz 25cb1a6343 release-common: prefer utillinuxMinimal to reduce compile-time deps 
Honestly could probably use busybox here instead, but at least
with utillinuxMinimal there's no build-time dependency on systemd.
 2018-06-18 15:50:37 -05:00
Will Dietz 6bf7dc1baf download: if there are active requests, never sleep for 10s 
In some versions/configurations libcurl doesn't handle timeouts
(especially DNS timeouts) in a way that wakes curl_multi_wait.

This doesn't appear to be a problem if using c-ares, FWIW.
 2018-06-08 21:12:43 -05:00
Will Dietz 54b1c59643 download.cc: fix readCallback return type (int -> size_t) 
I'm not sure if curl ever asks for enough data at once
for truncation to occur but better safe than sorry.
 2018-06-01 10:59:26 -05:00
Will Dietz 93ae90de0f eval.cc: add message to static_assert, message can be omitted w/c++17 2018-05-26 14:04:41 -05:00
Will Dietz 14c464b6c8 nix-daemon: remove unused "pendingMsgs" variable 2018-05-26 13:09:55 -05:00
Will Dietz ca9c6cb95d libstore/download: remove unused function "getTime()" 2018-05-25 19:49:45 -05:00
Will Dietz b08923b4a0 serialise: fix buffer size used, hide method for internal use only 
Fixes #2169.
 2018-05-21 17:30:38 -05:00
Will Dietz 8e7d77d494 globals.hh: don't use '==' to compare string literals 
Saw this in logs, also reported here:

https://github.com/NixOS/nix/commit/8e6108ff71caae180d764ab9e9bff5593724655c#r28707288
 2018-04-23 20:57:05 -05:00
Will Dietz 6d9129014d build.cc: fix bind-mount of /dev/{pts,ptmx} fallback 
Don't bind-mount these to themselves,
mount them into the chroot directory.

Fixes pty issues when using sandbox on CentOS 7.4.
(build of perlPackages.IOTty fails before this change)
 2018-04-20 12:24:23 -05:00
Will Dietz 74da813912 download: improve error for hash mismatch ("store mismatch") 
Fixes #1905
 2018-03-22 15:22:06 -05:00
Will Dietz 59b32403f2 download.cc: fix path for cached files 2018-03-22 15:05:46 -05:00
Will Dietz f66ae22288 shared.cc: style: prefer "nullptr" over '(char *)NULL' 2018-03-21 17:17:37 -05:00
Will Dietz 02d36fdab7 execl: cast NULL sentinel to (char *), per man page and compiler warning 
From exec(3):

> The list of arguments must be terminated by a null pointer, and, since these
> are variadic functions, this pointer must be cast (char *) NULL
 2018-03-20 13:31:58 -05:00
Will Dietz dc99ea4483 ask autotools for c++14 support flags, not c++11; don't override later 2018-03-20 11:33:03 -05:00
Will Dietz f5a2136a40 serialise.cc: remove pessimising move 
from clang6:

src/libutil/serialise.cc:189:23: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
 2018-03-19 19:18:47 -05:00
Will Dietz 9b33201e72 util: rename stdout/stdin members to avoid conflicts w/standard macro 
(cherry picked from commit c389a7fb617ed7bcd617efa68c6a48c00405310d)
 2018-03-19 11:18:56 -05:00
Will Dietz d98755b0c2 nix-daemon: preserve errno in signal handler (thanks tsan) 2018-03-14 21:39:46 -05:00
Will Dietz 56253bb08f rand() -> random(), since we use srandom(). 
rand() requires we call srand() instead,
but might as well use random().
 2018-03-06 17:44:25 -06:00
Will Dietz e917c05628 logging: Don't throw from Activity destructor 
Move definition of destructor to logging.cc for
access to util.hh's ignoreException.
 2018-03-06 10:42:58 -06:00
Will Dietz e9a5ce9b07 release.nix: don't try to use nix-2.0 branch, no longer exists 
Probably should point at the 18.03 release branch once that's made.
 2018-03-03 13:48:54 -06:00
Will Dietz 6b9a03f5d8 hoist vector out of loop just in case 2018-03-02 10:52:05 -06:00
Will Dietz c89a3d5368 don't allocate large buffers on the stack 2018-03-02 10:52:04 -06:00
Will Dietz c577186f59 tests/search.sh: simplify, don't rely on consistent ordering 2018-03-01 13:25:06 -06:00
Will Dietz e89d02bf03 fetchGit: use "HEAD" as default ref 2018-02-28 16:34:34 -06:00
Will Dietz 009cf9cd23 nix search: explicitly handle empty search string, fixes #1893 
This is important since this is given as an example.
Other patterns containing "empty search string" will still
be handled differently on different platforms ("asdf|")
but that's less of an issue.
 2018-02-25 16:40:56 -06:00
Will Dietz 3cac8734ac nix search: fix bug where we wrote to cache when shouldn't, breaking 
This is exposed by the tests added previously,
and resolves the error reported in #1892:
"expected JSON value".
 2018-02-25 16:40:05 -06:00
Will Dietz 8282c60d74 tests: test nix search behavior 2018-02-25 16:40:05 -06:00
Will Dietz a6c0b773b7 configure.ac: define HAVE_SECCOMP macro when using seccomp, fix build/tests 
Happily the failing tests should prevent anyone from using such a Nix
in situations where they expect sandboxing to be on,
which would otherwise be a risk.
 2018-02-19 12:13:51 -06:00
Will Dietz c6209030c4 compression: make parallel sink separate class 2018-02-11 13:50:28 -06:00
Will Dietz a0bdc96726 compression: print warning if parallel requested but not supported 2018-02-11 13:03:47 -06:00
Will Dietz 5a082ad15a configure.ac: check if lzma has MT support, fix deb build/etc. 2018-02-09 21:02:25 -06:00
Will Dietz c7e0be1bfc build-dry: disable failing portion of test until issue is fixed 2018-02-07 15:20:54 -06:00
Will Dietz 98031b6050 nix build: Don't create output links with --dry-run. 
Fixes #1849.
 2018-02-07 15:20:54 -06:00
Will Dietz 3780435a0e tests: Add (failing) tests for reported --dry-run issues. 2018-02-07 15:20:54 -06:00
Will Dietz f201b7733e More completely fix recursive nix, unbreak tests 
See:
https://github.com/NixOS/nix/commit/88b5d0c8e89afefbc547b6243c5aa5a3ec8176e9#commitcomment-27406365
 2018-02-07 15:19:28 -06:00
Will Dietz 47dc6076af release-common: use shell from nixpkgs, provide fallback for compat 2018-02-05 11:33:18 -06:00
Will Dietz 0ffa615420 busybox shell: enable various useful/expected features 
Matches changes made in nixpkgs:
https://github.com/NixOS/nixpkgs/pull/34628
 2018-02-05 10:25:26 -06:00
Will Dietz f7c26365eb nlohmann-json: 2.1.1 -> 3.0.1 2018-01-22 12:19:50 -06:00
Will Dietz 6454ca393a nix log: use pager 2018-01-12 15:05:26 -06:00
Will Dietz 435ccc7980 release: access fetchGit from builtins to fix eval w/1.11 (<1.12) 2018-01-10 14:19:29 -06:00
Will Dietz 428680b307 fetchGit: fix creation of uninitialized cache dir, let git create it 
fetchGit test (as modified in previous commit) now passes.
 2018-01-09 09:05:18 -06:00
Will Dietz 84d9e213d2 fetchGit.sh: Test we don't "corrupt" cache if invoke w/o git avail 2018-01-09 08:58:19 -06: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
Will Dietz bd17ccf1d8 nix repl: use linenoiseKeyType to differentiate ^C and ^D 
Fixes #1757.
 2017-12-26 19:25:50 -06: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
Will Dietz 71987b18d4 linenoise.cpp: allow completions from empty input 
Fixes #1742.
 2017-12-19 12:52:10 -06: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
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
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
Will Dietz 9d7ce0bf45 anchor nix::Exit exception 2017-11-14 12:39:30 -06:00
Will Dietz 2f1a1c5a49 release-common: Fix busybox builtins (busybox >= 1.27) 
See https://github.com/NixOS/nixpkgs/pull/28261
 2017-10-07 07:43:55 -05:00
Will Dietz a0c56197fc tests/timeout: create output so tests don't trivially pass 
Timeout tests rely on failed build to determine success,
so make sure these derivations (silent in particular)
don't fail regardless of timeout behavior.
 2017-04-08 12:59:42 -05:00
Will Dietz 30f89e0d65 Process nix.conf options in "new" nix commands, add test. 
Without this (minor) change, the options set using "--option"
or read from nix.conf were parsed but not used.
 2017-04-08 12:59:42 -05:00