wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity
19934 commits 245 branches 205 tags 163 MiB
Commit graph

19934 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Eelco Dolstra
dab0ff4f9e Tagging release 2.27.1 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfheacTHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3kt2B/4tQvs6iDXA12d409ClHbVQjr1d0FLP
 rv8RxZ7Z4+Jaw8r2ra/I+gpr9juI5ULyEJWqfES72hTvbYPjH1Grsrrjak1tx57E
 +STs21oEPojE8LXsFH1oZamGPPIIpyQdxCvTgZs1N6cqUfCRQ3Jx97X6E6SIGJDR
 VqBM4ruSXCY57yT36HqwYydTkxzZHiNP5wwABGfSb7u9pYW5x3r8W7+fQ3udTnCw
 kCRhA5vnfxIQSlxu4j7dJqSCGzOIPnhYB19bXDV4aPhl4sn3pkBCdMZxPBlCWSwx
 it0ngMITf+TeiMpVl2TtvMBOHtlGrbhusbyKcsqzFYULGyGOC9ngTAY3
 =/JzB
 -----END PGP SIGNATURE-----

Merge tag '2.27.1' into detsys-main

Tagging release 2.27.1
 2025-03-24 21:28:03 +01:00
Jörg Thalheim
9cb662df74
Merge pull request #12743 from NixOS/mergify/bp/2.27-maintenance/pr-12734 
packaging/everything.nix: make sure doc and manpage outputs are symlinks (backport #12734)
 2025-03-24 14:47:47 +01:00
Kirens
53ac3c8ba9 make sure doc and manpage outputs are symlinks 
Part of https://github.com/NixOS/nixpkgs/pull/392549
The doc and manpage fix already happend in 0ddfbc5939

(cherry picked from commit 15dfeb9182)
 2025-03-24 13:10:27 +00:00
Jörg Thalheim
9178731176
Merge pull request #12740 from NixOS/mergify/bp/2.27-maintenance/pr-12736 
`MonitorFdHup::~MonitorFdHup`: use proper close method instead of lib… (backport #12736)
 2025-03-24 13:50:33 +01:00
Jörg Thalheim
2e9a36a8fe MonitorFdHup::~MonitorFdHup: use proper close method instead of libc close() 
Otherwise closing it again will cause an EBADF in the AutoCloseFd class.

(cherry picked from commit 87a34a45ff)
 2025-03-24 12:17:04 +00:00
John Ericson
1a87f122f4
Merge pull request #12733 from NixOS/mergify/bp/2.27-maintenance/pr-12714 
`MonitorFdHup`: replace `pthread_cancel` trick with a notification pipe (backport #12714)
 2025-03-23 20:24:23 -04:00
John Ericson
490e7c0984 MonitorFdHup: Don't sleep anymore 
After the previous commit it should not be necessary. Furthermore, if we
*do* sleep, we'll exacerbate a race condition (in conjunction with
getting rid of the thread cancellation) that will cause test failures.

(cherry picked from commit 49f486d8e0)
 2025-03-23 23:54:11 +00:00
Jade Lovelace
27f29ff6ed daemon: remove workaround for macOS kernel bug that seems fixed 
This was filed as https://github.com/nixos/nix/issues/7584, but as far
as I can tell, the previous solution of POLLHUP works just fine on macOS
14. I've also tested on an ancient machine with macOS 10.15.7, which
also has POLLHUP work correctly.

It's possible this might regress some older versions of macOS that have
a kernel bug, but I went looking through the history on the sources and
didn't find anything that looked terribly convincingly like a bug fix
between 2020 and today. If such a broken version exists, it seems pretty
reasonable to suggest simply updating the OS.

Change-Id: I178a038baa000f927ea2cbc4587d69d8ab786843

Based off of commit 69e2ee5b25752ba5fd8644cef56fb9d627ca4a64. Ericson2314 added
additional other information.

(cherry picked from commit 9b3352c3c8)
 2025-03-23 23:54:10 +00:00
Félix Baylac Jacqué
ea19cb2f50 MonitorFdHup: replace pthread_cancel trick with a notification pipe 
On https://github.com/NixOS/nix/issues/8946, we faced a surprising
behaviour wrt. exception when using pthread_cancel. In a nutshell when
a thread is inside a catch block and it's getting pthread_cancel by
another one, then the original exception is bubbled up and crashes the
process.

We now poll on the notification pipe from the thread and exit when the
main thread closes its end. This solution does not exhibit surprising
behaviour wrt. exceptions.

Co-authored-by: Mic92 <joerg@thalheim.io>

Fixes https://github.com/NixOS/nix/issues/8946

See also Lix https://gerrit.lix.systems/c/lix/+/1605 which is very
similar by coincidence. Pulled a comment from that.

(cherry picked from commit 1c636284a3)
 2025-03-23 23:54:10 +00:00
John Ericson
df18c9b2ed MonitorFdHup: introduce a num_fds variable 
Better than just putting `1` in multiple spots.

(cherry picked from commit cb95791198)
 2025-03-23 23:54:10 +00:00
John Ericson
1a461baee1 MonitorFdHup: Cleanup a bit with designated initializers 
(cherry picked from commit d028bb4c4a)
 2025-03-23 23:54:10 +00:00
Jörg Thalheim
709e228589 MonitorFdHup: raise explicit SysError rather unreachable 
Syscalls can fail for many reasons and we don't want to loose the errno
and error context.

(cherry picked from commit 8e0bc2c3a8)
 2025-03-23 23:54:09 +00:00