Unverified Commit bad8bf4b authored by isabel's avatar isabel Committed by GitHub
Browse files

lasuite-docs: 3.4.2 -> 3.6.0 (#442744)

parents a171774a c1127112

pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 = [

pkgs/by-name/la/lasuite-docs-frontend/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 = [

pkgs/by-name/la/lasuite-docs/mjml-mail-dir.patch

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
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}";

pkgs/by-name/la/lasuite-docs/package.nix

+3 −6
Original line number Diff line number Diff line
@@ -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";