Unverified Commit 86463cdd authored by Maximilian Bosch's avatar Maximilian Bosch
Browse files

lasuite-docs{,-frontend,-collaboration-server}: 4.8.1 -> 4.8.4 

Changes:
* https://github.com/suitenumerique/docs/releases/tag/v4.8.2
* https://github.com/suitenumerique/docs/releases/tag/v4.8.3
* https://github.com/suitenumerique/docs/releases/tag/v4.8.4
parent af50eca1

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.1";

  version = "4.8.4";



  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "docs";

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

    hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY=";

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

  };



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



  offlineCache = fetchYarnDeps {

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

    hash = "sha256-F8VXjGY6Ct2Y8btqOmxZevCkxBvqg6xWZLYTZA2uUnM=";

    hash = "sha256-ElI6WWKPCsO7Viexgp2XtcjXAXzFnG2ZPN5PjOaKO2g=";

  };



  nativeBuildInputs = [

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

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

  fetchFromGitHub,

  stdenv,

  fetchpatch,

  fetchYarnDeps,

  nodejs,

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


stdenv.mkDerivation (finalAttrs: {

  pname = "lasuite-docs-frontend";

  version = "4.8.1";

  version = "4.8.4";



  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "docs";

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

    hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY=";

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

  };



  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-F8VXjGY6Ct2Y8btqOmxZevCkxBvqg6xWZLYTZA2uUnM=";

    hash = "sha256-ElI6WWKPCsO7Viexgp2XtcjXAXzFnG2ZPN5PjOaKO2g=";

  };



  nativeBuildInputs = [

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

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

}:

let

  version = "4.8.1";

  version = "4.8.4";

  src = fetchFromGitHub {

    owner = "suitenumerique";

    repo = "docs";

    tag = "v${version}";

    hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY=";

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

  };



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


    offlineCache = fetchYarnDeps {

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

      hash = "sha256-ag9+g48dWl5Ww/78qqgtcKwiyPVlpNiJ7w7+DPaar2U=";

      hash = "sha256-Fd9HJ7c7fh8YYZrfzRK7BnlnHAXeyeQ9UBabnRlA+w0=";

    };



    nativeBuildInputs = [
@@ -88,6 +88,7 @@ python3Packages.buildPythonApplication (finalAttrs: { 
      django-storages

      django-timezone-field

      django-treebeard

      django-waffle

      djangorestframework

      drf-spectacular

      drf-spectacular-sidecar
@@ -145,6 +146,8 @@ python3Packages.buildPythonApplication (finalAttrs: { 


      mkdir -p $out/${python3.sitePackages}/core/templates

      ln -sv ${mail-templates}/ $out/${python3.sitePackages}/core/templates/mail



      cp -r impress/configuration $out/${python3.sitePackages}/impress/configuration

    '';



  passthru.tests = {