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: 06fc04dd910a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 990d041b539b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 27, 2020

  1. haskellPackages: remove obsolete overrides

    serversession: -dontCheck
    mockery: -dontCheck
    lzma-conduit: -dontCheck
    svmhdvn committed Jun 27, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    6518e33 View commit details

Commits on Jun 28, 2020

  1. Merge pull request #91651 from svmhdvn/overrides-6

    haskellPackages: cleaning up obsolete overrides (6/x)
    cdepillabout authored Jun 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    990d041 View commit details
Showing with 0 additions and 9 deletions.
  1. +0 −9 pkgs/development/haskell-modules/configuration-common.nix
9 changes: 0 additions & 9 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
@@ -510,21 +510,12 @@ self: super: {
inline-c-win32 = dontDistribute super.inline-c-win32;
Southpaw = dontDistribute super.Southpaw;

# https://github.com/yesodweb/serversession/issues/1
serversession = dontCheck super.serversession;

# Hydra no longer allows building texlive packages.
lhs2tex = dontDistribute super.lhs2tex;

# https://ghc.haskell.org/trac/ghc/ticket/9825
vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });

# https://github.com/hspec/mockery/issues/6
mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });

# https://github.com/alphaHeavy/lzma-conduit/issues/5
lzma-conduit = dontCheck super.lzma-conduit;

# https://github.com/kazu-yamamoto/logger/issues/42
logger = dontCheck super.logger;