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: 755710dbf538
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3625ce7a44f7
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Sep 13, 2018

  1. tamarin-prover: fix ghc 8.4 build (#46597) 

    See https://hydra.nixos.org/build/81125645

`tamarin-prover' upstream has a patch to fix GHC 8.4 compilation (and
uses stack lts-12.1 now), but it's not released yet:

tamarin-prover/tamarin-prover@a08f6e4

The build is divided in several derivations, therefore the patch had to
be splitted and rebased for `lib/term', `lib/theory' and `lib/utils' to
ensure that the patch applies properly during the `patchPhase'.

Addresses #45960

(cherry picked from commit 2cfc0bb)
    @Ma27 @xeji
    Ma27 authored and xeji committed Sep 13, 2018
    Copy the full SHA
    3625ce7 View commit details
    Browse the repository at this point in the history