Befator-Inc-Firmen-Netzwerk/nix
3
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,940 Commits 207 Branches 226 Tags
aef431fbd1b41dde113683579cba1cc43ad8f2bb
Commit Graph
20940 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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.
![image](https://github.com/user-attachments/assets/b4aec474-52d1-497d-b4e8-6f5737d6acc7)
![image](https://github.com/user-attachments/assets/ee91fcd4-4a1a-4c33-bf88-3aee67ad3cc9)

## 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:
![current](https://github.com/user-attachments/assets/d9501b34-274c-4eb3-88c3-9021a482e364)
Proposed behaviour:
![proposed](https://github.com/user-attachments/assets/8236e4f4-21ef-45d7-87e1-6c8d416e8c1c)

[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
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 Zimmermanandeldritch horrors 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 https://git.lix.systems/lix-project/lix/commit/f017f9ddd336e32a5ed1ee835f1c6c7e73a052ae.

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 Zimmermanandeldritch horrors 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 https://git.lix.systems/lix-project/lix/commit/f017f9ddd336e32a5ed1ee835f1c6c7e73a052ae.

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
Sergei Zimmerman 2ed2c79721 libexpr: Fix Value::mkList for empty lists 
This code used to save the pointer to a small
list allocated on the stack to the Value, which
is unintended.
 2025-09-10 01:37:39 +03:00
Sergei Zimmerman 3c331b7ef3 Merge pull request #13953 from xokdvium/value-alignment 
libexpr: Overalign Value to 16 bytes
 2025-09-09 20:44:43 +00:00
Sergei Zimmerman 4524235af4 libexpr: Overalign Value to 16 bytes 
This is necessary to make use of 128 bit atomics on x86_64 [1],
since MOVAPD, MOVAPS, and MOVDQA need memory operands to be 16-byte
aligned. We are not losing anything here, because Value is already 16-byte
wide and Boehm allocates memory in granules that are 16 bytes by default
on 64 bit systems [2].

[1]: https://patchwork.sourceware.org/project/gcc/patch/YhxkfzGEEQ9KHbBC@tucnak/
[2]: https://github.com/bdwgc/bdwgc/blob/54ac18ccbc5a833dd7edaff94a10ab9b65044d61/include/gc/gc_tiny_fl.h#L31-L33
 2025-09-09 22:18:52 +03:00
Eelco Dolstra 86d19956f2 Remove WorkerProto::Op::ImportPaths 
This was obsoleted in May 2016 (538a64e8c3).
 2025-09-09 15:41:17 +02:00
Eelco Dolstra 4fb61bc5af Remove WorkerProto::Op::ExportPath 
This was obsoleted in May 2016 (538a64e8c3).
 2025-09-09 15:41:12 +02:00
Eelco Dolstra 137a55122c Remove support for daemon protocol version < 18 
Version 18 was introduced in November 2016 (4b8f1b0ec0).
 2025-09-09 15:41:01 +02:00
Eelco Dolstra 7658f00bb1 Merge pull request #13941 from NixOS/dependabot/github_actions/actions/labeler-6 
build(deps): bump actions/labeler from 5 to 6
 2025-09-09 09:37:08 +02:00
Eelco Dolstra a97c5df47c Merge pull request #13939 from DeterminateSystems/fix-inputs-from-ignoring-dir-param-upstreaming 
Pass `dir` in extraAttrs when overriding the registry
 2025-09-09 09:36:33 +02:00
Sergei Zimmerman 371623bf0c Merge pull request #13940 from xokdvium/unbracketed-ipv6 
libstore: Reallow unbracketed IPv6 addresses in store references
 2025-09-08 23:21:34 +00:00
dependabot[bot] 7128abd217 build(deps): bump actions/labeler from 5 to 6 
Bumps [actions/labeler](https://github.com/actions/labeler) from 5 to 6.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-09-08 22:00:58 +00:00
Sergei Zimmerman 7cc654afa9 libstore: Reallow unbracketed IPv6 addresses in store references 
This implements a special back-compat shim to specifically allow
unbracketed IPv6 addresses in store references. This is something
that is relied upon in the wild and the old parsing logic accepted
both ways (brackets were optional). This patch restores this behavior.
As always, we didn't have any tests for this.

Addresses #13937.
 2025-09-09 00:41:03 +03:00
Cole Helbling 38663fb434 Pass dir in extraAttrs when overriding the registry 
This is handled similarly in the handler for `--override-flake` in
`MixEvalArgs`.
 2025-09-08 09:00:59 +02:00
Cole Helbling ed6ef7cdf4 Test that using --inputs-from with a flakeref that has a dir works 
Will not pass until the next commit.
 2025-09-08 09:00:59 +02:00
Eelco Dolstra 12db0726e9 Merge pull request #13934 from DeterminateSystems/fix-flake-registry-ignoring-dir-param-upstreaming 
Fix flake registry ignoring `dir` parameter
 2025-09-08 07:50:54 +02:00
Eelco Dolstra 525245181a Merge pull request #13933 from NixOS/local-store-state 
LocalStore::State: Put behind a ref to reduce false sharing
 2025-09-08 06:22:04 +02:00
Eelco Dolstra 9302ec5e0e Add comment 2025-09-08 05:57:02 +02:00
Cole Helbling 9c832a08b0 fixup: cached case 
I couldn't come up with a test that failed before this, but my existing
test still passes so 🤷
 2025-09-07 19:40:24 +02:00
Cole Helbling bccdb95a86 Fix flake registry ignoring dir parameter 
This broke in e3042f10af.
 2025-09-07 19:40:24 +02:00
Cole Helbling 258d41bfb6 Test that dir is propagated from registry entry 2025-09-07 19:40:23 +02:00