Unverified Commit eb1a2f0e authored by lassulus's avatar lassulus Committed by GitHub
Browse files

Merge pull request #327441 from getchoo/pkgs/ntpd-rs/by-name 

ntpd-rs: migrate to by-name & add updateScript, 1.2.0 -> 1.2.2
parents ef1525d3 f2a6b12a

pkgs/tools/networking/ntpd-rs/default.nix→pkgs/by-name/nt/ntpd-rs/package.nix

+11 −5
Original line number Diff line number Diff line
@@ -5,26 +5,27 @@ 
  fetchFromGitHub,

  ntpd-rs,

  installShellFiles,

  darwin,

  pandoc,

  Security,

  nixosTests,

  nix-update-script,

  testers,

}:



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 [ Security ];

  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ];

  nativeBuildInputs = [

    pandoc

    installShellFiles
@@ -39,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"
@@ -62,6 +66,8 @@ rustPlatform.buildRustPackage rec { 
        inherit version;

      };

    };



    updateScript = nix-update-script { };

  };



  meta = {

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -1945,10 +1945,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 {













    inherit (darwin.apple_sdk_11_0.frameworks) Security;













  };



























  ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };





























  openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { };