gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: nf-fmt-nix

Browse source
This commit is contained in:
arcnmx 2024-05-13 15:13:58 -07:00
parent 7486517713
commit 9903866044
160 changed files with 4570 additions and 3019 deletions
Download patch file Download diff file Expand all files Collapse all files

2
overlays/barcodebuddy.nix
View file

@ -1,4 +1,4 @@
final: prev: let
in {
barcodebuddy = final.callPackage ../packages/barcodebuddy.nix { };
barcodebuddy = final.callPackage ../packages/barcodebuddy.nix {};
}

5
overlays/default.nix
View file

@ -1,7 +1,4 @@
{
inputs,
...
}: let
{inputs, ...}: let
inherit (inputs.self.lib) nixlib;
in rec {
default = nixlib.composeManyExtensions [

42
overlays/krb5.nix
View file

@ -7,22 +7,30 @@ in {
_389-ds-base = let
inherit (prev) _389-ds-base;
drv = _389-ds-base.overrideAttrs (old: {
patches = old.patches or [ ] ++ [
../packages/389-ds-base-fix.patch
(final.fetchpatch {
name = "389-ds-base-5973-f_un.patch";
url = "https://github.com/389ds/389-ds-base/pull/5974.patch";
sha256 = "sha256-WtctQPZVZSAbPg2tjY7wD8ysI4SKkfyS5tQx0NPhSmY=";
})
(final.fetchpatch {
name = "389-ds-base-5962-f_un.patch";
url = "https://github.com/389ds/389-ds-base/pull/6089.patch";
sha256 = "sha256-b0HSaDjuEUKERIXKg8np+lZDdZNmrCTAXybJzF+0hq0=";
})
];
meta = old.meta // {
broken = false;
};
patches =
old.patches
or []
++ [
../packages/389-ds-base-fix.patch
(final.fetchpatch {
name = "389-ds-base-5973-f_un.patch";
url = "https://github.com/389ds/389-ds-base/pull/5974.patch";
sha256 = "sha256-WtctQPZVZSAbPg2tjY7wD8ysI4SKkfyS5tQx0NPhSmY=";
})
(final.fetchpatch {
name = "389-ds-base-5962-f_un.patch";
url = "https://github.com/389ds/389-ds-base/pull/6089.patch";
sha256 = "sha256-b0HSaDjuEUKERIXKg8np+lZDdZNmrCTAXybJzF+0hq0=";
})
];
meta =
old.meta
// {
broken = false;
};
});
in if _389-ds-base.meta.broken or false && _389-ds-base.version == "2.4.3" then drv else lib.warn "389-ds patch/overlay no longer needed" _389-ds-base;
in
if _389-ds-base.meta.broken or false && _389-ds-base.version == "2.4.3"
then drv
else lib.warn "389-ds patch/overlay no longer needed" _389-ds-base;
}

14
overlays/minecraft.nix
View file

@ -1,12 +1,12 @@
final: prev: let
inherit (final) callPackage callPackages;
in {
minecraft-bedrock-server = callPackage ../packages/minecraft-bedrock/server.nix { };
minecraft-bedrock-server-libCrypto = callPackage ../packages/minecraft-bedrock/libcrypto.nix { };
minecraft-bedrock-server-patchdebug = callPackage ../packages/minecraft-bedrock/patchdebug.nix { };
minecraft-bedrock-server-patchelf = callPackage ../packages/minecraft-bedrock/patchelf.nix { };
minecraft-bedrock-server = callPackage ../packages/minecraft-bedrock/server.nix {};
minecraft-bedrock-server-libCrypto = callPackage ../packages/minecraft-bedrock/libcrypto.nix {};
minecraft-bedrock-server-patchdebug = callPackage ../packages/minecraft-bedrock/patchdebug.nix {};
minecraft-bedrock-server-patchelf = callPackage ../packages/minecraft-bedrock/patchelf.nix {};
minecraft-bedrock-addons = callPackages ../packages/minecraft-bedrock/addons.nix { };
mkMinecraftBedrockServerAddon = final.callPackage ../packages/minecraft-bedrock/mkaddon.nix { };
unzipMcpack = final.callPackage ../packages/minecraft-bedrock/mcpack.nix { };
minecraft-bedrock-addons = callPackages ../packages/minecraft-bedrock/addons.nix {};
mkMinecraftBedrockServerAddon = final.callPackage ../packages/minecraft-bedrock/mkaddon.nix {};
unzipMcpack = final.callPackage ../packages/minecraft-bedrock/mcpack.nix {};
}

