Unverified Commit 4539466a authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

lasuite-docs{,-frontend,-collaboration-server}: 4.8.4 -> 4.8.5 (#507297)

parents 93be9a3d 5f4797ae

nixos/modules/services/web-apps/lasuite-docs.nix

+5 −0
Original line number Diff line number Diff line
@@ -519,6 +519,11 @@ in 
          tryFiles = "$uri /docs/[id]/index.html";

        };



        locations."~ '^/user-reconciliations/(active|inactive)/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/?$'" =

          {

            tryFiles = "$uri /user-reconciliations/$1/[id]/index.html";

          };



        locations."/api" = {

          proxyPass = "http://${cfg.bind}";

          recommendedProxySettings = true;

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 (finalAttrs: {

  pname = "lasuite-docs-collaboration-server";

  version = "4.8.4";

  version = "4.8.5";



  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "docs";

    tag = "v${finalAttrs.version}";

    hash = "sha256-k90JxFxXL3vEGBMkgbQABUCK99utJ88E/v9Zcj/2oBo=";

    hash = "sha256-zXV3gXUgN28a2J48EwS6RrYxkIgoj0IJ5lPTxvexYdA=";

  };



  sourceRoot = "${finalAttrs.src.name}/src/frontend";



  offlineCache = fetchYarnDeps {

    yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";

    hash = "sha256-ElI6WWKPCsO7Viexgp2XtcjXAXzFnG2ZPN5PjOaKO2g=";

    hash = "sha256-3irVoASl77ZU6+WIe5O+HY7QSggeK9lxQwwEYzgwl+o=";

  };



  nativeBuildInputs = [

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

+3 −14
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  fetchFromGitHub,

  stdenv,

  fetchpatch,

  fetchYarnDeps,

  nodejs,

  fixup-yarn-lock,
@@ -13,30 +12,20 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "lasuite-docs-frontend";

  version = "4.8.4";

  version = "4.8.5";



  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "docs";

    tag = "v${finalAttrs.version}";

    hash = "sha256-k90JxFxXL3vEGBMkgbQABUCK99utJ88E/v9Zcj/2oBo=";

    hash = "sha256-zXV3gXUgN28a2J48EwS6RrYxkIgoj0IJ5lPTxvexYdA=";

  };



  sourceRoot = "${finalAttrs.src.name}/src/frontend";



  patches = [

    # from https://github.com/suitenumerique/docs/pull/2147,

    # fixes the frontend when using the MIT build.

    (fetchpatch {

      url = "https://github.com/suitenumerique/docs/commit/79e909cf6489428d8f6644d772006f73503b7073.patch";

      hash = "sha256-Ucw1KtsFrPvtoeeG2fH5L64Jfcog4RV38Qg+EykGcQY=";

      stripLen = 2;

    })

  ];



  offlineCache = fetchYarnDeps {

    yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";

    hash = "sha256-ElI6WWKPCsO7Viexgp2XtcjXAXzFnG2ZPN5PjOaKO2g=";

    hash = "sha256-3irVoASl77ZU6+WIe5O+HY7QSggeK9lxQwwEYzgwl+o=";

  };



  nativeBuildInputs = [

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

+3 −3
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ 
  yarnConfigHook,

}:

let

  version = "4.8.4";

  version = "4.8.5";

  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "docs";

    tag = "v${version}";

    hash = "sha256-k90JxFxXL3vEGBMkgbQABUCK99utJ88E/v9Zcj/2oBo=";

    hash = "sha256-zXV3gXUgN28a2J48EwS6RrYxkIgoj0IJ5lPTxvexYdA=";

  };



  mail-templates = stdenv.mkDerivation {
@@ -29,7 +29,7 @@ let 


    offlineCache = fetchYarnDeps {

      yarnLock = "${src}/src/mail/yarn.lock";

      hash = "sha256-Fd9HJ7c7fh8YYZrfzRK7BnlnHAXeyeQ9UBabnRlA+w0=";

      hash = "sha256-B2vtdQYFhhsA7dK5nwAJl65kaedspfYySJJBjVwYeBM=";

    };



    nativeBuildInputs = [