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

Commits on Jan 2, 2018

  1. loosen version bounds for lzma test dependencies

    Test committed Jan 2, 2018
    Copy the full SHA
    6ea3749 View commit details

Commits on Jan 7, 2018

  1. reference issue in comment

    Allen Nelson committed Jan 7, 2018
    Copy the full SHA
    a4c8f60 View commit details

Commits on Jan 12, 2018

  1. Merge pull request #33360 from adnelson/unpin_lzma_versions 

    haskellPackages.lzma: loosen version bounds for test dependencies
    @peti
    peti authored Jan 12, 2018
    Copy the full SHA
    e277be1 View commit details
Showing with 16 additions and 0 deletions.
  1. +3 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +13 −0 pkgs/development/haskell-modules/patches/lzma-tests.patch
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -481,6 +481,9 @@ self: super: {
# https://github.com/alphaHeavy/lzma-enumerator/issues/3
lzma-enumerator = dontCheck super.lzma-enumerator;

# https://github.com/haskell-hvr/lzma/issues/8
lzma = appendPatch super.lzma ./patches/lzma-tests.patch;

# https://github.com/BNFC/bnfc/issues/140
BNFC = dontCheck super.BNFC;

13 changes: 13 additions & 0 deletions pkgs/development/haskell-modules/patches/lzma-tests.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- a/lzma.cabal
+++ b/lzma.cabal
@@ -70,8 +70,8 @@ test-suite lzma-tests
, base
, bytestring
-- additional dependencies that require version bounds
- build-depends: HUnit >= 1.2 && <1.4
- , QuickCheck >= 2.8 && <2.9
+ build-depends: HUnit >= 1.2 && <2
+ , QuickCheck >= 2.8 && <3
, tasty >= 0.10 && <0.12
, tasty-hunit == 0.9.*
, tasty-quickcheck >= 0.8.3.2 && < 0.9