Skip to content

Commit 049a839

Browse files
committed
chore: update nixpkgs
* `apple_sdk` is now `apple-sdk` * separate packages (Security, CoreFoundation) are no longer explicitly named, but included as part of `apple-sdk`
1 parent f90892b commit 049a839

File tree

4 files changed

+14
-20
lines changed

4 files changed

+14
-20
lines changed

flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{
22
description = "Haskell bindings to the Temporal Core library as well as an SDK built on top of it.";
33
inputs = {
4-
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
4+
# 2025-06-10: Pinned to the last commit before #411741, from 2025-05-30.
5+
#
6+
# PR that broke `ghcWithPackages`: https://github.com/NixOS/nixpkgs/pull/411741
7+
# Upstream issue: https://github.com/NixOS/nixpkgs/issues/415436
8+
# Proposed fix: https://github.com/NixOS/nixpkgs/pull/415434
9+
nixpkgs.url = "github:NixOS/nixpkgs/81da63bafe32b705c40deb62a1ce1ae73836ff8b";
510
devenv.url = "github:cachix/devenv/v1.0.5";
611
fenix = {
712
url = "github:nix-community/fenix";

nix/devenv/temporal-bridge.nix

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
pkgs.crate2nix
55
pkgs.protobuf
66
pkgs.rust-cbindgen
7-
]
8-
++ (with pkgs;
9-
lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
10-
Security
11-
CoreFoundation
12-
SystemConfiguration
13-
]));
7+
] ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
8+
pkgs.apple-sdk
9+
];
1410

1511
languages.rust = {
1612
enable = true;

nix/overlays/temporal-bridge/derivation.nix

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,7 @@ let
1717
PROTOC_INCLUDE = "${pkgs.protobuf}/include";
1818
};
1919
temporal_bridge = attrs: {
20-
buildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin (
21-
with pkgs.darwin.apple_sdk.frameworks;
22-
[
23-
Security
24-
CoreFoundation
25-
SystemConfiguration
26-
]
27-
);
20+
buildInputs = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ pkgs.apple-sdk ];
2821
postInstall = ''
2922
${attrs.postInstall or ""}
3023
${pkgs.lib.optionalString pkgs.stdenv.isDarwin ''

0 commit comments

Comments
 (0)