gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mattermost, mattermostLatest: 11.6.1 -> 11.7.0 (#520723)

Browse Source
This commit is contained in:
@mjones
2026-05-16 20:01:40 +00:00
committed by GitHub
parent 2aacf99e88 6920499ae0
commit 793fb74a57
3 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+5 -3
View File
@@ -20226,11 +20226,13 @@
github = "numinit";
githubId = 369111;
keys = [
# >=2025, stays in one place
# SSH
{ fingerprint = "XX/0lMz82MpucPqf0KG+5EJoozzNRi8i/t59byD2kNo"; }
# GPG, >=2025, stays in one place
{ fingerprint = "FD28 F9C9 81C5 D78E 56E8 8311 5C3E B94D 198F 1491"; }
# >=2025, travels with me
# GPG, >=2025, travels with me
{ fingerprint = "C48F 475F 30A9 B192 3213 D5D5 C6E2 4809 77B2 F2F4"; }
# <=2024
# GPG, <=2024
{ fingerprint = "190B DA97 F616 DE35 6899 ED17 F819 F1AF 2FC1 C1FF"; }
];
};
pkgs/by-name/ma/mattermost/package.nix
+38 -15
View File
@@ -12,6 +12,7 @@
jq,
nixosTests,
latestVersionInfo ? null,
versionInfo ? {
# ESR releases only. Note: if NixOS would release with an ESR that goes out
# of support during the lifetime of the NixOS release, it is acceptable
@@ -23,11 +24,11 @@
# the version regex here as well.
#
# Ensure you also check ../mattermostLatest/package.nix.
regex = "^v(11\\.[67]\\.[0-9]+)$";
version = "11.6.1";
srcHash = "sha256-0TUh5qKi64jt3YhgCTceoizOGzqyt70Rh8VH+bSfS5o=";
vendorHash = "sha256-bWl1rdVRTOJzS2HKKsSRhzVcH1sPgEAlRLjrc+/o0lo=";
npmDepsHash = "sha256-30xwoizNh6fAWS0YdEheXtcO6I9MjoFdCekvLnnoBMc=";
regex = "^v(11\\.7\\.[0-9]+)$";
version = "11.7.0";
srcHash = "sha256-oH9bLN2BPvRSWl5m3VNHBNMBXfdmkwaE9tzL7pcD1mg=";
vendorHash = "sha256-PmwwiXNaDarc1H7z1G4zstgs7tvmZ/d7V5eGqMh1VX4=";
npmDepsHash = "sha256-C3vfWW2hMOMnrPn1538kT+ma09T9VswrmADV/KPkrPc=";
},
...
}:
@@ -87,16 +88,27 @@ let
};
in
finalPassthru.withoutTests;
versionInfo' =
if
latestVersionInfo != null && lib.versionAtLeast latestVersionInfo.version versionInfo.version
then
# Prefer the latest if we're building mattermostLatest
latestVersionInfo
else
# Prefer the one we have
assert versionInfo != null;
versionInfo;
in
buildMattermost rec {
pname = "mattermost";
inherit (versionInfo) version;
inherit (versionInfo') version;
src = fetchFromGitHub {
owner = "mattermost";
repo = "mattermost";
tag = "v${version}";
hash = versionInfo.srcHash;
hash = versionInfo'.srcHash;
postFetch = ''
cd $out/webapp
@@ -107,13 +119,13 @@ buildMattermost rec {
' < package-lock.json > package-lock.fixed.json
# Run the lockfile overlay, if present.
${lib.optionalString (versionInfo.lockfileOverlay or null != null) ''
${lib.optionalString (versionInfo'.lockfileOverlay or null != null) ''
${lib.getExe jq} ${lib.escapeShellArg ''
# Unlock a dependency and let npm-lockfile-fix relock it.
def unlock(root; dependency; path):
root | .packages[path] |= del(.resolved, .integrity)
| .packages[path].version = root.packages.channels.dependencies[dependency];
${versionInfo.lockfileOverlay}
${versionInfo'.lockfileOverlay}
''} < package-lock.fixed.json > package-lock.overlaid.json
mv package-lock.overlaid.json package-lock.fixed.json
''}
@@ -130,20 +142,24 @@ buildMattermost rec {
# https://github.com/mattermost/mattermost/issues/26221#issuecomment-1945351597
overrideModAttrs = _: {
buildPhase = ''
runHook preBuild
make setup-go-work
go work vendor -e -v
runHook postBuild
'';
};
npmDeps = fetchNpmDeps {
inherit src;
sourceRoot = "${src.name}/webapp";
hash = versionInfo.npmDepsHash;
hash = versionInfo'.npmDepsHash;
makeCacheWritable = true;
forceGitDeps = true;
};
inherit (versionInfo) vendorHash;
inherit (versionInfo') vendorHash;
modRoot = "./server";
preBuild = ''
@@ -188,9 +204,14 @@ buildMattermost rec {
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
for subPackage in $subPackages; do
echo "Checking version for: $subPackage" >&2
"$out/bin/$(basename -- "$subPackage")" version | grep "$version"
done
runHook postInstallCheck
'';
passthru = {
@@ -198,11 +219,11 @@ buildMattermost rec {
extraArgs = [
"--use-github-releases"
"--version-regex"
versionInfo.regex
versionInfo'.regex
]
++ lib.optionals (versionInfo.autoUpdate or null != null) [
++ lib.optionals (versionInfo'.autoUpdate or null != null) [
"--override-filename"
versionInfo.autoUpdate
versionInfo'.autoUpdate
];
};
tests.mattermost = nixosTests.mattermost;
@@ -235,7 +256,9 @@ buildMattermost rec {
runHook preBuild
for ws in platform/{types,client,components,shared} channels; do
npm run build --workspace="$ws"
if [ -d "$ws" ]; then
npm run build --workspace="$ws"
fi
done
runHook postBuild
pkgs/by-name/ma/mattermostLatest/package.nix
+21 -1
View File
@@ -3,4 +3,24 @@
...
}@args:
mattermost.override args
mattermost.override (
{
latestVersionInfo = {
# Latest, non-RC releases only.
# If the latest is an ESR (Extended Support Release),
# duplicate it here to facilitate the update script.
# Note that the Mattermost package will prefer whichever is later of this one
# or itself, in case the update script is lagging on one set of hashes.
# See https://docs.mattermost.com/about/mattermost-server-releases.html
# and make sure the version regex is up to date here.
# Ensure you also check ../mattermost/package.nix for ESR releases.
regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
version = "11.7.0";
srcHash = "sha256-oH9bLN2BPvRSWl5m3VNHBNMBXfdmkwaE9tzL7pcD1mg=";
vendorHash = "sha256-PmwwiXNaDarc1H7z1G4zstgs7tvmZ/d7V5eGqMh1VX4=";
npmDepsHash = "sha256-C3vfWW2hMOMnrPn1538kT+ma09T9VswrmADV/KPkrPc=";
autoUpdate = ./package.nix;
};
}
// args
)