1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Commit graph

19946 commits

Author SHA1 Message Date
Eelco Dolstra
1b92e875f4
Merge pull request #20 from DeterminateSystems/map-to-original-accessors-2
Source path error improvements
2025-04-01 21:48:40 +00:00
Eelco Dolstra
fb7bcdd554 Make Git error messages more consistent 2025-04-01 22:56:14 +02:00
Eelco Dolstra
2526293171 shellcheck 2025-04-01 20:52:27 +02:00
Eelco Dolstra
4e0346dcc1 Restore 'forbidden in restricted mode' errors 2025-04-01 20:46:26 +02:00
Eelco Dolstra
1564c8f9d9 Fix missing file error messages from 'import' 2025-04-01 18:37:21 +02:00
Eelco Dolstra
5b079073c1 Add FIXME 2025-04-01 18:34:08 +02:00
Eelco Dolstra
73b1754816 Mount flake input source accessors on top of storeFS
This way, we don't need the PathDisplaySourceAccessor source accessor
hack, since error messages are produced directly by the original
source accessor.

In fact, we don't even need to copy the inputs to the store at all, so
this gets us very close to lazy trees. We just need to know the store
path so that requires hashing the entire input, which isn't lazy. But
the next step will be to use a virtual store path that gets rewritten
to the actual store path only when needed.
2025-04-01 17:49:28 +02:00
Eelco Dolstra
fcddf4afe3 Apply makeNotAllowedError to empty repos 2025-04-01 15:35:01 +02:00
Eelco Dolstra
002faa3d1c Tweak error message 2025-04-01 15:17:59 +02:00
Graham Christensen
f56887206f Improve and fix the error message when a file is not tracked by Git 2025-04-01 15:07:01 +02:00
Eelco Dolstra
b2038f120c Add test for source path display 2025-04-01 14:03:16 +02:00
Eelco Dolstra
3f0a8241fc Fix path display of empty Git repos 2025-04-01 13:58:08 +02:00
Eelco Dolstra
b28bc7ae64 Make rootFS's showPath() render the paths from the original accessors
This makes paths in error messages behave similar to lazy-trees,
e.g. instead of store paths like

       error: attribute 'foobar' missing
       at /nix/store/ddzfiipzqlrh3gnprmqbadnsnrxsmc9i-source/machine/configuration.nix:209:7:
          208|
          209|       pkgs.foobar
             |       ^
          210|     ];

you now get

       error: attribute 'foobar' missing
       at /home/eelco/Misc/eelco-configurations/machine/configuration.nix:209:7:
          208|
          209|       pkgs.foobar
             |       ^
          210|     ];
