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

Commits on Oct 28, 2019

  1. polysemy-plugin: fix tests 

    - polysemy-plugin was broken due to failing doctests:
  #71164.
- I submitted a PR upstream to fix this:
  polysemy-research/polysemy#265.
- I've applied the patch of the PR here and moved the default
  "polysemy" attribute to "polysemy_1_2_0_0" because polysemy-plugin
  requires "polysemy >= 1.2.0.0".
- Move default "polysemy-zoo" attribute to "polysemy-zoo_0_6_0_1"
  because it is fixed by the polysemy-plugin changes and fixes issues
  with building "polysemy-RandomFu" and "knit-haskell".
- Removed packages no longer broken from
  "configuration-hackage2nix.yaml".
- Add cabal-doctest to setupDepends of polysemy-plugin.
    @sevanspowell
    sevanspowell committed Oct 28, 2019
    Copy the full SHA
    94455d0 View commit details

Commits on Oct 31, 2019

  1. Merge pull request #71967 from sevanspowell/feature/fix-polysemy-plugin 

    polysemy-plugin: fix tests
    @peti
    peti authored Oct 31, 2019

    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
    9b87ad0 View commit details
Showing with 16 additions and 8 deletions.
  1. +16 −3 pkgs/development/haskell-modules/configuration-common.nix
  2. +0 −5 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
19 changes: 16 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1272,9 +1272,22 @@ self: super: {
# upstream issue: https://github.com/vmchale/atspkg/issues/12
language-ats = dontCheck super.language-ats;

# polysemy has occasional test failures from what looks like buggy async tests.
# We think this will probably be fixed when updating to the polysemy version in LTS-15.
polysemy = dontCheck super.polysemy;
# polysemy-plugin requires polysemy >= 1.2.0.0
polysemy = self.polysemy_1_2_2_0;

# The polysemy-plugin tests failed because it couldn't find
# the polysemy-plugin package in the doctests:
# https://github.com/NixOS/nixpkgs/issues/71164
# I've addressed this with a PR upstream:
# https://github.com/polysemy-research/polysemy/pull/265
# the patch of which is applied here.
polysemy-plugin = appendPatch (addSetupDepend super.polysemy-plugin self.cabal-doctest) (pkgs.fetchpatch {
url = "https://github.com/polysemy-research/polysemy/pull/265.patch";
sha256 = "19237js70chq84w7vqgvj49n6bs9lp95k13ia3xzbr1r9yyrfkhq";
stripLen = 1;
});

polysemy-zoo = self.polysemy-zoo_0_6_0_1;

# https://github.com/Happstack/web-routes-th/pull/3
web-routes-th = doJailbreak super.web-routes-th;
5 changes: 0 additions & 5 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -3191,7 +3191,6 @@ broken-packages:
- aws-sign4
- aws-simple
- aws-sns
- axel
- axiom
- azubi
- azure-service-api
@@ -6701,7 +6700,6 @@ broken-packages:
- kmp-dfa
- knead
- knead-arithmetic
- knit-haskell
- knots
- koellner-phonetic
- kontra-config
@@ -8054,9 +8052,6 @@ broken-packages:
- polydata
- polydata-core
- polynomial
- polysemy-plugin
- polysemy-RandomFu
- polysemy-zoo
- polyseq
- polysoup
- polytypeable