Merge pull request 'fix-hydra-evaluator' (#635) from fix-hydra-evaluator into main

Reviewed-on: #635

config/instance-20221213-1915.nix

@@ -16,7 +16,7 @@
     ./services/shitalloverme.nix
     ./users/remote-build.nix
     ./services/atticd.nix
-    ./services/minecraft.nix
+    #./services/minecraft.nix
     ./services/postgres.nix
     ./services/uptime-kuma.nix
     ./services/reverse-proxy.nix
@@ -27,7 +27,11 @@
     ./services/chir-rs.nix
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "virtio_pci"
+    "usbhid"
+  ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = [];
   boot.extraModulePackages = [];

config/nix.nix

@@ -13,7 +13,10 @@
   nix = {
     settings = {
       sandbox = true;
-      trusted-users = ["@wheel" "remote-build"];
+      trusted-users = [
+        "@wheel"
+        "remote-build"
+      ];
       require-sigs = true;
       substituters = [
         "https://attic.chir.rs/chir-rs/"
@@ -46,7 +49,15 @@
             ];
             maxJobs = 4;
             speedFactor = 1;
-            supportedFeatures = ["nixos-test" "benchmark" "ca-derivations" "gccarch-armv8-a" "gccarch-armv8.1-a" "gccarch-armv8.2-a" "big-parallel"];
+            supportedFeatures = [
+              "nixos-test"
+              "benchmark"
+              "ca-derivations"
+              "gccarch-armv8-a"
+              "gccarch-armv8.1-a"
+              "gccarch-armv8.2-a"
+              "big-parallel"
+            ];
           }
         ])
         (mkIf (config.networking.hostName != "nas") [
@@ -98,6 +109,7 @@
               "big-parallel"
               "benchmark"
               "gccarch-skylake-avx512"
+              "gccarch-znver4"
               "gccarch-znver3"
               "gccarch-znver2"
               "gccarch-znver1"

config/services/hydra.nix

@@ -5,38 +5,42 @@
   config,
   pkgs,
   hydra,
+  nix-eval-jobs,
   ...
-}: let
+}:
+let
   machines = pkgs.writeText "machines" ''
     localhost armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,wasm32-wasi,x86_64-linux,i686-linux,riscv32-linux,riscv64-linux - 12 1 kvm,nixos-test,big-parallel,benchmark,gccarch-znver1,gccarch-skylake,ca-derivations  -
     build-aarch64 aarch64-linux,riscv32-linux,riscv64-linux - 4 1 nixos-test,benchmark,ca-derivations,gccarch-armv8-a,gccarch-armv8.1-a,gccarch-armv8.2-a,big-parallel  -
     build-riscv riscv64-linux,riscv32-linux - 4 2 nixos-test,benchmark,ca-derivations,gccarch-rv64gc_zba_zbb,gccarch-rv64gc_zba,gccarch-rv64gc_zbb,ccarch-rv64gc,gccarch-rv32gc_zba_zbb,gccarch-rv32gc_zba,gccarch-rv32gc_zbb,gccarch-rv32gc,big-parallel,native-riscv  -
   '';
-  sshConfig = pkgs.writeText "ssh-config" ''
+  sshConfig =
+    home:
+    pkgs.writeText "ssh-config" ''
       Host build-aarch64
         Port 22
         IdentitiesOnly yes
         User remote-build
         HostName instance-20221213-1915.int.chir.rs
-      IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519
+        IdentityFile ${home}/.ssh/builder_id_ed25519
       Host build-nas
         Port 22
         IdentitiesOnly yes
         User remote-build
         HostName nas.int.chir.rs
-      IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519
+        IdentityFile ${home}/.ssh/builder_id_ed25519
       Host build-rainbow-resort
         Port 22
         IdentitiesOnly yes
         User remote-build
         HostName rainbow-resort.int.chir.rs
-      IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519
+        IdentityFile ${home}/.ssh/builder_id_ed25519
       Host build-riscv
         Port 22
         IdentitiesOnly yes
         User remote-build
         HostName not522.tailbab65.ts.net
-      IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519
+        IdentityFile ${home}/.ssh/builder_id_ed25519
 
       Host *
         ForwardAgent no
@@ -49,7 +53,23 @@
         ControlPath ~/.ssh/master-%r@%n:%p
         ControlPersist 10m
     '';
