21410 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
John Ericson	5bc96798b1	Merge pull request #13982 from obsidiansystems/path-info-static-function ... `ValidPathInfo`, `NarInfo`, turn funky constructor into static method	2025-09-13 20:10:45 -04:00
Sergei Zimmerman	e75501da3e	libexpr: Remove non-const iterators of Bindings	2025-09-13 23:21:24 +03:00
John Ericson	74be28820c	ValidPathInfo, NarInfo, turn funky constructor into static method ... This is more flexible, and needed for me to be able to reshuffle the inheritance bureaucracy to make the JSON instances more precise.	2025-09-13 13:17:14 -04:00
Jörg Thalheim	465d627f7f	Merge pull request #13978 from xokdvium/fix-warn ... libutil: Fix missing return warning	2025-09-13 10:30:32 +02:00
Sergei Zimmerman	298ea97c12	libutil: Fix missing return warning ... ../hash.cc: In function 'nix::{anonymous}::DecodeNamePair nix::baseExplicit(HashFormat)': ../hash.cc:114:1: warning: control reaches end of non-void function [-Wreturn-type] 114 | } | ^	2025-09-13 09:19:07 +03:00
John Ericson	1907a3300f	Merge pull request #13811 from hgl/patch-2 ... doc: Rephrase store-object.md	2025-09-12 23:34:52 -04:00
John Ericson	1710fd09f3	Merge pull request #13975 from obsidiansystems/prep-json-0 ... Misc prep changes for #13942	2025-09-12 23:32:20 -04:00
Glen Huang	a0b633dd2b	doc: Rephrase store-object.md	2025-09-13 10:17:12 +08:00
John Ericson	f78062d2fb	Merge pull request #13976 from xokdvium/darwin-packaging ... packaging: Drop legacy apple sdk pattern	2025-09-12 18:37:36 -04:00
Sergei Zimmerman	20b532eab0	packaging: Drop legacy apple sdk pattern ... This has been dropped on unstable an nix no longer compiled with overridden nixpkgs input. On 25.05 these overrides already do nothing. Tested with: nix build .#packages.x86_64-darwin.nix-cli -L --override-input nixpkgs https://releases.nixos.org/nixos/unstable/nixos-25.11pre859555.ab0f3607a6c7/nixexprs.tar.xz Default deployment target on 25.05 is 11.3, so 10.13 sdk override doesn't have to be updated at all as evident from the fact that we didn't observe any issues with it.	2025-09-13 01:07:42 +03:00
John Ericson	095ac66d4c	Introduce Hash::parseExplicitFormatUnprefixed	2025-09-12 18:04:29 -04:00
John Ericson	c6d06ce486	Fix hash error message ... Wrong number of arguments was causing a format assertion.	2025-09-12 18:04:29 -04:00
John Ericson	c242706319	Move json_avoids_null to its own header ... This is because we need it in declarations where we should not be including the full `nlohmann/json.hpp`. Already can clean up by moving the experimental feature "instance". Also, make the `std::map` instance better by allowing for other comparison functions.	2025-09-12 18:04:29 -04:00
Philip Wilk	aef431fbd1	bugfix/3514: do not throw on substituter errors if other substituters are still enabled (#13301) ... ## Motivation Nix currently hard fails if a substituter is inaccessible, even when they are other substituters available, unless `fallback = true`. This breaks nix build, run, shell et al entirely. This would modify the default behaviour so that nix would actually use the other available substituters and not hard error. Here is an example before vs after when using dotenv where I have manually stopped my own cache to trigger this issue, before and after the patch. The initial error is really frustrating because there is other caches available.   ## Context https://github.com/NixOS/nix/issues/3514#issuecomment-2905056198 is the earliest issue I could find, but there are many duplicates. There is an initial PR at https://github.com/NixOS/nix/pull/7188, but this appears to have been abandoned - over 2 years with no activity, then a no comment review in jan. There was a subsequent PR at https://github.com/NixOS/nix/pull/8983 but this was closed without merge - over a year without activity. <!-- Non-trivial change: Briefly outline the implementation strategy. --> I have visualised the current and proposed flows. I believe my logic flows line up with what is suggested in https://github.com/NixOS/nix/pull/7188#issuecomment-1375652870 but correct me if I am wrong. Current behaviour:  Proposed behaviour:  [Charts in lucid](https://lucid.app/lucidchart/1b51b08d-6c4f-40e0-bf54-480df322cccf/view) <!-- Invasive change: Discuss alternative designs or approaches you considered. --> Possible issues to think about: - I could not figure out where the curl error is created... I can't figure out how to swallow it and turn it into a warn or better yet, a debug log. - Unfortunately, in contrast with the previous point, I'm not sure how verbose we want to warns/traces to be - personally I think that the warn that a substituter has been disabled (when it happens) is sufficient, and that the next one is being used, but this is personal preference.	2025-09-12 17:29:34 -04:00
Sergei Zimmerman	92df96543c	Merge pull request #13972 from xokdvium/no-string-values-in-evalstate	2025-09-12 21:19:09 +00:00
Jörg Thalheim	5772c207d8	Merge pull request #13970 from xokdvium/no-soname ... Revert "meson: add soversion to libraries (#13960)"	2025-09-12 23:17:17 +02:00
Sergei Zimmerman	f4c38278ca	libexpr: Remove vString* Values from EvalState ... EvalState is too big and cluttered. These strings can be private constant statics.	2025-09-12 23:44:52 +03:00
Sergei Zimmerman	0db2b8c8fe	Revert "meson: add soversion to libraries (#13960)" ... This reverts commit bdbc739d6e. Such a change needs more thought put into it. By versioning shared libraries we'd make a false impression that libraries themselves are actually versioned and have some sort of stable ABI, which is not the case. This will be useful when C bindings become stable, but as long as they are experimental it does not make sense to set SONAME. Also this change should not have been backported, since it's severely breaking.	2025-09-12 20:43:34 +03:00
Eelco Dolstra	8d8f49cb5a	Use concurrent_flat_map_fwd.hpp	2025-09-12 17:49:15 +02:00
Eelco Dolstra	4b63ff63a4	Remove some unnecessary hash template arguments	2025-09-12 17:26:29 +02:00
Eelco Dolstra	ad6eb22368	Ensure that files are parsed/evaluated only once ... When doing multithreaded evaluation, we want to ensure that any Nix file is parsed and evaluated only once. The easiest way to do this is to rely on thunks, since those ensure locking in the multithreaded evaluator. `fileEvalCache` is now a mapping from `SourcePath` to a `Value *`. The value is initially a thunk (pointing to a `ExprParseFile` helper object) that can be forced to parse and evaluate the file. So a subsequent thread requesting the same file will see a thunk that is possibly locked and wait for it. The parser cache is gone since it's no longer needed. However, there is a new `importResolutionCache` that maps `SourcePath`s to `SourcePath`s (e.g. `/foo` to `/foo/default.nix`). Previously we put multiple entries in `fileEvalCache`, which was ugly and could result in work duplication.	2025-09-12 17:05:21 +02:00
Eelco Dolstra	47c16fc4bd	SourcePath: Implement boost::hash	2025-09-12 17:05:21 +02:00
Eelco Dolstra	8fbf4b9427	CanonPath: Implement boost::hash	2025-09-12 17:05:21 +02:00
Eelco Dolstra	7f9b5226af	Add getConcurrent helper function	2025-09-12 16:49:25 +02:00
Jörg Thalheim	377b60ee9b	Merge pull request #13926 from NaN-git/opt_boost-unordered ... replace all occurences of std::unordered_* by equivalents from boost	2025-09-12 11:46:42 +02:00
Jörg Thalheim	429812cdb8	Merge pull request #13966 from juhp/patch-1 ... meson: add soversion to libraries (#13960)	2025-09-12 08:25:12 +02:00
Jörg Thalheim	f6802a8ccf	Merge pull request #13963 from xokdvium/fix-no-gc ... libexpr: Fix build without Boehm	2025-09-12 08:23:19 +02:00
Jens Petersen	bdbc739d6e	meson: add soversion to libraries (#13960)	2025-09-12 14:06:39 +08:00
Sergei Zimmerman	c0b35c71cd	libexpr: Fix build without Boehm ... This should have been placed under the ifdef.	2025-09-12 04:02:07 +03:00
Sergei Zimmerman	ef5fedbc0d	Merge pull request #13936 from xokdvium/empty-list-bindings ... libexpr: Make constant Values global constants, move out of EvalState	2025-09-10 23:12:20 +00:00
Sergei Zimmerman	5db4b0699c	libexpr: Make constant Values global constants, move out of EvalState ... These constant Values have no business being in the EvalState in the first place. The ultimate goal is to get rid of the ugly `getBuiltins` and its relience (in `createBaseEnv`) on these global constants is getting in the way. Same idea as in f017f9ddd3. Co-authored-by: eldritch horrors <pennae@lix.systems>	2025-09-11 01:53:41 +03:00
Sergei Zimmerman	462b9ac49c	libexpr: Make Value::isa and Value::getStorage private methods ... This was always intended to be the case, but accidentally left in the public interface.	2025-09-11 01:52:17 +03:00
Sergei Zimmerman	4df1a3ca76	libexpr: Make emptyBindings a global constant ... This object is always constant and will never get modified. Having it as a global (constant) static is much easier and unclutters the EvalState. Same idea as in f017f9ddd3. Co-authored-by: eldritch horrors <pennae@lix.systems>	2025-09-11 01:51:48 +03:00
Philipp Otterbein	9dbc2cae4f	hashmaps with string keys: add transparent lookups	2025-09-10 23:04:44 +02:00
Philipp Otterbein	9f2b6a1b94	replace more std::unordered_* types by faster boost hash maps	2025-09-10 23:04:44 +02:00
Philipp Otterbein	4f8c50fb77	libexpr: replace std::unordered_* types by faster boost hash maps	2025-09-10 23:04:44 +02:00
John Ericson	c0fd9146d6	Move exportPaths() / importPaths() out of the Store class (#13959)	2025-09-10 15:39:20 -04:00
Eelco Dolstra	3898a7343a	Merge pull request #13961 from NyCodeGHG/push-prlsssvmxwvl ... meson: link to libatomic on powerpc-linux	2025-09-10 19:22:54 +02:00
Marie Ramlow	37eec84bc1	meson: link to libatomic on powerpc-linux ... Like 32-bit Arm, 32-bit PowerPC also needs linking against libatomic because it doesn't support some atomic instructions in hardware.	2025-09-10 18:50:35 +02:00
Eelco Dolstra	fe5b669534	Move exportPaths() / importPaths() out of the Store class	2025-09-10 14:22:46 +02:00
Jörg Thalheim	5e46df973f	Merge pull request #13957 from NixOS/drop-old-serve-protocol ... Remove support for serve protocol version < 5	2025-09-10 13:50:12 +02:00
Eelco Dolstra	9df99e0658	Remove ServeProto::Command::ExportPaths ... This seems to have been unused since the build-remote.pl removal in February 2017 (27dc76c1a5).	2025-09-10 10:57:15 +02:00
Eelco Dolstra	fa048e4383	Remove support for serve protocol < 5 ... This was introduced in August 2018 (2825e05d21).	2025-09-10 10:57:15 +02:00
Jörg Thalheim	8c789db05b	Merge pull request #13956 from NixOS/drop-unused-addMultipleToStoreLegacy ... Drop unused LegacySSHStore::addMultipleToStoreLegacy()	2025-09-10 10:52:05 +02:00
Eelco Dolstra	f8b15bfc7f	Merge pull request #13951 from NixOS/drop-old-daemon-protocol ... Remove support for worker protocol version < 18	2025-09-10 10:43:48 +02:00
Eelco Dolstra	5013b38df4	Drop unused LegacySSHStore::addMultipleToStoreLegacy()	2025-09-10 10:27:07 +02:00
Eelco Dolstra	247d16a530	Merge pull request #13954 from xokdvium/empty-list-elems-fix ... libexpr: Fix Value::mkList for empty lists	2025-09-10 10:23:49 +02:00
Eelco Dolstra	d1d3ed6241	Add release note	2025-09-10 10:20:37 +02:00
Jörg Thalheim	7d26bf8cc7	Merge pull request #13906 from obsidiansystems/derivation-builder-simpler ... More `DerivationBuilder` simplifications	2025-09-10 09:58:07 +02:00
Jörg Thalheim	9c186c35fa	Merge pull request #13932 from NixOS/move-pathInfoCache ... Reduce false sharing between pathInfoCache and Store	2025-09-10 09:56:46 +02:00