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

Commits on Aug 19, 2019

  1. haskell: mark termonad and focuslist as unbroken

    @cdepillabout
    cdepillabout committed Aug 19, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 1EF0B522349E532F
    Learn about vigilant mode
    Copy the full SHA
    48857ff View commit details

  2. haskell: Run termonad tests

    @cdepillabout
    cdepillabout committed Aug 19, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 1EF0B522349E532F
    Learn about vigilant mode
    Copy the full SHA
    550ee2f View commit details

  3. Merge pull request #66858 from cdepillabout/mark-termonad-unbroken 

    haskell: mark termonad and focuslist as unbroken
    @infinisil
    infinisil authored Aug 19, 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
    b6a311c View commit details
Showing with 0 additions and 6 deletions.
  1. +0 −2 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
  2. +0 −4 pkgs/development/haskell-modules/configuration-nix.nix
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -4832,7 +4832,6 @@ broken-packages:
- fmark
- FModExRaw
- fn-extra
- focuslist
- foldl-incremental
- foldl-statistics
- folds-common
@@ -9463,7 +9462,6 @@ broken-packages:
- terminal-punch
- terminal-text
- termination-combinators
- termonad
- termplot
- terntup
- terrahs
4 changes: 0 additions & 4 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -531,10 +531,6 @@ self: super: builtins.intersectAttrs super {
librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
}));

# Doctests hang only when compiling with nix.
# https://github.com/cdepillabout/termonad/issues/15
termonad = dontCheck super.termonad;

# Expects z3 to be on path so we replace it with a hard
sbv = overrideCabal super.sbv (drv: {
postPatch = ''