Unverified Commit 46b63d3d authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

chrony: 4.5 -> 4.6.1; move to by-name (#346858)

parents ecf38cbe a92e2bdc

ci/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/pkgs/tools/misc/esphome @mweinelt



# Network Time Daemons

/pkgs/tools/networking/chrony @thoughtpolice

/pkgs/by-name/ch/chrony @thoughtpolice

/pkgs/tools/networking/ntp @thoughtpolice

/pkgs/tools/networking/openntpd @thoughtpolice

/nixos/modules/services/networking/ntp @thoughtpolice

pkgs/tools/networking/chrony/default.nix→pkgs/by-name/ch/chrony/package.nix

+116 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config

, gnutls, libedit, nspr, nss, readline, texinfo

, libcap, libseccomp, pps-tools

, nixosTests

{

  lib,

  stdenv,

  overrideSDK,

  fetchurl,

  pkg-config,

  gnutls,

  libedit,

  texinfo,

  libcap,

  libseccomp,

  pps-tools,

  nixosTests,

}:



stdenv.mkDerivation rec {

let

  stdenv' =

    if stdenv.hostPlatform.isDarwin then

      overrideSDK stdenv {

        darwinSdkVersion = "11.0";

        darwinMinVersion = "10.13";

      }

    else

      stdenv;

in

stdenv'.mkDerivation rec {

  pname = "chrony";

  version = "4.5";

  version = "4.6.1";



  src = fetchurl {

    url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";

    hash = "sha256-Gf4dn0Zk1EWmmpbHHo/bYLzY3yTHPROG4CKH9zZq1CI=";

    url = "https://chrony-project.org/releases/${pname}-${version}.tar.gz";

    hash = "sha256-Vx/3P78K4wl/BgTsouALHYuy6Rr/4aNJR4X/IdYZnFw=";

  };



  outputs = [ "out" "man" ];

  outputs = [

    "out"

    "man"

  ];



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [ gnutls libedit nspr nss readline texinfo ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libseccomp pps-tools ];

  buildInputs =

    [

      gnutls

      libedit

      texinfo

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      libcap

      libseccomp

      pps-tools

    ];



  configureFlags = [

    "--enable-ntp-signd"
@@ -33,18 +64,39 @@ stdenv.mkDerivation rec { 


  postPatch = ''

    patchShebangs test



    # nts_ke_session unit test fails, so drop it.

    # TODO: try again when updating?

    rm test/unit/nts_ke_session.c

  '';



  hardeningEnable = [ "pie" ];

  enableParallelBuilding = true;

  doCheck = true;



  passthru.tests = { inherit (nixosTests) chrony chrony-ptp; };

  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];



  meta = with lib; {

  passthru.tests = {

    inherit (nixosTests) chrony chrony-ptp;

  };



  meta = {

    description = "Sets your computer's clock from time servers on the Net";

    homepage = "https://chrony.tuxfamily.org/";

    license = licenses.gpl2Only;

    platforms = with platforms; linux ++ freebsd ++ openbsd;

    maintainers = with maintainers; [ fpletz thoughtpolice ];

    homepage = "https://chrony-project.org/";

    license = lib.licenses.gpl2Only;

    platforms =

      with lib.platforms;

      builtins.concatLists [

        linux

        freebsd

        netbsd

        darwin

        illumos

      ];

    maintainers = with lib.maintainers; [

      fpletz

      thoughtpolice

      vifino

    ];



    longDescription = ''

      Chronyd is a daemon which runs in background on the system. It obtains

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -6267,8 +6267,6 @@ with pkgs; 














  chkrootkit = callPackage ../tools/security/chkrootkit { };



























  chrony = callPackage ../tools/networking/chrony { };



























  chunkfs = callPackage ../tools/filesystems/chunkfs { };





























  chunksync = callPackage ../tools/backup/chunksync { };