-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
supercell-wx: init at 0.4.4 #316266
base: master
Are you sure you want to change the base?
supercell-wx: init at 0.4.4 #316266
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Build fails:
FAILED: wxdata/CMakeFiles/wxdata.dir/source/scwx/provider/aws_level3_data_provider.cpp.o
/nix/store/vh9fsdhgxcnab2qk7vdp2palkkn6j3cp-gcc-wrapper-13.3.0/bin/g++ -DFMT_SHARED -DONLY_C_LOCALE=0 -DSPDLOG_COMPILED_LIB -DSPDLOG_FMT_EXTERNAL -DSPDLOG_SHARED_LIB -DUSE_OS_TZDB=1 -I/build/source/external/hsluv-c/src -I/build/source/wxdata/inclu
de -I/build/source/wxdata/source -I/build/source/external/units/include -isystem /nix/store/x6y7max0zx622sp0p12wi4xzmg82jw08-libxml2-2.13.4-dev/include/libxml2 -DBOOST_ALL_NO_LIB -O3 -DNDEBUG -std=c++20 -Wall -Wextra -Wpedantic -Werror -g -MD -MT
wxdata/CMakeFiles/wxdata.dir/source/scwx/provider/aws_level3_data_provider.cpp.o -MF wxdata/CMakeFiles/wxdata.dir/source/scwx/provider/aws_level3_data_provider.cpp.o.d -o wxdata/CMakeFiles/wxdata.dir/source/scwx/provider/aws_level3_data_provider.c
pp.o -c /build/source/wxdata/source/scwx/provider/aws_level3_data_provider.cpp
In file included from /nix/store/0vsyw5bhwmisszyfd1a0sdnwvnf4qa5a-gcc-13.3.0/include/c++/13.3.0/chrono:41,
from /build/source/wxdata/include/scwx/provider/nexrad_data_provider.hpp:5,
from /build/source/wxdata/include/scwx/provider/aws_nexrad_data_provider.hpp:3,
from /build/source/wxdata/include/scwx/provider/aws_level3_data_provider.hpp:3,
from /build/source/wxdata/source/scwx/provider/aws_level3_data_provider.cpp:3:
In constructor 'constexpr std::chrono::duration<_Rep, _Period>::duration(const _Rep2&) [with _Rep2 = long double; <template-parameter-2-2> = void; _Rep = long double; _Period = std::ratio<1>]',
inlined from 'std::basic_istream<_CharT, _Traits>& date::from_stream(std::basic_istream<_CharT, _Traits>&, const CharT*, fields<Duration>&, std::__cxx11::basic_string<CharT, Traits, Alloc>*, std::chrono::minutes*) [with CharT = char; Traits =
std::char_traits<char>; Duration = std::chrono::duration<long int, std::ratio<1, 1000000000> >; Alloc = std::allocator<char>]' at /nix/store/4dm8l4hdhzm3bhiiixnp7wfa3wwps3c8-howard-hinnant-date-3.0.1-dev/include/date/date.h:7263:57,
inlined from 'std::basic_istream<_CharT, _Traits>& date::from_stream(std::basic_istream<_CharT, _Traits>&, const CharT*, sys_time<Duration>&, std::__cxx11::basic_string<CharT, Traits, Alloc>*, std::chrono::minutes*) [with Duration = std::chron
o::duration<long int, std::ratio<1, 1000000000> >; CharT = char; Traits = std::char_traits<char>; Alloc = std::allocator<char>]' at /nix/store/4dm8l4hdhzm3bhiiixnp7wfa3wwps3c8-howard-hinnant-date-3.0.1-dev/include/date/date.h:8010:16,
inlined from 'std::basic_istream<_CharT, _Traits>& date::operator>>(std::basic_istream<_CharT, _Traits>&, const parse_manip<Parsable, CharT, Traits, Alloc>&) [with Parsable = std::chrono::time_point<std::chrono::_V2::system_clock, std::chrono:
:duration<long int, std::ratio<1, 1000000000> > >; CharT = char; Traits = std::char_traits<char>; Alloc = std::allocator<char>]' at /nix/store/4dm8l4hdhzm3bhiiixnp7wfa3wwps3c8-howard-hinnant-date-3.0.1-dev/include/date/date.h:8080:23,
inlined from 'static std::chrono::_V2::system_clock::time_point scwx::provider::AwsLevel3DataProvider::GetTimePointFromKey(const std::string&)' at /build/source/wxdata/source/scwx/provider/aws_level3_data_provider.cpp:121:35:
/nix/store/0vsyw5bhwmisszyfd1a0sdnwvnf4qa5a-gcc-13.3.0/include/c++/13.3.0/bits/chrono.h:574:17: error: 'S' may be used uninitialized [-Werror=maybe-uninitialized]
574 | : __r(static_cast<rep>(__rep)) { }
| ^~~~~~~~~~~~~~~~~~~~~~~
In file included from /nix/store/4dm8l4hdhzm3bhiiixnp7wfa3wwps3c8-howard-hinnant-date-3.0.1-dev/include/date/tz.h:99,
from /build/source/wxdata/include/scwx/util/time.hpp:10,
from /build/source/wxdata/source/scwx/provider/aws_level3_data_provider.cpp:6:
/nix/store/4dm8l4hdhzm3bhiiixnp7wfa3wwps3c8-howard-hinnant-date-3.0.1-dev/include/date/date.h: In static member function 'static std::chrono::_V2::system_clock::time_point scwx::provider::AwsLevel3DataProvider::GetTimePointFromKey(const std::strin
g&)':
/nix/store/4dm8l4hdhzm3bhiiixnp7wfa3wwps3c8-howard-hinnant-date-3.0.1-dev/include/date/date.h:7261:37: note: 'S' declared here
7261 | long double S;
| ^
cc1plus: all warnings being treated as errors
By the way, I think one commit supercell-wx: init at 0.4.4
is sufficient for the package.
d9f8788
to
a3cf298
Compare
- commitString = commitString + "+dirty" | ||
- copyrightYear = datetime.date.today().year | ||
+ commitString = "@rev@" | ||
+ copyrightYear = datetime.date.today().year |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not reproducible. I suppose it doesn't matter much though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could just hard-code it to the year of the revision being built.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could also modify this script to read it from the LICENSE file. What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it's not too much effort, then yes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@FliegendeWurst I have updated this patch to read the copyright year from the license file.
+find_package(Boost REQUIRED COMPONENTS iostreams) | ||
+find_package(BZip2) | ||
find_package(cpr) | ||
find_package(LibXml2) | ||
find_package(re2) | ||
find_package(spdlog) | ||
+find_package(date) | ||
+find_package(OpenSSL COMPONENTS Crypto) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So.. how does upstream build without these libraries? Just wondering
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't - most of these are represented in the conanfile. BZip2
is acknowledged here but not explicitly tracked.
I bypassed the conanfile to bring in all the dependencies I could from Nix, and left alone some of the larger vendored dependencies (like maplibre-native-qt
). Some of these might be here to fix linker errors for that.
The explicit link against OpenSSL::Crypto
was to fix a linker error, but I could see that being a case of one of the Nix dependencies needing an withOpenSSL = true
override somewhere.
435433e
to
b2a9af1
Compare
aff8fd3
to
2a371da
Compare
698d3ad
to
e5aad45
Compare
curl, | ||
glew, | ||
geos, | ||
boost185, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
boost185, | |
boost, |
boost 1.85 was removed some time ago. New default version is 1.86 so it should work. Also replace below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've made the suggested change.
Build fails on x64 Linux. Note that ofborg (and my build) are done by first merging the PR on current master. To reproduce the failure you need to rebase your branch on master.
|
5f07890
to
153f063
Compare
It looks like this was a new warning for gcc 14 from the updated stdenv. The same warning is present in the nixpkgs However, it looks like a recent change to geographiclib (90b3a6a) which split the outputs has broken the project's integration with that library. Reverting the split outputs locally fixed it, but I will still investigate how to properly use the library in this new form. |
Hey @sikmir, the project added by this PR uses (geographiclib.overrideAttrs {
outputs = [ "out" ];
}) Without that change, using find_package(GeographicLib) in the project's cmake configuration produces this error:
I think this may be related to: #144170. |
6c50ffe
to
83d9bbe
Compare
I will take a look. |
Description of changes
Adds Supercell Wx at version 0.4.4.
Supercell Wx is a free, open source application to visualize live and archive NEXRAD Level 2 and Level 3 data, and severe weather alerts. It displays continuously updating weather data on top of a responsive map, providing the capability to monitor weather events using reflectivity, velocity, and other products. Extended functionality, including weather reports and lightning data can be added using placefiles.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.