Loading pkgs/servers/nosql/mongodb/7.0.nix +2 −2 Original line number Diff line number Diff line Loading @@ -21,8 +21,8 @@ let in buildMongoDB { inherit avxSupport; version = "7.0.25"; sha256 = "sha256-RAJg1uXGZKi9qOPvW9UK/j0JFTftL8YwGcE7YnZ4Tks="; version = "7.0.26"; sha256 = "sha256-731rmMz5C2cmOVKRWmT439uiRUW3kWQCz2/l/Ffk9zI="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: Loading pkgs/servers/nosql/mongodb/mongodb7-SConstruct.patch +2 −27 Original line number Diff line number Diff line diff --git a/SConstruct b/SConstruct index 07579349b83..68a26f26a49 100644 index 4ec07a36a51..0010dcb6d27 100644 --- a/SConstruct +++ b/SConstruct @@ -23,7 +23,6 @@ from pkg_resources import parse_version import SCons import SCons.Script -from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics from site_scons.mongo import build_profiles # This must be first, even before EnsureSConsVersion, if @@ -1653,16 +1652,6 @@ env = Environment(variables=env_vars, **envDict) del envDict env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption') -# The placement of this is intentional. Here we setup an atexit method to store tooling metrics. -# We should only register this function after env, env_vars and the parser have been properly initialized. -SConsToolingMetrics.register_metrics( - utc_starttime=datetime.utcnow(), - artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), - env_vars=env_vars, - env=env, - parser=_parser, -) - if get_option('build-metrics'): env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR' env.Tool('build_metrics') @@ -3549,33 +3538,6 @@ def doConfigure(myenv): @@ -3535,33 +3535,6 @@ def doConfigure(myenv): myenv.AddMethod( functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported") Loading Loading
pkgs/servers/nosql/mongodb/7.0.nix +2 −2 Original line number Diff line number Diff line Loading @@ -21,8 +21,8 @@ let in buildMongoDB { inherit avxSupport; version = "7.0.25"; sha256 = "sha256-RAJg1uXGZKi9qOPvW9UK/j0JFTftL8YwGcE7YnZ4Tks="; version = "7.0.26"; sha256 = "sha256-731rmMz5C2cmOVKRWmT439uiRUW3kWQCz2/l/Ffk9zI="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: Loading
pkgs/servers/nosql/mongodb/mongodb7-SConstruct.patch +2 −27 Original line number Diff line number Diff line diff --git a/SConstruct b/SConstruct index 07579349b83..68a26f26a49 100644 index 4ec07a36a51..0010dcb6d27 100644 --- a/SConstruct +++ b/SConstruct @@ -23,7 +23,6 @@ from pkg_resources import parse_version import SCons import SCons.Script -from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics from site_scons.mongo import build_profiles # This must be first, even before EnsureSConsVersion, if @@ -1653,16 +1652,6 @@ env = Environment(variables=env_vars, **envDict) del envDict env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption') -# The placement of this is intentional. Here we setup an atexit method to store tooling metrics. -# We should only register this function after env, env_vars and the parser have been properly initialized. -SConsToolingMetrics.register_metrics( - utc_starttime=datetime.utcnow(), - artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), - env_vars=env_vars, - env=env, - parser=_parser, -) - if get_option('build-metrics'): env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR' env.Tool('build_metrics') @@ -3549,33 +3538,6 @@ def doConfigure(myenv): @@ -3535,33 +3535,6 @@ def doConfigure(myenv): myenv.AddMethod( functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported") Loading