forked from mirrors/nixpkgs
be53a0f2ef
The package breaks currently breaks with the following message: ``` fixed-output derivation produced path '/nix/store/5dh1mdj027ad8sprk12fqa5h5bpdxs5n-sasview' with sha256 hash '12k1w4yq1mzjxcp2cqb562c7cbwzhi54rsbmgi0fax0i1660q167' instead of the expected hash '05la54wwzzlkhmj8vkr0bvzagyib6z6mgwqbddzjs5y1wd48vpcx' ``` To fix the build the following changes were applied: * Switched to latest master for now as the older releases have a broken `py.test` configuration and altering hashes. * Added `checkPhase` which invokes `py.test` directly and drops duplicated files from `dist/tmpbuild`. * Rebased the patches `pyparsing-fix.patch` and `local_config.patch` for the latest master revision. Additionally refer to the discussion in #40381 for further reference.
23 lines
762 B
Diff
23 lines
762 B
Diff
diff --git a/src/sas/_config.py b/src/sas/_config.py
|
|
index ece08fd4c..926768593 100644
|
|
--- a/src/sas/_config.py
|
|
+++ b/src/sas/_config.py
|
|
@@ -67,8 +67,8 @@ def load_local_config(app_dir):
|
|
logger.info("GuiManager loaded %s", path)
|
|
return module
|
|
except Exception as exc:
|
|
- logger.critical("Error loading %s: %s", path, exc)
|
|
- sys.exit()
|
|
+ import sas.sasview.local_config
|
|
+ return sas.sasview.local_config
|
|
|
|
def make_custom_config_path(user_dir):
|
|
"""
|
|
@@ -116,4 +116,4 @@ def load_custom_config(path):
|
|
|
|
from sas.sasview import custom_config
|
|
logger.info("GuiManager custom_config defaults to sas.sasview.custom_config")
|
|
- return custom_config
|
|
\ No newline at end of file
|
|
+ return custom_config
|