From 57d1daa76658107e6933e2e658797e08869b627c Mon Sep 17 00:00:00 2001 From: Spotlight Date: Tue, 26 Sep 2023 09:01:19 -0500 Subject: [PATCH 1/2] Include Dispatch in swiftformat build inputs --- pkgs/swiftformat.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/swiftformat.nix b/pkgs/swiftformat.nix index dc5fb06..c4ba854 100644 --- a/pkgs/swiftformat.nix +++ b/pkgs/swiftformat.nix @@ -12,10 +12,7 @@ clangStdenv.mkDerivation rec { }; nativeBuildInputs = [ swift swiftpm ]; - buildInputs = [ swiftPackages.Foundation ]; - - # We only install the swiftformat binary, so don't need the other products. - swiftpmFlags = [ "--product swiftformat" ]; + buildInputs = [ swiftPackages.Dispatch swiftPackages.Foundation ]; installPhase = '' binPath="$(swiftpmBinPath)" From 1f608e854c8ad2954c588a3f2a8f0f03af5bd4e2 Mon Sep 17 00:00:00 2001 From: Spotlight Date: Tue, 26 Sep 2023 09:02:01 -0500 Subject: [PATCH 2/2] Upgrade nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index dff478a..a3afcf5 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1695550077, - "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=", + "lastModified": 1695708052, + "narHash": "sha256-QiWOrZcCmY+zH2NVM6/opZaMRMgam9u+qVYycKLqL10=", "owner": "nix-community", "repo": "home-manager", - "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091", + "rev": "dd88dbc69438384bd94f8282584a86798750028c", "type": "github" }, "original": {