Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
572133a941 | ||
|
|
ed721dd961 |
@@ -56,7 +56,7 @@
|
|||||||
"-L" "${cfg.dataDir}/logs/bootstrap.log"
|
"-L" "${cfg.dataDir}/logs/bootstrap.log"
|
||||||
] ++ lib.optional (!cfg.caseSensitive) "-C1";
|
] ++ lib.optional (!cfg.caseSensitive) "-C1";
|
||||||
|
|
||||||
initScript = pkgs.writeShellScript "p4d-init" ''
|
initScript = ''
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
export P4ROOT=${lib.escapeShellArg cfg.dataDir}
|
export P4ROOT=${lib.escapeShellArg cfg.dataDir}
|
||||||
@@ -334,7 +334,7 @@ in {
|
|||||||
after = [ "network-online.target" ];
|
after = [ "network-online.target" ];
|
||||||
wants = [ "network-online.target" ];
|
wants = [ "network-online.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
preStart = builtins.readFile initScript;
|
preStart = initScript;
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
User = serviceUser;
|
User = serviceUser;
|
||||||
|
|||||||
+2
-3
@@ -25,11 +25,10 @@
|
|||||||
rev = "6ff3b71e3705e0d4081a51c21ca0379e869ba5fb";
|
rev = "6ff3b71e3705e0d4081a51c21ca0379e869ba5fb";
|
||||||
hash = "sha256-wC/2rAsSDO83UITaFhtaf3do3aaOAko4gnKUOzwURc8=";
|
hash = "sha256-wC/2rAsSDO83UITaFhtaf3do3aaOAko4gnKUOzwURc8=";
|
||||||
};
|
};
|
||||||
cargo = self.lib.cargoToml src;
|
|
||||||
in
|
in
|
||||||
buildPgrxExtension pkgs {
|
buildPgrxExtension pkgs {
|
||||||
pname = cargo.package.name;
|
pname = "pg_smtp_client";
|
||||||
version = cargo.package.version;
|
version = "0.2.0";
|
||||||
|
|
||||||
inherit src postgresql;
|
inherit src postgresql;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
{ system, inputs, self, pkgs }:
|
{ system, inputs, self, pkgs }:
|
||||||
|
let
|
||||||
|
smtpPackages = map
|
||||||
|
(version: self.packages.${system}."pg-${version}-ext-smtp-client")
|
||||||
|
[ "15" "16" "17" ];
|
||||||
|
in
|
||||||
(import ./migrator { inherit system inputs self pkgs; }) //
|
(import ./migrator { inherit system inputs self pkgs; }) //
|
||||||
(import ./hemar { inherit system inputs self pkgs; }) //
|
(import ./hemar { inherit system inputs self pkgs; }) //
|
||||||
(import (./. + "/sentinèlla") { inherit system inputs self pkgs; }) //
|
(import (./. + "/sentinèlla") { inherit system inputs self pkgs; }) //
|
||||||
@@ -7,4 +12,12 @@
|
|||||||
(import ./with-attic-cache { inherit system inputs self pkgs; }) //
|
(import ./with-attic-cache { inherit system inputs self pkgs; }) //
|
||||||
(import ./element-web { inherit system inputs self pkgs; }) //
|
(import ./element-web { inherit system inputs self pkgs; }) //
|
||||||
(import ./linux-devshell { inherit system inputs self pkgs; }) //
|
(import ./linux-devshell { inherit system inputs self pkgs; }) //
|
||||||
(import ./windows-devshell { inherit system inputs self pkgs; })
|
(import ./windows-devshell { inherit system inputs self pkgs; }) //
|
||||||
|
{
|
||||||
|
pg-smtp-client-metadata =
|
||||||
|
assert builtins.all (package: package.pname == "pg_smtp_client") smtpPackages;
|
||||||
|
assert builtins.all (package: package.version == "0.2.0") smtpPackages;
|
||||||
|
pkgs.runCommand "pg-smtp-client-metadata" {} ''
|
||||||
|
touch "$out"
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user