Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c1a8104f1198
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e57249fc365
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 30, 2020

  1. chrony: 3.5.1 -> 4.0

    @bbigras
    bbigras committed Oct 30, 2020
    Copy the full SHA
    4e6f5a3 View commit details

Commits on Nov 1, 2020

  1. Merge pull request #102185 from bbigras/chrony 

    chrony: 3.5.1 -> 4.0
    @thoughtpolice
    thoughtpolice authored Nov 1, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4e57249 View commit details
Showing with 4 additions and 48 deletions.
  1. +0 −26 pkgs/tools/networking/chrony/allow-clock_adjtime.patch
  2. +4 −9 pkgs/tools/networking/chrony/default.nix
  3. +0 −13 pkgs/tools/networking/chrony/fix-seccomp-build.patch
26 changes: 0 additions & 26 deletions pkgs/tools/networking/chrony/allow-clock_adjtime.patch
View file

This file was deleted.

13 changes: 4 additions & 9 deletions pkgs/tools/networking/chrony/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr
, libseccomp, pps-tools }:
, libseccomp, pps-tools, gnutls }:

assert stdenv.isLinux -> libcap != null;

stdenv.mkDerivation rec {
pname = "chrony";
version = "3.5.1";
version = "4.0";

src = fetchurl {
url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";
sha256 = "19ywl8a3lb2id7lcna5hp2g4pjnfwdc9ihr0fk6i9m45vdq2za0v";
sha256 = "09f6w2x5h5kamb4rhcbaz911q1f730qdalgsn8s48yjyqlafl9xy";
};

patches = [
./allow-clock_adjtime.patch
./fix-seccomp-build.patch
];

postPatch = ''
patchShebangs test
'';

buildInputs = [ readline texinfo nss nspr ]
buildInputs = [ readline texinfo nss nspr gnutls ]
++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ];
nativeBuildInputs = [ pkgconfig ];

13 changes: 0 additions & 13 deletions pkgs/tools/networking/chrony/fix-seccomp-build.patch
View file

This file was deleted.