3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
Maximilian Bosch be53a0f2ef sasview: fix build (#40433)
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.
2018-05-13 17:25:18 +02:00

14 lines
367 B
Diff

diff --git a/setup.py b/setup.py
index 866ab7e36..78727b276 100755
--- a/setup.py
+++ b/setup.py
@@ -401,7 +401,7 @@ package_data['sas.sasview'] = ['images/*',
packages.append("sas.sasview")
required = [
- 'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing>=2.0.0',
+ 'bumps>=0.7.5.9', 'periodictable>=1.5.0',
# 'lxml>=2.2.2',
'lxml', 'h5py',