From 9beed5436762949c19763b32cd23600eb85f934d Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 13 Sep 2025 16:33:40 -0400 Subject: [PATCH 1/3] lasuite-docs: 3.4.2 -> 3.6.0 --- .../la/lasuite-docs/mjml-mail-dir.patch | 26 ------------------- pkgs/by-name/la/lasuite-docs/package.nix | 9 +++---- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 pkgs/by-name/la/lasuite-docs/mjml-mail-dir.patch diff --git a/pkgs/by-name/la/lasuite-docs/mjml-mail-dir.patch b/pkgs/by-name/la/lasuite-docs/mjml-mail-dir.patch deleted file mode 100644 index 4d9f554648c8..000000000000 --- a/pkgs/by-name/la/lasuite-docs/mjml-mail-dir.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/mail/bin/html-to-plain-text b/src/mail/bin/html-to-plain-text -index ced0c13d..bcdef288 100755 ---- a/src/mail/bin/html-to-plain-text -+++ b/src/mail/bin/html-to-plain-text -@@ -1,7 +1,7 @@ - #!/usr/bin/env bash - set -eo pipefail - # Run html-to-text to convert all html files to text files --DIR_MAILS="../backend/core/templates/mail/" -+DIR_MAILS="${DIR_MAILS:-../backend/core/templates/mail}/" - - if [ ! -d "${DIR_MAILS}" ]; then - mkdir -p "${DIR_MAILS}"; -diff --git a/src/mail/bin/mjml-to-html b/src/mail/bin/mjml-to-html -index fb5710b0..15e2fc7d 100755 ---- a/src/mail/bin/mjml-to-html -+++ b/src/mail/bin/mjml-to-html -@@ -1,7 +1,7 @@ - #!/usr/bin/env bash - - # Run mjml command to convert all mjml templates to html files --DIR_MAILS="../backend/core/templates/mail/html/" -+DIR_MAILS="${DIR_MAILS:-../backend/core/templates/mail}/html/" - - if [ ! -d "${DIR_MAILS}" ]; then - mkdir -p "${DIR_MAILS}"; diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 322f61ae8e95..9268b4fc5969 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -26,12 +26,12 @@ let }; }; - version = "3.4.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU="; + hash = "sha256-8bD+rBEN0GEQz3tiPEQYmf/mpijPefFmQchGhYkVBVY="; }; mail-templates = stdenv.mkDerivation { @@ -40,10 +40,7 @@ let sourceRoot = "source/src/mail"; - patches = [ ./mjml-mail-dir.patch ]; - patchFlags = [ "-p3" ]; - - env.DIR_MAILS = "${placeholder "out"}"; + env.DOCS_DIR_MAILS = "${placeholder "out"}"; offlineCache = fetchYarnDeps { yarnLock = "${src}/src/mail/yarn.lock"; From d4ea8f745f8b1aa886aabdf90b559b816aab9a87 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 13 Sep 2025 16:56:44 -0400 Subject: [PATCH 2/3] lasuite-docs-collaboration-server: 3.4.2 -> 3.6.0 --- .../la/lasuite-docs-collaboration-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index 44e340b76f74..4aec5a19498f 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -13,20 +13,20 @@ stdenv.mkDerivation rec { pname = "lasuite-docs-collaboration-server"; - version = "3.4.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU="; + hash = "sha256-8bD+rBEN0GEQz3tiPEQYmf/mpijPefFmQchGhYkVBVY="; }; sourceRoot = "source/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${src}/src/frontend/yarn.lock"; - hash = "sha256-07zsggGQFX/Wx/fxs1f0w01HHx7Z2BG5d3PIBlX2SVM="; + hash = "sha256-b4JBjJUB1i9jYSy+RFkXKmq6rzp28xHLdPNSH0QO1Ek="; }; nativeBuildInputs = [ From c112711203311c8ca77ed6c31ea7f3fd57fcdd80 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 13 Sep 2025 17:02:35 -0400 Subject: [PATCH 3/3] lasuite-docs-frontend: 3.4.2 -> 3.6.0 --- pkgs/by-name/la/lasuite-docs-frontend/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index de5d31a94019..3862e34dac5f 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -12,20 +12,20 @@ stdenv.mkDerivation rec { pname = "lasuite-docs-frontend"; - version = "3.4.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU="; + hash = "sha256-8bD+rBEN0GEQz3tiPEQYmf/mpijPefFmQchGhYkVBVY="; }; sourceRoot = "source/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${src}/src/frontend/yarn.lock"; - hash = "sha256-07zsggGQFX/Wx/fxs1f0w01HHx7Z2BG5d3PIBlX2SVM="; + hash = "sha256-b4JBjJUB1i9jYSy+RFkXKmq6rzp28xHLdPNSH0QO1Ek="; }; nativeBuildInputs = [