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

Commits on Oct 30, 2019

  1. postgresql: Disable 2 failing tests on musl

    @nh2
    nh2 committed Oct 30, 2019
    Copy the full SHA
    09ffd72 View commit details

  2. Merge pull request #72019 from nh2/postgres-musl-test-failures 

    postgresql: Disable 2 failing tests on musl
    @nh2
    nh2 authored Oct 30, 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
    765c0e0 View commit details
Showing with 11 additions and 0 deletions.
  1. +11 −0 pkgs/servers/sql/postgresql/default.nix
11 changes: 11 additions & 0 deletions pkgs/servers/sql/postgresql/default.nix
View file
Original file line number Diff line number Diff line change
@@ -110,6 +110,17 @@ let
# autodetection doesn't seem to able to find this, but it's there.
checkTarget = "check";

preCheck =
# On musl, comment skip the following tests, because they break due to
# ! ERROR: could not load library "/build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so": Error loading shared library libpq.so.5: No such file or directory (needed by /build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so)
# See also here:
# https://git.alpinelinux.org/aports/tree/main/postgresql/disable-broken-tests.patch?id=6d7d32c12e073a57a9e5946e55f4c1fbb68bd442
if stdenv.hostPlatform.isMusl then ''
substituteInPlace src/test/regress/parallel_schedule \
--replace "subscription" "" \
--replace "object_address" ""
'' else null;

doInstallCheck = false; # needs a running daemon?

disallowedReferences = [ stdenv.cc ];