make checks build needed software

Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=b15be9c77de593581007de53b2bbca97d121900a' (2024-06-16)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=a9c7a0830fd9a8b9fc4065f1cd654efd1326691a' (2024-06-17)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/3f84a279f1a6290ce154c5531378acc827836fbb' (2024-06-13)
  → 'github:nixos/nixpkgs/e6cea36f83499eb4e9cd184c8a8e823296b50ad5' (2024-06-15)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/937cdd5ba09099b20d665cba048959f505fd0880' (2024-06-16)
  → 'github:nix-community/nixpkgs-wayland/4a3b27cc9526208686896d0ef01c7bb67a47b91f' (2024-06-17)
• Updated input 'stable':
    'github:nixos/nixpkgs/5c2ec3a5c2ee9909904f860dadc19bc12cd9cc44' (2024-06-12)
  → 'github:nixos/nixpkgs/842253bf992c3a7157b67600c2857193f126563a' (2024-06-15)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/59549938d6f2651b4d5cb1582a6589f60c147bff' (2024-06-16)
  → 'github:Cloudef/zig2nix/26b1364329ffb4c910da43c53f6be27b140723de' (2024-06-17)

.github/workflows/checks.yml

@@ -38,4 +38,4 @@ jobs:
 
       - name: Build
         run: |
-          cachix watch-exec daylin -- nix build --accept-flake-config '.#checks.x86_64-linux.packageCheck'
+          cachix watch-exec daylin -- nix build --accept-flake-config '.#checks.x86_64-linux.makePackages'

flake.lock

@@ -305,11 +305,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1718566457,
+        "lastModified": 1718633685,
-        "narHash": "sha256-FtgnoGecYVBnGelxdcgavpogPVn+zi/5p4JFJM+9VJk=",
+        "narHash": "sha256-dAuZ6mIIVQraN1PnCe12Qwdcs/Nvfe/zfSy45ED5aso=",
         "ref": "refs/heads/main",
-        "rev": "b15be9c77de593581007de53b2bbca97d121900a",
+        "rev": "a9c7a0830fd9a8b9fc4065f1cd654efd1326691a",
-        "revCount": 4851,
+        "revCount": 4856,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland/"
@@ -682,11 +682,11 @@
         "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1718541015,
