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

Commits on Apr 5, 2020

  1. haskellPackages.persistent-postgresql: don't check 

    Test suite requires database. Disabling tests as is done for mysql backend.
    @turboMaCk
    turboMaCk committed Apr 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    turboMaCk Marek Fajkus
    GPG key ID: 95585219BA6FE2CC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    69996c8 View commit details

  2. Merge pull request #84272 from turboMaCk/persistent-postgresql 

    haskellPackages.persistent-postgresql: don't check
    @cdepillabout
    cdepillabout authored Apr 5, 2020

    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
    b0caf86 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +0 −1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1474,7 +1474,9 @@ self: super: {
vty = self.vty_5_28_2;
});

# Test suite requires database
persistent-mysql = dontCheck super.persistent-mysql;
persistent-postgresql = dontCheck super.persistent-postgresql;

# Fix EdisonAPI and EdisonCore for GHC 8.8:
# https://github.com/robdockins/edison/pull/16
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
@@ -8094,7 +8094,6 @@ broken-packages:
- persistent-migration
- persistent-mongoDB
- persistent-mysql-haskell
- persistent-postgresql
- persistent-protobuf
- persistent-ratelimit
- persistent-redis