2025-04-01 13:17:14 +02:00
Eelco Dolstra
5506428e67 Set path display for substituted inputs 2025-04-01 13:11:00 +02:00
Luc Perkins
54a755ba0c
Merge pull request #19 from DeterminateSystems/determinate-nix-param
Use determinate param with nix-installer-action
2025-03-28 17:20:03 +00:00
Luc Perkins
6feccefc2d
Remove test.yml 2025-03-28 13:58:39 -03:00
Luc Perkins
cb84d20e79
Fix merge conflicts with main 2025-03-28 13:57:30 -03:00
Luc Perkins
77c2ac633e
Use determinate param with nix-installer-action 2025-03-28 13:43:53 -03:00
Graham Christensen
4984b7dd50
Merge pull request #18 from DeterminateSystems/fixup-ci-system-ifs
Fixup ci system ifs
2025-03-28 16:33:12 +00:00
Graham Christensen
c134cf52db Collapse build / test into one .yml to make skips easier 2025-03-28 12:25:25 -04:00
Graham Christensen
42cb189703 success/failure the vm checks 2025-03-28 12:20:28 -04:00
Graham Christensen
2315b54f91 Move down the if from build workflows 2025-03-28 11:22:58 -04:00
Graham Christensen
feba05b18d fixup ifs 2025-03-28 11:15:04 -04:00
Graham Christensen
96e7e63ea0 Bigger runners thank you 2025-03-28 11:09:04 -04:00
Graham Christensen
8762c10aae Move the if evaluation of the test jobs onthe tests job itself, so we can skip it properly in PRs and block on it in merge groups 2025-03-28 11:06:22 -04:00
Graham Christensen
6469efee7b Pass the system to the test yml from ci 2025-03-28 11:04:51 -04:00
Graham Christensen
10b7535c87 Pass system to test.yml 2025-03-28 11:00:31 -04:00
Graham Christensen
5766d207a5 Pass system from ci 2025-03-28 10:58:38 -04:00
Graham Christensen
c3b29c1c8c Pass the system to build.yml directly 2025-03-28 10:56:16 -04:00
Cole Helbling
bfc986b5a6
Merge pull request #17 from DeterminateSystems/release-v3.1.1/9c446d0c-9d8a-48d5-89d7-eee8bc1fdf33
Release v3.1.1
2025-03-28 14:35:02 +00:00
Cole Helbling
c648c52392 ci: make macos runners larger 2025-03-28 07:22:24 -07:00
github-actions[bot]
3b72727be0
Set .version-determinate to 3.1.1 2025-03-28 13:31:09 +00:00
github-actions[bot]
4a667d4459
Prepare release v3.1.1 2025-03-28 13:31:06 +00:00
Graham Christensen
10e8034641
Merge pull request #15 from DeterminateSystems/release-v3.1.0/c12ac6f6-f0db-4ad5-bfb4-1d0eb44bc566
Release v3.1.0
2025-03-27 19:41:03 +00:00
Cole Helbling
9fa907efc5
Merge pull request #16 from DeterminateSystems/push-qxoyqqlnnuly
Fixup release notes
2025-03-27 19:22:41 +00:00
Cole Helbling
946297c684 Fixup release notes 2025-03-27 12:03:02 -07:00
github-actions[bot]
ce8deea082
Prepare release v3.1.0 2025-03-27 18:48:05 +00:00
Eelco Dolstra
afcce6f73f
Merge pull request #13 from DeterminateSystems/logger-improvements
Logger improvements
2025-03-27 18:16:08 +00:00
Eelco Dolstra
10f9b2f1fc Set release date 2025-03-27 19:08:09 +01:00
Eelco Dolstra
9e6c999bdf Add release note 2025-03-27 19:07:06 +01:00
Eelco Dolstra
f80f7e001b Abort if we cannot create TeeLogger 2025-03-27 19:07:00 +01:00
Eelco Dolstra
37f3b255b2 makeTeeLogger(): Distinguish between main and extra loggers 2025-03-27 17:17:01 +01:00
Eelco Dolstra
eca002ddc4 Don't segfault if we can't create the JSON logger 2025-03-27 13:54:07 +01:00
Eelco Dolstra
17d0810a7c Cleanup 2025-03-26 23:49:35 +01:00
Eelco Dolstra
c8692b378b Merge remote-tracking branch 'detsys/detsys-main' into logger-improvements 2025-03-26 23:21:32 +01:00
Eelco Dolstra
502f027390 nix daemon: Respect json-log-path and re-open for every connection
We don't want to inherit the parent's JSON logger since then messages
from different daemon processes may clobber each other.
2025-03-26 22:15:39 +01:00
Cole Helbling
aa9d573db4
Merge pull request #14 from DeterminateSystems/sync-2.27.1
Sync with upstream 2.27.1
2025-03-25 16:06:05 +00:00
Eelco Dolstra
9d0c3dd6a7 Formatting 2025-03-24 22:02:49 +01:00
Eelco Dolstra
117d671923 Bump Determinate Nix version 2025-03-24 21:47:26 +01:00
Eelco Dolstra
9c26996e73 Fix release notes (1.0.0 -> 3.0.0) 2025-03-24 21:47:26 +01:00