update mastodon

nixos/pkgs/glitch-soc/README.md

@@ -8,4 +8,14 @@ Modifications for the new yarn berry lockfiles and some other improvements stole
 
 I've also made some further modifications myself to try and simplify the package and better understand it.
 
-The package can be updated to the latest glitch-soc commit with `./update.sh`. The yarn hash in `version_data.nix` has to be adjusted manually afterwards from the error message though.
+## Updating
+
+The package can be updated to the latest glitch-soc commit with `update.sh`.
+
+- the `deps.patch` for the yarn lockfile will probably not work anymore
+- in that case, delete it before running `update.sh`
+- then try to build the package
+- when it fails again with a yarn error, run `nix log` to get the full yarn output
+- take the diff from there and adjust `deps.patch` accordingly
+- also, the yarn hash in `version_data.nix` has to be adjusted manually
+- build the package and paste the hash from the error message into `yarnHash`

nixos/pkgs/glitch-soc/default.nix

@@ -1,5 +1,5 @@
-{ lib, stdenv, stdenvNoCC, nodejs-slim, bundlerEnv
-, yarn-berry, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript
+{ stdenv, stdenvNoCC, nodejs-slim, bundlerEnv
+, yarn-berry, callPackage, ruby_3_4, writeShellScript
 , brotli, cacert
 }:
 
@@ -17,7 +17,8 @@ let
   # ruby gems, built from `gemset.nix`, which is generated by bundix in `update.sh` from the source Gemfile
   mastodonGems = bundlerEnv {
     name = "glitch-soc-gems-${version}";  # bundlerEnv breaks when pname is set instead
-    inherit version ruby;
+    inherit version;
+    ruby = ruby_3_4;
     gemset = ./gemset.nix;
     gemdir = src;
   };

nixos/pkgs/glitch-soc/patches/deps.patch

@@ -1,16 +1,28 @@
-diff --git a/yarn.lock b/yarn.lock
-index 764617e032..c269e098c9 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -17310,11 +17310,10 @@ __metadata:
+@@ -17707,23 +17707,21 @@
+   linkType: hard
 
  "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-   version: 5.5.2
--  resolution: "typescript@patch:typescript@npm%3A5.5.2#optional!builtin<compat/typescript>::version=5.5.2&hash=379a07"
-+  resolution: "typescript@patch:typescript@npm%3A5.5.2#optional!builtin<compat/typescript>::version=5.5.2&hash=b45daf"
+   version: 5.7.3
+-  resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
++  resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=8c6c40"
    bin:
      tsc: bin/tsc
      tsserver: bin/tsserver
--  checksum: 10c0/a7b7ede75dc7fc32a76d0d0af6b91f5fbd8620890d84c906f663d8783bf3de6d7bd50f0430b8bb55eac88a38934af847ff709e7156e5138b95ae94cbd5f73e5b
+-  checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4
    languageName: node
    linkType: hard
+
+ "typescript@patch:typescript@npm%3A^5.6.0#optional!builtin<compat/typescript>":
+   version: 5.8.2
+-  resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=5786d5"
++  resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=8c6c40"
+   bin:
+     tsc: bin/tsc
+     tsserver: bin/tsserver
+-  checksum: 10c0/5448a08e595cc558ab321e49d4cac64fb43d1fa106584f6ff9a8d8e592111b373a995a1d5c7f3046211c8a37201eb6d0f1566f15cdb7a62a5e3be01d087848e2
+   languageName: node
+   linkType: hard
+
+ "unbox-primitive@npm:^1.1.0":

nixos/pkgs/glitch-soc/source.nix

@@ -19,5 +19,5 @@ in applyPatches {
     repo = "mastodon";
     inherit (versionData) rev hash;
   };
-  # patches = lib.filesystem.listFilesRecursive ./patches;
+  patches = lib.filesystem.listFilesRecursive ./patches;
 }

nixos/pkgs/glitch-soc/version_data.nix

@@ -1,6 +1,6 @@
 # This file was generated with update.sh.
 {
-  rev = "05cfe04415084995ccc01b6c737edb39c9dd8411";
-  hash = "sha256-qV6p3PGzsQhA0b6usqLe6lHcXt4z30nvdpkO5zeHBlw=";
-  yarnHash = "sha256-2iud+LfchFMXEv9/qQRTIyVPHJRe1WyljK2KmPMJ4Yg=";
+  rev = "3de62078053bbd45f9ca2eaad4bda76ca4afa421";
+  hash = "sha256-Dbe2n3qk65F1n2m5dRgD7GRFkNr85TR1xiMVrjxq1To=";
+  yarnHash = "sha256-Ld2g2fqNcO1aQqLfMwznG6kU2eDsXScwlPwUAajF7t4=";
 }