From 89b002b7962a3757a67a95016050328975fbfe1d Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 15 Jul 2024 13:47:55 -0400 Subject: [PATCH 1/5] ntpd-rs: pin apple_sdk version in expression --- pkgs/tools/networking/ntpd-rs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/ntpd-rs/default.nix b/pkgs/tools/networking/ntpd-rs/default.nix index 6d1353a4e905..f2e0a8299ec3 100644 --- a/pkgs/tools/networking/ntpd-rs/default.nix +++ b/pkgs/tools/networking/ntpd-rs/default.nix @@ -5,8 +5,8 @@ fetchFromGitHub, ntpd-rs, installShellFiles, + darwin, pandoc, - Security, nixosTests, testers, }: @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-NRFmb9rZVbd0qYKIkslT4TcbC/aD4QhAjm2GA4BvReY="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; nativeBuildInputs = [ pandoc installShellFiles diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b35e4a69c67..9b5f247583ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1940,9 +1940,7 @@ with pkgs; npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; - ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { - inherit (darwin.apple_sdk_11_0.frameworks) Security; - }; + ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; From 263f99457e67a803f68b41d308f927ac989008ec Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 15 Jul 2024 13:49:41 -0400 Subject: [PATCH 2/5] ntpd-rs: migrate to by-name --- .../ntpd-rs/default.nix => by-name/nt/ntpd-rs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/ntpd-rs/default.nix => by-name/nt/ntpd-rs/package.nix} (100%) diff --git a/pkgs/tools/networking/ntpd-rs/default.nix b/pkgs/by-name/nt/ntpd-rs/package.nix similarity index 100% rename from pkgs/tools/networking/ntpd-rs/default.nix rename to pkgs/by-name/nt/ntpd-rs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b5f247583ca..ef954c6df164 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1940,8 +1940,6 @@ with pkgs; npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; - ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; From 94743533ea90dbb2abf9bf0c7691538125801d89 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 15 Jul 2024 13:51:16 -0400 Subject: [PATCH 3/5] ntpd-rs: add updateScript --- pkgs/by-name/nt/ntpd-rs/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index f2e0a8299ec3..780eb2c0877d 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -8,6 +8,7 @@ darwin, pandoc, nixosTests, + nix-update-script, testers, }: @@ -62,6 +63,8 @@ rustPlatform.buildRustPackage rec { inherit version; }; }; + + updateScript = nix-update-script { }; }; meta = { From 9f8234f17e88f545449f03e8a1bc4c1c25ac707e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 20 Jul 2024 03:05:18 +0200 Subject: [PATCH 4/5] ntpd-rs: 1.2.0 -> 1.2.2 --- 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 780eb2c0877d..055ec97b491b 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.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "pendulum-project"; repo = "ntpd-rs"; rev = "v${version}"; - hash = "sha256-yIX9RD1xqkFoxDt82wnKfQR3z/vLA0I5/cptaIgSNjw="; + hash = "sha256-td+op7nVmznIcj3JYafEy7HgbBPLuRv25Hu2N5A5qOQ="; }; - cargoHash = "sha256-NRFmb9rZVbd0qYKIkslT4TcbC/aD4QhAjm2GA4BvReY="; + cargoHash = "sha256-guim3IC2uIA7NKMXDCil/UK8Yj+rt2KUSwtJTcBcZoU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; nativeBuildInputs = [ From f2a6b12af7bb1160c214b83aa3ecd9a73dd2cba3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 20 Jul 2024 03:06:54 +0200 Subject: [PATCH 5/5] ntpd-rs: disable testsuite, too flaky --- pkgs/by-name/nt/ntpd-rs/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index 055ec97b491b..3e7c35227c33 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -40,6 +40,9 @@ rustPlatform.buildRustPackage rec { source utils/generate-man.sh ''; + # lots of flaky tests + doCheck = false; + checkFlags = [ # doesn't find the testca "--skip=daemon::keyexchange::tests"