18659 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Robert Hensing	5d6bc484be	Hide getGCCycles when we have no GC ... Alternatively, we could make it return 0, but we don't need it in the first place because the caller exists conditionally too.	2024-07-23 16:24:43 +02:00
Robert Hensing	eb89e50cbb	Rejiggle getGCCycles() for buildNoGc	2024-07-23 16:21:43 +02:00
John Ericson	e20b0a5dda	Merge pull request #11159 from DeterminateSystems/framedsource-terminate ... ~FramedSource(): Don't throw an exception if the remote has disconnected	2024-07-23 09:19:39 -04:00
Eelco Dolstra	498eed0a25	~FramedSource(): Don't throw an exception if the remote has disconnected ... This would cause the daemon to crash with a call to terminate().	2024-07-23 10:56:29 +02:00
Robert Hensing	4457cebe05	Update comment in tests//vars-and-functions.sh ... Co-authored-by: tomberek <tomberek@users.noreply.github.com>	2024-07-23 10:24:18 +02:00
Eelco Dolstra	babfd0cd99	Merge pull request #11150 from hercules-ci/issue-11141-broken-sp-corrector ... Fix issue #11141 broken stack pointer corrector	2024-07-22 19:59:46 +02:00
John Ericson	046cc8cbb3	Merge pull request #11156 from obsidiansystems/fix-bsd-pthread ... Fix some BSD builds missing pthread functions	2024-07-22 13:58:41 -04:00
John Ericson	00fd180a79	Merge pull request #11153 from nix-windows/wine-ci ... Run unit tests with wine	2024-07-22 13:35:32 -04:00
John Ericson	d39bbcabb9	Fix some BSD builds missing pthread functions ... In addition to adding the missing thread deps in the last commit, we also appear to need to skip `-Wl,--as-needed` flags that Meson wants to use, but doesn't work with our *BSD toolchains. See https://github.com/mesonbuild/meson/issues/3593	2024-07-22 13:10:03 -04:00
John Ericson	da625b8817	Merge pull request #11155 from obsidiansystems/build-system-fixes ... Two Build system fixes	2024-07-22 12:16:56 -04:00
John Ericson	d3cee8160c	Add missing threads deps	2024-07-22 11:46:54 -04:00
Robert Hensing	f2e0cecf34	tests/functional/lang-gc: Disable for now	2024-07-22 17:46:08 +02:00
Eelco Dolstra	fe158e3e92	Merge pull request #10603 from edolstra/flake-regressions ... Run the flake regressions test suite	2024-07-22 17:45:27 +02:00
Eelco Dolstra	9b9fc405d2	Merge pull request #11154 from DeterminateSystems/ping-store ... nix ping-store: Redirect to 'nix store info'	2024-07-22 17:38:51 +02:00
Eelco Dolstra	d08bb025e1	Merge pull request #11043 from hercules-ci/assert-eq ... `assert`: Report why values aren't equal	2024-07-22 17:34:28 +02:00
John Ericson	d7024ac9b7	Add S3 opt dep to Meson, and simplify build ... Numeric version macros are now defined upstream, so we don't need roll our own.	2024-07-22 11:11:38 -04:00
John Ericson	823baa25f3	Meson build: libstore check for statvfs	2024-07-22 11:09:53 -04:00
Eelco Dolstra	4878c31815	nix ping-store: Redirect to 'nix store info' ... This avoids the double warning warning: 'ping-store' is a deprecated alias for 'store ping' warning: 'nix store ping' is a deprecated alias for 'nix store info'	2024-07-22 16:39:02 +02:00
John Ericson	eea63d5f99	Run unit tests with wine ... Fix #10547 The tests do not all run successfully, but that is a separate issue.	2024-07-22 10:31:26 -04:00
John Ericson	dc6dbbc1a5	Test exes do not need dev outputs	2024-07-22 10:26:05 -04:00
John Ericson	112373c03c	flake.lock: Update ... Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/88269ab3044128b7c2f4c7d68448b2fb50456870' (2024-06-03) → 'github:NixOS/nixpkgs/be3ca229c85e978880babdeda9748b14e6aa008f' (2024-07-21)	2024-07-22 10:26:05 -04:00
Eelco Dolstra	f343364918	Merge remote-tracking branch 'origin/master' into flake-regressions	2024-07-22 16:03:45 +02:00
Eelco Dolstra	40f80e1b5c	Merge pull request #11142 from detroyejr/fix-alias-flags ... Allow flag aliases	2024-07-22 15:53:41 +02:00
Eelco Dolstra	56a2f7ab1d	Merge pull request #11102 from fzakaria/issue-10532 ... doc: Add comment for fetchurl for name & url	2024-07-22 15:49:41 +02:00
Eelco Dolstra	3ef72040bf	Merge pull request #11149 from hercules-ci/gc-stats ... libexpr: Track and show GC time and cycle number	2024-07-22 15:39:50 +02:00
Robert Hensing	380becf0db	Fix #11141 broken sp corrector	2024-07-22 14:52:08 +02:00
Robert Hensing	b16861d82e	libexpr: Track and show GC time and cycle number	2024-07-22 12:56:01 +02:00
Robert Hensing	c00e396494	maintainers/README: Update Monday meeting time (#11147)	2024-07-22 12:05:50 +02:00
poweredbypie	0ec5e3a1bc	Progress on Wine CI support, MinGW dev shell with Meson (#10975) ... * Only build perl subproject on Linux * Fix various Windows regressions * Don't put the emulator hook in test builds We run the tests in a separate derivation. Only need it for the dev shell. * Fix native dev shells * Fix cross dev shells we don't know how to emulate Co-authored-by: PoweredByPie <poweredbypie@users.noreply.github.com> Co-authored-by: Joachim Schiele <js@lastlog.de> Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>	2024-07-21 22:03:04 +00:00
Robert Hensing	56757e15cf	Merge pull request #11123 from tweag/fix-non-det-parser-printing ... Fix non-deterministic inherit printing	2024-07-20 19:12:48 +02:00
Robert Hensing	584f8cb065	Merge pull request #11120 from tweag/early-string-cutoff ... parser: Remove empty multiline string parts earlier	2024-07-20 19:10:50 +02:00
detroyejr	d54dfbf879	addFlag: test that alias flags are allowed	2024-07-19 15:56:54 -04:00
detroyejr	74dccef004	addFlag: use aliases	2024-07-19 15:05:00 -04:00
Eelco Dolstra	c4213f0e6c	Merge pull request #11125 from DeterminateSystems/basic-connection ... Factor out commonality between WorkerProto::Basic{Client,Server}Connection	2024-07-19 14:26:04 +02:00
Eelco Dolstra	58a79b6943	performOp(): Take a WorkerProto::BasicServerConnection	2024-07-19 13:35:46 +02:00
John Ericson	d629b27e3c	Merge pull request #11138 from emilazy/push-znxusvxozllv ... libmain: add missing header include	2024-07-18 21:46:47 -04:00
Silvan Mosberger	0c91bb97e5	parser: Remove empty multiline string parts earlier ... Makes parsing more consistent and is a super minor optimisation Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>	2024-07-19 00:43:44 +02:00
Silvan Mosberger	a6dccae223	Fix non-deterministic parser printing ... In _very_ rare cases (I had about 7 cases out of 32200 files!), the order of how inherit-from bindings are printed when using `nix-instantiate --parse` gets messed up. The cause of this seems to be because the std::map the bindings are placed in is keyed on a _pointer_, which then uses an [implementation-defined strict total order](https://en.cppreference.com/w/cpp/language/operator_comparison#Pointer_total_order). The fix here is to key the bindings on their displacement instead, which maintains the same order as they appear in the file. Unfortunately I wasn't able to make a reproducible test for this in the source, there's something about the local environment that makes it unreproducible for me. However I was able to make a reproducible test in a Nix build on a Nix version from a very recent master: nix build github:infinisil/non-det-nix-parsing-repro Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>	2024-07-19 00:42:00 +02:00
Emily	31e151386b	libmain: add missing header include	2024-07-18 23:26:22 +01:00
Eelco Dolstra	fa7aa0389a	FdSource: Fix operator = ... This wasn't moving the underlying buffer, so if the buffer was non-empty, it could lose data.	2024-07-18 16:10:48 +02:00
Eelco Dolstra	d231d802f5	Typo	2024-07-18 16:10:48 +02:00
Eelco Dolstra	c1d5cf6f34	Factor out commonality between WorkerProto::Basic{Client,Server}Connection ... This also renames clientVersion and daemonVersion to the more correct protoVersion (since it's the version agreed to by both sides).	2024-07-18 16:10:48 +02:00
Robert Hensing	8ce4287409	Merge pull request #11086 from kognise/eval-cache-fixes ... Eval cache: fix cache regressions	2024-07-18 14:57:07 +02:00
John Ericson	606ace41d2	Merge pull request #11112 from obsidiansystems/move-schemes-set ... Move `uriSchemes` to `*StoreConfig`	2024-07-18 00:39:07 -04:00
John Ericson	2aa9cf34dd	Move uriSchemes to *StoreConfig ... It is a property of the configuration of a store --- how a store URL is parsed into a store config, not a store itself. Progress towards #10766	2024-07-17 23:48:19 -04:00
Farid Zakaria	57399bfc0e	Refactor unix domain socket store config (#11109) ... Following what is outlined in #10766 refactor the uds-remote-store such that the member variables (state) don't live in the store itself but in the config object. Additionally, the config object includes a new necessary constructor that takes a scheme & authority. Tests are commented out because of linking errors with the current config system. When there is a new config system we can reenable them. Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>	2024-07-17 23:32:27 -04:00
Eelco Dolstra	17051ca80a	Merge pull request #11061 from rhendric/rhendric/reference-manual ... docs: fill out language/types.md#type-path	2024-07-17 21:59:05 +02:00
Eelco Dolstra	1e1a8e8ad1	Merge pull request #11058 from hercules-ci/more-nix-shell ... Make `#!nix-shell` arguments and options relative to script	2024-07-17 21:52:34 +02:00
John Ericson	a915862450	Merge pull request #11126 from DeterminateSystems/dont-send-version-twice ... BasicClientConnection::handshake(): Don't send our version twice	2024-07-17 15:50:17 -04:00
Eelco Dolstra	6867cb1096	Merge pull request #11103 from fzakaria/issue-10795 ... lint: fix shellcheck for misc/systemv/nix-daemon	2024-07-17 21:46:17 +02:00