Skip to content

Commit

Permalink
postgresql: drop build-time dependency on GHC
Browse files Browse the repository at this point in the history
This replaces `writeShellApplication` with `writeShellScriptBin` that
doesn't perform a shellcheck. This makes it way easier to build
postgresql on staging since GHC is super slow to build, even with pretty
powerful machines.

Also Haskell updates are currently merged straight into master which
means that postgresql and all reverse dependencies require a rebuild on
master then[1].

[1] #354270 (comment)
  • Loading branch information
Ma27 committed Nov 8, 2024
1 parent 3e6cdbc commit 4cd083a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 2 additions & 5 deletions pkgs/servers/sql/postgresql/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let
, pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin
, linux-pam, bison, flex, perl, docbook_xml_dtd_45, docbook-xsl-nons, libxslt

, removeReferencesTo, writeShellApplication
, removeReferencesTo, writeShellScriptBin

, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs
, gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
Expand Down Expand Up @@ -53,10 +53,7 @@ let
else
stdenv;

pg_config = writeShellApplication {
name = "pg_config";
text = builtins.readFile ./pg_config.sh;
};
pg_config = writeShellScriptBin "pg_config" (builtins.readFile ./pg_config.sh);
in stdenv'.mkDerivation (finalAttrs: {
inherit version;
pname = pname + lib.optionalString jitSupport "-jit";
Expand Down
2 changes: 2 additions & 0 deletions pkgs/servers/sql/postgresql/pg_config.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
set -euo pipefail

# The real pg_config needs to be in the same path as the "postgres" binary
# to return proper paths. However, we want it in the -dev output to prevent
# cyclic references and to prevent blowing up the runtime closure. Thus, we
Expand Down

0 comments on commit 4cd083a

Please sign in to comment.