From 701a1f2679dfcbddff4cf4f53817c0cd2ebf0084 Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Sun, 22 Mar 2026 12:27:52 +0100 Subject: [PATCH 1/5] Fix bounds for keter it's kinda hard expressing to AI how this should be --- ChangeLog.md | 5 +++++ keter.cabal | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 957793f..ac53fef 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,10 @@ # Changelog +## 2.3.3 + +- Bump wai-app-static upper bound to include 3.2.x +- set tls bound to be bigger then 2.3.0, this forces the solver to include ram on any comming version + ## 2.3.2 - Bump `tls` upper bound from `<2.2` to `<2.4` to allow tls 2.2.x and 2.3.x. diff --git a/keter.cabal b/keter.cabal index 2f393fe..8638206 100644 --- a/keter.cabal +++ b/keter.cabal @@ -62,7 +62,7 @@ library , template-haskell >=2.17.0 && <3.0 , text >=1.2.5 && <3.0 , time >=1.9.3 && <2.0 - , tls >=1.5.7 && <2.4 + , tls >=2.3.0 && <2.4 , tls-session-manager >=0.0.4 && <0.1 || ^>=0.1.0 , transformers >=0.5.6 && <0.7 , unix >=2.7.2 && <2.9 @@ -71,7 +71,7 @@ library , unordered-containers >=0.2.17 && <0.3 , vector >=0.12.3.0 && <1.0.0.0 , wai >=3.2.3 && <3.3 - , wai-app-static >=3.1 && <3.2 + , wai-app-static >=3.2 && <3.3 , wai-extra >=3.0.3 && <3.2 , warp >=3.3.20 && <3.4 || ^>=3.4.0 , warp-tls ^>=3.0.3 || ^>=3.1 || ^>=3.2 || ^>=3.3 || ^>=3.4 From 448bc3f57f8231271fe34fdccd3e6d817a559c0d Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Sun, 22 Mar 2026 12:35:33 +0100 Subject: [PATCH 2/5] update to latest nixpkgs hopefully we put the cypton stuff in stackage now? --- flake.lock | 7 +++---- flake.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index a6b5960..0870482 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755274400, - "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", + "lastModified": 1774176452, + "narHash": "sha256-xknh83RyYAKcI2nqTdbWq/wwstknHm7cUWFuLyJCBjQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", + "rev": "e1e423f183cde97926ac113d8a4de5a5042a7264", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 4267c5b..1fb06c4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; }; From ac3c7d7569729484cdea66daa9f35c4099f228fd Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Sun, 22 Mar 2026 12:42:00 +0100 Subject: [PATCH 3/5] Revert "update to latest nixpkgs" This reverts commit 448bc3f57f8231271fe34fdccd3e6d817a559c0d. --- flake.lock | 7 ++++--- flake.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 0870482..a6b5960 100644 --- a/flake.lock +++ b/flake.lock @@ -20,15 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774176452, - "narHash": "sha256-xknh83RyYAKcI2nqTdbWq/wwstknHm7cUWFuLyJCBjQ=", + "lastModified": 1755274400, + "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e1e423f183cde97926ac113d8a4de5a5042a7264", + "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 1fb06c4..4267c5b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05"; flake-utils.url = "github:numtide/flake-utils"; }; From d8f7736af5f934cdc95be797fd29d153829c0e99 Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Sun, 22 Mar 2026 12:46:25 +0100 Subject: [PATCH 4/5] give larger bound so the nix build can succeed It's weird because we want to disallow it pulling in memory and ram, but no good way to express that. --- keter.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keter.cabal b/keter.cabal index 8638206..a12d1d1 100644 --- a/keter.cabal +++ b/keter.cabal @@ -62,7 +62,7 @@ library , template-haskell >=2.17.0 && <3.0 , text >=1.2.5 && <3.0 , time >=1.9.3 && <2.0 - , tls >=2.3.0 && <2.4 + , tls >=1.5.7 && <2.4 , tls-session-manager >=0.0.4 && <0.1 || ^>=0.1.0 , transformers >=0.5.6 && <0.7 , unix >=2.7.2 && <2.9 @@ -71,7 +71,7 @@ library , unordered-containers >=0.2.17 && <0.3 , vector >=0.12.3.0 && <1.0.0.0 , wai >=3.2.3 && <3.3 - , wai-app-static >=3.2 && <3.3 + , wai-app-static >=3.1 && <3.3 , wai-extra >=3.0.3 && <3.2 , warp >=3.3.20 && <3.4 || ^>=3.4.0 , warp-tls ^>=3.0.3 || ^>=3.1 || ^>=3.2 || ^>=3.3 || ^>=3.4 From 60925965de808c2a9d0f431f35bc373ff1961881 Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Sun, 22 Mar 2026 12:56:57 +0100 Subject: [PATCH 5/5] fix cabal buidls --- cabal.project | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 cabal.project diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..04ed57b --- /dev/null +++ b/cabal.project @@ -0,0 +1,6 @@ +packages: . + +source-repository-package + type: git + location: https://github.com/haskell/wreq.git + tag: master