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

Commits on Apr 14, 2020

  1. Unbreak hasql-pool in haskellPackages.

    Remo committed Apr 14, 2020
    Copy the full SHA
    a3b1760 View commit details

  2. Merge pull request #85206 from monacoremo/monacoremo-unbreak-hasql-pool 

    haskellPackages.hasql-pool: unbreak
    @cdepillabout
    cdepillabout authored Apr 14, 2020
    Copy the full SHA
    46dada3 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +0 −1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
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
@@ -1501,4 +1501,7 @@ self: super: {
# Fixed at head, but hasn't cut a release in awhile.
darcs = doJailbreak super.darcs;

# Test suite requires running a database server. Testing is done upstream.
hasql-pool = dontCheck super.hasql-pool;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -5621,7 +5621,6 @@ broken-packages:
- hasql-migration
- hasql-notifications
- hasql-optparse-applicative
- hasql-pool
- hasql-postgres
- hasql-postgres-options
- hasql-simple