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

Commits on Nov 27, 2018

  1. postgresql: disable parallel building on Darwin 

    There have been multiple reports of this failing.

Fixes #51093.
    @alyssais
    alyssais committed Nov 27, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c41c195 View commit details

Commits on Nov 28, 2018

  1. Merge pull request #51142 from alyssais/postgres_parallel 

    postgresql: disable parallel building on Darwin
    @Mic92
    Mic92 authored Nov 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c1ba7f4 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/servers/sql/postgresql/default.nix
2 changes: 1 addition & 1 deletion pkgs/servers/sql/postgresql/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ let
++ lib.optionals (atLeast "9.6" && !stdenv.isDarwin) [ systemd ]
++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];

enableParallelBuilding = true;
enableParallelBuilding = !stdenv.isDarwin;

makeFlags = [ "world" ];