github-actions[bot]
454e0f798d
Set .version-determinate to 3.3.0
2025-04-11 20:56:54 +00:00
github-actions[bot]
2596288f88
Prepare release v3.3.0
2025-04-11 20:56:51 +00:00
Graham Christensen
02da540353
Merge pull request #24 from DeterminateSystems/rename-nix-profile-install-to-add
...
Rename `nix profile install` to `nix profile add`
2025-04-10 18:38:33 +00:00
Eelco Dolstra
497fe6dd31
Make nix profile install an alias of nix profile add
2025-04-10 18:48:23 +02:00
Eelco Dolstra
666aa20da8
Move alias support from NixArgs to MultiCommand
...
This allows subcommands to declare aliases, e.g. `nix store ping` is
now a proper alias of `nix store info`.
2025-04-10 18:48:23 +02:00
mergify[bot]
4d990f1459
Merge pull request #12989 from NixOS/mergify/bp/2.28-maintenance/pr-12986
...
Fix another machine config parsing bug (backport #12986 )
2025-04-09 20:51:33 +00:00
John Ericson
f9c262c3d5
Fix another machine config parsing bug
...
We were ignorning the result of `trim`, and after my last change we were
also trimmming too early.
(cherry picked from commit b74b0f4e1c
2025-04-09 20:13:30 +00:00
mergify[bot]
bb8af4ceb7
Merge pull request #12985 from NixOS/mergify/bp/2.28-maintenance/pr-12984
...
Fix `;` and `#` bug in machine file parsing (backport #12984 )
2025-04-09 19:04:07 +00:00
John Ericson
2892b758b3
Fix ; and # bug in machine file parsing
...
Comments go to the end of the line, not merely the next ; *or* \n. Fix
by splitting on `;` *within* lines, and test.
(cherry picked from commit f8b13cce19
2025-04-09 18:27:16 +00:00
mergify[bot]
e191b93a0e
Merge pull request #12983 from NixOS/mergify/bp/2.28-maintenance/pr-12699
...
tests/functional/flakes: Add test case for subflake locking (backport #12699 )
2025-04-09 17:54:32 +00:00
Rodney Lorrimar
080950b0fe
tests/functional/flakes: Add test case for subflake locking
...
This adds a test case where the lockfile of a relative path flake
dependency is updated.
It was reported by a user here: https://discourse.nixos.org/t/updating-local-subflakes-inputs-when-building-root-flake/61682
I think this test case relates to issue #7730 .
Because the issue is not resolved, this test case would fail without
the `|| true` clause.
(cherry picked from commit 1bc82d1c86
2025-04-09 17:20:31 +00:00
mergify[bot]
6d98cef93f
Merge pull request #12982 from NixOS/mergify/bp/2.28-maintenance/pr-12979
...
Actually ignore system/user registries during locking (backport #12979 )
2025-04-09 17:07:38 +00:00
Eelco Dolstra
a08477975d
Actually ignore system/user registries during locking
...
Something went wrong in #12068 so this didn't work. Also added a test.
(cherry picked from commit 77d4316353
2025-04-09 16:33:47 +00:00
Eelco Dolstra
c548e92860
Merge pull request #12966 from NixOS/mergify/bp/2.28-maintenance/pr-12958
...
Fix some unlinked tests (backport #12958 )
2025-04-08 13:55:54 +02:00
mergify[bot]
a7f078aa84
Merge pull request #12972 from NixOS/mergify/bp/2.28-maintenance/pr-12967
...
Add trailing commas on addFlag incantations (backport #12967 )
2025-04-07 23:56:11 +00:00
Graham Christensen
cd7e01526e
format as required
...
(cherry picked from commit 9b47b2b217
2025-04-07 23:16:28 +00:00
Graham Christensen
16a2cddfb9
Add trailing commas on addFlag incantations
...
(cherry picked from commit 06acbd37bd
2025-04-07 23:16:27 +00:00
mergify[bot]
1a4332fd3a
Merge pull request #12965 from NixOS/mergify/bp/2.28-maintenance/pr-12962
...
Fix some clang-tidy warnings (backport #12962 )
2025-04-07 21:17:06 +00:00
Eelco Dolstra
3a4dc47c22
Remove unused tracing-file-system-object-sink.{hh,cc}
...
(cherry picked from commit 611fd806cb
2025-04-07 20:42:08 +00:00
Eelco Dolstra
f0ed61bb4e
Fix/run monitorfdhup test
...
(cherry picked from commit 340fa00d52
2025-04-07 20:42:08 +00:00
Eelco Dolstra
85902fad58
Fix some clang-tidy warnings
...
(cherry picked from commit c0ad5d36c4
2025-04-07 20:38:07 +00:00
mergify[bot]
467a1df842
Merge pull request #12964 from NixOS/mergify/bp/2.28-maintenance/pr-12959
...
Keep fchmodat2-compat.hh private (backport #12959 )
2025-04-07 20:32:05 +00:00
Eelco Dolstra
aa1c690ebf
Keep fchmodat2-compat.hh private
...
Since it references store-config-private.hh.
(cherry picked from commit 04e9dc27ac
2025-04-07 19:18:46 +00:00
mergify[bot]
3a758fc348
Merge pull request #12963 from NixOS/mergify/bp/2.28-maintenance/pr-12961
...
Make lexer-helpers.hh internal to fix a clang-tidy error (backport #12961 )
2025-04-07 19:04:29 +00:00
Eelco Dolstra
17de9dd275
Make lexer-helpers.hh internal to fix a clang-tidy error
...
(cherry picked from commit 8be24f58f2
2025-04-07 18:29:08 +00:00
mergify[bot]
6dde30bacf
Merge pull request #12960 from NixOS/mergify/bp/2.28-maintenance/pr-12956
...
Fix meson warnings on minimum version (backport #12956 )
2025-04-07 18:26:02 +00:00
Sandro
5b21c94fab
Fix meson warnings on minimum version
...
nix> meson.build:216: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:222: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:235: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:236: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:242: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
(cherry picked from commit 14a829acbb
2025-04-07 17:51:44 +00:00
Graham Christensen
2233cf1d3c
Merge pull request #26 from DeterminateSystems/cole-h/push-qkwtwqoytvuq
...
ci: manual: don't try to comment on the perpetual PR
2025-04-07 16:33:16 +00:00
Cole Helbling
74bcfbe10c
ci: manual: don't try to comment on the perpetual PR
2025-04-07 09:27:27 -07:00
Graham Christensen
8443f01536
Rename nix profile install to nix profile add.
2025-04-07 09:22:57 -04:00
mergify[bot]
a4962f73b5
Merge pull request #12955 from NixOS/mergify/bp/2.28-maintenance/pr-12951
...
tests/functional/repl: fix race condition (backport #12951 )
2025-04-07 12:52:09 +00:00
Graham Christensen
bc02da2a69
Merge pull request #23 from DeterminateSystems/sync-2.28.0
...
Sync with upstream 2.28.1
2025-04-07 12:40:40 +00:00
Jörg Thalheim
288fee2d14
tests/functional/repl: fix race condition
...
the sleep 1 is not enough in some circumstances. Switching to a fifo
helps.
(cherry picked from commit 1de951d31d
2025-04-07 12:20:05 +00:00
mergify[bot]
42ba32f1ff
Merge pull request #12949 from NixOS/mergify/bp/2.28-maintenance/pr-12944
...
maintainers/release-notes: Let it fail (backport #12944 )
2025-04-07 09:58:20 +00:00
Eelco Dolstra
59d1634aab
Tagging release 2.28.1
...
-----BEGIN PGP SIGNATURE-----
iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfzku8THGVkb2xzdHJh
QGdtYWlsLmNvbQAKCRCBcLRybXGY3ngWB/0e5vMSgZtARQXjuyexyJyy2m8JIQzJ
Stw7dP0/oAvWYWuytez3jX4KC9xztMELblgZzXQhO72wIfzpa/CmxWQXVSaHm6Kq
zYAWhxXz2HKGEPd8bS6eCFCZcrmChso7UN2WjrROYwB+1HO5S1rtOJtv2K1zvy5C
xRMoOpSfKVfn63FoODhenW3UWbfeck5Dmb6eirPxvIMUIcDi2FeX5MVlklgNhxum
351/Ymo5dxyK1pGmm8NrvB/3RSk7rVRUR+R4257lCmrN0g4gvM0G4MvxGm+XHMmC
d/tmeU+JKPiXKFDSWmuTCmwCenu/q95QRadKST+Wls+qc4gHQLCaXfgn
=hcKx
-----END PGP SIGNATURE-----
Merge tag '2.28.1' into sync-2.28.0
Tagging release 2.28.1
2025-04-07 11:21:07 +02:00
Eelco Dolstra
e0778c2796
Bump version
2025-04-07 10:55:37 +02:00
Robert Hensing
e7dbf0fc0a
maintainers/release-notes: Let it fail
...
Fail when a command fails.
Basic error handling was missing, which would lead to errors getting
obscured a bit by subsequent successful logging.
(cherry picked from commit da36c34db7
2025-04-07 08:53:33 +00:00
Eelco Dolstra
e3a8e43600
Merge pull request #12942 from NixOS/mergify/bp/2.28-maintenance/pr-12936
...
libflake: add lock file path to invalid json error (backport #12936 )
2025-04-07 09:57:33 +02:00
John Ericson
9cdf72beaa
Merge pull request #12945 from NixOS/mergify/bp/2.28-maintenance/pr-12940
...
Header cleanup (backport #12940 )
2025-04-06 21:06:58 -04:00
John Ericson
efb0feb22b
Get rid of raw -D defines, always use private config files
...
Now that we have the private vs public distinction, we can do this
without leaking information downstream.
(cherry picked from commit 7a7fe350d5
2025-04-07 00:10:38 +00:00
John Ericson
7e96f31753
Clean some header related things.
...
Revert most of "Hack together a fix for the public headers"
- The `libmain` change is kept, and one more libmain change is made.
(Need to update Meson and Nix per the package alike).
- The S3 situation is fixed in a different way: the variable is public
now, used in the header, and fixed accordingly.
- Fix TODO for `HAVE_EMBEDDED_SANDBOX_SHELL`
This reverts commit 2b512505343294b22a68
2025-04-07 00:10:37 +00:00
Alexander Romanov
49b6766332
libflake: add lock file path to invalid json error
...
Previously, when lock file contained invalid JSON nix reported a parser
error without specifying the file it came from.
This change adds flake.lock file path to the error message to avoid
confusion.
(cherry picked from commit e3873aa1a0
2025-04-06 23:33:35 +00:00
mergify[bot]
63b9b932f4
Merge pull request #12938 from NixOS/mergify/bp/2.28-maintenance/pr-12937
...
Fix undefined macro errors (backport #12937 )
2025-04-06 17:04:42 +00:00
Robert Hensing
3bb46b73a8
Fix undefined macro errors
...
(cherry picked from commit 77b4bb74d5
2025-04-06 16:25:51 +00:00
mergify[bot]
1b119ded3a
Merge pull request #12932 from NixOS/mergify/bp/2.28-maintenance/pr-12931
...
Add `-Wundef` and fix public headers (backport #12931 )
2025-04-05 12:24:43 +00:00
Robert Hensing
615344fdf0
Fix more -Wundef, in darwin context
2025-04-05 13:46:04 +02:00
Robert Hensing
bd2d5b7335
Hack together a fix for the public headers
...
Please fix this.
2025-04-05 13:44:58 +02:00
Robert Hensing
5c90b41715
Add -Wundef to make #if FOO an error if not defined
...
This commit has all the straightforward stuff.
2025-04-05 13:44:58 +02:00
Eelco Dolstra
d81cd04d23
Bump version
2025-04-04 18:03:19 +02:00
Eelco Dolstra
852075ec9d
Tagging release 2.28.0
...
-----BEGIN PGP SIGNATURE-----
iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfv9fITHGVkb2xzdHJh
QGdtYWlsLmNvbQAKCRCBcLRybXGY3ohrCAC1Uw/JJr3yEPlJ/jLc9t9HqEKMY08W
W6SEjpYJHYixMXmoonexkqojncNWBaiytRa+vBY7JQq0xTOOBwj42TM2ZzMF4GXi
vO4Ox0hEsRa/v7tSmK6GFz1sNEKEUOHDNbilg4kzkkBHPEGPUGMwdWkT0akO576Q
SQ6ERwPPLsHDI2YtAeAD8R4p07CraiyA34ljDPz3rChTAXRPVKWxJUt1enwEWYTr
cKk45RcR4S8rP1BVwf3wsNsrHjqjbaY45kPAo8GD79hFH0zkyJarS3Kgv8qsWLra
9ph0DVVG0wiArlET7Y3uchqtAC0Z5LOnutAmOFYFw6DKfWp9yGfl/SVW
=XRda
-----END PGP SIGNATURE-----
Merge tag '2.28.0' into sync-2.28.0
Tagging release 2.28.0
2025-04-04 17:49:15 +02:00
