1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 18:31:49 +02:00
Commit graph

20160 commits

Author SHA1 Message Date
Robert Hensing
cdb1d2c4c8 nix-flake: Move primops registration to configureEvalSettings
(cherry picked from commit d48101109d)
2025-03-31 18:17:09 +00:00
Robert Hensing
f07e4e27ce C API: (breaking) remove nix-flake-c global init
(cherry picked from commit 6a192ec0cd)
2025-03-31 18:17:09 +00:00
Robert Hensing
4642570e79 nix-expr: Add primops to EvalSettings
(cherry picked from commit 3c4c0953e0)
2025-03-31 18:17:08 +00:00
mergify[bot]
a8749a412f
Merge pull request #12819 from NixOS/mergify/bp/2.28-maintenance/pr-12812
Disable packaging-overriding test (backport #12812)
2025-03-31 17:44:54 +00:00
Eelco Dolstra
1d2fbfe99b Disable packaging-overriding
Fixes #12690.

(cherry picked from commit a4be66828a)
2025-03-31 17:35:57 +00:00
Robert Hensing
4f3f26cd96 .mergify.yml: Add backport 2.27-maintenance entry 2025-03-31 12:09:22 -04:00
John Ericson
4688590733
Merge pull request #12797 from NixOS/mergify/bp/2.27-maintenance/pr-12794
Fix windows build (backport #12794)
2025-03-28 21:50:47 -04:00
John Ericson
44c2bd35e0 Fix windows build
PR #12767 accidentally broke it.

(cherry picked from commit 99041b4d84)
2025-03-29 01:05:25 +00:00
mergify[bot]
eb7d96a8ac
Merge pull request #12793 from NixOS/mergify/bp/2.27-maintenance/pr-12789
nix daemon: Don't open the store (backport #12789)
2025-03-29 00:24:30 +00:00
Eelco Dolstra
84a25dc846 nix daemon: Don't open the store
This makes it behave the same as nix-daemon. Opening the store in the
parent can cause a SIGBUS in libsqlite in the child:

  #0  0x00007f141cf6f789 in __memset_avx2_unaligned_erms () from /nix/store/wn7v2vhyyyi6clcyn0s9ixvl7d4d87ic-glibc-2.40-36/lib/libc.so.6
  #1  0x00007f141c322fe8 in walIndexAppend () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0
  #2  0x00007f141c3711a2 in pagerWalFrames () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0
  #3  0x00007f141c38317e in sqlite3PagerCommitPhaseOne.part.0 () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0
  #4  0x00007f141c383555 in sqlite3BtreeCommitPhaseOne.part.0 () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0
  #5  0x00007f141c384797 in sqlite3VdbeHalt () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0
  #6  0x00007f141c3b8f60 in sqlite3VdbeExec () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0
  #7  0x00007f141c3bbfef in sqlite3_step () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0
  #8  0x00007f141c3bd0e5 in sqlite3_exec () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0
  #9  0x00007f141da140e0 in nix::SQLiteTxn::commit() () from /nix/store/1m4r8s7s1v54zq9isncvjgia02bffxlz-determinate-nix-store-3.1.0/lib/libnixstore.so
  #10 0x00007f141d9ce69c in nix::LocalStore::registerValidPaths(std::map<nix::StorePath, nix::ValidPathInfo, std::less<nix::StorePath>, std::allocator<std::pair<nix::StorePath const, nix::ValidPathInfo> > > const&)::{lambda()#1}::operator()() const () from /nix/store/1m4r8s7s1v54zq9isncvjgia02bffxlz-determinate-nix-store-3.1.0/lib/libnixstore.so

(cherry picked from commit 9590167290)
2025-03-29 00:02:50 +00:00
mergify[bot]
d891f233cb
Merge pull request #12785 from NixOS/mergify/bp/2.27-maintenance/pr-12758
libutil: Fix error message (backport #12758)
2025-03-28 19:23:41 +00:00
mergify[bot]
84c4049e3c
Merge pull request #12778 from NixOS/mergify/bp/2.27-maintenance/pr-12767
use createDirs consistently everywhere (backport #12767)
2025-03-28 18:09:59 +00: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
Robert Hensing
9c20bb18de libutil: Fix error message
I encountered this with a misconfigured libutil. I doubt that a
non-lutimes config is viable, because tests were failing.

(cherry picked from commit 1cffcd91a9)
2025-03-28 17:08:23 +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
mergify[bot]
52049bc76e
Merge pull request #12776 from NixOS/mergify/bp/2.27-maintenance/pr-12772
Light packaging cleanups (backport #12772)
2025-03-28 16:44:06 +00: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
Jörg Thalheim
e308524097 use createDirs consistently everywhere
(cherry picked from commit a8217f2642)
2025-03-28 15:56:02 +00:00
John Ericson
5056aae63a Add a withAWS flag to libstore
Nixpkgs wants this, at least.

(cherry picked from commit e4c571c2f1)
2025-03-28 15:54:57 +00:00
John Ericson
602840bfd2 Link the right issue about the bad AWS pkg-config
It is https://github.com/aws/aws-sdk-cpp/issues/2673

(cherry picked from commit fb9c9ee35a)
2025-03-28 15:54:56 +00:00
John Ericson
71b0edcfe3 Remove boost env vars
https://github.com/NixOS/nixpkgs/issues/86131 is now fixed!
(cherry picked from commit 459fb59493)
2025-03-28 15:54:56 +00:00
John Ericson
1763cf115b Fix a bunch of missing meson boilerplate
These other libraries need this too

(cherry picked from commit ffdce51cd5)
2025-03-28 15:54:56 +00: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