From 881bd134b60cffcddb4ad1e65d5d62463ab96511 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 16 Dec 2024 09:22:30 +0000 Subject: [PATCH 1/2] ntpd-rs: 1.3.1 -> 1.4.0 Changelog: https://github.com/pendulum-project/ntpd-rs/releases/tag/v1.4.0 Diff: https://github.com/pendulum-project/ntpd-rs/compare/v1.3.1...v1.4.0 --- pkgs/by-name/nt/ntpd-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index 473138ffb476..c93904180807 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "ntpd-rs"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "pendulum-project"; repo = "ntpd-rs"; rev = "refs/tags/v${version}"; - hash = "sha256-WN+6Ba3oGnoiH5SC0ZHBHqS4F/XPqEyC3J71Fj+3CrQ="; + hash = "sha256-usLtf4qwKkn+lEYSQWCa1ap9h/52YYMVFDkpFJVD00k="; }; - cargoHash = "sha256-IksW8a6OGZzgEInX0P2sS/UMH8XaPRwXCesq7qxvURk="; + cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security From 11da4f30a08130cf748cd1dea730d02c92ed6b09 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 16 Dec 2024 19:14:48 -0500 Subject: [PATCH 2/2] ntpd-rs: migrate to new darwin sdk pattern --- pkgs/by-name/nt/ntpd-rs/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index c93904180807..87aea07c6e98 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -3,9 +3,9 @@ stdenv, rustPlatform, fetchFromGitHub, + apple-sdk_11, ntpd-rs, installShellFiles, - darwin, pandoc, nixosTests, nix-update-script, @@ -25,9 +25,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security - ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + nativeBuildInputs = [ pandoc installShellFiles