Unverified Commit b19d7721 authored by Bruno BELANYI's avatar Bruno BELANYI Committed by GitHub
Browse files

collabora-online: 24.04.6-1 -> 24.04.13-2 (#393618)

parents 50bfb2f2 57b4e9ba

pkgs/by-name/co/collabora-online/package-lock.json

+1716 −1216

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/co/collabora-online/package.nix

+9 −8
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "collabora-online";

  version = "24.04.6-1";

  version = "24.04.13-2";



  src = fetchFromGitHub {

    owner = "CollaboraOnline";

    repo = "online";

    tag = "cp-${finalAttrs.version}";

    hash = "sha256-0IvymvXAozsjm+GXJK9AGWo79QMaIACrAfkYfX67fBc=";

    hash = "sha256-d6i/aSmbim7UAKz9VX1ClbtIQravMq0r8beZC9FD6as=";

  };



  nativeBuildInputs = [
@@ -56,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: { 
    zstd

  ];



  enableParallelBuilding = true;



  configureFlags = [

    "--disable-setcap"

    "--disable-werror"
@@ -66,11 +68,11 @@ stdenv.mkDerivation (finalAttrs: { 


  patches = [

    ./fix-file-server-regex.patch

    # Remove after next release

    # https://github.com/CollaboraOnline/online/pull/11464/

    (fetchpatch {

      name = "add-missing-includes-for-poco-1.14.1";

      url = "https://patch-diff.githubusercontent.com/raw/CollaboraOnline/online/pull/11196.patch";

      hash = "sha256-ke4dOxITFHK3xMXIdp+zzUEGYMyDxMJrbbXTN+LaoVU=";

      name = "fix-testPreProcessedFileSubstitution";

      url = "https://github.com/CollaboraOnline/online/commit/76a4b64297d721d66603dc63f525324475036917.patch";

      hash = "sha256-PGys1dpHLFsUKKA1YyxkJpbBbc2prySdGH/CZni90kI=";

    })

  ];
@@ -94,14 +96,13 @@ stdenv.mkDerivation (finalAttrs: { 
    postPatch = ''

      cp ${./package-lock.json} package-lock.json

    '';

    hash = "sha256-CUh+jwJnKtmzk8w6QwH1Nh92500dFj63ThkI4tN5FyQ=";

    hash = "sha256-0RnGt9NLgyARgbh2GOcz7H3l4vtij8PD5jmcdUDB/5Y=";

  };



  npmRoot = "browser";



  passthru = {

    libreoffice = libreoffice-collabora; # Used by NixOS module.

    updateScript = ./update.sh;

  };



  meta = {

pkgs/by-name/co/collabora-online/update.sh

+1 −1
Original line number Diff line number Diff line 
#! /usr/bin/env nix-shell

#! nix-shell -i bash -p common-updater-scripts prefetch-npm-deps jq sd

#! nix-shell -i bash -p common-updater-scripts prefetch-npm-deps jq sd nodejs

#shellcheck shell=bash



set -xeu -o pipefail