yaml-cpp: 0.8.0 -> 0.9.0 - #560590
yaml-cpp: 0.8.0 -> 0.9.0#560590
Conversation
575b2c0 to
3aaf1e9
Compare
3aaf1e9 to
8214ccc
Compare
|
(trying my best to
nixpkgs/pkgs/by-name/st/starship-sf64/package.nix Lines 99 to 110 in c043004 This can be dropped. And this changed to yaml-cpp_src = srcOnly yaml-cpp;
|
|
It seems like this bump causes most of the When running the Edit: Seems like one of their tests has intentionally messy YAML that turns out to not actually be valid, so diff --git a/pkgs/by-name/op/opencolorio/package.nix b/pkgs/by-name/op/opencolorio/package.nix
index a18f3a0f3843..aeb6c04294eb 100644
--- a/pkgs/by-name/op/opencolorio/package.nix
+++ b/pkgs/by-name/op/opencolorio/package.nix
@@ -32,7 +32,14 @@ stdenv.mkDerivation rec {
hash = "sha256-b4tdQ9VH9M7hAD5Uuxu4QKwwpaVwroj/Bvg+Zsy0M1M=";
};
- postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+ # This is *not* how you express a multi-line array in YAML...
+ postPatch = ''
+ substituteInPlace tests/cpu/Config_tests.cpp \
+ --replace-fail \
+ 'inactive_colorspaces: [cs1\t\n \n, \ncs2]\n' \
+ 'inactive_colorspaces:\t\n \n - \t cs1\t\n\n \n -\tcs2\t \t\n'
+ ''
+ + lib.optionalString stdenv.hostPlatform.isDarwin ''
# these tests don't like being run headless on darwin. no builtin
# way of skipping tests so this is what we're reduced to.
substituteInPlace tests/cpu/Config_tests.cpp \This is the messiest that I could get working. This'll need a report on the |
|
Seems like tests also stopped being built in 0.8.0 because their Other than the above two issues, my spot testing of various packages I maintain / that looked important indicates this might be good.
|
|
thank you for the reviews and extensive testing :) i'll admit i didn't anticipate that this would cause much breakage, and so i didn't test as much myself beforehand. sorry about that.
done, tests seem to be working. fwiw i did try to enable
i've added your fix to opencolorio, seems to build fine now. |
da2fd80 to
18ed4ab
Compare
|
Please reorder the commits to avoid an inbetween state where things are broken (i.e. when bisecting): yaml-cpp 0.9.0 fixes to other packages first, then the bump to 0.9.0.
Tried to submit a fix to Even smaller fix for the issue, after some more messing around during daytime hours: diff --git a/pkgs/by-name/op/opencolorio/package.nix b/pkgs/by-name/op/opencolorio/package.nix
index 2bec1449e10f..2d745ca4cdba 100644
--- a/pkgs/by-name/op/opencolorio/package.nix
+++ b/pkgs/by-name/op/opencolorio/package.nix
@@ -34,10 +34,11 @@ stdenv.mkDerivation rec {
# This test produces an invalid multi-line array in YAML, which is rejected
# by yaml-cpp 0.9.0.
+ # https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/2340
postPatch = ''
substituteInPlace tests/cpu/Config_tests.cpp --replace-fail \
'inactive_colorspaces: [cs1\t\n \n, \ncs2]\n' \
- 'inactive_colorspaces:\t\n \n - \t cs1\t\n\n \n -\tcs2\t \t\n'
+ 'inactive_colorspaces: [cs1\t\n \n , \n cs2]\n'
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
# these tests don't like being run headless on darwin. no builtin |
18ed4ab to
fb38a17
Compare
|
Thanks! |
|
spaghettikart also patches yaml like starship-sf64 |
fb38a17 to
1ff32c9
Compare
There was a problem hiding this comment.
Spot-testing:
nixpkgs-review result
Generated using nixpkgs-review.
Command: nixpkgs-review pr 560590 --package mongodb --package mir --package lomiri.qtmir --package lomiri.hfd-service --package lomiri-qt6.deviceinfo --package miriway --package calamares --package lomiri.lomiri-session --package qtcreator --package yaml-cpp --package openmw --package lomiri.deviceinfo --package mir_2_15 --package krita --package starship-sf64 --package miracle-wm --package lomiri.lomiri-system-settings --package freecad --package blender --package vtk --package lomiri.lomiri --package lomiri.lomiri-system-settings-unwrapped
Commit: fb38a17144532711c700752d3a9cbb8bfe66a979
x86_64-linux
✅ 22 packages built:
- blender
- calamares
- freecad
- krita
- lomiri-qt6.deviceinfo
- lomiri.deviceinfo
- lomiri.hfd-service
- lomiri.lomiri
- lomiri.lomiri-session
- lomiri.lomiri-system-settings
- lomiri.lomiri-system-settings-unwrapped
- lomiri.qtmir
- mir
- mir_2_15
- miracle-wm
- miriway
- mongodb
- openmw
- qtcreator
- starship-sf64
- vtk
- yaml-cpp
Also successfully built all of the above packages' .passthru.tests. As far as my storage permits me to test things, this seems functionally fine now.
starship-sf64 takes the *source* of yaml-cpp and plugs it into the build, so it applied a cmake 4 patches where it was previously necessary. now that we update to yaml-cpp 0.9.0, which builds with cmake 4 directly, this is no longer necessary.
spaghettikart takes the *source* of yaml-cpp and plugs it into the build, so it applied a cmake 4 patches where it was previously necessary. now that we update to yaml-cpp 0.9.0, which builds with cmake 4 directly, this is no longer necessary.
some of the tests produce invalid yaml, which is rejected by yaml-cpp 0.9.0. accordingly, we replace it with some of the correct syntax for a multiline array. Co-authored-by: OPNA2608 <opna2608@protonmail.com>
1ff32c9 to
cc677c6
Compare
There was a problem hiding this comment.
LGTM, hope this doesn't break anything that I was unable to test. (I also checked spaghettikart between the nixpkgs-review and this.)
Many thanks! 💚
(letting this sit for a week before hitting merge, in case anyone else sees/notices anything that still needs fixing)
|
thank you so much for the thorough reviews and testing! |
|
You're welcome! Thanks for putting up with all the back-and-forth. Hoping nothing that I wasn't able to |
changelog: https://github.com/jbeder/yaml-cpp/releases/tag/yaml-cpp-0.9.0
diff: jbeder/yaml-cpp@0.8.0...yaml-cpp-0.9.0
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.