From 548672d0cb661ce11d08ee8bde92b87d2a75c872 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 29 Nov 2024 17:51:35 -0500 Subject: [PATCH] refactor: expose darwin systems as flake input MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don’t think anyone actually cares but 🤷 --- flake.lock | 17 ++++++++++------- flake.nix | 12 ++++++++---- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 9d72abe..9a9ad16 100644 --- a/flake.lock +++ b/flake.lock @@ -34,7 +34,9 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -70,21 +72,22 @@ "cl-nix-lite": "cl-nix-lite", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "systems": "systems" } }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347925, + "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-darwin", + "rev": "2235d7e6cc29ae99878133c95e9fe5e157661ffb", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-darwin", "type": "github" } } diff --git a/flake.nix b/flake.nix index e2107c6..3f7da81 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,11 @@ url = "github:hraban/flake-compat/fixed-output"; flake = false; }; + systems.url = "github:nix-systems/default-darwin"; + flake-utils = { + url = "flake-utils"; + inputs.systems.follows = "systems"; + }; }; outputs = { self, nixpkgs, flake-utils, cl-nix-lite, ... }: @@ -57,11 +62,10 @@ }; } // - (with flake-utils.lib; eachSystem (with system; [ x86_64-darwin aarch64-darwin ]) (system: - with rec { + (with flake-utils.lib; eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}.extend cl-nix-lite.overlays.default; - }; - { + in { packages = { default = pkgs.callPackage ({ lispPackagesLite