deadnix + nixfmt

This commit is contained in:
Daylin Morgan 2024-04-05 09:59:46 -05:00
parent 3547ecd3c5
commit 360cb79ea1
Signed by: daylin
GPG key ID: 950D13E9719334AD
3 changed files with 11 additions and 8 deletions

View file

@ -32,7 +32,7 @@ in rec {
oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts); oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
oizysPkg = forAllSystems ( oizysPkg = forAllSystems (
pkgs: rec { pkgs: rec {
oizys-zig = pkgs.callPackage ../pkgs/oizys/oizys-zig { zig2nix = inputs.zig2nix;}; oizys-zig = pkgs.callPackage ../pkgs/oizys/oizys-zig {zig2nix = inputs.zig2nix;};
oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim {}; oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim {};
oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs {}; oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs {};
default = oizys-zig; default = oizys-zig;

View file

@ -10,9 +10,11 @@
zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin; zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin;
in { in {
config = mkIfIn "misc" cfg { config = mkIfIn "misc" cfg {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs;
go [
rustup go
] ++ [ zig ]; rustup
]
++ [zig];
}; };
} }

View file

@ -4,9 +4,10 @@
lib, lib,
... ...
}: }:
(zig2nix.outputs.zig-env.${pkgs.system} { (zig2nix.outputs.zig-env.${pkgs.system} {
zig = zig2nix.outputs.packages.${pkgs.system}.zig.master.bin; zig = zig2nix.outputs.packages.${pkgs.system}.zig.master.bin;
}).package { })
.package {
name = "oizys"; name = "oizys";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
} }