From 08d60a37170b5b2bba73ffc90af9f08d72f7694a Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Thu, 22 Feb 2024 15:32:43 -0500 Subject: [PATCH] shit --- .github/workflows/ci.yaml | 3 +-- flake.nix | 14 ++++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 719c474..036319c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,8 +20,7 @@ jobs: needs: configure runs-on: self-hosted strategy: - matrix: - out: ${{ fromJson(needs.configure.outputs.matrix) }} + matrix: ${{ fromJson(needs.configure.outputs.matrix) }} steps: - uses: actions/checkout@v4 - run: echo ${{ matrix.out }} diff --git a/flake.nix b/flake.nix index db27cdb..037d18f 100644 --- a/flake.nix +++ b/flake.nix @@ -22,14 +22,16 @@ let inherit (inputs.nixpkgs) lib; perSystem = k: lib.concatLists (lib.flip lib.mapAttrsToList inputs.self.${k} (system: s: - builtins.map (name: "${k}.${system}.${name}") (lib.attrNames s) + builtins.map (name: { out = "${k}.${system}.${name}"; }) (lib.attrNames s) )); in - lib.concatLists [ - (perSystem "packages") - #(perSystem "devShells") - #(perSystem "checks") - ]; + { + include = lib.concatLists [ + (perSystem "packages") + #(perSystem "devShells") + #(perSystem "checks") + ]; + }; perSystem = { self', system, lib, config, pkgs, ... }: { # Our only Haskell project. You can have multiple projects, but this template # has only one.