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

Commits on Oct 24, 2019

  1. LTS Haskell 14.11

    @peti
    peti committed Oct 24, 2019
    Copy the full SHA
    0d47fe8 View commit details

  2. hackage2nix: disable broken builds to fix evaluation on Hydra

    @peti
    peti committed Oct 24, 2019
    Copy the full SHA
    38fc43e View commit details

  3. haskellPackages.grammatical-parsers: mark unbroken 

    I did see a timeout in the test suite, in the mconcat property test
provided by checkers, but lost the seed.
    @endgame @peti
    endgame authored and peti committed Oct 24, 2019
    Copy the full SHA
    1fc7dea View commit details

  4. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.15.0-6-g12ceeb2 from Hackage revision
commercialhaskell/all-cabal-hashes@d7308f3.
    @peti
    peti committed Oct 24, 2019
    Copy the full SHA
    d604960 View commit details

  5. haskell-dhall: update overrides for the latest version

    @peti
    peti committed Oct 24, 2019
    Copy the full SHA
    7dcc5c7 View commit details

  6. haskellPackages.language-ats: dontCheck

    @turboMaCk @peti
    turboMaCk authored and peti committed Oct 24, 2019
    Copy the full SHA
    35f1e57 View commit details

  7. haskellPackages.polysemy: mark dontCheck

    @cdepillabout
    cdepillabout committed Oct 24, 2019
    Copy the full SHA
    c41bbef View commit details

  8. Merge pull request #71944 from cdepillabout/disable-polysemy-tests 

    haskellPackages.polysemy: disable polysemy tests
    @peti
    peti authored Oct 24, 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
    b80d357 View commit details

  9. haskell-polysemy: remove 'broken' marker; the package now builds

    @peti
    peti committed Oct 24, 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
    40c944f View commit details

  10. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.15.0-6-g12ceeb2 from Hackage revision
commercialhaskell/all-cabal-hashes@d7308f3.
    @peti
    peti committed Oct 24, 2019
    Copy the full SHA
    c822db3 View commit details
13 changes: 10 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1048,7 +1048,7 @@ self: super: {
generateOptparseApplicativeCompletion "dhall" (
dontCheck super.dhall
);
dhall_1_26_1 = dontCheck super.dhall_1_26_1;
dhall_1_27_0 = dontCheck super.dhall_1_27_0;


# Missing test files in source distribution, fixed once 1.4.0 is bumped
@@ -1202,8 +1202,8 @@ self: super: {
temporary-resourcet = doJailbreak super.temporary-resourcet;

# Requires dhall >= 1.23.0
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_1; };
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_1; };
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_27_0; };
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_27_0; };

# Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11
@@ -1269,4 +1269,11 @@ 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;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
Loading