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-07-31 11:13:50 -07:00
parent c2726dd41b
commit ffde3c1c27
14 changed files with 170 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

23
overlays/krb5.nix
View file

@ -8,16 +8,23 @@ in {
freeipa = let
inherit (prev) freeipa;
python3 = final.python311;
freeipa'py311 = (freeipa.override {
inherit python3;
}).overrideAttrs (old: {
nativeBuildInputs = [
python3
] ++ old.nativeBuildInputs;
});
freeipa'py311 =
(freeipa.override {
inherit python3;
})
.overrideAttrs (old: {
nativeBuildInputs =
[
python3
]
++ old.nativeBuildInputs;
});
isBroken = !(builtins.tryEval freeipa.outPath).success;
isUpdated = lib.versionAtLeast freeipa.version "4.12.2";
isPythonUpdated = lib.versionAtLeast final.python3.version "3.12";
warnFixed = lib.warnIf isUpdated "freeipa python overlay fix probably no longer needed";
in if isPythonUpdated && (isBroken || !isUpdated) then freeipa'py311 else warnFixed freeipa;
in
if isPythonUpdated && (isBroken || !isUpdated)
then freeipa'py311
else warnFixed freeipa;
}

63
overlays/print.nix
View file

@ -2,47 +2,58 @@ final: prev: let
inherit (final) lib;
in {
cura-octoprint = final.cura.override {
plugins = [ final.curaPlugins.octoprint ];
plugins = [final.curaPlugins.octoprint];
};
octoprint = let
mapPlugin = python3Packages: _: plugin: plugin.override {
inherit python3Packages;
inherit (python3Packages) buildPlugin;
};
packageOverrides = python3Packages: python3Packages'prev: lib.mapAttrs (mapPlugin python3Packages) {
inherit (final.octoprintPlugins) prometheus-exporter octorant queue printtimegenius;
};
mapPlugin = python3Packages: _: plugin:
plugin.override {
inherit python3Packages;
inherit (python3Packages) buildPlugin;
};
packageOverrides = python3Packages: python3Packages'prev:
lib.mapAttrs (mapPlugin python3Packages) {
inherit (final.octoprintPlugins) prometheus-exporter octorant queue printtimegenius;
};
octoprint = prev.octoprint.override (old: {
packageOverrides = lib.composeExtensions old.packageOverrides or (_: _: {}) packageOverrides;
});
in octoprint;
in
octoprint;
octoprintPlugins = let
pythonPackages = final.octoprint.python.pkgs;
octoprintPlugins'overlay = final.callPackage (final.path + "/pkgs/applications/misc/octoprint/plugins.nix") { };
octoprintPlugins'overlay = final.callPackage (final.path + "/pkgs/applications/misc/octoprint/plugins.nix") {};
octoprintPlugins'nixpkgs = octoprintPlugins'overlay pythonPackages pythonPackages;
octoprintPlugins = prev.octoprintPlugins or octoprintPlugins'nixpkgs;
callPackage = final.newScope {
inherit (final.octoprintPlugins) buildPlugin;
};
in octoprintPlugins // {
callPackage = prev.octoprintPlugins.callPackage or callPackage;
in
octoprintPlugins
// {
callPackage = prev.octoprintPlugins.callPackage or callPackage;
prometheus-exporter = callPackage ../packages/octoprint/prometheus-exporter.nix { };
octorant = callPackage ../packages/octoprint/octorant.nix { };
queue = callPackage ../packages/octoprint/queue.nix { };
printtimegenius = let
printtimegenius = { fetchFromGitHub, python3Packages, buildPlugin }: octoprintPlugins.printtimegenius.overrideAttrs (old: rec {
version = lib.warnIf (lib.versionAtLeast old.version "2.3.2") "printtimegenius updated upstream" "2.3.3";
src = fetchFromGitHub {
inherit (old.src) owner repo;
rev = version;
sha256 = "sha256-hqm8RShCNpsVbrVXquat5VXqcVc7q5tn5+7Ipqmaw4U=";
};
});
in callPackage printtimegenius { };
};
prometheus-exporter = callPackage ../packages/octoprint/prometheus-exporter.nix {};
octorant = callPackage ../packages/octoprint/octorant.nix {};
queue = callPackage ../packages/octoprint/queue.nix {};
printtimegenius = let
printtimegenius = {
fetchFromGitHub,
python3Packages,
buildPlugin,
}:
octoprintPlugins.printtimegenius.overrideAttrs (old: rec {
version = lib.warnIf (lib.versionAtLeast old.version "2.3.2") "printtimegenius updated upstream" "2.3.3";
src = fetchFromGitHub {
inherit (old.src) owner repo;
rev = version;
sha256 = "sha256-hqm8RShCNpsVbrVXquat5VXqcVc7q5tn5+7Ipqmaw4U=";
};
});
in
callPackage printtimegenius {};
};
# XXX: build broken upstream ugh...
curaengine = prev.curaengine.override {