From 67eedad208441a3517713f75500bec58ad302fc4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 13 Jul 2024 13:34:53 +0200
Subject: [PATCH] ntpd-rs: 1.1.3 -> 1.2.0

---
 pkgs/tools/networking/ntpd-rs/default.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/networking/ntpd-rs/default.nix b/pkgs/tools/networking/ntpd-rs/default.nix
index 264d07428fc3..6d1353a4e905 100644
--- a/pkgs/tools/networking/ntpd-rs/default.nix
+++ b/pkgs/tools/networking/ntpd-rs/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ntpd-rs";
-  version = "1.1.3";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "pendulum-project";
     repo = "ntpd-rs";
     rev = "v${version}";
-    hash = "sha256-7b0IZLTt9ROEhp9bOBOvNQmS+iuQjgSrdwL1Nxy46t4=";
+    hash = "sha256-yIX9RD1xqkFoxDt82wnKfQR3z/vLA0I5/cptaIgSNjw=";
   };
 
-  cargoHash = "sha256-FgRVWo27gdIzUNNTqgu7oHwrKSaWDA+sgL8kGak0otA=";
+  cargoHash = "sha256-NRFmb9rZVbd0qYKIkslT4TcbC/aD4QhAjm2GA4BvReY=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
   nativeBuildInputs = [
@@ -39,17 +39,9 @@ rustPlatform.buildRustPackage rec {
     source utils/generate-man.sh
   '';
 
-  # tests don't compile for 1.1.3
-  # https://github.com/pendulum-project/ntpd-rs/actions/runs/9712796372/job/26808251482
-  doCheck = false;
-
   checkFlags = [
     # doesn't find the testca
     "--skip=daemon::keyexchange::tests"
-    # seems flaky?
-    "--skip=algorithm::kalman::peer::tests::test_offset_steering_and_measurements"
-    # needs networking
-    "--skip=hwtimestamp::tests::get_hwtimestamp"
   ];
 
   postInstall = ''
@@ -72,16 +64,16 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Full-featured implementation of the Network Time Protocol";
     homepage = "https://tweedegolf.nl/en/pendulum";
     changelog = "https://github.com/pendulum-project/ntpd-rs/blob/v${version}/CHANGELOG.md";
     mainProgram = "ntp-ctl";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       fpletz
       getchoo
     ];