style: format (alejandra)
This commit is contained in:
@@ -55,29 +55,20 @@
|
|||||||
# This last approach is the one we're taking in this file. To make sure the removal of the
|
# 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
|
# 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.
|
# hooks run, this needs to be run in an override of `mkDerivation` and not in a setup hook.
|
||||||
|
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
postgresql,
|
postgresql,
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
}:
|
}: args: let
|
||||||
|
buildPostgresqlExtension = finalAttrs: {enableUpdateScript ? true, ...} @ prevAttrs: {
|
||||||
args:
|
|
||||||
|
|
||||||
let
|
|
||||||
buildPostgresqlExtension =
|
|
||||||
finalAttrs:
|
|
||||||
{
|
|
||||||
enableUpdateScript ? true,
|
|
||||||
...
|
|
||||||
}@prevAttrs:
|
|
||||||
{
|
|
||||||
passthru =
|
passthru =
|
||||||
prevAttrs.passthru or { }
|
prevAttrs.passthru
|
||||||
|
or {}
|
||||||
// lib.optionalAttrs enableUpdateScript {
|
// lib.optionalAttrs enableUpdateScript {
|
||||||
updateScript =
|
updateScript =
|
||||||
prevAttrs.passthru.updateScript or (nix-update-script (
|
prevAttrs.passthru.updateScript
|
||||||
|
or (nix-update-script (
|
||||||
lib.optionalAttrs (lib.hasInfix "unstable" prevAttrs.version) {
|
lib.optionalAttrs (lib.hasInfix "unstable" prevAttrs.version) {
|
||||||
extraArgs = ["--version=branch"];
|
extraArgs = ["--version=branch"];
|
||||||
}
|
}
|
||||||
@@ -86,9 +77,11 @@ let
|
|||||||
|
|
||||||
buildInputs = [postgresql] ++ prevAttrs.buildInputs or [];
|
buildInputs = [postgresql] ++ prevAttrs.buildInputs or [];
|
||||||
|
|
||||||
installFlags = [
|
installFlags =
|
||||||
|
[
|
||||||
"DESTDIR=${placeholder "out"}"
|
"DESTDIR=${placeholder "out"}"
|
||||||
] ++ prevAttrs.installFlags or [ ];
|
]
|
||||||
|
++ prevAttrs.installFlags or [];
|
||||||
|
|
||||||
postInstall =
|
postInstall =
|
||||||
''
|
''
|
||||||
|
|||||||
138
flake.nix
138
flake.nix
@@ -10,24 +10,31 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, rust-overlay }:
|
outputs = {
|
||||||
let
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
rust-overlay,
|
||||||
|
}: let
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
recursiveUpdate = lib.recursiveUpdate;
|
recursiveUpdate = lib.recursiveUpdate;
|
||||||
|
|
||||||
supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin"];
|
supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin"];
|
||||||
|
|
||||||
forSpecSystemsWithPkgs = supportedSystems: pkgOverlays: f:
|
forSpecSystemsWithPkgs = supportedSystems: pkgOverlays: f:
|
||||||
builtins.foldl' (acc: system:
|
builtins.foldl' (
|
||||||
let
|
acc: system: let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = pkgOverlays;
|
overlays = pkgOverlays;
|
||||||
};
|
};
|
||||||
systemOutputs = f { system = system; pkgs = pkgs; };
|
systemOutputs = f {
|
||||||
|
system = system;
|
||||||
|
pkgs = pkgs;
|
||||||
|
};
|
||||||
in
|
in
|
||||||
recursiveUpdate acc systemOutputs
|
recursiveUpdate acc systemOutputs
|
||||||
) {} supportedSystems;
|
) {}
|
||||||
|
supportedSystems;
|
||||||
|
|
||||||
forAllSystemsWithPkgs = pkgOverlays: f: forSpecSystemsWithPkgs supportedSystems pkgOverlays f;
|
forAllSystemsWithPkgs = pkgOverlays: f: forSpecSystemsWithPkgs supportedSystems pkgOverlays f;
|
||||||
|
|
||||||
@@ -37,22 +44,20 @@
|
|||||||
|
|
||||||
dotEnv = builtins.getEnv "DOTENV";
|
dotEnv = builtins.getEnv "DOTENV";
|
||||||
minorEnvironment =
|
minorEnvironment =
|
||||||
if dotEnv != "" then
|
if dotEnv != ""
|
||||||
if builtins.pathExists dotEnv then
|
then
|
||||||
parseEnv dotEnv
|
if builtins.pathExists dotEnv
|
||||||
else
|
then parseEnv dotEnv
|
||||||
throw "${dotEnv} file not exist"
|
else throw "${dotEnv} file not exist"
|
||||||
else
|
else if builtins.pathExists ./.env
|
||||||
if builtins.pathExists ./.env then
|
then parseEnv ./.env
|
||||||
parseEnv ./.env
|
else {};
|
||||||
else
|
|
||||||
{};
|
|
||||||
|
|
||||||
in
|
in
|
||||||
forAllSystemsWithPkgs [ (import rust-overlay) ] ({ system, pkgs }:
|
forAllSystemsWithPkgs [(import rust-overlay)] ({
|
||||||
{
|
system,
|
||||||
packages.${system} =
|
pkgs,
|
||||||
let
|
}: {
|
||||||
|
packages.${system} = let
|
||||||
rust = {
|
rust = {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default
|
pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default
|
||||||
@@ -63,8 +68,7 @@
|
|||||||
inherit (rust) nativeBuildInputs;
|
inherit (rust) nativeBuildInputs;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
nvim-alias = pkgs.callPackage ./package/nvim-alias.nix {};
|
nvim-alias = pkgs.callPackage ./package/nvim-alias.nix {};
|
||||||
bolt-unpack = pkgs.callPackage ./package/bolt-unpack.nix {};
|
bolt-unpack = pkgs.callPackage ./package/bolt-unpack.nix {};
|
||||||
nvim-pager = pkgs.callPackage ./package/nvim-pager.nix {};
|
nvim-pager = pkgs.callPackage ./package/nvim-pager.nix {};
|
||||||
@@ -81,17 +85,17 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells.${system} =
|
devShells.${system} = let
|
||||||
let
|
|
||||||
shells = self.devShells.${system};
|
shells = self.devShells.${system};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
buildInputs = (with self.packages.${system}; [
|
buildInputs =
|
||||||
|
(with self.packages.${system}; [
|
||||||
nvim-alias
|
nvim-alias
|
||||||
#prettify-log
|
#prettify-log
|
||||||
nvim-pager
|
nvim-pager
|
||||||
]) ++ (with pkgs; [
|
])
|
||||||
|
++ (with pkgs; [
|
||||||
git
|
git
|
||||||
jq
|
jq
|
||||||
yq-go
|
yq-go
|
||||||
@@ -101,28 +105,32 @@
|
|||||||
# environment
|
# environment
|
||||||
PAGER = "${self.packages.${system}.nvim-pager}/bin/pager";
|
PAGER = "${self.packages.${system}.nvim-pager}/bin/pager";
|
||||||
};
|
};
|
||||||
rust =
|
rust = let
|
||||||
let
|
rustToolchain =
|
||||||
rustToolchain = if builtins.pathExists ./rust-toolchain.toml then
|
if builtins.pathExists ./rust-toolchain.toml
|
||||||
pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml
|
then pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml
|
||||||
else
|
else pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default;
|
||||||
pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default;
|
|
||||||
in
|
in
|
||||||
shells.default //
|
shells.default
|
||||||
(pkgs.mkShell {
|
// (pkgs.mkShell {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
rustToolchain
|
rustToolchain
|
||||||
pkgs.pkg-config
|
pkgs.pkg-config
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
haskell = shells.default // (pkgs.mkShell {
|
haskell =
|
||||||
|
shells.default
|
||||||
|
// (pkgs.mkShell {
|
||||||
buildInputs = [pkgs.stack];
|
buildInputs = [pkgs.stack];
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
nixosModules.${system} = {
|
nixosModules.${system} = {
|
||||||
"preset.default" = { pkgs, modulesPath, ... }: {
|
"preset.default" = {
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/profiles/qemu-guest.nix")
|
(modulesPath + "/profiles/qemu-guest.nix")
|
||||||
];
|
];
|
||||||
@@ -144,7 +152,11 @@
|
|||||||
"-vga qxl"
|
"-vga qxl"
|
||||||
];
|
];
|
||||||
forwardPorts = [
|
forwardPorts = [
|
||||||
{ from = "host"; host.port = 40500; guest.port = 22; }
|
{
|
||||||
|
from = "host";
|
||||||
|
host.port = 40500;
|
||||||
|
guest.port = 22;
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -162,13 +174,15 @@
|
|||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
defaultPackages = [];
|
defaultPackages = [];
|
||||||
systemPackages = (with pkgs; [
|
systemPackages =
|
||||||
|
(with pkgs; [
|
||||||
curl
|
curl
|
||||||
neovim
|
neovim
|
||||||
yq-go
|
yq-go
|
||||||
jq
|
jq
|
||||||
htop-vim
|
htop-vim
|
||||||
]) ++ (with self.packages.${system}; [
|
])
|
||||||
|
++ (with self.packages.${system}; [
|
||||||
prettify-log
|
prettify-log
|
||||||
nvim-pager
|
nvim-pager
|
||||||
]);
|
]);
|
||||||
@@ -177,7 +191,6 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
system.stateVersion = "24.11";
|
system.stateVersion = "24.11";
|
||||||
};
|
};
|
||||||
"hardware.hetzner" = {...}: {
|
"hardware.hetzner" = {...}: {
|
||||||
@@ -189,12 +202,15 @@
|
|||||||
"vmw_pvscsi"
|
"vmw_pvscsi"
|
||||||
];
|
];
|
||||||
boot.initrd.kernelModules = ["nvme"];
|
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
|
let
|
||||||
version = "1.6.1";
|
version = "1.6.1";
|
||||||
buildHttpExt = versionSuffix: let
|
buildHttpExt = versionSuffix: let
|
||||||
@@ -205,7 +221,8 @@
|
|||||||
})) {
|
})) {
|
||||||
postgresql = prev."postgresql_${versionSuffix}";
|
postgresql = prev."postgresql_${versionSuffix}";
|
||||||
};
|
};
|
||||||
in buildPostgresqlExtension {
|
in
|
||||||
|
buildPostgresqlExtension {
|
||||||
pname = "http";
|
pname = "http";
|
||||||
inherit version;
|
inherit version;
|
||||||
src = prev.fetchFromGitHub {
|
src = prev.fetchFromGitHub {
|
||||||
@@ -216,32 +233,35 @@
|
|||||||
};
|
};
|
||||||
nativeBuildInputs = with prev; [pkg-config curl];
|
nativeBuildInputs = with prev; [pkg-config curl];
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
hectic = self.packages.${prev.system};
|
hectic = self.packages.${prev.system};
|
||||||
postgresql_17 = prev.postgresql_17 // {pkgs = prev.postgresql_17.pkgs // {http = buildHttpExt "17";};};
|
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_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_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";};};
|
postgresql_14 = prev.postgresql_14 // {pkgs = prev.postgresql_14.pkgs // {http = buildHttpExt "14";};};
|
||||||
});
|
}
|
||||||
|
);
|
||||||
lib = {
|
lib = {
|
||||||
# -- For all systems --
|
# -- For all systems --
|
||||||
inherit dotEnv minorEnvironment parseEnv forAllSystemsWithPkgs forSpecSystemsWithPkgs;
|
inherit dotEnv minorEnvironment parseEnv forAllSystemsWithPkgs forSpecSystemsWithPkgs;
|
||||||
|
|
||||||
makeEnvironment = envVars:
|
makeEnvironment = envVars:
|
||||||
builtins.listToAttrs
|
builtins.listToAttrs
|
||||||
(map (name: { inherit name; value = self.lib.getEnv name; }) envVars);
|
(map (name: {
|
||||||
|
inherit name;
|
||||||
|
value = self.lib.getEnv name;
|
||||||
|
})
|
||||||
|
envVars);
|
||||||
|
|
||||||
# -- Env processing --
|
# -- Env processing --
|
||||||
getEnv = varName: let
|
getEnv = varName: let
|
||||||
var = builtins.getEnv varName;
|
var = builtins.getEnv varName;
|
||||||
in
|
in
|
||||||
if var != "" then
|
if var != ""
|
||||||
var
|
then var
|
||||||
else if minorEnvironment ? varName then
|
else if minorEnvironment ? varName
|
||||||
minorEnvironment."${varName}"
|
then minorEnvironment."${varName}"
|
||||||
else
|
else throw (envErrorMessage varName);
|
||||||
throw (envErrorMessage varName);
|
|
||||||
|
|
||||||
# -- Cargo.toml --
|
# -- Cargo.toml --
|
||||||
cargoToml = src: (builtins.fromTOML (builtins.readFile "${src}/Cargo.toml"));
|
cargoToml = src: (builtins.fromTOML (builtins.readFile "${src}/Cargo.toml"));
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{pkgs, ...}:
|
{pkgs, ...}:
|
||||||
|
|
||||||
pkgs.writeShellScriptBin "unpack" ''
|
pkgs.writeShellScriptBin "unpack" ''
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
set -e
|
set -e
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
{ cargoToml, nativeBuildInputs, pkgs, ... }:
|
{
|
||||||
let
|
cargoToml,
|
||||||
|
nativeBuildInputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
src = ./.;
|
src = ./.;
|
||||||
cargo = cargoToml src;
|
cargo = cargoToml src;
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
{ cargoToml, nativeBuildInputs, pkgs, ... }:
|
{
|
||||||
let
|
cargoToml,
|
||||||
|
nativeBuildInputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
src = ./.;
|
src = ./.;
|
||||||
cargo = cargoToml src;
|
cargo = cargoToml src;
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
{ cargoToml, nativeBuildInputs, pkgs, ... }:
|
{
|
||||||
let
|
cargoToml,
|
||||||
|
nativeBuildInputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
src = ./.;
|
src = ./.;
|
||||||
cargo = cargoToml src;
|
cargo = cargoToml src;
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}: let
|
||||||
let
|
|
||||||
name = "printobstacle";
|
name = "printobstacle";
|
||||||
in
|
in
|
||||||
pkgs.writeShellScriptBin "${name}" ''
|
pkgs.writeShellScriptBin "${name}" ''
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{pkgs, ...}: let
|
||||||
let
|
|
||||||
name = "printprogress";
|
name = "printprogress";
|
||||||
in
|
in
|
||||||
pkgs.writeShellScriptBin "${name}" ''
|
pkgs.writeShellScriptBin "${name}" ''
|
||||||
|
|||||||
Reference in New Issue
Block a user