From 0db6ce3dd4cbe318a27490ffb114ece41dd83d89 Mon Sep 17 00:00:00 2001 From: yukkop Date: Wed, 2 Jul 2025 16:08:30 +0000 Subject: [PATCH] feat(package): update slpt --- buildPostgresqlExtension.nix | 4 ++-- flake.nix | 20 +++++++++++++++++++- package/slpt.nix | 4 ++-- result-man | 1 + 4 files changed, 24 insertions(+), 5 deletions(-) create mode 120000 result-man diff --git a/buildPostgresqlExtension.nix b/buildPostgresqlExtension.nix index 66c7db0..9ca4a88 100644 --- a/buildPostgresqlExtension.nix +++ b/buildPostgresqlExtension.nix @@ -57,7 +57,7 @@ # hooks run, this needs to be run in an override of `mkDerivation` and not in a setup hook. { lib, - clangStdenv, + stdenv, postgresql, nix-update-script, }: args: let @@ -137,4 +137,4 @@ + prevAttrs.postInstall or ""; }; in - clangStdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args)) + stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args)) diff --git a/flake.nix b/flake.nix index 043bd42..71cd533 100644 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,7 @@ postgresql = pkgs."postgresql_${versionSuffix}"; c-hectic = self.packages.${pkgs.system}.c-hectic; in buildPostgresqlExtension pkgs { + stdenv = pkgs.clangStdenv; inherit postgresql; } { pname = "hemar"; @@ -100,6 +101,7 @@ buildPlShExt = pkgs: versionSuffix: let version = "4.0"; in buildPostgresqlExtension pkgs { + stdenv = pkgs.clangStdenv; postgresql = pkgs."postgresql_${versionSuffix}"; } { pname = "plsh"; @@ -115,6 +117,7 @@ buildPlHaskellExt = pkgs: versionSuffix: let version = "4.0"; in buildPostgresqlExtension pkgs { + stdenv = pkgs.clangStdenv; postgresql = pkgs."postgresql_${versionSuffix}"; } { pname = "plhaskell"; @@ -125,11 +128,26 @@ rev = "d917f0991a455cf0558c2036e360ba1a9b40a8ef"; hash = "sha256-+sJmR/SCMfxxExa7GZuNmWez1dfhvlM9qOdO9gHNf74="; }; - nativeBuildInputs = with pkgs; [pkg-config curl ghc haskellPackages.hsc2hs haskellPackages.HSFFIG]; + preBuild = '' + last=$(pwd) + cd ${pkgs.haskellPackages.ghc} + include=$(dirname "${pkgs.haskellPackages.ghc}/$(find . -name HsFFI.h)") + ls $include + cd $last + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$include" + ''; + nativeBuildInputs = with pkgs; [ + pkg-config + curl + ghc + haskellPackages.hsc2hs + haskellPackages.ghc + ]; }; buildHttpExt = pkgs: versionSuffix: let version = "1.6.1"; in buildPostgresqlExtension pkgs { + stdenv = pkgs.clangStdenv; postgresql = pkgs."postgresql_${versionSuffix}"; } { pname = "http"; diff --git a/package/slpt.nix b/package/slpt.nix index 82122aa..56c5c09 100644 --- a/package/slpt.nix +++ b/package/slpt.nix @@ -2,7 +2,7 @@ src = fetchFromGitHub { owner = "nativerv"; repo = "slpt"; - rev = "6ce04bcf53e12518eb7abba193c72014557ec2c2"; - hash = "sha256-AZ8z8wR8xX9tYNM9sPb0Uqc0UHWebMbal8sNupWAbOI="; + rev = "8d70db4d8dfcd624ed49b9e6fb0ad449b6f25b89"; + hash = "sha256-sCHZsf7Y36iAesh7BeSxy9WhE/uQv13/VWmjlaVSEcU="; }; in writeShellScriptBin "slpt" (builtins.readFile "${src}/slpt") diff --git a/result-man b/result-man new file mode 120000 index 0000000..ceef440 --- /dev/null +++ b/result-man @@ -0,0 +1 @@ +/nix/store/914rqhi68mlykix1dd72rspwc5zmnj4g-postgresql-15.7-man \ No newline at end of file