22
overlays/nfs.nix
View file

@ -1,14 +1,18 @@
final: prev: {
# https://github.com/NixOS/nixpkgs/pull/286793
nfs-utils-ldap = prev.nfs-utils.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [
final.openldap
(final.cyrus_sasl.override {
openssl = final.openssl_legacy;
})
];
configureFlags = old.configureFlags ++ [
"--enable-ldap"
];
buildInputs =
old.buildInputs
++ [
final.openldap
(final.cyrus_sasl.override {
openssl = final.openssl_legacy;
})
];
configureFlags =
old.configureFlags
++ [
"--enable-ldap"
];
});
}

37
overlays/nginx.nix
View file

@ -1,27 +1,36 @@
final: prev: let
inherit (final) lib;
luaOverlay = luafinal: luaprev: let
mkRestyCore = { nixpkgsVersion, version, sha256 }: luaprev.lua-resty-core.overrideAttrs (old: {
version = lib.warnIf (old.version != nixpkgsVersion) "lua-resty-core updated upstream" version;
src = old.src.override {
rev = "v${version}";
inherit sha256;
};
});
mkRestyCore = {
nixpkgsVersion,
version,
sha256,
}:
luaprev.lua-resty-core.overrideAttrs (old: {
version = lib.warnIf (old.version != nixpkgsVersion) "lua-resty-core updated upstream" version;
src = old.src.override {
rev = "v${version}";
inherit sha256;
};
});
in {
#lua-resty-core = mkRestyCore { nixpkgsVersion = "0.1.24"; version = "0.1.28"; sha256 = "sha256-RJ2wcHTu447wM0h1fa2qCBl4/p9XL6ZqX9pktRW64RI="; };
};
in {
nginxModules = prev.nginxModules // {
lua = let
inherit (prev.nginxModules) lua;
in lua // lib.warnIf (lua.version != "0.10.26") "nginxModules.lua updated upstream" {
preConfigure = lib.replaceStrings [ "patch " ] [ "#patch " ] lua.preConfigure;
nginxModules =
prev.nginxModules
// {
lua = let
inherit (prev.nginxModules) lua;
in
lua
// lib.warnIf (lua.version != "0.10.26") "nginxModules.lua updated upstream" {
preConfigure = lib.replaceStrings ["patch "] ["#patch "] lua.preConfigure;
};
};
};
luaInterpreters = prev.luaInterpreters.override (old: {
callPackage = final.newScope {
packageOverrides = lib.composeExtensions (final.packageOverrides or (_: _: { })) luaOverlay;
packageOverrides = lib.composeExtensions (final.packageOverrides or (_: _: {})) luaOverlay;
};
});
}

2
overlays/openwebrxplus.nix
View file

@ -1,4 +1,4 @@
final: prev: let
in {
openwebrxplus = final.python3Packages.callPackage ../packages/openwebrxplus.nix {};
}
}

20
overlays/samba.nix
View file

@ -4,24 +4,30 @@ in {
freeipa-ipasam = let
attrs = old: {
pname = "freeipa-ipasam";
patches = old.patches or [ ] ++ [
../packages/freeipa-ipasam.patch
];
patches =
old.patches
or []
++ [
../packages/freeipa-ipasam.patch
];
configureFlags = lib.filter (f: f != "--disable-server") old.configureFlags;
};
overrides = {
samba = final.samba-ldap;
};
in (final.freeipa.override overrides).overrideAttrs attrs;
in
(final.freeipa.override overrides).overrideAttrs attrs;
samba-ldap = final.samba.override {
enableLDAP = true;
};
samba-ipa = final.samba-ldap.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [
final.freeipa-ipasam
];
buildInputs =
old.buildInputs
++ [
final.freeipa-ipasam
];
postInstall = ''
${old.postInstall or ""}
cp -a ${final.freeipa-ipasam}/lib/samba/pdb/ipasam.so $out/lib/samba/pdb/