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

style: format (alejandra)

Browse Source
This commit is contained in:
zerosummed
2025-02-14 21:06:51 +03:00
parent 70021da132
commit e1c484b1c0
14 changed files with 363 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
buildPostgresqlExtension.nix
View File

@@ -55,29 +55,20 @@
# This last approach is the one we're taking in this file. To make sure the removal of the
# nested nix/store happens immediately after the installPhase, before any other postInstall
# hooks run, this needs to be run in an override of `mkDerivation` and not in a setup hook.
{
lib,
stdenv,
postgresql,
nix-update-script,
}:
args:
let
buildPostgresqlExtension =
finalAttrs:
{
enableUpdateScript ? true,
...
}@prevAttrs:
{
}: args: let
buildPostgresqlExtension = finalAttrs: {enableUpdateScript ? true, ...} @ prevAttrs: {
passthru =
prevAttrs.passthru or { }
prevAttrs.passthru
or {}
// lib.optionalAttrs enableUpdateScript {
updateScript =
prevAttrs.passthru.updateScript or (nix-update-script (
prevAttrs.passthru.updateScript
or (nix-update-script (
lib.optionalAttrs (lib.hasInfix "unstable" prevAttrs.version) {
extraArgs = ["--version=branch"];
}
@@ -86,9 +77,11 @@ let
buildInputs = [postgresql] ++ prevAttrs.buildInputs or [];
installFlags = [
installFlags =
[
"DESTDIR=${placeholder "out"}"
] ++ prevAttrs.installFlags or [ ];
]
++ prevAttrs.installFlags or [];
postInstall =
''

138
flake.nix
View File

@@ -10,24 +10,31 @@
};
};
outputs = { self, nixpkgs, rust-overlay }:
let
outputs = {
self,
nixpkgs,
rust-overlay,
}: let
lib = nixpkgs.lib;
recursiveUpdate = lib.recursiveUpdate;
supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin"];
forSpecSystemsWithPkgs = supportedSystems: pkgOverlays: f:
builtins.foldl' (acc: system:
let
builtins.foldl' (
acc: system: let
pkgs = import nixpkgs {
inherit system;
overlays = pkgOverlays;
};
systemOutputs = f { system = system; pkgs = pkgs; };
systemOutputs = f {
system = system;
pkgs = pkgs;
};
in
recursiveUpdate acc systemOutputs
) {} supportedSystems;
) {}
supportedSystems;
forAllSystemsWithPkgs = pkgOverlays: f: forSpecSystemsWithPkgs supportedSystems pkgOverlays f;
@@ -37,22 +44,20 @@
dotEnv = builtins.getEnv "DOTENV";
minorEnvironment =
if dotEnv != "" then
if builtins.pathExists dotEnv then
parseEnv dotEnv
else
throw "${dotEnv} file not exist"
else
if builtins.pathExists ./.env then
parseEnv ./.env
else
{};
if dotEnv != ""
then
if builtins.pathExists dotEnv
then parseEnv dotEnv
else throw "${dotEnv} file not exist"
else if builtins.pathExists ./.env
then parseEnv ./.env
else {};
in
forAllSystemsWithPkgs [ (import rust-overlay) ] ({ system, pkgs }:
{
packages.${system} =
let
forAllSystemsWithPkgs [(import rust-overlay)] ({
system,
pkgs,
}: {
packages.${system} = let
rust = {
nativeBuildInputs = [
pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default
@@ -63,8 +68,7 @@
inherit (rust) nativeBuildInputs;
};
};
in
{
in {
nvim-alias = pkgs.callPackage ./package/nvim-alias.nix {};
bolt-unpack = pkgs.callPackage ./package/bolt-unpack.nix {};
nvim-pager = pkgs.callPackage ./package/nvim-pager.nix {};
@@ -81,17 +85,17 @@
};
};
devShells.${system} =
let
devShells.${system} = let
shells = self.devShells.${system};
in
{
in {
default = pkgs.mkShell {
buildInputs = (with self.packages.${system}; [
buildInputs =
(with self.packages.${system}; [
nvim-alias
#prettify-log
nvim-pager
]) ++ (with pkgs; [
])
++ (with pkgs; [
git
jq
yq-go
@@ -101,28 +105,32 @@
# environment
PAGER = "${self.packages.${system}.nvim-pager}/bin/pager";
};
rust =
let
rustToolchain = if builtins.pathExists ./rust-toolchain.toml then
pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml
else
pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default;
rust = let
rustToolchain =
if builtins.pathExists ./rust-toolchain.toml
then pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml
else pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default;
in
shells.default //
(pkgs.mkShell {
shells.default
// (pkgs.mkShell {
nativeBuildInputs = [
rustToolchain
pkgs.pkg-config
];
});
haskell = shells.default // (pkgs.mkShell {
haskell =
shells.default
// (pkgs.mkShell {
buildInputs = [pkgs.stack];
});
};
nixosModules.${system} = {
"preset.default" = { pkgs, modulesPath, ... }: {
"preset.default" = {
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
@@ -144,7 +152,11 @@
"-vga qxl"
];
forwardPorts = [
{ from = "host"; host.port = 40500; guest.port = 22; }
{
from = "host";
host.port = 40500;
guest.port = 22;
}
];
};
@@ -162,13 +174,15 @@
environment = {
defaultPackages = [];
systemPackages = (with pkgs; [
systemPackages =
(with pkgs; [
curl
neovim
yq-go
jq
htop-vim
]) ++ (with self.packages.${system}; [
])
++ (with self.packages.${system}; [
prettify-log
nvim-pager
]);
@@ -177,7 +191,6 @@
};
};
system.stateVersion = "24.11";
};
"hardware.hetzner" = {...}: {
@@ -189,12 +202,15 @@
"vmw_pvscsi"
];
boot.initrd.kernelModules = ["nvme"];
fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
fileSystems."/" = {
device = "/dev/sda1";
fsType = "ext4";
};
};
}) // {
overlays.default =
final: prev: (
};
})
// {
overlays.default = final: prev: (
let
version = "1.6.1";
buildHttpExt = versionSuffix: let
@@ -205,7 +221,8 @@
})) {
postgresql = prev."postgresql_${versionSuffix}";
};
in buildPostgresqlExtension {
in
buildPostgresqlExtension {
pname = "http";
inherit version;
src = prev.fetchFromGitHub {
@@ -216,32 +233,35 @@
};
nativeBuildInputs = with prev; [pkg-config curl];
};
in
{
in {
hectic = self.packages.${prev.system};
postgresql_17 = prev.postgresql_17 // {pkgs = prev.postgresql_17.pkgs // {http = buildHttpExt "17";};};
postgresql_16 = prev.postgresql_16 // {pkgs = prev.postgresql_16.pkgs // {http = buildHttpExt "16";};};
postgresql_15 = prev.postgresql_15 // {pkgs = prev.postgresql_15.pkgs // {http = buildHttpExt "15";};};
postgresql_14 = prev.postgresql_14 // {pkgs = prev.postgresql_14.pkgs // {http = buildHttpExt "14";};};
});
}
);
lib = {
# -- For all systems --
inherit dotEnv minorEnvironment parseEnv forAllSystemsWithPkgs forSpecSystemsWithPkgs;
makeEnvironment = envVars:
builtins.listToAttrs
(map (name: { inherit name; value = self.lib.getEnv name; }) envVars);
(map (name: {
inherit name;
value = self.lib.getEnv name;
})
envVars);
# -- Env processing --
getEnv = varName: let
var = builtins.getEnv varName;
in
if var != "" then
var
else if minorEnvironment ? varName then
minorEnvironment."${varName}"
else
throw (envErrorMessage varName);
if var != ""
then var
else if minorEnvironment ? varName
then minorEnvironment."${varName}"
else throw (envErrorMessage varName);
# -- Cargo.toml --
cargoToml = src: (builtins.fromTOML (builtins.readFile "${src}/Cargo.toml"));

1
package/bolt-unpack.nix
View File

@@ -1,5 +1,4 @@
{pkgs, ...}:
pkgs.writeShellScriptBin "unpack" ''
#!/usr/bin/env sh
set -e

8
package/postgres/pg-from/default.nix
View File

@@ -1,5 +1,9 @@
{ cargoToml, nativeBuildInputs, pkgs, ... }:
let
{
cargoToml,
nativeBuildInputs,
pkgs,
...
}: let
src = ./.;
cargo = cargoToml src;
in

8
package/postgres/pg-migration/default.nix
View File

@@ -1,5 +1,9 @@
{ cargoToml, nativeBuildInputs, pkgs, ... }:
let
{
cargoToml,
nativeBuildInputs,
pkgs,
...
}: let
src = ./.;
cargo = cargoToml src;
in

8
package/prettify-log/default.nix
View File

@@ -1,5 +1,9 @@
{ cargoToml, nativeBuildInputs, pkgs, ... }:
let
{
cargoToml,
nativeBuildInputs,
pkgs,
...
}: let
src = ./.;
cargo = cargoToml src;
in

3
package/printobstacle.nix
View File

@@ -1,5 +1,4 @@
{ pkgs, ... }:
let
{pkgs, ...}: let
name = "printobstacle";
in
pkgs.writeShellScriptBin "${name}" ''

3
package/printprogress.nix
View File

@@ -1,5 +1,4 @@
{ pkgs, ... }:
let
{pkgs, ...}: let
name = "printprogress";
in
pkgs.writeShellScriptBin "${name}" ''