hectic-lab/util.nix
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(package): update slpt

Browse Source
This commit is contained in:
yukkop
2025-07-02 16:08:30 +00:00
parent 2c16cebf9a
commit 0db6ce3dd4
4 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildPostgresqlExtension.nix
View File

@@ -57,7 +57,7 @@
# hooks run, this needs to be run in an override of `mkDerivation` and not in a setup hook. # hooks run, this needs to be run in an override of `mkDerivation` and not in a setup hook.
{ {
lib, lib,
clangStdenv, stdenv,
postgresql, postgresql,
nix-update-script, nix-update-script,
}: args: let }: args: let
@@ -137,4 +137,4 @@
+ prevAttrs.postInstall or ""; + prevAttrs.postInstall or "";
}; };
in in
clangStdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args)) stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args))

20
flake.nix
View File

@@ -53,6 +53,7 @@
postgresql = pkgs."postgresql_${versionSuffix}"; postgresql = pkgs."postgresql_${versionSuffix}";
c-hectic = self.packages.${pkgs.system}.c-hectic; c-hectic = self.packages.${pkgs.system}.c-hectic;
in buildPostgresqlExtension pkgs { in buildPostgresqlExtension pkgs {
stdenv = pkgs.clangStdenv;
inherit postgresql; inherit postgresql;
} { } {
pname = "hemar"; pname = "hemar";
@@ -100,6 +101,7 @@
buildPlShExt = pkgs: versionSuffix: let buildPlShExt = pkgs: versionSuffix: let
version = "4.0"; version = "4.0";
in buildPostgresqlExtension pkgs { in buildPostgresqlExtension pkgs {
stdenv = pkgs.clangStdenv;
postgresql = pkgs."postgresql_${versionSuffix}"; postgresql = pkgs."postgresql_${versionSuffix}";
} { } {
pname = "plsh"; pname = "plsh";
@@ -115,6 +117,7 @@
buildPlHaskellExt = pkgs: versionSuffix: let buildPlHaskellExt = pkgs: versionSuffix: let
version = "4.0"; version = "4.0";
in buildPostgresqlExtension pkgs { in buildPostgresqlExtension pkgs {
stdenv = pkgs.clangStdenv;
postgresql = pkgs."postgresql_${versionSuffix}"; postgresql = pkgs."postgresql_${versionSuffix}";
} { } {
pname = "plhaskell"; pname = "plhaskell";
@@ -125,11 +128,26 @@
rev = "d917f0991a455cf0558c2036e360ba1a9b40a8ef"; rev = "d917f0991a455cf0558c2036e360ba1a9b40a8ef";
hash = "sha256-+sJmR/SCMfxxExa7GZuNmWez1dfhvlM9qOdO9gHNf74="; 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 buildHttpExt = pkgs: versionSuffix: let
version = "1.6.1"; version = "1.6.1";
in buildPostgresqlExtension pkgs { in buildPostgresqlExtension pkgs {
stdenv = pkgs.clangStdenv;
postgresql = pkgs."postgresql_${versionSuffix}"; postgresql = pkgs."postgresql_${versionSuffix}";
} { } {
pname = "http"; pname = "http";

4
package/slpt.nix
View File

@@ -2,7 +2,7 @@
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nativerv"; owner = "nativerv";
repo = "slpt"; repo = "slpt";
rev = "6ce04bcf53e12518eb7abba193c72014557ec2c2"; rev = "8d70db4d8dfcd624ed49b9e6fb0ad449b6f25b89";
hash = "sha256-AZ8z8wR8xX9tYNM9sPb0Uqc0UHWebMbal8sNupWAbOI="; hash = "sha256-sCHZsf7Y36iAesh7BeSxy9WhE/uQv13/VWmjlaVSEcU=";
}; };
in writeShellScriptBin "slpt" (builtins.readFile "${src}/slpt") in writeShellScriptBin "slpt" (builtins.readFile "${src}/slpt")

1
result-man Symbolic link
View File

@@ -0,0 +1 @@
/nix/store/914rqhi68mlykix1dd72rspwc5zmnj4g-postgresql-15.7-man