talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

postgresql: drop build-time dependency on GHC

Browse Source 
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] https://github.com/NixOS/nixpkgs/pull/354270#issuecomment-2463196665
This commit is contained in:
Maximilian Bosch 2024-11-08 17:45:25 +01:00
parent 3e6cdbcf5d
commit 4cd083a3cd
No known key found for this signature in database
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/servers/sql/postgresql/generic.nix
View File

@ -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
@ -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";

2
pkgs/servers/sql/postgresql/pg_config.sh
View File

@ -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