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: 5b46af03e2bf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: adf16b1b9f7f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 24, 2020

  1. guid: fix compilation of Setup.hs and disable tests 

    guid: fix compilation of Setup.hs and disable tests

Add more docs

Remove guid from broken-packages
    @aycanirican
    aycanirican committed May 24, 2020
    Copy the full SHA
    74a6889 View commit details

Commits on May 25, 2020

  1. Merge pull request #88754 from aycanirican/fix_haskellPackages_guid 

    guid: fix compilation of Setup.hs and disable tests
    @cdepillabout
    cdepillabout authored May 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    adf16b1 View commit details
Showing with 8 additions and 1 deletion.
  1. +0 −1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
  2. +8 −0 pkgs/development/haskell-modules/configuration-nix.nix
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -5310,7 +5310,6 @@ broken-packages:
- gtksourceview3
- guarded-rewriting
- guess-combinator
- guid
- GuiHaskell
- GuiTV
- gulcii
8 changes: 8 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -761,4 +761,12 @@ self: super: builtins.intersectAttrs super {
rebase_1_6_1 = super.rebase_1_6_1.override {
selective = super.selective_0_4_1;
};

# Fix compilation of Setup.hs by removing the module declaration.
# See: https://github.com/tippenein/guid/issues/1
guid = overrideCabal (super.guid) (drv: {
prePatch = "sed -i '1d' Setup.hs"; # 1st line is module declaration, remove it
doCheck = false;
});

}