style: ~apply alejandra

This commit is contained in:
zerosummed
2025-04-17 03:57:54 +03:00
parent 3dfe3d61f6
commit 29ff6989e5
7 changed files with 299 additions and 234 deletions

View File

@@ -26,16 +26,15 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
{
{ lib lib,
, cargo-pgrx cargo-pgrx,
, pkg-config pkg-config,
, rustPlatform rustPlatform,
, stdenv stdenv,
, Security Security,
, writeShellScriptBin writeShellScriptBin,
}: }:
# The idea behind: Use it mostly like rustPlatform.buildRustPackage and so # The idea behind: Use it mostly like rustPlatform.buildRustPackage and so
# we hand most of the arguments down. # we hand most of the arguments down.
# #
@@ -46,33 +45,29 @@
# If the generated rust bindings aren't needed to use the extension, its a # If the generated rust bindings aren't needed to use the extension, its a
# unnecessary and heavy dependency. If you set this to true, you also # unnecessary and heavy dependency. If you set this to true, you also
# have to add `rustfmt` to `nativeBuildInputs`. # have to add `rustfmt` to `nativeBuildInputs`.
{
{ buildAndTestSubdir ? null buildAndTestSubdir ? null,
, buildType ? "release" buildType ? "release",
, buildFeatures ? [ ] buildFeatures ? [],
, cargoBuildFlags ? [ ] cargoBuildFlags ? [],
, postgresql postgresql,
# cargo-pgrx calls rustfmt on generated bindings, this is not strictly necessary, so we avoid the # cargo-pgrx calls rustfmt on generated bindings, this is not strictly necessary, so we avoid the
# dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g. # dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g.
# if you include the generated code in the output via postInstall. # if you include the generated code in the output via postInstall.
, useFakeRustfmt ? true useFakeRustfmt ? true,
, usePgTestCheckFeature ? true usePgTestCheckFeature ? true,
, ... ...
} @ args: } @ args: let
let
rustfmtInNativeBuildInputs = lib.lists.any (dep: lib.getName dep == "rustfmt") (args.nativeBuildInputs or []); rustfmtInNativeBuildInputs = lib.lists.any (dep: lib.getName dep == "rustfmt") (args.nativeBuildInputs or []);
in in
assert lib.asserts.assertMsg ((args.installPhase or "") == "")
assert lib.asserts.assertMsg ((args.installPhase or "") == "")
"buildPgrxExtensions overwrites the installPhase, so providing one does nothing"; "buildPgrxExtensions overwrites the installPhase, so providing one does nothing";
assert lib.asserts.assertMsg ((args.buildPhase or "") == "") assert lib.asserts.assertMsg ((args.buildPhase or "") == "")
"buildPgrxExtensions overwrites the buildPhase, so providing one does nothing"; "buildPgrxExtensions overwrites the buildPhase, so providing one does nothing";
assert lib.asserts.assertMsg (useFakeRustfmt -> !rustfmtInNativeBuildInputs) assert lib.asserts.assertMsg (useFakeRustfmt -> !rustfmtInNativeBuildInputs)
"The parameter useFakeRustfmt is set to true, but rustfmt is included in nativeBuildInputs. Either set useFakeRustfmt to false or remove rustfmt from nativeBuildInputs."; "The parameter useFakeRustfmt is set to true, but rustfmt is included in nativeBuildInputs. Either set useFakeRustfmt to false or remove rustfmt from nativeBuildInputs.";
assert lib.asserts.assertMsg (!useFakeRustfmt -> rustfmtInNativeBuildInputs) assert lib.asserts.assertMsg (!useFakeRustfmt -> rustfmtInNativeBuildInputs)
"The parameter useFakeRustfmt is set to false, but rustfmt is not included in nativeBuildInputs. Either set useFakeRustfmt to true or add rustfmt from nativeBuildInputs."; "The parameter useFakeRustfmt is set to false, but rustfmt is not included in nativeBuildInputs. Either set useFakeRustfmt to true or add rustfmt from nativeBuildInputs."; let
let
fakeRustfmt = writeShellScriptBin "rustfmt" '' fakeRustfmt = writeShellScriptBin "rustfmt" ''
exit 0 exit 0
''; '';
@@ -97,19 +92,24 @@ let
pg_ctl stop pg_ctl stop
''; '';
argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" "usePgTestCheckFeature" ]; argsForBuildRustPackage = builtins.removeAttrs args ["postgresql" "useFakeRustfmt" "usePgTestCheckFeature"];
# so we don't accidentally `(rustPlatform.buildRustPackage argsForBuildRustPackage) // { ... }` because # so we don't accidentally `(rustPlatform.buildRustPackage argsForBuildRustPackage) // { ... }` because
# we forgot parentheses # we forgot parentheses
finalArgs = argsForBuildRustPackage // { finalArgs =
buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; argsForBuildRustPackage
// {
buildInputs = (args.buildInputs or []) ++ lib.optionals stdenv.hostPlatform.isDarwin [Security];
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ nativeBuildInputs =
(args.nativeBuildInputs or [])
++ [
cargo-pgrx cargo-pgrx
postgresql postgresql
pkg-config pkg-config
rustPlatform.bindgenHook rustPlatform.bindgenHook
] ++ lib.optionals useFakeRustfmt [ fakeRustfmt ]; ]
++ lib.optionals useFakeRustfmt [fakeRustfmt];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
@@ -155,7 +155,7 @@ let
RUST_BACKTRACE = "full"; RUST_BACKTRACE = "full";
checkNoDefaultFeatures = true; checkNoDefaultFeatures = true;
checkFeatures = (args.checkFeatures or [ ]) ++ (lib.optionals usePgTestCheckFeature [ "pg_test" ]) ++ [ "pg${pgrxPostgresMajor}" ]; checkFeatures = (args.checkFeatures or []) ++ (lib.optionals usePgTestCheckFeature ["pg_test"]) ++ ["pg${pgrxPostgresMajor}"];
}; };
in in
rustPlatform.buildRustPackage finalArgs rustPlatform.buildRustPackage finalArgs

