Sandro
f9a8fdecf5
Fix meson warning about meson_version 1.1
...
meson.options requires that we set meson_version to at least 1.1
similar to #12956
2025-04-09 15:31:34 +02:00
Robert Hensing
e76bbe413e
Merge pull request #12877 from roberth/c-api-libflake-override-input
...
C API: Flake loading, input overriding
2025-04-08 09:01:51 +02:00
John Ericson
73d3159ba0
Merge pull request #12967 from DeterminateSystems/trailing-commas
...
Add trailing commas on addFlag incantations
2025-04-07 19:14:31 -04:00
Graham Christensen
9b47b2b217
format as required
2025-04-07 17:24:41 -04:00
Graham Christensen
06acbd37bd
Add trailing commas on addFlag incantations
2025-04-07 17:18:15 -04:00
John Ericson
596389a5f6
Merge pull request #12958 from DeterminateSystems/unlinked-tests
...
Fix some unlinked tests
2025-04-07 16:41:07 -04:00
John Ericson
6789202af0
Merge pull request #12962 from DeterminateSystems/clang-tidy-warnings
...
Fix some clang-tidy warnings
2025-04-07 16:37:02 -04:00
John Ericson
3bcc70b64f
Merge pull request #12959 from DeterminateSystems/fchmodat2-compat-private
...
Keep fchmodat2-compat.hh private
2025-04-07 15:17:46 -04:00
John Ericson
856f8e0e49
Merge pull request #12961 from DeterminateSystems/lexer-helpers-private
...
Make lexer-helpers.hh internal to fix a clang-tidy error
2025-04-07 14:28:14 -04:00
Eelco Dolstra
c0ad5d36c4
Fix some clang-tidy warnings
2025-04-07 19:55:33 +02:00
Eelco Dolstra
d1ba01235f
Merge pull request #12956 from SuperSandro2000/patch-2
...
Fix meson warnings on minimum version
2025-04-07 19:50:36 +02:00
Eelco Dolstra
8be24f58f2
Make lexer-helpers.hh internal to fix a clang-tidy error
2025-04-07 18:21:08 +02:00
Eelco Dolstra
04e9dc27ac
Keep fchmodat2-compat.hh private
...
Since it references store-config-private.hh.
2025-04-07 18:19:42 +02:00
Eelco Dolstra
611fd806cb
Remove unused tracing-file-system-object-sink.{hh,cc}
2025-04-07 17:10:28 +02:00
Eelco Dolstra
340fa00d52
Fix/run monitorfdhup test
2025-04-07 17:09:42 +02:00
Sandro
14a829acbb
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.
2025-04-07 15:06:10 +02:00
Jörg Thalheim
2960d7adf5
Merge pull request #12951 from Mic92/fix-race-condition
...
tests/functional/repl: fix race condition
2025-04-07 14:18:05 +02:00
Jörg Thalheim
1de951d31d
tests/functional/repl: fix race condition
...
the sleep 1 is not enough in some circumstances. Switching to a fifo
helps.
2025-04-07 14:00:19 +02:00
Jörg Thalheim
3ff19be1f7
Merge pull request #12944 from roberth/maintainers-release-notes-fail
...
maintainers/release-notes: Let it fail
2025-04-07 10:51:08 +02:00
mergify[bot]
07204ff6e5
Merge pull request #12940 from NixOS/header-cleanup
...
Header cleanup
2025-04-07 00:09:49 +00:00
Robert Hensing
da36c34db7
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.
2025-04-07 01:46:43 +02:00
mergify[bot]
1dc7e6c4dc
Merge pull request #12936 from ajlekcahdp4/master
...
libflake: add lock file path to invalid json error
2025-04-06 23:32:50 +00:00
John Ericson
7a7fe350d5
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.
2025-04-06 18:53:42 -04:00
John Ericson
3294b22a68
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 2b51250534
.
2025-04-06 18:53:38 -04:00
mergify[bot]
3fcdccb8ce
Merge pull request #12939 from NixOS/2.28-release-notes
...
2.28 release notes for master
2025-04-06 21:41:00 +00:00
Robert Hensing
78e2832d7d
Edit rl-2.28
...
(cherry picked from commit 1ca3ee1287
)
2025-04-06 17:03:38 -04:00
Robert Hensing
4ac9bc08ea
Fix maintainers/release-credits output
...
(cherry picked from commit b87b3d79f2
)
2025-04-06 17:03:36 -04:00
Robert Hensing
93248bd92c
doc/rl-2.28: Add contributors
...
(cherry picked from commit fea87a94e6
)
2025-04-06 17:03:36 -04:00
Robert Hensing
f261c03686
chore: Update contributor handle caches
...
(cherry picked from commit 6687ce2a6d
)
2025-04-06 17:03:35 -04:00
John Ericson
682a28a76b
release notes: 2.28.0
...
(cherry picked from commit 703f0fbe74
)
2025-04-06 17:03:34 -04:00
Alexander Romanov
e3873aa1a0
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.
2025-04-06 22:52:46 +03:00
mergify[bot]
a56aaf26c2
Merge pull request #12937 from roberth/undefined-macros
...
Fix undefined macro errors
2025-04-06 16:25:22 +00:00
Robert Hensing
77b4bb74d5
Fix undefined macro errors
2025-04-06 17:43:17 +02:00
Jörg Thalheim
cf5e59911b
Merge pull request #12931 from roberth/add-Wundef-and-fix-public-headers
...
Add `-Wundef` and fix public headers
2025-04-05 08:43:43 +02:00
Robert Hensing
ba89da8fa2
Fix more -Wundef, in darwin context
2025-04-05 01:04:58 +02:00
Robert Hensing
2b51250534
Hack together a fix for the public headers
...
Please fix this.
2025-04-05 00:59:58 +02:00
Robert Hensing
59ced3da96
Add -Wundef to make #if FOO an error if not defined
...
This commit has all the straightforward stuff.
2025-04-05 00:45:19 +02:00
Robert Hensing
8bd342c660
Merge pull request #12911 from Mic92/no-copy-twice
...
create cache entry for paths already in the nix store
2025-04-04 13:41:36 +02:00
Jörg Thalheim
61c6210dbf
create cache entry for paths already in the nix store
...
This allows path:/nix/store/* paths to not be copied twice to the nix
store.
2025-04-04 12:45:22 +02:00
Jörg Thalheim
6c3476784b
Merge pull request #12919 from roberth/darwin-minversion
...
Reinstate Darwin minversion
2025-04-04 08:38:22 +02:00
Robert Hensing
4be92e7b82
packaging/dependency: Clarify darwinMinVersion
2025-04-03 23:22:33 +02:00
Robert Hensing
5c4a4aeed7
Revert "remove obsolete stdenv darwinMinVersion override"
...
This reverts commit d91310bb32
.
> Some packages require setting a non-default deployment target
> (or minimum version) to gain access to certain APIs. You do
> that using the darwinMinVersionHook, which takes the deployment
> target version as a parameter.
-- 60b54c7aee/doc/stdenv/platform-notes.chapter.md (what-is-a-deployment-target-or-minimum-version-sec-darwin-troubleshooting-using-deployment-targets)
This will again solve error:
../nix_api_expr.cc:38:18: error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
-- https://hydra.nixos.org/build/294088946
2025-04-03 23:22:19 +02:00
Jörg Thalheim
cb972c789a
Merge pull request #12912 from DeterminateSystems/substituted-path-display
...
Set path display for substituted inputs
2025-04-03 14:49:51 +02:00
Eelco Dolstra
4a397cfb80
Set path display for substituted inputs
2025-04-03 14:14:22 +02:00
Jörg Thalheim
5e19252de9
Merge pull request #12902 from Mic92/signed-comparison
...
Fix -Wsign-compare errors
2025-04-03 10:30:18 +02:00
Jörg Thalheim
c0912a12bf
Merge pull request #12846 from allrealmsoflife/clearer-continuation-prompt
...
repl: improve continuation prompt for incomplete expressions
2025-04-03 09:52:16 +02:00
Jörg Thalheim
bbc4977fed
local-derivation-goal: fix sized comparison when checking sandbox profile length
2025-04-03 09:50:53 +02:00
Jörg Thalheim
681d7f7e57
Fix -Wsign-compare errors
2025-04-03 09:48:53 +02:00
mergify[bot]
c4b81184e4
Merge pull request #12886 from Mic92/symlink-exists
...
symlink_exists: wrap exceptions into nix exception
2025-04-02 23:13:24 +00:00
mergify[bot]
1831948c20
Merge pull request #12885 from NixOS/fix-windows-build
...
Fix windows build
2025-04-02 22:34:41 +00:00