+        "lastModified": 1718630464,
-        "narHash": "sha256-Hh5FRnI0WgDmSgs0Xky2VKtSDibcWOOEA1T79/tIer0=",
+        "narHash": "sha256-GXuN6MmzNomxT9VOEFu4iwP1kRTJ7F3/HdOzeDGPE1c=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "937cdd5ba09099b20d665cba048959f505fd0880",
+        "rev": "4a3b27cc9526208686896d0ef01c7bb67a47b91f",
         "type": "github"
       },
       "original": {
@@ -761,11 +761,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1718276985,
+        "lastModified": 1718428119,
-        "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
+        "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
+        "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
         "type": "github"
       },
       "original": {
@@ -930,11 +930,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1718229064,
+        "lastModified": 1718447546,
-        "narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=",
+        "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5c2ec3a5c2ee9909904f860dadc19bc12cd9cc44",
+        "rev": "842253bf992c3a7157b67600c2857193f126563a",
         "type": "github"
       },
       "original": {
@@ -1169,11 +1169,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718500719,
+        "lastModified": 1718624172,
-        "narHash": "sha256-lPaOrzQe8xVMha9IEQSVkPYVZmrZIl7pvTymERM3sAQ=",
+        "narHash": "sha256-ZWrhjpNX6WSdjnSV8/JTaSLLqY4VqRp9ql16DldcGYk=",
         "owner": "Cloudef",
         "repo": "zig2nix",
-        "rev": "59549938d6f2651b4d5cb1582a6589f60c147bff",
+        "rev": "26b1364329ffb4c910da43c53f6be27b140723de",
         "type": "github"
       },
       "original": {

lib/checks.nix

@@ -1,6 +1,15 @@
-{ inputs, pkgs }:
+{ inputs, system }:
+let
+  pkgs = import inputs.nixpkgs {
+    inherit system;
+    overlays = [
+      inputs.lix-module.overlays.default
+      inputs.hyprland-contrib.overlays.default
+      inputs.nixpkgs-wayland.overlay
+    ];
+  };
+in
 {
-
   makePackages =
     pkgs.runCommandLocal "build-third-party"
       {
@@ -8,12 +17,13 @@
         nativeBuildInputs = [
           pkgs.pixi
           pkgs.swww
+          pkgs.xdg-desktop-portal-hyprland
+          pkgs.nixVersions.stable
 
           inputs.tsm.packages.${pkgs.system}.default
           inputs.hyprman.packages.${pkgs.system}.default
 
-          inputs.roc.packages.${pkgs.system}.full
+          inputs.roc.packages.${pkgs.system}.full # cli + lang_server
-          inputs.roc.packages.${pkgs.system}.lang-server
 
           inputs.zls.outputs.packages.${pkgs.system}.default
           inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin

lib/default.nix

@@ -22,10 +22,8 @@ let
   inherit (import ./find-modules.nix { inherit lib; }) findModulesList;
   #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
   supportedSystems = [ "x86_64-linux" ];
-in
+
-rec {
   forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; }));
-  oizysModules = listToAttrs (findModulesList ../modules);
 
   mkSystem =
     hostName:
@@ -36,7 +34,6 @@ rec {
         ../overlays
         inputs.lix-module.nixosModules.default
       ] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}"));
-
       specialArgs = {
         inherit
           inputs
@@ -50,15 +47,19 @@ rec {
       };
     };
 
-  oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
+in
-  oizysPkg = forAllSystems (pkgs: rec {
+{
+  oizysFlake = {
+    nixosModules = listToAttrs (findModulesList ../modules);
+    nixosConfigurations = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
+    packages = forAllSystems (pkgs: rec {
       oizys-zig = pkgs.callPackage ../pkgs/oizys/oizys-zig { inherit zig2nix; };
       oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim { };
       oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs { };
       oizys-go = pkgs.callPackage ../pkgs/oizys/oizys-go { };
       default = oizys-go;
     });
-  oizysShells = forAllSystems (pkgs: {
+    devShells = forAllSystems (pkgs: {
       default = pkgs.mkShell {
         packages = with pkgs; [
           git
@@ -66,35 +67,15 @@ rec {
         ];
       };
     });
+    checks = forAllSystems (
+      pkgs:
+      import ./checks.nix {
+        inherit inputs;
+        system = pkgs.system;
+      }
+    );
+    formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
 
-  oizysChecks = forAllSystems (pkgs: import ./checks.nix { inherit pkgs inputs; });
-  oizysFormatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
-  oizysFlake = {
-    nixosModules = oizysModules;
-    nixosConfigurations = oizysHosts;
-    packages = oizysPkg;
-    devShells = oizysShells;
-    formatter = oizysFormatter;
-    checks = oizysChecks;
-    # checks = forAllSystems (pkgs: {
-    #   packageCheck = mkPackageCheck {
-    #     inherit pkgs;
-    #     # make sure lix is in this?
-    #     packages = [
-    #       pkgs.pixi
-    #       pkgs.swww
-    #
-    #       inputs.tsm.packages.${pkgs.system}.default
-    #       inputs.hyprman.packages.${pkgs.system}.default
-    #
-    #       inputs.roc.packages.${pkgs.system}.full
-    #       inputs.roc.packages.${pkgs.system}.lang-server
-    #
-    #       inputs.zls.outputs.packages.${pkgs.system}.default
-    #       inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin
-    #     ];
-    #
-    #   };
-    # });
   };
+
 }

modules/languages/roc.nix

@@ -13,8 +13,7 @@ in
 {
   config = mkIfIn "roc" cfg {
     environment.systemPackages = with rocPkgs; [
-      full
+      full # cli + lang_server
-      lang-server
     ];
   };
 }