From 360cb79ea112630fbba473378c1b14ea9c520564 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 5 Apr 2024 09:59:46 -0500 Subject: [PATCH] deadnix + nixfmt --- lib/default.nix | 2 +- modules/languages/misc.nix | 10 ++++++---- pkgs/oizys/oizys-zig/default.nix | 7 ++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 4f31f44..efe18e3 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -32,7 +32,7 @@ in rec { oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts); oizysPkg = forAllSystems ( 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-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs {}; default = oizys-zig; diff --git a/modules/languages/misc.nix b/modules/languages/misc.nix index c2812e8..73b95be 100644 --- a/modules/languages/misc.nix +++ b/modules/languages/misc.nix @@ -10,9 +10,11 @@ zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin; in { config = mkIfIn "misc" cfg { - environment.systemPackages = with pkgs; [ - go - rustup - ] ++ [ zig ]; + environment.systemPackages = with pkgs; + [ + go + rustup + ] + ++ [zig]; }; } diff --git a/pkgs/oizys/oizys-zig/default.nix b/pkgs/oizys/oizys-zig/default.nix index c29bd7d..c6f4ca9 100644 --- a/pkgs/oizys/oizys-zig/default.nix +++ b/pkgs/oizys/oizys-zig/default.nix @@ -4,9 +4,10 @@ lib, ... }: - (zig2nix.outputs.zig-env.${pkgs.system} { - zig = zig2nix.outputs.packages.${pkgs.system}.zig.master.bin; - }).package { +(zig2nix.outputs.zig-env.${pkgs.system} { + zig = zig2nix.outputs.packages.${pkgs.system}.zig.master.bin; +}) +.package { name = "oizys"; src = lib.cleanSource ./.; }