Update mastodon to 4.3.0

Yarn v2 hacks mostly stolen from d7eb0c761a

common/fragments/frq-friend.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
   config = pkgs.writeText "config.kdl" ''
     status-text "hi there! i like to know people following me on here

common/fragments/graphical/default.nix

@@ -159,10 +159,6 @@
         forwardX11 = true;
         forwardX11Trusted = true;
         forwardAgent = true;
-        remoteForwards = [{
-          bind.address = "/run/user/1000/gnupg/S.gpg-agent";
-          host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
-        }];
         extraOptions."TCPKeepAlive" = "yes";
       };
 

common/home_manager/common.nix

@@ -38,6 +38,7 @@
         extraConfig = {
           init = { defaultBranch = "mistress"; };
           core = { editor = "hx"; };
+          merge.conflictStyle = "zdiff3";
           rebase.autosquash = true;
           pull.rebase = true;
         };

common/pkgs/mastodon/default.nix

@@ -1,6 +1,5 @@
-{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests, yarn, callPackage
-, imagemagick, ffmpeg, file, ruby, writeShellScript, fetchYarnDeps
-, fixup_yarn_lock, brotli
+{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests, yarn-berry, callPackage
+, imagemagick, ffmpeg, file, ruby, writeShellScript, brotli
 # Allow building a fork or custom version of Mastodon:
 , pname ? "mastodon", version ? srcOverride.version, patches ? [ ]
   # src is a package
@@ -34,19 +33,13 @@ stdenv.mkDerivation rec {
     pname = "${pname}-modules";
     inherit src version;
 
-    yarnOfflineCache = fetchYarnDeps {
-      yarnLock = "${src}/yarn.lock";
+    yarnOfflineCache = callPackage ./yarn.nix {
+      src = srcOverride;
       hash = yarnHash;
     };
 
-    nativeBuildInputs = [
-      fixup_yarn_lock
-      nodejs-slim
-      yarn
-      mastodonGems
-      mastodonGems.wrappedRuby
-      brotli
-    ];
+    nativeBuildInputs =
+      [ nodejs-slim yarn-berry mastodonGems mastodonGems.wrappedRuby brotli ];
 
     RAILS_ENV = "production";
     NODE_ENV = "production";
@@ -58,9 +51,12 @@ stdenv.mkDerivation rec {
       # This option is needed for openssl-3 compatibility
       # Otherwise we encounter this upstream issue: https://github.com/mastodon/mastodon/issues/17924
       export NODE_OPTIONS=--openssl-legacy-provider
-      fixup_yarn_lock ~/yarn.lock
-      yarn config --offline set yarn-offline-mirror $yarnOfflineCache
-      yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
+
+      export YARN_ENABLE_TELEMETRY=0
+      mkdir -p ~/.yarn/berry
+      ln -sf $yarnOfflineCache ~/.yarn/berry/cache
+
+      yarn install --immutable --immutable-cache
 
       patchShebangs ~/bin
       patchShebangs ~/node_modules
@@ -70,7 +66,7 @@ stdenv.mkDerivation rec {
 
       OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder \
         rails assets:precompile
-      yarn cache clean --offline
+      yarn cache clean
       rm -rf ~/node_modules/.cache
 
       # Create missing static gzip and brotli files

common/pkgs/mastodon/source.nix

@@ -1,18 +1,15 @@
 # This file was generated by pkgs.mastodon.updateScript.
-{ fetchFromGitHub, applyPatches, patches ? [] }:
-let
-  version = "8fbaf6711d6d33de2fcc62888a7109993a5c8f24";
-in
-(
-  applyPatches {
-    src = fetchFromGitHub {
-      owner = "AgathaSorceress";
-      repo = "mastodon";
-      rev = "${version}";
-      hash = "sha256-AVlugSNe55feq3RUiFITU0MWcIr9rNAa1iqPFV3aVPg=";
-    };
-    patches = patches ++ [];
-  }) // {
+{ fetchFromGitHub, applyPatches, patches ? [ ] }:
+let version = "4615ff9a14d80753ebbae8eb6174d43f553241ad";
+in (applyPatches {
+  src = fetchFromGitHub {
+    owner = "AgathaSorceress";
+    repo = "mastodon";
+    rev = "${version}";
+    sha256 = "bTjyeZbxdkAtLb63jBgNUKhlnXY0KIpGAN0YCglcT5E=";
+  };
+  patches = patches ++ [ ./yarn-typescript.patch ];
+}) // {
   inherit version;
-  yarnHash = "sha256-WsPNqV1PC2YjL37qnWfRTj8LaIBUI7+C0cWTfFd7HGo=";
+  yarnHash = "sha256-qE1TBqa3BSEu1MC3Qw/k3h7QEicWd3AwJdA+U1v8924=";
 }

common/pkgs/mastodon/yarn-typescript.patch

@@ -0,0 +1,15 @@
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -16483,11 +16483,11 @@
+
+ "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
+   version: 5.3.3
+-  resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
++  resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=29ae49"
+   bin:
+     tsc: bin/tsc
+     tsserver: bin/tsserver
+-  checksum: 1d0a5f4ce496c42caa9a30e659c467c5686eae15d54b027ee7866744952547f1be1262f2d40de911618c242b510029d51d43ff605dba8fb740ec85ca2d3f9500
++  checksum: e22df47df9b2b2f2617b8bf511a29aea3d177f9f7a0756818230a76b01cbd7da988bf55f9463aaa1a4c1ff90b80f8dc5676460d4e9dfc010572cbba59b822b0c
+   languageName: node
+   linkType: hard

common/pkgs/mastodon/yarn.nix

@@ -0,0 +1,32 @@
+{ stdenvNoCC, yarn-berry, cacert, src, hash }:
+stdenvNoCC.mkDerivation {
+  pname = "yarn-deps";
+  version = hash;
+
+  nativeBuildInputs = [ yarn-berry cacert ];
+  inherit src;
+
+  dontInstall = true;
+
+  NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  buildPhase = ''
+    mkdir -p $out
+
+    export HOME=$(mktemp -d)
+    echo $HOME
+
+    export YARN_ENABLE_TELEMETRY=0
+    export YARN_COMPRESSION_LEVEL=0
+
+    cache="$(yarn config get cacheFolder)"
+    yarn install --immutable --mode skip-build
+
+    cp -r $cache/* $out/
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHash = hash;
+  outputHashMode = "recursive";
+
+}

flake.lock

@@ -194,11 +194,11 @@
         "utils": "utils_3"
       },
       "locked": {
-        "lastModified": 1687004839,
-        "narHash": "sha256-2DxUHOyJ9FY6zibWabHEpecmv7ImsQFDbuND/eweDJM=",
+        "lastModified": 1704635792,
+        "narHash": "sha256-18cwml0k6g7wWkPlFtORFt/eVf6vxu/g2fEr8LrEQIE=",
         "ref": "refs/heads/main",
-        "rev": "a131f680ddb64f4dd8a2761c41af3980c17aad30",
-        "revCount": 5,
+        "rev": "fa324fbf2651f33f1d3557c058f5fbf8e985e624",
+        "revCount": 6,
         "type": "git",
         "url": "https://git.xenua.me/xenua/fedi-frq-friend"
       },
@@ -217,11 +217,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1702485432,
-        "narHash": "sha256-3wcT7NGgH1Du9w+acJEnrorr49g2c2040m00FNNFLWs=",
+        "lastModified": 1705976678,
+        "narHash": "sha256-gPVkZJ4XbdJ5JWltoMHfJbmgbgsgYi/hE2zkj/njUjM=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "7c55190806f31595e18da2b56c8ca54d8f5b33b7",
+        "rev": "ae8042bb83e34b7cf085ec8792fcbf529896d998",
         "type": "github"
       },
       "original": {
@@ -237,11 +237,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702195709,
-        "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
+        "lastModified": 1705659542,
+        "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
+        "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9",
         "type": "github"
       },
       "original": {
@@ -374,11 +374,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1679567394,
-        "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=",
+        "lastModified": 1698420672,
+        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "88cd22380154a2c36799fe8098888f0f59861a15",
+        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
         "type": "github"
       },
       "original": {
@@ -440,11 +440,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1702272962,
-        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
+        "lastModified": 1705883077,
+        "narHash": "sha256-ByzHHX3KxpU1+V0erFy8jpujTufimh6KaS/Iv3AciHk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
+        "rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9",
         "type": "github"
       },
       "original": {
@@ -499,11 +499,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1702346276,
-        "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
+        "lastModified": 1705916986,
+        "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
+        "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8",
         "type": "github"
       },
       "original": {
@@ -514,11 +514,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1680273054,
-        "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
+        "lastModified": 1704161960,
+        "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3",
+        "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
         "type": "github"
       },
       "original": {
@@ -592,11 +592,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699986787,
-        "narHash": "sha256-eYlLWibKtHN/uWJQLzOMRXpoTbO6VcFTfVY4dpgdJcQ=",
+        "lastModified": 1704167711,
+        "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
         "owner": "the-argus",
         "repo": "spicetify-nix",
-        "rev": "3c702af1f717b7876fac08809201b1368d0d956c",
+        "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
         "type": "github"
       },
       "original": {
@@ -726,6 +726,21 @@
         "type": "github"
       }
     },
+    "systems_8": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "url-eater": {
       "inputs": {
         "naersk": "naersk_4",
@@ -735,11 +750,11 @@
         "utils": "utils_5"
       },
       "locked": {
-        "lastModified": 1691162641,
-        "narHash": "sha256-j2LTtFVXtVhuwtp0ETYLD8Ra9izW4BiW2k+ttGh2Vag=",
+        "lastModified": 1705955798,
+        "narHash": "sha256-lN3AnOCz5thhFhnj8xN7KuuUrAbG9FrvUcNJ3Ys45NU=",
         "owner": "AgathaSorceress",
         "repo": "url-eater",
-        "rev": "605b5f5388e6f31c7c5306a21f8a8c5ac4b15096",
+        "rev": "3ea3d1363d61654d489f31578994bcb799b683b2",
         "type": "github"
       },
       "original": {
@@ -821,12 +836,15 @@
       }
     },
     "utils_5": {
+      "inputs": {
+        "systems": "systems_7"
+      },
       "locked": {
-        "lastModified": 1678901627,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -837,7 +855,7 @@
     },
     "utils_6": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -859,11 +877,11 @@
         "utils": "utils_6"
       },
       "locked": {
-        "lastModified": 1689340601,
-        "narHash": "sha256-15P2VwCiGFQSDG7g8Y+Bv2zW1GUJ3i3skrwCblpojdg=",
+        "lastModified": 1704387018,
+        "narHash": "sha256-ng+S3lDHgAu0FApVV74omIkYOQft1Vgh2rHpYxnhV6A=",
         "ref": "refs/heads/mistress",
-        "rev": "60ebc18af7416d624883bea57a27db95e718a562",
-        "revCount": 19,
+        "rev": "bd6a6777ad2faf3779caaeb359354dff047066a4",
+        "revCount": 20,
         "type": "git",
         "url": "https://git.lain.faith/sorceress/vampysite"
       },

flake.nix

@@ -66,7 +66,7 @@
             ./hosts/${hostname}/configuration.nix
             ./common/options.nix
             (import "${home-manager}/nixos")
-            url-eater.nixosModule
+            url-eater.nixosModules.default
             colorpickle.nixosModules.default
             spicetify-nix.nixosModule
           ];
@@ -110,7 +110,7 @@
                   '';
                 });
                 colorpickle = colorpickle.packages.${final.system}.default;
-                frq-friend = frq-friend.defaultPackage.${final.system};
+                frq-friend = frq-friend.packages.${final.system}.default;
                 vampysite = vampysite.packages.${final.system}.default;
                 spicetify-pkgs = spicetify-nix.packages.${final.system}.default;
                 matrix-ril100 = matrix-ril100.packages.${final.system}.default;

hosts/ritual/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
@@ -12,6 +12,12 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
+  boot.initrd.systemd = {
+    enable = true;
+    emergencyAccess =
+      "$2b$05$eOIXFST5/9G6vAFIZDLGfuJV7CV1B26YmRMAFRstyRHwvBNFSN6Im";
+  };
+
   boot.supportedFilesystems = [ "ntfs" ];
 
   fileSystems."/" = {

hosts/tears/hardware-configuration.nix

@@ -12,6 +12,12 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
+  boot.initrd.systemd = {
+    enable = true;
+    emergencyAccess =
+      "$2b$05$eOIXFST5/9G6vAFIZDLGfuJV7CV1B26YmRMAFRstyRHwvBNFSN6Im";
+  };
+
   boot.supportedFilesystems = [ "ntfs" ];
 
   fileSystems."/" = {