John Ericson
e65510da56
Move unit tests to the location Meson expects them to be
...
Everything that is a separate subproject should live in the subprojects
directory.
Progress on #2503
This reverts commit 451f8a8c19
.
2024-10-17 15:42:16 -04:00
Eelco Dolstra
1cd48008f0
Merge pull request #11710 from NixOS/doc-onboarding
...
maintainers/onboarding: Start documenting
2024-10-17 11:06:23 +02:00
Eelco Dolstra
2e2c7f3b14
Merge pull request #11709 from DeterminateSystems/remove-team-list
...
maintainers/README.md: Remove the list of team members
2024-10-17 11:05:55 +02:00
Robert Hensing
c196011d23
maintainers/onboarding: Start documenting
2024-10-16 22:06:28 +02:00
Eelco Dolstra
7bd0c70b37
maintainers/README.md: Remove the list of team members
...
Let's have one canonical location for the team membership.
2024-10-16 22:03:44 +02:00
Robert Hensing
f51974d698
Merge pull request #11665 from roberth/fix-Interrupted-falling-out-of-thread
...
Fix `Interrupted` falling out of thread crash
2024-10-16 20:09:29 +02:00
Robert Hensing
ed184f0b61
Typo
...
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2024-10-16 19:40:45 +02:00
Eelco Dolstra
facc502bc8
Merge pull request #11695 from DeterminateSystems/override-lastModified
...
path fetcher: Allow the lastModified attribute to be overriden again
2024-10-16 18:03:29 +02:00
Robert Hensing
fd8a4a86d9
ThreadPool: don't silently ignore non-std exceptions
...
Introduced in 8f6b347abd
without explanation.
Throwing anything that's not that is a programming mistake that we don't want
to ignore silently. A crash would be ok, because that means we/they can fix
the offending throw.
2024-10-16 17:56:08 +02:00
Robert Hensing
16320f6d24
Handle ThreadPoolShutdown with normal catch
2024-10-16 17:56:08 +02:00
Robert Hensing
3f9ff10786
ThreadPool: catch Interrupted
2024-10-16 17:56:08 +02:00
Robert Hensing
de41e46175
Document recursive-nix startDaemon/stopDaemon
2024-10-16 17:56:08 +02:00
Robert Hensing
0e5a5303ad
fix: Ignore Interrupted in recursive-nix daemon worker
...
Otherwise, if checkInterrupt() in any of the supported store operations
would catch onto a user interrupt, the exception would bubble to the thread
start and be handled by std::terminate(): a crash.
2024-10-16 17:56:08 +02:00
Eelco Dolstra
de1289229f
Merge pull request #11669 from obsidiansystems/doc-source-rename
...
Make the subproject dir `src` again
2024-10-16 17:30:40 +02:00
Eelco Dolstra
781ff7672e
Add test
2024-10-16 17:18:07 +02:00
Robert Hensing
806a91f7bf
Merge pull request #11688 from roberth/meson-tidy
...
Clean up the `package.nix` files
2024-10-14 17:40:46 +02:00
John Ericson
379ada42bc
Make the subproject dir src
again
...
We got rid of this in c7ec33605e
because
of bug https://github.com/mesonbuild/meson/issues/13774 , but in the
previous commit we renamed the manual source directory, which avoids it.
Now we can change it back.
2024-10-14 11:21:24 -04:00
John Ericson
eb7d7780b1
Rename doc/manual{src -> source}
...
This is needed to avoid this
https://github.com/mesonbuild/meson/issues/13774 when we go back to
making our subproject directory `src`.
2024-10-14 11:21:24 -04:00
Eelco Dolstra
5d35424445
path fetcher: Allow the lastModified attribute to be overriden again
...
Fixes #11660 .
2024-10-14 16:17:18 +02:00
Eelco Dolstra
d5c45952ac
Merge pull request #11690 from DeterminateSystems/non-contiguous-tarballs
...
Handle tarballs where directory entries are not contiguous
2024-10-14 14:50:31 +02:00
Eelco Dolstra
b11c331c53
Merge pull request #11684 from geofft/real-root-mode-0500
...
libstore: Make our sandbox pivot_root directory accessible to ourself
2024-10-14 14:35:37 +02:00
Eelco Dolstra
a7b9877da9
Add a test
2024-10-14 14:10:36 +02:00
Eelco Dolstra
71c2d82302
Merge pull request #11677 from DeterminateSystems/fix-s3-crash
...
builtins.fetchurl: Fix segfault on s3:// URLs
2024-10-14 13:55:49 +02:00
Eelco Dolstra
4012954b59
Handle tarballs where directory entries are not contiguous
...
I.e. when not all entries underneath a directory X follow eachother,
but there is some entry Y that isn't a child of X in between.
Fixes #11656 .
2024-10-14 13:53:54 +02:00
Eelco Dolstra
d2f4d07619
Add assert
2024-10-14 13:15:55 +02:00
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
e10ff893e5
packaging: Factor out mkPackageBuilder
2024-10-13 22:43:06 +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
d21026b6f1
packaging: Remove package.nix from libexpr src
2024-10-13 22:18:57 +02:00
Robert Hensing
0a49d1e0d2
refactor: lib.composeManyExtensions
2024-10-13 22:03:52 +02:00
Robert Hensing
ab0f9f9089
Merge pull request #11680 from Mic92/git-utils
...
git-utils: fix x86_64-w64-mingw32 build
2024-10-13 13:09:00 +02:00
Valentin Gagarin
de0a34a362
doc: note that nix eval
is eager ( #11670 )
...
doc: note that `nix eval` is eager
---------
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2024-10-13 12:31:01 +02:00
Robert Hensing
3c59df412a
nix/meson.build: Rename name_suffix -> executable_suffix
2024-10-13 12:29:48 +02:00
Geoffrey Thomas
5a794d9366
libstore: Make our sandbox pivot_root directory accessible to ourself
...
If you have the Nix store mounted from a nonlocal filesystem whose
exporter is not running as root, making the directory mode 000 makes it
inaccessible to that remote unprivileged user and therefore breaks the
build. (Specifically, I am running into this with a virtiofs mount using
Apple Virtualization.framework as a non-root user, but I expect the
same thing would happen with virtiofs in qemu on Linux as a non-root
user or with various userspace network file servers.)
Make the directory mode 500 (dr-x------) to make the sandbox work in
this use case, which explicitly conveys our intention to read and search
the directory. The code only works because root can already bypass
directory checks, so this does not actually grant more permissions to
the directory owner / does not make the sandbox less secure.
2024-10-12 19:55:58 -04: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
Jörg Thalheim
bd1961b7cc
meson: fix executable extensions for windows build
2024-10-11 21:50:50 +02:00
Jörg Thalheim
30655dd146
git-utils: fix x86_64-w64-mingw32 build
2024-10-11 21:04:52 +02:00
Eelco Dolstra
d38f62f64d
Make S3 downloads slightly more interruptable
2024-10-11 14:55:22 +02:00
Eelco Dolstra
0500fba56a
builtins.fetchurl: Fix segfault on s3:// URLs
...
Also, add an activity to show that we're downloading an s3:// file.
Fixes #11674 .
2024-10-11 14:32:34 +02:00
Valentin Gagarin
dbcd4cd6ba
Merge pull request #11671 from onnimonni/patch-1
...
Fix deprecated example from distributed-builds.md
2024-10-10 21:19:44 +02:00
Onni Hakala
e6db2dafe6
Update distributed-builds.md
...
Fixes deprecation warning from nix build:
warning: 'nix store ping' is a deprecated alias for 'nix store info'
2024-10-10 20:35:55 +03:00
Eelco Dolstra
4202d4fc81
Merge pull request #11664 from DeterminateSystems/show-sandbox-setup-error
...
Propagate errors from early sandbox initialization to the parent
2024-10-10 17:01:37 +02:00
Jacek Galowicz
39da9462e9
Document common options in stable nix binaries ( #11663 )
2024-10-10 09:00:01 +00:00
Robert Hensing
4db9487823
Merge pull request #11650 from obsidiansystems/nix-eval-slight-fs-cleanup
...
Slightly more `std::filesystem` for `nix eval`
2024-10-09 22:55:58 +02:00
Robert Hensing
d4b9977f83
Merge pull request #11224 from NixOS/meson-misc
...
Build manual with Meson
2024-10-09 22:38:29 +02:00
Eelco Dolstra
0be70469dc
Propagate errors from early sandbox initialization to the parent
...
This should help with issues like
https://github.com/DeterminateSystems/nix-installer/issues/1227 , which
currently just print "unable to start build process".
2024-10-09 20:53:43 +02:00
John Ericson
08b59aad31
Build the manual with Meson
...
Co-Authored-By: Qyriad <qyriad@qyriad.me>
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
Co-Authored-By: eldritch horrors <pennae@lix.systems>
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
Co-authored-by: Tom Bereknyei <tomberek@gmail.com>
2024-10-09 11:58:17 -04:00
John Ericson
8b2ffbae3a
Merge pull request #11662 from obsidiansystems/misc-changes
...
Misc changes
2024-10-09 11:52:37 -04:00
John Ericson
67a66212c3
Extend Nix repl missing executable error message
...
Co-Authored-By: Robert Hensing <robert@roberthensing.nl
2024-10-09 11:08:31 -04:00
John Ericson
6594573f3d
Remove dead code in the Meson build system
...
Identified in https://github.com/NixOS/nix/pull/11224#discussion_r1715056429
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
2024-10-09 11:07:15 -04:00