-in {
+  nix-eval-jobs-script = pkgs.stdenvNoCC.mkDerivation {
+    name = "remote-eval-jobs.py";
+    src = ./hydra/remote-eval-jobs.py;
+    dontUnpack = true;
+    dontBuild = true;
+    installPhase = ''
+      substitute $src $out \
+        --subst-var-by python3 ${pkgs.python3}/bin/python3 \
+        --subst-var-by ping ${pkgs.iputils}/bin/ping \
+        --subst-var-by nix-eval-jobs ${nix-eval-jobs.packages.x86_64-linux.nix-eval-jobs}/bin/nix-eval-jobs \
+        --subst-var-by nix ${pkgs.nix}/bin/nix \
+        --subst-var-by ssh ${pkgs.openssh}/bin/ssh
+      chmod +x $out
+    '';
+  };
+in
+{
   imports = [
     ./postgres.nix
     ../../modules/hydra.nix
@@ -63,10 +83,7 @@ in {
     package = hydra.packages.${system}.hydra.overrideAttrs (super: {
       doCheck = false;
       doInstallCheck = false;
-      patches =
+      patches = super.patches or [ ] ++ [
-        super.patches
-        or []
-        ++ [
         ./hydra/0001-add-gitea-pulls.patch
         ./hydra/0002-unlimit-output.patch
         ./hydra/0003-remove-pr-number-from-github-job-name.patch
@@ -75,6 +92,11 @@ in {
         ./hydra/0006-status-state.patch
         ./hydra/0007-hydra-server-findLog-fix-issue-with-ca-derivations-e.patch
       ];
+      postPatch =
+        super.postPatch or ""
+        + ''
+          substituteInPlace src/script/hydra-eval-jobset --replace-fail nix-eval-jobs ${nix-eval-jobs-script}
+        '';
     });
     hydraURL = "https://hydra.chir.rs/";
     notificationSender = "hydra@chir.rs";
@@ -114,9 +136,13 @@ in {
       "/run/hydra-machines"
     ];
   };
-  nix.settings.allowed-uris = ["github:" "https://" "http://"];
+  nix.settings.allowed-uris = [
-  sops.secrets."services/hydra/gitea_token" = {};
+    "github:"
-  sops.secrets."services/hydra/github_token" = {};
+    "https://"
+    "http://"
+  ];
+  sops.secrets."services/hydra/gitea_token" = { };
+  sops.secrets."services/hydra/github_token" = { };
   sops.secrets."services/hydra/cache-key" = {
     owner = "hydra-www";
     mode = "0440";
@@ -135,7 +161,7 @@ in {
   sops.secrets."services/hydra/aws_credentials" = {
     owner = "hydra-queue-runner";
     path = "/var/lib/hydra/queue-runner/.aws/credentials";
-    restartUnits = ["hydra-notify.service"];
+    restartUnits = [ "hydra-notify.service" ];
   };
   systemd.services.update-hydra-hosts = {
     description = "Update hydra hosts";
@@ -153,24 +179,33 @@ in {
   systemd.timers.update-hydra-hosts = {
     enable = true;
     description = "Update hydra hosts";
-    requires = ["update-hydra-hosts.service"];
+    requires = [ "update-hydra-hosts.service" ];
-    wantedBy = ["multi-user.target"];
+    wantedBy = [ "multi-user.target" ];
     timerConfig = {
       OnBootSec = 300;
       OnUnitActiveSec = 300;
     };
   };
-  nix.settings.trusted-users = ["@hydra"];
+  nix.settings.trusted-users = [ "@hydra" ];
+  sops.secrets."hydra-evaluator/ssh/builder_id_ed25519" = {
+    sopsFile = ../../secrets/shared.yaml;
+    owner = "hydra";
+    key = "ssh/builder_id_ed25519";
+    path = "/var/lib/hydra/.ssh/builder_id_ed25519";
+  };
   sops.secrets."hydra/ssh/builder_id_ed25519" = {
     sopsFile = ../../secrets/shared.yaml;
     owner = "hydra-queue-runner";
     key = "ssh/builder_id_ed25519";
     path = "/var/lib/hydra/queue-runner/.ssh/builder_id_ed25519";
   };
-  system.activationScripts.setupHydraSshConfig = lib.stringAfter ["var"] ''
+  system.activationScripts.setupHydraSshConfig = lib.stringAfter [ "var" ] ''
     mkdir -p /var/lib/hydra/queue-runner/.ssh/
     chown -Rv hydra-queue-runner /var/lib/hydra/queue-runner
-    ln -svf ${sshConfig} /var/lib/hydra/queue-runner/.ssh/config
+    ln -svf ${sshConfig "/var/lib/hydra/queue-runner"} /var/lib/hydra/queue-runner/.ssh/config
+    mkdir -p /var/lib/hydra/.ssh/
+    chown -Rv hydra /var/lib/hydra/.ssh
+    ln -svf ${sshConfig "/var/lib/hydra"} /var/lib/hydra/.ssh/config
   '';
   sops.secrets."attic/config.toml" = {
     owner = "hydra-queue-runner";
@@ -189,7 +224,7 @@ in {
 
   systemd.services."attic-queue" = {
     description = "Upload build results";
-    wantedBy = ["multi-user.target"];
+    wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       User = "hydra-queue-runner";
       Group = "hydra";

config/services/hydra/remote-eval-jobs.py

@@ -0,0 +1,68 @@
+#!@python3@
+import sys
+import subprocess
+import os
+import json
+import shlex
+
+# First check if the server is up
+
+if subprocess.run(["@ping@", "-c", "1", "rainbow-resort.int.chir.rs"], stdout=subprocess.DEVNULL).returncode != 0:
+    os.execv("@nix-eval-jobs@", ["@nix-eval-jobs@"] + sys.argv[1:])
+
+inputs_to_copy = set()
+
+remote_args = []
+skip_next = 0
+next_to_copy = False
+next_to_gcroots = False
+gcroots = None
+
+# parse arguments and add them to a list
+
+for arg in sys.argv[1:]:
+    if arg == "--gc-roots-dir" or arg == "--max-jobs" or arg == "--workers":
+        skip_next = 2
+    if next_to_gcroots:
+        next_to_gcroots = False    
+        gcroots = arg
+    if arg == "--gc-roots-dir":
+        next_to_gcroots = True
+    if skip_next > 0:
+        skip_next -= 1
+        continue
+    if next_to_copy:
+        inputs_to_copy.add('='.join(arg.split('=')[1:]))
+        next_to_copy = False
+    if arg == "-I":
+        next_to_copy = True
+    remote_args.append(arg)
+
+remote_args += ["--workers", "4", "--gc-roots-dir", "/tmp"]
+
+if len(inputs_to_copy) != 0:
+    # copy over what files we need to ensure are present on the target
+    subprocess.run(["@nix@", "copy"] + list(inputs_to_copy) + ["--to", "ssh://build-rainbow-resort", "--no-check-sigs"], check=True, stdout=subprocess.DEVNULL)
+
+# Evaluate on target
+result = subprocess.Popen(["@ssh@", "build-rainbow-resort", "nix-eval-jobs"] + list(map(shlex.quote, remote_args)), bufsize=1, stdout=subprocess.PIPE, text=True)
+
+for line in iter(result.stdout.readline, ""):
+    try:
+        line = line.strip()
+        data = json.loads(line)
+        # copy .drv file home
+        subprocess.run(["@nix@", "copy", data["drvPath"], "--from", "ssh://build-rainbow-resort", "--no-check-sigs"], check=True, stdout=subprocess.DEVNULL)
+        # if we have a gcroot, add it to it
+        if gcroots is not None:
+            drvBasename = os.path.basename(data["drvPath"])
+            try:
+                os.symlink(data["drvPath"], os.path.join(gcroots, drvBasename))
+            except:
+                pass
+        # Now we are done with this job, we can tell hydra about it
+        print(line)
+    except Exception as e:
+        print(e, file=sys.stderr)
+
+sys.exit(result.wait())

config/services/jellyfin.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   services.jellyfin.enable = true;
   environment.systemPackages = [
     pkgs.jellyfin

flake.lock

@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728563845,
+        "lastModified": 1732172292,
-        "narHash": "sha256-hRWxXnfUMZEORbDm0/GDKJhGy6FIKg3skM93esvSR7E=",
+        "narHash": "sha256-MkTunl5rEN3So8ocQqHyic8u9kGPVU0D0qbS5Gw35pg=",
         "owner": "DarkKirb",
         "repo": "akkoma",
-        "rev": "38905fcf2fb4a4a9f23b1a3bf23daf78e41f3d3a",
+        "rev": "956dcdbc342aab38a5b1f8248cd9e972140f3574",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1728796349,
+        "lastModified": 1732104012,
-        "narHash": "sha256-4/FIhIx9Ussnt4aQNlhGH/1swHmep45559sRLcLgKHQ=",
+        "narHash": "sha256-vxybH1OwVAg/Vj8xPB+msG3SKAQzvfE9PR7clJ/EWLU=",
         "owner": "DarkKirb",
         "repo": "akkoma-fe",
-        "rev": "6914e57a840537f45abbbf3b01d41e56a66d968a",
+        "rev": "716fec794e98c508f6697490f48f8bdb41f7d0ad",
         "type": "github"
       },
       "original": {
@@ -270,6 +270,22 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732722421,
+        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -285,7 +301,7 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -351,11 +367,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1722555600,
+        "lastModified": 1730504689,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nix-eval-jobs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
         "type": "github"
       },
       "original": {
@@ -371,11 +408,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726560853,
+        "lastModified": 1731533236,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -464,11 +501,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730837930,
+        "lastModified": 1733045511,
-        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
+        "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
+        "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e",
         "type": "github"
       },
       "original": {
@@ -484,11 +521,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1728321752,
+        "lastModified": 1732915394,
-        "narHash": "sha256-GbBAoBF7ZObz0IP+g0LZKxMafpMvNKjTEu9haiZbV54=",
+        "narHash": "sha256-OIPFkXbL1DzswQvNuds9Sm6r7lwRA5Fnalr/PNXTGtQ=",
         "ref": "refs/heads/main",
-        "rev": "ee1234c15cdcb427dbd4828e0add09d02cd606c9",
+        "rev": "6285440304e74fdad01490f95419a6fe04cdc718",
-        "revCount": 4220,
+        "revCount": 4226,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/hydra"
       },
@@ -499,11 +536,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1730403150,
+        "lastModified": 1731242966,
-        "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=",
+        "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f",
+        "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a",
         "type": "github"
       },
       "original": {
@@ -522,11 +559,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730635946,
+        "lastModified": 1733055216,
-        "narHash": "sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc=",
+        "narHash": "sha256-yB2y7tGJxDI/SDQ0D7b6ocRtLTPm93u8ybdIKQGXRDE=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "d0ecc1890f77e9e170f2de279d6902d84a0cbc51",
+        "rev": "f67bf0781c69a46bf3a1469f83c98518aa3054c3",
         "type": "github"
       },
       "original": {
@@ -547,11 +584,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1728163191,
+        "lastModified": 1732112222,
-        "narHash": "sha256-SW0IEBsPN1EysqzvfDT+8Kimtzy03O1BxQQm7ZB6fRY=",
+        "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
         "ref": "refs/heads/main",
-        "rev": "ed9b7f4f84fd60ad8618645cc1bae2d686ff0db6",
+        "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
-        "revCount": 16323,
+        "revCount": 16513,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -576,11 +613,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727752861,
+        "lastModified": 1732603698,
-        "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=",
+        "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=",
         "ref": "refs/heads/main",
-        "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d",
+        "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730",
-        "revCount": 116,
+        "revCount": 123,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
@@ -606,11 +643,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730938523,
+        "lastModified": 1732899308,
-        "narHash": "sha256-UAh8hocN7Vdl+sXxuToL6Cm1TsMHBpcEmHy+l5xFrMk=",
+        "narHash": "sha256-1jsQqcbMbaWuFim3sqEUdB1/E2KqHa0+cHbTzd/GYFE=",
         "ref": "refs/heads/main",
-        "rev": "72cce7be3f8031ccf6dc9d3c69ba19068b3bd21f",
+        "rev": "2e5780ebc848f3b021f11dd94533b0b68362d989",
-        "revCount": 16454,
+        "revCount": 16545,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -619,6 +656,29 @@
         "url": "https://git.lix.systems/lix-project/lix"
       }
     },
+    "lix_3": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "nix2container": "nix2container_2",
+        "nixpkgs": [
+          "nix-eval-jobs",
+          "nixpkgs"
+        ],
+        "nixpkgs-regression": "nixpkgs-regression_3",
+        "pre-commit-hooks": "pre-commit-hooks_2"
+      },
+      "locked": {
+        "lastModified": 1732112222,
+        "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
+        "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66f6dbda32959dd5cf3a9aaba15af72d037ab7ff.tar.gz?rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
+      }
+    },
     "microformats2-parser": {
       "flake": false,
       "locked": {
@@ -671,11 +731,35 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1723579251,
+        "lastModified": 1732351635,
-        "narHash": "sha256-xnHtfw0gRhV+2S9U7hQwvp2klTy1Iv7FlMMO0/WiMVc=",
+        "narHash": "sha256-H94CcQ3yamG5+RMxtxXllR02YIlxQ5WD/8PcolO9yEA=",
         "ref": "refs/heads/main",
-        "rev": "42a160bce2fd9ffebc3809746bc80cc7208f9b08",
+        "rev": "dfc286ca3dc49118c30d8d6205d6d6af76c62b7a",
-        "revCount": 609,
+        "revCount": 617,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nix-eval-jobs"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/nix-eval-jobs"
+      }
+    },
+    "nix-eval-jobs_2": {
+      "inputs": {
+        "flake-parts": "flake-parts_4",
+        "lix": "lix_3",
+        "nix-github-actions": "nix-github-actions_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix_3"
+      },
+      "locked": {
+        "lastModified": 1732351635,
+        "narHash": "sha256-H94CcQ3yamG5+RMxtxXllR02YIlxQ5WD/8PcolO9yEA=",
+        "ref": "refs/heads/main",
+        "rev": "dfc286ca3dc49118c30d8d6205d6d6af76c62b7a",
+        "revCount": 617,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nix-eval-jobs"
       },
@@ -695,11 +779,11 @@
         "umu": "umu"
       },
       "locked": {
-        "lastModified": 1730770711,
+        "lastModified": 1733018215,
-        "narHash": "sha256-UHm56cW/04efHY4NgboGFOXliGQCqRRY+l1HM7c8/Ms=",
+        "narHash": "sha256-RIvcgs8yGix6g6694omcGpvAza5LxZfV5LmyXsw8c0I=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "0c25376479d11073346ed22de8571805543ede71",
+        "rev": "59363ec701ee3e994a6c8afc88b61d1fab40c66a",
         "type": "github"
       },
       "original": {
@@ -717,11 +801,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1720066371,
+        "lastModified": 1731952509,
-        "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
+        "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
         "owner": "nix-community",
         "repo": "nix-github-actions",
-        "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
+        "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
+    "nix-github-actions_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-eval-jobs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731952509,
+        "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
         "type": "github"
       },
       "original": {
@@ -733,11 +838,11 @@
     "nix2container": {
       "flake": false,
       "locked": {
-        "lastModified": 1720642556,
+        "lastModified": 1724996935,
-        "narHash": "sha256-qsnqk13UmREKmRT7c8hEnz26X3GFFyIQrqx4EaRc1Is=",
+        "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=",
         "owner": "nlewo",
         "repo": "nix2container",
-        "rev": "3853e5caf9ad24103b13aa6e0e8bcebb47649fe4",
+        "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401",
         "type": "github"
       },
       "original": {
@@ -747,6 +852,22 @@
       }
     },
     "nix2container_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1724996935,
+        "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "type": "github"
+      }
+    },
+    "nix2container_3": {
       "inputs": {
         "flake-utils": [
           "flake-utils"
@@ -771,11 +892,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1730919458,
+        "lastModified": 1732483221,
-        "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=",
+        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e1cc1f6483393634aee94514186d21a4871e78d7",
+        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
         "type": "github"
       },
       "original": {
@@ -854,6 +975,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-regression_3": {
+      "locked": {
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1725826545,
@@ -872,11 +1009,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1728768054,
+        "lastModified": 1732054526,
-        "narHash": "sha256-eDVWVreO1e1CN5V1Oq0aI449ESEyJcu7OtZeZ2zZ434=",
+        "narHash": "sha256-0+HA8rNHLFSmT5HlEKRUCpZQnp6rTmD8W0nr9KIXSLw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b1ea4a36d6f1bb62734bce3483994df69910e6d9",
+        "rev": "fe58058517b168bd94bdfe164314d1b38b841588",
         "type": "github"
       },
       "original": {
@@ -887,11 +1024,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1728193676,
+        "lastModified": 1731797254,
-        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
+        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
+        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
         "type": "github"
       },
       "original": {
@@ -903,11 +1040,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1730968922,
+        "lastModified": 1733052534,
-        "narHash": "sha256-t9h9hga70NTgaeLzxtxET1GXbdP3lxJ7XAWCvia9ny8=",
+        "narHash": "sha256-fqmu39j1Y0FEhF/KZcGUW9MjAGotAaTfN2gyb1a2LZ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "652b22a3759aa4a2dfe54b6be84997a5c9a19298",
+        "rev": "10f06c512e429ffd497761a5a49e31ada70e85ca",
         "type": "github"
       },
       "original": {
@@ -919,11 +1056,11 @@
     "pre-commit-hooks": {
       "flake": false,
       "locked": {
-        "lastModified": 1721042469,
+        "lastModified": 1726745158,
-        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
+        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
         "type": "github"
       },
       "original": {
@@ -933,6 +1070,22 @@
       }
     },
     "pre-commit-hooks_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726745158,
+        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks_3": {
       "inputs": {
         "flake-compat": [
           "flake-compat"
@@ -948,11 +1101,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730814269,
+        "lastModified": 1732021966,
-        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
         "type": "github"
       },
       "original": {
@@ -986,12 +1139,13 @@
         "lix": "lix_2",
         "lix-module": "lix-module",
         "naersk": "naersk",
+        "nix-eval-jobs": "nix-eval-jobs_2",
         "nix-gaming": "nix-gaming",
-        "nix2container": "nix2container_2",
+        "nix2container": "nix2container_3",
         "nixos-hardware": "nixos-hardware",
         "nixos-vscode-server": "nixos-vscode-server",
         "nixpkgs": "nixpkgs_4",
-        "pre-commit-hooks": "pre-commit-hooks_2",
+        "pre-commit-hooks": "pre-commit-hooks_3",
         "rust-overlay": "rust-overlay",
         "sops-nix": "sops-nix",
         "systems": "systems"
@@ -1004,11 +1158,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730946479,
+        "lastModified": 1733020719,
-        "narHash": "sha256-AxGJ3BRc44o3RBcfXxZqjVYftVtJ2sl+/WEjiLUmXRY=",
+        "narHash": "sha256-Chv9+3zrf1DhdB9JyskjoV0vJbCQEgkVqrU3p4RPLv8=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "7fba269fe89ffad47206e0afba233d337c04cf08",
+        "rev": "8e18f10703112e6c33e1c0d8b93e8305f6f0a75c",
         "type": "github"
       },
       "original": {
@@ -1021,17 +1175,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1730883027,
+        "lastModified": 1732575825,
-        "narHash": "sha256-pvXMOJIqRW0trsW+FzRMl6d5PbsM4rWfD5lcKCOrrwI=",
+        "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c5ae1e214ff935f2d3593187a131becb289ea639",
+        "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
         "type": "github"
       },
       "original": {
@@ -1085,11 +1236,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1723454642,
+        "lastModified": 1732292307,
-        "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
+        "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "349de7bc435bdff37785c2466f054ed1766173be",
+        "rev": "705df92694af7093dfbb27109ce16d828a79155f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_3": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-eval-jobs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732292307,
+        "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "705df92694af7093dfbb27109ce16d828a79155f",
         "type": "github"
       },
       "original": {
@@ -1107,11 +1279,11 @@
       },
       "locked": {
         "dir": "packaging/nix",
-        "lastModified": 1730836236,
+        "lastModified": 1733037609,
-        "narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=",
+        "narHash": "sha256-HkS24indfMaQbVZ+9GY5BHc+rqPvh8htF0rWYhvgPKI=",
         "ref": "refs/heads/main",
-        "rev": "90352466d502c40e147cfd11a428dde6c2899ab3",
+        "rev": "e559e2e50999093c3e837d33886f9e14e34ead0a",
-        "revCount": 833,
+        "revCount": 863,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/Open-Wine-Components/umu-launcher/"

flake.nix

@@ -126,6 +126,10 @@ rec {
       url = "github:nix-community/naersk/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-eval-jobs = {
+      url = "git+https://git.lix.systems/lix-project/nix-eval-jobs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     nix-gaming = {
       url = "github:fufexan/nix-gaming";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -157,7 +161,6 @@ rec {
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "nixpkgs";
     };
     systems.url = "github:nix-systems/default";
   };
@@ -175,26 +178,14 @@ rec {
         name = "nixos-8gb-fsn1-1"; # Hetzner Server
         system = "x86_64-linux";
       }
-      {
-        name = "thinkrac"; # Thinkpad T470
-        system = "x86_64-linux";
-      }
       {
         name = "nas"; # My nas
         system = "x86_64-linux";
       }
-      {
-        name = "installer"; # Installer iso
-        system = "x86_64-linux";
-      }
       {
         name = "instance-20221213-1915"; # Oracle server
         system = "aarch64-linux";
       }
-      {
-        name = "rainbow-resort"; # PC
-        system = "x86_64-linux";
-      }
       /*
         {
         name = "devterm";
@@ -283,16 +274,15 @@ rec {
     in
       common // perSystem.${system} or {};
   in rec {
-    nixosConfigurations = builtins.listToAttrs (map
+    nixosConfigurations = builtins.listToAttrs (
-      ({
+      map (
+        {
           name,
           system,
           configName ? name,
         }: {
           inherit name;
-        value =
+          value = nixpkgs.lib.nixosSystem {
-          nixpkgs.lib.nixosSystem
-          {
             inherit system;
             specialArgs =
               args
@@ -304,15 +294,23 @@ rec {
               ./config/default.nix
               sops-nix.nixosModules.sops
               home-manager.nixosModules.home-manager
-              ({pkgs, ...}: {
+              (
-                home-manager.extraSpecialArgs = args // {inherit system;};
+                {pkgs, ...}: {
-              })
+                  home-manager.extraSpecialArgs =
+                    args
+                    // {
+                      inherit system;
+                    };
+                }
+              )
               (import utils/link-input.nix args)
               lix-module.nixosModules.default
             ];
           };
-      })
+        }
-      systems);
+      )
+      systems
+    );
     overlays = {
       x86_64-linux = import ./overlays args "x86_64-linux";
       aarch64-linux = import ./overlays args "aarch64-linux";
@@ -346,8 +344,9 @@ rec {
     packages.x86_64-linux = mkPackages "x86_64-linux";
     packages.aarch64-linux = mkPackages "aarch64-linux";
     hydraJobs =
-      (builtins.listToAttrs (map
+      (builtins.listToAttrs (
-        ({
+        map (
+          {
             name,
             system,
             ...
@@ -356,8 +355,10 @@ rec {
             value = {
               ${system} = nixosConfigurations.${name}.config.system.build.toplevel;
             };
-        })
+          }
-        systems))
+        )
+        systems
+      ))
       // {
         inherit devShell;
         inherit packages;

packages/art/lotte/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://git.chir.rs/DarkKirb/lotte-art",
-  "rev": "9d341d1b44bfbd1305e66ac1f5a07f01413951d0",
+  "rev": "2e4045c8f1c28f43a9727ba502bf1bddcb841747",
-  "date": "2024-09-29T11:09:27+02:00",
+  "date": "2024-11-11T09:42:08+01:00",
-  "path": "/nix/store/s1j9hzifi3f7wc8w39619yvr6n4a0vv7-lotte-art",
+  "path": "/nix/store/p714m3g4gdapq6s3pzncfa7d0y9qkhma-lotte-art",
-  "sha256": "1rzlvlyjqkbzpyl14v6hgiyb9xkx5rzvhgnbn1gwp0pv5r2lbsnn",
+  "sha256": "07g0m6gg6vs9v6c1bz2c869gihfk0ara2yy0abmmaa55imys2myg",
-  "hash": "sha256-1upFRS77gstfsMs+uH8uffa0fHzQbBKov39NLD3d9Oc=",
+  "hash": "sha256-z1ehfY2lKFXrUsB7obIC08H4kkFM/BWY2Ulv856p4B0=",
   "fetchLFS": true,
   "fetchSubmodules": false,
   "deepClone": false,

packages/emulator/mgba-dev/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/mgba-emu/mgba",
-  "rev": "77e747ebf6e2becd669312667999e39e79036ceb",
+  "rev": "a9bddb92e3152f58df6242f1f773fc8d9421af79",
-  "date": "2024-11-03T19:38:17-08:00",
+  "date": "2024-11-25T19:29:23-08:00",
-  "path": "/nix/store/nb40imhfdq9ipj99x3jplv3ay246i7ha-mgba",
+  "path": "/nix/store/hl7pw6pqmcn9nq9sm0iaw0pn7hsi1k8y-mgba",
-  "sha256": "17kaxs4ws2c8q6d3iffwyq0srl2gpfmcmai1npiircbf4l7fqw16",
+  "sha256": "13slpj5zzmh007caar3dqc985idc4pbdj9mf2pcizbgyz89sbhrd",
-  "hash": "sha256-JnDsDiVusRzjtSGqyqq7T9CsAfbcuTiawYgJzYnuap4=",
+  "hash": "sha256-LcOlE/r+rR/ZFa4m2dYlrMWCEsNtZKXYAQDW/4u8VI8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

packages/matrix/mautrix-discord/gomod2nix.toml

@@ -2,8 +2,8 @@ schema = 3
 
 [mod]
   [mod."github.com/bwmarrin/discordgo"]
-    version = "v0.0.0-20231013182643-f333f2578a3c"
+    version = "v0.0.0-20241129182205-d6dffc9bf133"
-    hash = "sha256-5S/9DqVPRZSjaKkqjnr23vJHk1iMY0QepIbwFBWvAgw="
+    hash = "sha256-5Ar2jOU046hw3Cgy4qeFKAYg/4BUu7q//P9Gnj2+77c="
     replaced = "github.com/beeper/discordgo"
   [mod."github.com/coreos/go-systemd/v22"]
     version = "v22.5.0"
@@ -12,8 +12,8 @@ schema = 3
     version = "v1.1.1"
     hash = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="
   [mod."github.com/gabriel-vasile/mimetype"]
-    version = "v1.4.3"
+    version = "v1.4.7"
-    hash = "sha256-EDmlRi3av27dq/ISVTglv08z4yZzMQ/SxL1c46EJro0="
+    hash = "sha256-q5p6DbKNn148tq38X2FLDg0sBteXoRZSiqgkMYC7ldE="
   [mod."github.com/google/shlex"]
     version = "v0.0.0-20191202100458-e7afc7fbc510"
     hash = "sha256-1f392pCmS7AXVKXIC1SvKlYtK/rvW47F5CCkGT2G6JM="
@@ -33,8 +33,8 @@ schema = 3
     version = "v0.0.19"
     hash = "sha256-wYQqGxeqV3Elkmn26Md8mKZ/viw598R4Ych3vtt72YE="
   [mod."github.com/mattn/go-sqlite3"]
-    version = "v1.14.22"
+    version = "v1.14.24"
-    hash = "sha256-CWF2Hjg43658NhaePWbGzS19gHJXjuTroG5c0W3hgYQ="
+    hash = "sha256-taGKFZFQlR5++5b2oZ1dYS3RERKv6yh1gniNWhb4egg="
   [mod."github.com/pmezard/go-difflib"]
     version = "v1.0.0"
     hash = "sha256-/FtmHnaGjdvEIKAJtrUfEhV7EVo5A/eYrtdnUkuxLDA="
@@ -45,8 +45,8 @@ schema = 3
     version = "v0.0.0-20200617195104-da1b6568686e"
     hash = "sha256-ST9t4/b7WFXUb8wra4ZYVDNZJGrEykw8dkWhLrxp8F0="
   [mod."github.com/stretchr/testify"]
-    version = "v1.8.4"
+    version = "v1.10.0"
-    hash = "sha256-MoOmRzbz9QgiJ+OOBo5h5/LbilhJfRUryvzHJmXAWjo="
+    hash = "sha256-fJ4gnPr0vnrOhjQYQwJ3ARDKPsOtA7d4olQmQWR+wpI="
   [mod."github.com/tidwall/gjson"]
     version = "v1.17.0"
     hash = "sha256-eS+Ble3UZClAH/XpulH+MuxyZFsF7/yvWeBIn1D9ryk="
@@ -69,20 +69,20 @@ schema = 3
     version = "v0.1.2"
     hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w="
   [mod."golang.org/x/crypto"]
-    version = "v0.15.0"
+    version = "v0.29.0"
-    hash = "sha256-ABytl19ORbe9xcY4Ao76AcAkqqPduUCd8OrD4Sl5jyU="
+    hash = "sha256-sqckobR2VWucCgb7xpY2wLktnAA+XyXJbhCm80yCo78="
   [mod."golang.org/x/exp"]
-    version = "v0.0.0-20231219180239-dc181d75b848"
+    version = "v0.0.0-20241108190413-2d47ceb2692f"
-    hash = "sha256-K35MT3O16IlvqhDZBVBF4lJZIM7T/15PxOmeyGYv01A="
+    hash = "sha256-uRR1wFVGutfXAQIG69BD4g5Y8Ejw+ugw28F6ayu2BPY="
   [mod."golang.org/x/net"]
-    version = "v0.18.0"
+    version = "v0.31.0"
-    hash = "sha256-7c3GBByVmRjd7CXf4STGTAnnUWtHVH4S0HjSYUHCcCA="
+    hash = "sha256-G+vGyCnn8jywmX3KvsIwhZkOv3+oAERNNeCeiQqfIL0="
   [mod."golang.org/x/sync"]
-    version = "v0.5.0"
+    version = "v0.9.0"
-    hash = "sha256-EAKeODSsct5HhXPmpWJfulKSCkuUu6kkDttnjyZMNcI="
+    hash = "sha256-sGvzGqaaXE5dxohKkpbJMnu+bMmismsSqr8YMtrK+Rc="
   [mod."golang.org/x/sys"]
-    version = "v0.14.0"
+    version = "v0.27.0"
-    hash = "sha256-ReIRQmONicRW9idzGVPCBx5TTcKacmQTF1vPC3L4SxY="
+    hash = "sha256-BXQcF9RrJ55Pq7Nl67TeFGkgkyuKkQ8hHKN4/L4ggWc="
   [mod."gopkg.in/natefinch/lumberjack.v2"]
     version = "v2.2.1"
     hash = "sha256-GaXWRDxhGy4Z4mgE+bJ8OE9SVvYUa9TnNiydnp2s1Ms="

packages/matrix/mautrix-discord/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/mautrix/discord",
-  "rev": "ce1f401ddcf57305a9782702c72619c86eb3595d",
+  "rev": "5a029367b3ca24247213a0ff8ff2589298bfb8a6",
-  "date": "2024-07-16T11:28:58+03:00",
+  "date": "2024-11-29T20:22:31+02:00",
-  "path": "/nix/store/s1pdfswh85c82m8rqbmddnl9z0cbw94d-discord",
+  "path": "/nix/store/wxb3fdz6ffdd3pq0cw50prswamw2xwbs-discord",
-  "sha256": "1ck61zs67dfg0jf51gv2bf27kr8jr411bfm853479swgzyj9x81p",
+  "sha256": "0alwgcl3q3hyfh8wsnflkip4swk6417bqnmbsg92g2jfv03vnj52",
-  "hash": "sha256-N6CepP+P63TIKKi6FQLJEuV5hFtiv1CcBM+1Y/QPZrI=",
+  "hash": "sha256-oki7B9hOiifS06tavE4gZnJNbpzUWc0RdB4OPCh7nCo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

packages/matrix/mautrix-slack/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/mautrix/slack",
-  "rev": "78e302ae3249ce5ec1a71d26d6350012294b04b1",
+  "rev": "1d54054ac8090ca53c590cd35cd4bacf44c889d1",
-  "date": "2024-10-23T12:14:22+03:00",
+  "date": "2024-11-16T17:23:18+02:00",
-  "path": "/nix/store/w3dr5cdfgjl392phiz4fvf3ahj8lsjlr-slack",
+  "path": "/nix/store/4283yv2a0j0jl1p14amg1ldr3b910nzz-slack",
-  "sha256": "1ym6daxhy39p5jlqipi7a0xmxxmsw2z53pn4r66fglz136r3wx8i",
+  "sha256": "0nf1452l5v16zgqydl2gcdiy7i0yzwzrb5qfvdaadzwvd15rqq9f",
-  "hash": "sha256-EXU+shnh0+eMycTeUb7guvZeO1An3oipLDcND7tqpvo=",
+  "hash": "sha256-LmGcS2ib/6ZU2w6XlT//HsTjY2NP0Obx+ybsQkUhwVk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

packages/minecraft/papermc/paper.json

@@ -1,6 +1,6 @@
 {
   "version": "1.21.1",
-  "build": 131,
+  "build": 132,
-  "name": "paper-1.21.1-131.jar",
+  "name": "paper-1.21.1-132.jar",
-  "sha256": "dc7dd1b6a3093641f182e874e52637682e9fa9bbcc8025a1f761c5bbec2dd341"
+  "sha256": "49716b013342c75f5fa141c8cda2647aa0a1e1818d2a61aae0a43299e35ff418"
 }

packages/plover/plover-lapwing-aio.nix

@@ -14,10 +14,10 @@
 in
   buildPythonPackage rec {
     pname = "plover_lapwing_aio";
-    version = "1.3.5";
+    version = "1.3.7";
     src = fetchPypi {
       inherit pname version;
-      sha256 = "sha256-wE/enSIds7BJqwlHbye/u+PC4riuLkcH9QpeGemjEUM=";
+      sha256 = "sha256-3w0ASJ7CeQ/fO02AOcWCRB7AiuzHkvVOJy7TkemzTcY=";
     };
 
     postPatch = ''

packages/web/miifox-net.nix

@@ -13,7 +13,10 @@ in
     src = fetchgit {
       inherit (source) url rev sha256;
     };
-    nativeBuildInputs = [chevron lndir];
+    nativeBuildInputs = [
+      chevron
+      lndir
+    ];
     buildPhase = ''
       chevron -d index.json index.handlebars > index.html
     '';
@@ -27,5 +30,5 @@ in
       description = "miifox.net";
       license = lib.licenses.unfree;
     };
-    passthru.updateScript = [../scripts/update-git.sh "https://git.chir.rs/CarolineHusky/MiiFox.net" "web/miifox.json"];
+    #passthru.updateScript = [../scripts/update-git.sh "https://git.chir.rs/CarolineHusky/MiiFox.net" "web/miifox.json"];
   }