From 283b4658c2778b2fd11cb904831137242dbbe0d6 Mon Sep 17 00:00:00 2001 From: Sergey Kurgak Date: Fri, 24 Apr 2026 14:53:35 +0400 Subject: [PATCH 1/3] Use localStorageOnly --- src/Yesod/Pendo.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Yesod/Pendo.hs b/src/Yesod/Pendo.hs index e1c3ae4..c735917 100644 --- a/src/Yesod/Pendo.hs +++ b/src/Yesod/Pendo.hs @@ -76,7 +76,8 @@ addPendo = do guidesFailed: function() { document.dispatchEvent(new Event("PENDO_GUIDES_FAILED")); } - } + }, + localStorageOnly: true }); })(#{apiKey}); |] From be81848b6839fb9133f44c7c5fc3b97c4392d79a Mon Sep 17 00:00:00 2001 From: Sergey Kurgak Date: Fri, 24 Apr 2026 18:00:57 +0400 Subject: [PATCH 2/3] Modify nix flake --- flake.lock | 26 ++++++++++++++++++++++---- flake.nix | 25 ++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index d324250..e0c4258 100644 --- a/flake.lock +++ b/flake.lock @@ -20,15 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688237090, - "narHash": "sha256-eA/Wfmg3XDwbbP1xDcTJF0HZna9jtQcQdEWEJV2G/xw=", + "lastModified": 1776734388, + "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9edfe6dfc69d5995c024dc219187042c5de5c5e8", + "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -36,7 +37,8 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "yesod-middleware-csp": "yesod-middleware-csp" } }, "systems": { @@ -53,6 +55,22 @@ "repo": "default", "type": "github" } + }, + "yesod-middleware-csp": { + "flake": false, + "locked": { + "lastModified": 1686786406, + "narHash": "sha256-asXBtjdY/A0ykpL6v/Lbq1scw6Ykna0fxNhqpWBwv8A=", + "owner": "SupercedeTech", + "repo": "yesod-middleware-csp", + "rev": "bb2dde22f88f256d1526ed6dbf3522bdd2fb9ec2", + "type": "github" + }, + "original": { + "owner": "SupercedeTech", + "repo": "yesod-middleware-csp", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 17d83a5..1f521d5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,31 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.11"; flake-utils.url = "github:numtide/flake-utils"; + yesod-middleware-csp = { + url = "github:SupercedeTech/yesod-middleware-csp"; + flake = false; + }; }; - outputs = { self, nixpkgs, flake-utils }: + outputs = { self, nixpkgs, flake-utils, yesod-middleware-csp }: flake-utils.lib.eachDefaultSystem (system: - with nixpkgs.legacyPackages.${system}; + let + pkgs = import nixpkgs { + inherit system; + overlays = [(_: prev: { + haskellPackages = prev.haskellPackages.override { + overrides = _: hprev: { + yesod-middleware-csp = prev.haskell.lib.doJailbreak + (hprev.callCabal2nix "supercede-yesod-middleware-csp" + yesod-middleware-csp + { }); + }; + }; + })]; + }; + in + with pkgs; let t = lib.trivial; hl = haskell.lib; From ba4c3b6034d9c5f0e5bb3548f574829081a0cf09 Mon Sep 17 00:00:00 2001 From: Sergey Kurgak Date: Fri, 24 Apr 2026 21:07:01 +0400 Subject: [PATCH 3/3] Remove 'with pkgs' --- flake.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 1f521d5..661e549 100644 --- a/flake.nix +++ b/flake.nix @@ -24,19 +24,15 @@ }; })]; }; - in - with pkgs; - let - t = lib.trivial; - hl = haskell.lib; - name = "yesod-pendo"; + t = pkgs.lib.trivial; + hl = pkgs.haskell.lib; project = devTools: let addBuildTools = (t.flip hl.addBuildTools) devTools; - in haskellPackages.developPackage { - root = lib.sourceFilesBySuffices ./. [ ".cabal" ".hs" ]; - name = name; + in pkgs.haskellPackages.developPackage { + root = pkgs.lib.sourceFilesBySuffices ./. [ ".cabal" ".hs" ]; + name = "yesod-pendo"; returnShellEnv = !(devTools == [ ]); modifier = (t.flip t.pipe) [ @@ -54,7 +50,7 @@ defaultPackage = self.packages.${system}.pkg; - devShell = project (with haskellPackages; [ + devShell = project (with pkgs.haskellPackages; [ cabal-fmt cabal-install hlint