mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 15:44:20 +00:00
1c6b48a423
This is a breaking update (at least for the internal C++ APIs) so the packages all need to be updated in lockstep. Misc notes: * build2 * Remove unnecessary pkg-config patch * Trivially refresh remove-config-store-paths.patch * libbutl * Enable tests now that they work with NDEBUG * libodb * update 2.5.0-b.19 -> 2.5.0-b.21
15 lines
721 B
Diff
15 lines
721 B
Diff
--- a/libbuild2/buildfile
|
|
+++ b/libbuild2/buildfile
|
|
@@ -73,7 +73,11 @@ config/cxx{host-config}: config/in{host-config}
|
|
#
|
|
build2_config = $regex.replace_lines( \
|
|
+ $regex.replace_lines( \
|
|
$config.save(), \
|
|
'^ *(#|(config\.(dist\.|install\.chroot|config\.hermetic))).*$', \
|
|
[null], \
|
|
+ return_lines), \
|
|
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
|
|
+ [null], \
|
|
return_lines)
|
|
|