From baad73c2ac37b6a9a2fe55f3e8b4e70c314690f9 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Fri, 5 Jul 2024 22:11:25 +0200 Subject: [PATCH] use local swift on macos Signed-off-by: Kristoffer Dalby --- Package.resolved | 8 ++++---- flake.lock | 6 +++--- flake.nix | 24 +++++++++++++----------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Package.resolved b/Package.resolved index 808ac6e..8f52e7d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log.git", "state" : { - "revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5", - "version" : "1.5.4" + "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537", + "version" : "1.6.1" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-system.git", "state" : { - "revision" : "f9266c85189c2751589a50ea5aec72799797e471", - "version" : "1.3.0" + "revision" : "6a9e38e7bd22a3b8ba80bddf395623cf68f57807", + "version" : "1.3.1" } }, { diff --git a/flake.lock b/flake.lock index 4b1c079..ea6a9ff 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719317636, - "narHash": "sha256-bu0xbu2Z6DDzA9LGV81yJunIti6r7tjUImeR8orAL/I=", + "lastModified": 1719436386, + "narHash": "sha256-NBGYaic5FLRg8AWSj6yr4g2IlMPUxNCVjRK6+RNuQBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9c513fc6fb75142f6aec6b7545cb8af2236b80f5", + "rev": "c66e984bda09e7230ea7b364e677c5ba4f0d36d0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 037af5d..1262b79 100644 --- a/flake.nix +++ b/flake.nix @@ -16,21 +16,18 @@ else "dev"; ndeps = pkgs: - with pkgs; [ - swiftPackages.swiftNoSwiftDriver - swiftPackages.swiftpm - - pkg-config - ]; + with pkgs; + [ + pkg-config + ] + ++ lib.optionals stdenv.isLinux [ + swiftPackages.swiftNoSwiftDriver + swiftPackages.swiftpm + ]; bdeps = pkgs: with pkgs; [ - swiftPackages.stdenv - swiftPackages.XCTest - swiftPackages.Foundation - swiftPackages.Dispatch - # SwiftExif libexif libiptcdata @@ -73,6 +70,11 @@ # and find that library in Nix and add it to the buildDeps. ] ++ lib.optionals stdenv.isLinux [ + swiftPackages.stdenv + swiftPackages.XCTest + swiftPackages.Foundation + swiftPackages.Dispatch + swift-corelibs-libdispatch glibc.dev