Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 8712ea5ccf70
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: be53a0f2effc
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on May 13, 2018

  1. 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.
    @Ma27 @xeji
    Ma27 authored and xeji committed May 13, 2018
    Copy the full SHA
    be53a0f View commit details
    Browse the repository at this point in the history