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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 408d7aabb477
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f9f70446e90
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 20, 2021

  1. haskellPackages.dyre: fix build by removing out-dated patch and pulli… 

    …ng from upstream
    @cdepillabout
    cdepillabout committed May 20, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    cdepillabout Dennis Gosnell
    GPG key ID: 462E0C03D11422F4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8f9f704 View commit details
Showing with 12 additions and 27 deletions.
  1. +12 −2 pkgs/development/haskell-modules/configuration-nix.nix
  2. +0 −25 pkgs/development/haskell-modules/patches/dyre-nix.patch
14 changes: 12 additions & 2 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -259,8 +259,18 @@ self: super: builtins.intersectAttrs super {
'';
}));

# Patch to consider NIX_GHC just like xmonad does
dyre = appendPatch super.dyre ./patches/dyre-nix.patch;
dyre =
appendPatch
# dyre's tests appear to be trying to directly call GHC.
(dontCheck super.dyre)
# Dyre needs special support for reading the NIX_GHC env var. This is
# available upstream in https://github.com/willdonnelly/dyre/pull/43, but
# hasn't been released to Hackage as of dyre-0.9.1. Likely included in
# next version.
(pkgs.fetchpatch {
url = "https://github.com/willdonnelly/dyre/commit/c7f29d321aae343d6b314f058812dffcba9d7133.patch";
sha256 = "10m22k35bi6cci798vjpy4c2l08lq5nmmj24iwp0aflvmjdgscdb";
});

# https://github.com/edwinb/EpiVM/issues/13
# https://github.com/edwinb/EpiVM/issues/14
25 changes: 0 additions & 25 deletions pkgs/development/haskell-modules/patches/dyre-nix.patch
View file

This file was deleted.