Robert Hensing
15e3e1543b
packaging: Add mkMeson{Library,Executable}
...
and:
- move pkg-config out of mkMesonDerivation, for components that don't
produce any executable code
2024-10-13 23:17:54 +02:00
Robert Hensing
0aef34b790
packaging: Add mesonLayer
...
... and remove a few unused arguments.
This adds pkg-config to a two or three packages that don't use it,
but we shouldn't let that bother us. It's like our personal stdenv.
2024-10-13 22:39:53 +02:00
Robert Hensing
30c4f5eb51
Merge pull request #11682 from NaN-git/opt-str
...
Remove superfluous `std::string` copy operations
2024-10-12 10:59:40 +02:00
Philipp Otterbein
a353a99269
cont. cleanup: remove superfluous std::string copies
2024-10-08 02:25:52 +02:00
Philipp Otterbein
e21c7895eb
MacOS built: add workaround for missing view() member of std::ostringstream
2024-10-07 02:05:53 +02:00
Philipp Otterbein
caf3b55891
cont. cleanup: remove superfluous std::string copies
2024-10-07 01:15:44 +02:00
Eelco Dolstra
15e5684884
experimental-features.hh: Don't include json-utils.hh
...
This caused nlohmann/json.hpp to leak into a lot of compilation units,
which is slow (when not using precompiled headers).
Cuts build time from 46m24s to 42m5s (real time with -j24: 2m42s to
2m24s).
2024-10-04 15:59:35 +02:00
Eelco Dolstra
3e7b42dd89
Merge pull request #11618 from NixOS/ignoreException-interrupt
...
Split ignoreException for destructors vs interrupt-safe
2024-10-01 17:10:39 +02:00
Bryan Honof
1f024ecfcd
fix: warn on malformed URI query parameter
2024-09-30 14:44:06 +02:00
Robert Hensing
3df619339c
Split ignoreException for destructors or interrupt-safe
2024-09-30 11:50:25 +02:00
John Ericson
2b6b03d8df
Ensure error messages don't leak private key
...
Since #8766 , invalid base64 is rendered in errors, but we don't actually
want to show this in the case of an invalid private keys.
Co-Authored-By: Eelco Dolstra <edolstra@gmail.com>
2024-09-23 16:36:48 -04:00
John Ericson
d0c351bf43
Revert "base64Decode: clearer error message when an invalid character is detected"
...
We have a safer way of doing this.
This reverts commit dc3ccf02bf
.
2024-09-20 10:41:45 -04:00
Eelco Dolstra
9ea29ea517
Merge pull request #11540 from NixOS/meson-arm-atomic
...
nix-util / meson: Add -latomic on arm
2024-09-19 16:09:14 +02:00
Robert Hensing
56b8911766
nix-util / meson: Add -latomic on arm
...
I couldn't get the test program to work correctly after many attempts,
so let's just unblock this without making it perfect.
2024-09-19 00:01:24 +02:00
Robert Hensing
5c87c40a5e
Use close_range when available
...
This fixes the FreeBSD build of nix-util
2024-09-18 22:42:44 +02:00
John Ericson
95f2b2beab
Merge pull request #8766 from brianmcgee/fix/base64-decode-error-message
...
base64Decode: clearer error message when an invalid character is detected
2024-09-17 09:59:15 -04:00
Robert Hensing
799abea0c4
Merge pull request #11330 from NixOS/packfile
...
libgit2, GitRepo: Write (thin) packfiles
2024-09-16 14:42:59 +02:00
Eelco Dolstra
7aa3e7e3a5
Make the NAR parser much stricter wrt field order
...
We really want to enforce a canonical representation since NAR
hashing/signing/deduplication depends on that.
2024-09-12 15:57:46 +02:00
Eelco Dolstra
27ec0def74
Typo
2024-09-12 15:33:55 +02:00
Eelco Dolstra
69bf9947c7
Put 'names' in the right scope
2024-09-12 15:29:54 +02:00
Eelco Dolstra
4de9587e50
Improve badArchive()
2024-09-12 15:27:55 +02:00
John Ericson
db7c868d24
Merge pull request #11378 from Mic92/nix-dir-errors
...
builtins.readDir: fix nix error trace on filesystem errors
2024-09-11 13:10:28 -04:00
John Ericson
193dc49097
tweak unpack channel built-in, std::filesystem::path for tarball
2024-09-11 12:29:49 -04:00
Noam Yorav-Raphael
38bfbb297c
Use envvars NIX_CACHE_HOME, NIX_CONFIG_HOME, NIX_DATA_HOME, NIX_STATE_HOME if defined ( #11351 )
2024-09-11 10:36:46 +00:00
Jörg Thalheim
1ca1439b1f
add missing filesystem include (x86_64-darwin fix)
2024-09-10 16:45:39 +02:00
Eelco Dolstra
9c0e968843
Merge commit from fork
...
Fix unsafe NAR unpacking
2024-09-10 12:42:55 +02:00
Eelco Dolstra
5ca2f58798
Improve use-case-hack description slightly
2024-09-09 14:29:05 +02:00
Eelco Dolstra
5e337ee60d
Merge pull request #11412 from parkerhoyes/daemon-cgroup
...
Move daemon process into sub-cgroup
2024-09-09 13:49:31 +02:00
Eelco Dolstra
9fcb588dd8
RestoreSink::createDirectory(): Use append()
...
On macOS, `mkdir("x/')` behaves differently than `mkdir("x")` if `x` is
a dangling symlink (the formed succeed while the latter fails). So make
sure we always strip the trailing slash.
2024-09-05 22:21:53 +02:00
Eelco Dolstra
3557587381
Detect NAR directory entries that collide with another path after case-hacking
...
The test was made by @puckipedia.
2024-09-05 19:26:10 +02:00
Eelco Dolstra
da1ad28912
Test that nix-store --restore fails if the output already exists
...
This restores the behaviour from before the std::filesystem
refactorings.
2024-09-05 16:48:43 +02:00
Jörg Thalheim
5a5a010120
Revert "fix: Error on malformed URI query parameter"
...
This reverts commit c9f45677b5
.
This now triggers on simple cases like `nix build .#nix`.
Reverting for now.
2024-09-05 15:18:16 +02:00
Jörg Thalheim
a81083d080
Revert "Update src/libutil/url.cc"
...
This reverts commit 9b1cefe27e
.
2024-09-05 15:18:16 +02:00
Jörg Thalheim
22ba4dc78d
builtins.readDir: fix nix error trace on filesystem errors
...
Before:
nix-env % ./src/nix/nix eval --impure --expr 'let f = builtins.readDir "/nix/store/hs3yxdq9knimwdm51gvbs4dvncz46f9d-hello-2.12.1/foo"; in f' --show-trace
error: filesystem error: directory iterator cannot open directory: No such file or directory [/nix/store/hs3yxdq9knimwdm51gvbs4dvncz46f9d-hello-2.12.1/foo]
After:
error:
… while calling the 'readDir' builtin
at «string»:1:9:
1| let f = builtins.readDir "/nix/store/hs3yxdq9knimwdm51gvbs4dvncz46f9d-hello-2.12.1/foo"; in f
| ^
error: reading directory '/nix/store/hs3yxdq9knimwdm51gvbs4dvncz46f9d-hello-2.12.1/foo': No such file or directory
2024-09-05 14:00:39 +02:00
Eelco Dolstra
495d32e1b8
NAR parser: Fix check for duplicate / incorrectly sorted entries
...
"prevName" was always empty because it was declared in the wrong scope.
2024-09-04 21:43:59 +02:00
Parker Hoyes
bd6ae2f3b9
Use getCurrentCgroup() in getMaxCPU()
2024-09-04 19:10:31 +00:00
Parker Hoyes
03484641a1
Simplify getRootCgroup()
...
Static local initializers are atomic in C++.
2024-09-04 18:11:16 +00:00
Parker Hoyes
46b3188045
Move daemon process into sub-cgroup
...
The daemon process is now moved into a new sub-cgroup called nix-daemon when the
daemon starts. This is necessary to abide by the no-processes-in-inner-nodes
rule, because the service cgroup becomes an inner node when the child cgroups
for the build are created (see LocalDerivationGoal::startBuilder()).
See #9675
2024-09-03 17:18:01 +00:00
Alyssa Ross
9cc550d652
Don't refer to public keys as secret keys in error
...
This constructor is used for public keys as well.
2024-08-31 16:00:11 +02:00
Robert Hensing
b89eca9aec
Merge pull request #11349 from bryanhonof/bryanhonof.check-query-for-equals
...
Warn on malformed URI query parameter
2024-08-28 21:56:00 +02:00
Bryan Honof
9b1cefe27e
Update src/libutil/url.cc
...
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2024-08-28 18:48:18 +02:00
Robert Hensing
d0f8a92363
Make tarball cache more interruptible
2024-08-28 17:49:22 +02:00
John Ericson
c7ec33605e
Meson misc things
...
Meson-ify a few things, scripts, completions, etc. Should make our Meson
build complete except for docs.
Co-Authored-By: Qyriad <qyriad@qyriad.me>
Co-Authored-By: eldritch horrors <pennae@lix.systems>
2024-08-27 10:19:55 -04:00
John Ericson
a97a08411c
More support for std::filepath
in libnixutil
...
We're not replacing `Path` in exposed definitions in many cases, but
just adding alternatives. This will allow us to "top down" change `Path`
to `std::fileysystem::path`, and then we can remove the `Path`-using
utilities which will become unused.
Also add some test files which we forgot to include in the libutil unit
tests `meson.build`.
Co-Authored-By: siddhantCodes <siddhantk232@gmail.com>
2024-08-26 17:23:56 -04:00
John Ericson
dbabfc92d4
Make sure we have an execvpe
on Windows too
...
Necessary to fix a build (that was already broken in other ways) after
PR #11021 .
2024-08-26 15:45:55 -04:00
tomberek
440de80d34
Merge pull request #11021 from hercules-ci/issue-11010
...
Fix SSH invocation when local SHELL misbehaves
2024-08-26 10:40:51 -04:00
Robert Hensing
8bd835b7bc
Merge pull request #11278 from Mic92/close-fds
...
libutil: rename and optimize closeMostFDs
2024-08-26 15:51:34 +02:00
Bryan Honof
c9f45677b5
fix: Error on malformed URI query parameter
...
Signed-off-by: Bryan Honof <bryanhonof@gmail.com>
2024-08-23 22:04:37 +02:00
Eelco Dolstra
1facc3e35e
Merge pull request #7126 from squalus/fsync-store-paths
...
Add fsync-store-paths option
2024-08-22 17:45:11 +02:00
Eelco Dolstra
21a164aa03
Fix hang
...
Signed-off-by: Eelco Dolstra <edolstra@gmail.com>
2024-08-22 15:26:34 +02:00