From b0274abf85097e9a2da868b28a5532918dc14380 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 16 Oct 2021 07:10:22 +0200
Subject: [PATCH 1/2] =?UTF-8?q?tamarin-prover:=201.6.0=20=E2=86=92=201.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 05838a1632cab4f0371356666ed57f0be01575a9)
---
 .../science/logic/tamarin-prover/default.nix           | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index a77f2dbac442..76dc559cb7ae 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -4,12 +4,12 @@
 }:
 
 let
-  version = "1.6.0";
+  version = "1.6.1";
   src = fetchFromGitHub {
     owner  = "tamarin-prover";
     repo   = "tamarin-prover";
     rev    = version;
-    sha256 = "1pl3kz7gyw9g6s4x5j90z4snd10vq6296g3ajlr8d4n53p3c9i3w";
+    sha256 = "sha256:0cz1v7k4d0im749ag632nc34n91b51b0pq4z05rzw1p59a5lza92";
   };
 
   # tamarin has its own dependencies, but they're kept inside the repo,
@@ -85,15 +85,11 @@ mkDerivation (common "tamarin-prover" src // {
 
   executableHaskellDepends = (with haskellPackages; [
     binary-instances binary-orphans blaze-html conduit file-embed
-    gitrev http-types lifted-base monad-control monad-unlift
+    gitrev http-types lifted-base monad-control
     resourcet shakespeare threads wai warp yesod-core yesod-static
   ]) ++ [ tamarin-prover-utils
           tamarin-prover-sapic
           tamarin-prover-term
           tamarin-prover-theory
         ];
-
-  # tamarin-prover 1.6 is incompatible with maude 3.1.
-  hydraPlatforms = lib.platforms.none;
-  broken = true;
 })

From 0719766deef18b1b59275d2869b9e72d6d3aa19c Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 3 Oct 2021 08:06:37 +0300
Subject: [PATCH 2/2] cfdyndns: fix startAt by setting it to *:0/5 instead of 5
 minutes

5 minutes is invalid for startAt

(cherry picked from commit 2e4938eb6a7d594aa3884e903ac40270c5af2258)
---
 nixos/modules/services/misc/cfdyndns.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixos/modules/services/misc/cfdyndns.nix
index 15af1f50da1d..5885617d7429 100644
--- a/nixos/modules/services/misc/cfdyndns.nix
+++ b/nixos/modules/services/misc/cfdyndns.nix
@@ -48,7 +48,7 @@ in
       description = "CloudFlare Dynamic DNS Client";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      startAt = "5 minutes";
+      startAt = "*:0/5";
       serviceConfig = {
         Type = "simple";
         User = config.ids.uids.cfdyndns;