nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #221709 from Izorkin/update-mastodon

Browse Source
This commit is contained in:
Sandro 2023-03-21 00:46:14 +01:00 committed by GitHub
commit 56c62c8ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/servers/mastodon/default.nix
View File

@ -72,15 +72,13 @@ stdenv.mkDerivation rec {
rm -rf ~/node_modules/.cache rm -rf ~/node_modules/.cache
# Create missing static gzip and brotli files # Create missing static gzip and brotli files
gzip -9 -n -c ~/public/assets/500.html > ~/public/assets/500.html.gz gzip --best --keep ~/public/assets/500.html
gzip -9 -n -c ~/public/packs/report.html > ~/public/packs/report.html.gz gzip --best --keep ~/public/packs/report.html
find ~/public/assets -maxdepth 1 -type f -name ".*.json" | while read file; do find ~/public/assets -maxdepth 1 -type f -name '.*.json' \
gzip -9 -n -c $file > $file.gz -exec gzip --best --keep --force {} ';'
done brotli --best --keep ~/public/packs/report.html
brotli --best -f ~/public/packs/report.html -o ~/public/packs/report.html.br find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|js|json|html)' \
find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|js|json|html)' | while read file; do -exec brotli --best --keep {} ';'
brotli --best -f $file -o $file.br
done
''; '';
installPhase = '' installPhase = ''
@ -107,15 +105,16 @@ stdenv.mkDerivation rec {
fi fi
done done
# Remove execute permissions
chmod 0444 public/emoji/*.svg
# Create missing static gzip and brotli files # Create missing static gzip and brotli files
find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(css|js|svg|txt|xml)' | while read file; do find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(css|js|svg|txt|xml)' \
gzip -9 -n -c $file > $file.gz -exec gzip --best --keep --force {} ';' \
brotli --best -f $file -o $file.br -exec brotli --best --keep {} ';'
done find public/emoji -type f -name '.*.svg' \
find public/emoji -type f -name "*.svg" | while read file; do -exec gzip --best --keep --force {} ';' \
gzip -9 -n -c $file > $file.gz -exec brotli --best --keep {} ';'
brotli --best -f $file -o $file.br
done
ln -s assets/500.html.gz public/500.html.gz ln -s assets/500.html.gz public/500.html.gz
ln -s assets/500.html.br public/500.html.br ln -s assets/500.html.br public/500.html.br
ln -s packs/sw.js.gz public/sw.js.gz ln -s packs/sw.js.gz public/sw.js.gz

4
pkgs/servers/mastodon/source.nix
View File

@ -2,8 +2,8 @@
{ fetchgit, applyPatches }: let { fetchgit, applyPatches }: let
src = fetchgit { src = fetchgit {
url = "https://github.com/mastodon/mastodon.git"; url = "https://github.com/mastodon/mastodon.git";
rev = "v4.1.0"; rev = "v4.1.1";
sha256 = "00nc80s1hz4sdpq81hsv2r9da3bjn4lgwpk7w24zy2016iwjjwbb"; sha256 = "1c0mxz45pkgmyw81z025n1ps1dkdq92337h7sd865w2fbgmzg50l";
}; };
in applyPatches { in applyPatches {
inherit src; inherit src;

2
pkgs/servers/mastodon/version.nix
View File

@ -1 +1 @@
"4.1.0" "4.1.1"