133
flake.nix
View File

@@ -60,7 +60,7 @@
system, system,
pkgs, pkgs,
}: let }: let
pkgs-unstable = import nixpkgs-unstable { inherit system; }; pkgs-unstable = import nixpkgs-unstable {inherit system;};
in { in {
packages.${system} = let packages.${system} = let
rust = { rust = {
@@ -142,11 +142,11 @@
shells = self.devShells.${system}; shells = self.devShells.${system};
in { in {
c = pkgs.mkShell { c = pkgs.mkShell {
buildInputs = (with pkgs; [ inotify-tools gdb gcc ]) ++ (with self.packages.${system}; [ c-hectic nvim-pager watch ]); buildInputs = (with pkgs; [inotify-tools gdb gcc]) ++ (with self.packages.${system}; [c-hectic nvim-pager watch]);
PAGER = "${self.packages.${system}.nvim-pager}/bin/pager"; PAGER = "${self.packages.${system}.nvim-pager}/bin/pager";
}; };
postgres-c = pkgs.mkShell { postgres-c = pkgs.mkShell {
buildInputs = (with pkgs; [ inotify-tools postgresql_15 ]) ++ (with self.packages.${system}; [ nvim-pager ]) ++ (with pkgs-unstable; [ gdb gcc ]); buildInputs = (with pkgs; [inotify-tools postgresql_15]) ++ (with self.packages.${system}; [nvim-pager]) ++ (with pkgs-unstable; [gdb gcc]);
PAGER = "${self.packages.${system}.nvim-pager}/bin/pager"; PAGER = "${self.packages.${system}.nvim-pager}/bin/pager";
shellHook = '' shellHook = ''
@@ -155,7 +155,7 @@
''; '';
}; };
pure-c = pkgs.mkShell { pure-c = pkgs.mkShell {
buildInputs = (with pkgs; [ inotify-tools ]) ++ (with self.packages.${system}; [ nvim-pager ]) ++ (with pkgs-unstable; [ gdb gcc ]); buildInputs = (with pkgs; [inotify-tools]) ++ (with self.packages.${system}; [nvim-pager]) ++ (with pkgs-unstable; [gdb gcc]);
PAGER = "${self.packages.${system}.nvim-pager}/bin/pager"; PAGER = "${self.packages.${system}.nvim-pager}/bin/pager";
shellHook = '' shellHook = ''
@@ -204,17 +204,29 @@
modules = [ modules = [
self.nixosModules."preset.default" self.nixosModules."preset.default"
self.nixosModules."hardware.hetzner" self.nixosModules."hardware.hetzner"
({modulesPath, pkgs, ...}: { ({
modulesPath,
pkgs,
...
}: {
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
]; ];
users.users.root.openssh.authorizedKeys.keys = [ ]; users.users.root.openssh.authorizedKeys.keys = [];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(pkgs.writers.writeMinCBin "minc-hello-world" ["<stdio.h>"] /*c*/ '' (pkgs.writers.writeMinCBin "minc-hello-world" ["<stdio.h>"]
/*
c
*/
''
printf("hello world\n"); printf("hello world\n");
'') '')
(pkgs.writers.writeMinCBin "minc-env" ["<stdio.h>" "<stdlib.h>"] /*c*/ '' (pkgs.writers.writeMinCBin "minc-env" ["<stdio.h>" "<stdlib.h>"]
/*
c
*/
''
char *env_name; char *env_name;
if (argc > 1) { if (argc > 1) {
env_name = argv[1]; env_name = argv[1];
@@ -228,7 +240,11 @@
printf("Environment variable %s not found.\n", env_name); printf("Environment variable %s not found.\n", env_name);
} }
'') '')
(pkgs.writers.writeMinCBin "minc-env-check" ["<stdio.h>" "<stdlib.h>"] /*c*/ '' (pkgs.writers.writeMinCBin "minc-env-check" ["<stdio.h>" "<stdlib.h>"]
/*
c
*/
''
char *env_name; char *env_name;
if (argc > 1) { if (argc > 1) {
env_name = argv[1]; env_name = argv[1];
@@ -257,17 +273,17 @@
vmVariant = { vmVariant = {
systemd.services.fix-root-perms = { systemd.services.fix-root-perms = {
description = "Fix root directory permissions"; description = "Fix root directory permissions";
after = [ "local-fs.target" ]; after = ["local-fs.target"];
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${pkgs.coreutils}/bin/chmod 755 /"; ExecStart = "${pkgs.coreutils}/bin/chmod 755 /";
}; };
}; };
virtualisation = { virtualisation = {
diskSize = 1024*6; diskSize = 1024 * 6;
diskImage = null; diskImage = null;
forwardPorts = [ ]; forwardPorts = [];
}; };
}; };
}; };
@@ -279,7 +295,10 @@
}; };
}) })
]; ];
pkgs = import nixpkgs {inherit system; overlays = [ self.overlays.default ];}; pkgs = import nixpkgs {
inherit system;
overlays = [self.overlays.default];
};
}; };
}) })
// { // {
@@ -369,7 +388,7 @@
overlays.default = final: prev: ( overlays.default = final: prev: (
let let
version = "1.6.1"; version = "1.6.1";
pkgs-unstable = import nixpkgs-unstable { inherit (prev) system; }; pkgs-unstable = import nixpkgs-unstable {inherit (prev) system;};
buildPgrxExtension = buildPgrxExtension =
prev.callPackage (import (builtins.path { prev.callPackage (import (builtins.path {
@@ -380,8 +399,7 @@
inherit (pkgs-unstable.darwin.apple_sdk.frameworks) Security; inherit (pkgs-unstable.darwin.apple_sdk.frameworks) Security;
}; };
buildPostgresqlExtension = buildPostgresqlExtension = prev.callPackage (import (builtins.path {
prev.callPackage (import (builtins.path {
name = "extension-builder"; name = "extension-builder";
path = ./buildPostgresqlExtension.nix; path = ./buildPostgresqlExtension.nix;
})); }));
@@ -402,7 +420,7 @@
inherit src postgresql; inherit src postgresql;
buildInputs = with prev; [ openssl ]; buildInputs = with prev; [openssl];
cargoHash = "sha256-AbLT7vcFV89zwZIaTC1ELat9l4UeNP8Bn9QMMOms1Co="; cargoHash = "sha256-AbLT7vcFV89zwZIaTC1ELat9l4UeNP8Bn9QMMOms1Co=";
@@ -410,7 +428,8 @@
}; };
buildPlHaskellExt = versionSuffix: let buildPlHaskellExt = versionSuffix: let
version = "4.0"; version = "4.0";
in buildPostgresqlExtension { in
buildPostgresqlExtension {
postgresql = prev."postgresql_${versionSuffix}"; postgresql = prev."postgresql_${versionSuffix}";
} { } {
pname = "plhaskell"; pname = "plhaskell";
@@ -439,36 +458,61 @@
}; };
in { in {
hectic = self.packages.${prev.system}; hectic = self.packages.${prev.system};
postgresql_17 = prev.postgresql_17 // {pkgs = prev.postgresql_17.pkgs // { postgresql_17 =
prev.postgresql_17
// {
pkgs =
prev.postgresql_17.pkgs
// {
http = buildHttpExt "17"; http = buildHttpExt "17";
pg_smtp_client = buildSmtpExt "17"; pg_smtp_client = buildSmtpExt "17";
plhaskell = buildPlHaskellExt "15"; plhaskell = buildPlHaskellExt "15";
postgreact = prev.callPackage ./package/c/postgreact/default.nix { postgresql = prev.postgresql_17; }; postgreact = prev.callPackage ./package/c/postgreact/default.nix {postgresql = prev.postgresql_17;};
};}; };
postgresql_16 = prev.postgresql_16 // {pkgs = prev.postgresql_16.pkgs // { };
postgresql_16 =
prev.postgresql_16
// {
pkgs =
prev.postgresql_16.pkgs
// {
http = buildHttpExt "16"; http = buildHttpExt "16";
pg_smtp_client = buildSmtpExt "16"; pg_smtp_client = buildSmtpExt "16";
plhaskell = buildPlHaskellExt "15"; plhaskell = buildPlHaskellExt "15";
postgreact = prev.callPackage ./package/c/postgreact/default.nix { postgresql = prev.postgresql_16; }; postgreact = prev.callPackage ./package/c/postgreact/default.nix {postgresql = prev.postgresql_16;};
};}; };
postgresql_15 = prev.postgresql_15 // {pkgs = prev.postgresql_15.pkgs // { };
postgresql_15 =
prev.postgresql_15
// {
pkgs =
prev.postgresql_15.pkgs
// {
http = buildHttpExt "15"; http = buildHttpExt "15";
pg_smtp_client = buildSmtpExt "15"; pg_smtp_client = buildSmtpExt "15";
plhaskell = buildPlHaskellExt "15"; plhaskell = buildPlHaskellExt "15";
postgreact = prev.callPackage ./package/c/postgreact/default.nix { postgresql = prev.postgresql_15; }; postgreact = prev.callPackage ./package/c/postgreact/default.nix {postgresql = prev.postgresql_15;};
};}; };
postgresql_14 = prev.postgresql_14 // {pkgs = prev.postgresql_14.pkgs // { };
postgresql_14 =
prev.postgresql_14
// {
pkgs =
prev.postgresql_14.pkgs
// {
http = buildHttpExt "14"; http = buildHttpExt "14";
pg_smtp_client = buildSmtpExt "14"; pg_smtp_client = buildSmtpExt "14";
plhaskell = buildPlHaskellExt "15"; plhaskell = buildPlHaskellExt "15";
postgreact = prev.callPackage ./package/c/postgreact/default.nix { postgresql = prev.postgresql_14; }; postgreact = prev.callPackage ./package/c/postgreact/default.nix {postgresql = prev.postgresql_14;};
};}; };
};
writers = let writers = let
writeC = writeC = name: argsOrScript:
name: argsOrScript: if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript
if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then then
prev.writers.makeBinWriter ( prev.writers.makeBinWriter (
argsOrScript // { argsOrScript
// {
compileScript = '' compileScript = ''
# Force gcc to treat the input file as C code # Force gcc to treat the input file as C code
${prev.gcc}/bin/gcc -fsyntax-only -xc $contentPath ${prev.gcc}/bin/gcc -fsyntax-only -xc $contentPath
@@ -479,7 +523,8 @@
${prev.gcc}/bin/gcc -xc -o $out $contentPath ${prev.gcc}/bin/gcc -xc -o $out $contentPath
''; '';
} }
) name )
name
else else
prev.writers.makeBinWriter { prev.writers.makeBinWriter {
compileScript = '' compileScript = ''
@@ -491,9 +536,10 @@
fi fi
${prev.gcc}/bin/gcc -xc -o $out $contentPath ${prev.gcc}/bin/gcc -xc -o $out $contentPath
''; '';
} name argsOrScript; }
writeMinC = name
name: includes: body: argsOrScript;
writeMinC = name: includes: body:
writeC name '' writeC name ''
${builtins.concatStringsSep "\n" (map (h: "#include " + h) includes)} ${builtins.concatStringsSep "\n" (map (h: "#include " + h) includes)}
@@ -501,7 +547,9 @@
${body} ${body}
} }
''; '';
in prev.writers // { in
prev.writers
// {
writeCBin = name: writeC "/bin/${name}"; writeCBin = name: writeC "/bin/${name}";
writeC = writeC; writeC = writeC;
writeMinCBin = name: includes: body: writeMinC "/bin/${name}" includes body; writeMinCBin = name: includes: body: writeMinC "/bin/${name}" includes body;
@@ -513,7 +561,10 @@
# -- For all systems -- # -- For all systems --
inherit dotEnv minorEnvironment parseEnv forAllSystemsWithPkgs forSpecSystemsWithPkgs; inherit dotEnv minorEnvironment parseEnv forAllSystemsWithPkgs forSpecSystemsWithPkgs;
readEnvironment = { envVarsToRead, prefix ? "" }: readEnvironment = {
envVarsToRead,
prefix ? "",
}:
builtins.listToAttrs builtins.listToAttrs
(map (name: { (map (name: {
inherit name; inherit name;

View File

@@ -1,12 +1,17 @@
{ stdenv, gcc, lib, bash, inotify-tools }: {
stdenv,
gcc,
lib,
bash,
inotify-tools,
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "hectic"; pname = "hectic";
version = "1.0"; version = "1.0";
src = ./.; src = ./.;
doCheck = true; doCheck = true;
nativeBuildInputs = [ gcc inotify-tools ]; nativeBuildInputs = [gcc inotify-tools];
buildPhase = '' buildPhase = ''
ls ls

View File

@@ -4,7 +4,6 @@
postgresql, postgresql,
... ...
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "postgreact"; pname = "postgreact";
version = "0.1"; version = "0.1";
@@ -36,6 +35,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/yukkop/util.nix"; homepage = "https://github.com/yukkop/util.nix";
license = licenses.mit; license = licenses.mit;
platforms = postgresql.meta.platforms; platforms = postgresql.meta.platforms;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [];
}; };
} }

View File

@@ -1,12 +1,17 @@
{ stdenv, gcc, lib, bash, c-hectic }: {
stdenv,
gcc,
lib,
bash,
c-hectic,
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "prettify"; pname = "prettify";
version = "1.0"; version = "1.0";
src = ./.; src = ./.;
doCheck = false; doCheck = false;
nativeBuildInputs = [ gcc c-hectic ]; nativeBuildInputs = [gcc c-hectic];
buildPhase = '' buildPhase = ''
ls ls

View File

@@ -1,12 +1,17 @@
{ stdenv, gcc, lib, bash, gdb }: {
stdenv,
gcc,
lib,
bash,
gdb,
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "watch"; pname = "watch";
version = "1.0"; version = "1.0";
src = ./.; src = ./.;
doCheck = false; doCheck = false;
nativeBuildInputs = [ gcc gdb ]; nativeBuildInputs = [gcc gdb];
buildPhase = '' buildPhase = ''
${bash}/bin/sh ./make.sh build ${bash}/bin/sh ./make.sh build

View File

@@ -16,7 +16,7 @@ in
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
buildInputs = [ postgresql_15 ]; buildInputs = [postgresql_15];
doCheck = true; doCheck = true;
} }