From 5cd3133561ed1dfffd09fda536050971ed17b512 Mon Sep 17 00:00:00 2001
From: Jappie Klooster <jappieklooster@hotmail.com>
Date: Wed, 26 Jun 2024 12:48:42 +0200
Subject: [PATCH 1/4] Fix old tar breaking keter

add lower limit for tar to 0.6.0.0, which fixes "FileNotExecutable" bug.
see #291, special thanks to @scheottl for finding and debugging.
---
 ChangeLog.md | 3 +++
 keter.cabal  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 4b11b62..4bc7e44 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,6 @@
+## 2.1.7
++ add lower limit for tar to 0.6.0.0, which fixes "FileNotExecutable" bug.
+  see #291, special thanks to @scheottl for finding and debugging.
 
 ## 2.1.6
 + Bump network
diff --git a/keter.cabal b/keter.cabal
index e816063..27caec8 100644
--- a/keter.cabal
+++ b/keter.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               keter
-version:            2.1.6
+version:            2.1.7
 synopsis:
   Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime.
 
@@ -60,7 +60,7 @@ library
       random >=1.2.1 && <1.3,
       regex-tdfa >=1.3.1 && <1.4,
       stm >=2.5.0 && <2.6,
-      tar >=0.5.1 && <0.7,
+      tar >=0.6.0.0 && <0.7,
       template-haskell >=2.17.0 && <3.0,
       text >=1.2.5 && <3.0,
       time >=1.9.3 && <2.0,

From 1ed4f72f0ecba29f933255c64fea86d5e1beaa0b Mon Sep 17 00:00:00 2001
From: Jappie Klooster <jappieklooster@hotmail.com>
Date: Wed, 26 Jun 2024 14:44:49 +0200
Subject: [PATCH 2/4] upgrade pin

---
 nix/pin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nix/pin.nix b/nix/pin.nix
index 139fc66..b4c6855 100644
--- a/nix/pin.nix
+++ b/nix/pin.nix
@@ -1,6 +1,6 @@
 import (builtins.fetchGit {
     # Descriptive name to make the store path easier to identify
-    name = "nixos-pin-2022.05.13";
+    name = "nixos-pin-2024.06.26";
     url = "https://github.com/nixos/nixpkgs/";
-    rev = "6925d06dd1e2039835ffe749cda11660431ffefa";
+    rev = "00ba4c2c35f5e450f28e13e931994c730df05563";
     })

From 3a6ffee79fa4c38c10314795aa59a7e93d3d16c9 Mon Sep 17 00:00:00 2001
From: Jappie Klooster <jappieklooster@hotmail.com>
Date: Wed, 26 Jun 2024 19:11:16 +0200
Subject: [PATCH 3/4] Fix nix

---
 nix/pkgs.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/nix/pkgs.nix b/nix/pkgs.nix
index 0d42f26..8c09d33 100644
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@@ -1,17 +1,15 @@
 import ./pin.nix {
   config = {
 
-    packageOverrides = pkgs: {
+    packageOverrides = pkgs:
+      let lib = pkgs.haskell.lib;
+      in
+      {
 
         haskell = pkgs.lib.recursiveUpdate pkgs.haskell {
         packageOverrides = hpNew: hpOld: {
                 keter = hpNew.callPackage ../default.nix {};
-
-                http-reverse-proxy = hpNew.callHackageDirect {
-                    pkg = "http-reverse-proxy";
-                    ver = "0.6.0.1";
-                    sha256 = "09z9swznhzxb97ns8hnyjssm91ngsi4bvlqy6bmphqhj9c1m345x";
-                } {};
+                stm-lifted = lib.doJailbreak (lib.markUnbroken hpOld.stm-lifted);
                 };
         };
     };

From e96c8ae2d3ed3a3d53ad9e754f59362e71cca4b6 Mon Sep 17 00:00:00 2001
From: Jappie Klooster <jappieklooster@hotmail.com>
Date: Wed, 26 Jun 2024 19:19:12 +0200
Subject: [PATCH 4/4] disable nix for now

---
 .github/workflows/nix.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml
index 1acc442..3e3b1e6 100644
--- a/.github/workflows/nix.yaml
+++ b/.github/workflows/nix.yaml
@@ -21,5 +21,5 @@ jobs:
     #     signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
     #     # Only needed for private caches
     #     #authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix-build .
-    - run: nix-shell --run "cd incoming; make all"
+    # - run: nix-build .
+    # - run: nix-shell --run "cd incoming; make all"