movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-20 08:29:20 +03:00
Code Activity

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

Browse source
This commit is contained in:
Bruno BELANYI 2025-04-02 18:07:05 +01:00 • committed by GitHub
commit b19d7721ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1735 additions and 1234 deletions
Download patch file Download diff file Expand all files Collapse all files

2950
pkgs/by-name/co/collabora-online/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

17
pkgs/by-name/co/collabora-online/package.nix
View file

@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "collabora-online"; pname = "collabora-online";
version = "24.04.6-1"; version = "24.04.13-2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CollaboraOnline"; owner = "CollaboraOnline";
repo = "online"; repo = "online";
tag = "cp-${finalAttrs.version}"; tag = "cp-${finalAttrs.version}";
hash = "sha256-0IvymvXAozsjm+GXJK9AGWo79QMaIACrAfkYfX67fBc="; hash = "sha256-d6i/aSmbim7UAKz9VX1ClbtIQravMq0r8beZC9FD6as=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -56,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
zstd zstd
]; ];
enableParallelBuilding = true;
configureFlags = [ configureFlags = [
"--disable-setcap" "--disable-setcap"
"--disable-werror" "--disable-werror"
@ -66,11 +68,11 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ patches = [
./fix-file-server-regex.patch ./fix-file-server-regex.patch
# Remove after next release # https://github.com/CollaboraOnline/online/pull/11464/
(fetchpatch { (fetchpatch {
name = "add-missing-includes-for-poco-1.14.1"; name = "fix-testPreProcessedFileSubstitution";
url = "https://patch-diff.githubusercontent.com/raw/CollaboraOnline/online/pull/11196.patch"; url = "https://github.com/CollaboraOnline/online/commit/76a4b64297d721d66603dc63f525324475036917.patch";
hash = "sha256-ke4dOxITFHK3xMXIdp+zzUEGYMyDxMJrbbXTN+LaoVU="; hash = "sha256-PGys1dpHLFsUKKA1YyxkJpbBbc2prySdGH/CZni90kI=";
}) })
]; ];
@ -94,14 +96,13 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = '' postPatch = ''
cp ${./package-lock.json} package-lock.json cp ${./package-lock.json} package-lock.json
''; '';
hash = "sha256-CUh+jwJnKtmzk8w6QwH1Nh92500dFj63ThkI4tN5FyQ="; hash = "sha256-0RnGt9NLgyARgbh2GOcz7H3l4vtij8PD5jmcdUDB/5Y=";
}; };
npmRoot = "browser"; npmRoot = "browser";
passthru = { passthru = {
libreoffice = libreoffice-collabora; # Used by NixOS module. libreoffice = libreoffice-collabora; # Used by NixOS module.
updateScript = ./update.sh;
}; };
meta = { meta = {

2
pkgs/by-name/co/collabora-online/update.sh
View file

@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell #! /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 #shellcheck shell=bash
set -xeu -o pipefail set -xeu -o pipefail