diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 77ee9052fe5..14161532a16 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -130,6 +130,12 @@ rmdir /var/lib/ipfs/.ipfs
instead. Refer to the description of the options for more details.
+
+
+ tlsdate package and module were removed. This is due to the project
+ being dead and not building with openssl 1.1.
+
+
Other notable improvements:
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7dea5cb9da..f707f038dd7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -517,7 +517,6 @@
./services/networking/teamspeak3.nix
./services/networking/tinc.nix
./services/networking/tftpd.nix
- ./services/networking/tlsdated.nix
./services/networking/tox-bootstrapd.nix
./services/networking/toxvpn.nix
./services/networking/tvheadend.nix
diff --git a/nixos/modules/services/networking/tlsdated.nix b/nixos/modules/services/networking/tlsdated.nix
deleted file mode 100644
index 757cce28760..00000000000
--- a/nixos/modules/services/networking/tlsdated.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- inherit (pkgs) coreutils tlsdate;
-
- cfg = config.services.tlsdated;
-in
-
-{
-
- ###### interface
-
- options = {
-
- services.tlsdated = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable tlsdated daemon.
- '';
- };
-
- extraOptions = mkOption {
- type = types.string;
- default = "";
- description = ''
- Additional command line arguments to pass to tlsdated.
- '';
- };
-
- sources = mkOption {
- type = types.listOf (types.submodule {
- options = {
- host = mkOption {
- type = types.string;
- description = ''
- Remote hostname.
- '';
- };
- port = mkOption {
- type = types.int;
- description = ''
- Remote port.
- '';
- };
- proxy = mkOption {
- type = types.nullOr types.string;
- default = null;
- description = ''
- The proxy argument expects HTTP, SOCKS4A or SOCKS5 formatted as followed:
-
- http://127.0.0.1:8118
- socks4a://127.0.0.1:9050
- socks5://127.0.0.1:9050
-
- The proxy support should not leak DNS requests and is suitable for use with Tor.
- '';
- };
- };
- });
- default = [
- {
- host = "encrypted.google.com";
- port = 443;
- proxy = null;
- }
- ];
- description = ''
- You can list one or more sources to fetch time from.
- '';
- };
-
- };
-
- };
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- # Make tools such as tlsdate available in the system path
- environment.systemPackages = [ tlsdate ];
-
- systemd.services.tlsdated = {
- description = "tlsdated daemon";
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- # XXX because pkgs.tlsdate is compiled to run as nobody:nogroup, we
- # hard-code base-path to /tmp and use PrivateTmp.
- ExecStart = "${tlsdate}/bin/tlsdated -f ${pkgs.writeText "tlsdated.confg" ''
- base-path /tmp
-
- ${concatMapStrings (src: ''
- source
- host ${src.host}
- port ${toString src.port}
- proxy ${if src.proxy == null then "none" else src.proxy}
- end
- '') cfg.sources}
- ''} ${cfg.extraOptions}";
- PrivateTmp = "yes";
- };
- };
-
- };
-
-}
diff --git a/pkgs/tools/networking/tlsdate/default.nix b/pkgs/tools/networking/tlsdate/default.nix
deleted file mode 100644
index efea10eaa4d..00000000000
--- a/pkgs/tools/networking/tlsdate/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchpatch
-, autoconf
-, automake
-, libevent
-, libtool
-, pkgconfig
-, openssl
-}:
-
-stdenv.mkDerivation rec {
- version = "0.0.13";
- name = "tlsdate-${version}";
-
- src = fetchFromGitHub {
- owner = "ioerror";
- repo = "tlsdate";
- rev = name;
- sha256 = "0w3v63qmbhpqlxjsvf4k3zp90k6mdzi8cdpgshan9iphy1f44xgl";
- };
-
- patches = [
- (fetchpatch {
- name = "tlsdate-no_sslv3.patch";
- url = "https://github.com/ioerror/tlsdate/commit/f9d3cba7536d1679e98172ccbddad32bc9ae490c.patch";
- sha256 = "0prv46vxvb4paxaswmc6ix0kd5sp0552i5msdldnhg9fysbac8s0";
- })
- ];
-
- buildInputs = [
- autoconf
- automake
- libevent
- libtool
- pkgconfig
- openssl
- ];
-
- preConfigure = ''
- export COMPILE_DATE=0
- ./autogen.sh
- '';
-
- doCheck = true;
-
- meta = with stdenv.lib; {
- description = "Secure parasitic rdate replacement";
- homepage = https://github.com/ioerror/tlsdate;
- maintainers = with maintainers; [ tv fpletz ];
- platforms = platforms.allBut platforms.darwin;
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e7ebedbc13..afacaba3e25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4476,8 +4476,6 @@ with pkgs;
tiny8086 = callPackage ../applications/virtualization/8086tiny { };
- tlsdate = callPackage ../tools/networking/tlsdate { };
-
tldr = callPackage ../tools/misc/tldr { };
tlspool = callPackage ../tools/networking/tlspool { };