Merge pull request #498 from DarkKirb/create-pull-request/patch

Run automatic update

config/nas.nix

@@ -75,12 +75,14 @@
     TIMELINE_LIMIT_MONTHLY = 12;
     TIMELINE_LIMIT_YEARLY = 0;
   };
-  services.beesd.filesystems.root = {
+  /*
+    services.beesd.filesystems.root = {
     spec = "/";
     hashTableSizeMB = 2048;
     verbosity = "crit";
     extraOptions = ["--loadavg-target" "5.0"];
   };
+  */
 
   fileSystems."/boot" = {
     device = "/dev/nvme0n1p1";

config/nix.nix

@@ -161,7 +161,11 @@
     script = lib.mkDefault ''
       #!${pkgs.bash}/bin/bash
       set -ex
-      builds=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/jobset/flakes/${if config.networking.hostName != "vf2" then "nixos-config" else "nixos-config-riscv"}/evals | ${pkgs.jq}/bin/jq -r '.evals[0].builds[]')
+      builds=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/jobset/flakes/${
+        if config.networking.hostName != "vf2"
+        then "nixos-config"
+        else "nixos-config-riscv"
+      }/evals | ${pkgs.jq}/bin/jq -r '.evals[0].builds[]')
       for build in $builds; do
           doc=$(${pkgs.curl}/bin/curl -H 'accept: application/json' https://hydra.int.chir.rs/build/$build)
           jobname=$(echo $doc | ${pkgs.jq}/bin/jq -r '.job')
@@ -170,17 +174,21 @@
               output=$(${pkgs.nix}/bin/nix-store -r $drvname)
 
 
-              ${if config.networking.hostName != "nixos-8gb-fsn1-1" then ''
-                $output/bin/switch-to-configuration boot
-                booted="$(${pkgs.coreutils}/bin/readlink /run/booted-system/{initrd,kernel,kernel-modules})"
-                built="$(${pkgs.coreutils}/bin/readlink $output/{initrd,kernel,kernel-modules})"
-                if [ "$booted" = "$built" ]; then
-                    $output/bin/switch-to-configuration switch
-                else
-                    ${pkgs.systemd}/bin/shutdown -r +1
-                fi
-                exit
-              '' else "$output/bin/switch-to-configuration switch"}
+              ${
+        if config.networking.hostName != "nixos-8gb-fsn1-1"
+        then ''
+          $output/bin/switch-to-configuration boot
+          booted="$(${pkgs.coreutils}/bin/readlink /run/booted-system/{initrd,kernel,kernel-modules})"
+          built="$(${pkgs.coreutils}/bin/readlink $output/{initrd,kernel,kernel-modules})"
+          if [ "$booted" = "$built" ]; then
+              $output/bin/switch-to-configuration switch
+          else
+              ${pkgs.systemd}/bin/shutdown -r +1
+          fi
+          exit
+        ''
+        else "$output/bin/switch-to-configuration switch"
+      }
           fi
       done
     '';

config/rainbow-resort.nix

@@ -58,12 +58,14 @@
     TIMELINE_LIMIT_MONTHLY = 12;
     TIMELINE_LIMIT_YEARLY = 0;
   };
-  services.beesd.filesystems.root = {
+  /*
+    services.beesd.filesystems.root = {
     spec = "/";
     hashTableSizeMB = 2048;
     verbosity = "crit";
     extraOptions = ["--loadavg-target" "5.0"];
   };
+  */
 
   networking.interfaces.enp13s0.useDHCP = true;
 

config/thinkrac.nix

@@ -51,12 +51,14 @@
     TIMELINE_LIMIT_MONTHLY = 12;
     TIMELINE_LIMIT_YEARLY = 0;
   };
-  services.beesd.filesystems.root = {
+  /*
+    services.beesd.filesystems.root = {
     spec = "/";
     hashTableSizeMB = 2048;
     verbosity = "crit";
     extraOptions = ["--loadavg-target" "5.0"];
   };
+  */
 
   swapDevices = [
     {

flake.lock

@@ -389,11 +389,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724435763,
-        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+        "lastModified": 1725180166,
+        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
         "type": "github"
       },
       "original": {
@@ -446,11 +446,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724587851,
-        "narHash": "sha256-+tnTRvR9TzXQDl5OynS+tKBZyPB6viT99zs4fXI0lfk=",
+        "lastModified": 1725192674,
+        "narHash": "sha256-xEAVzgkjtdi9b4nl1yHWtiaPqYuvB7pwU9OurXv9Lls=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "eda1cdaddc64064f53e65ae614e061010e5fb92f",
+        "rev": "3f10d853f98081feec35b736e38da91202a87c3a",
         "type": "github"
       },
       "original": {
@@ -532,11 +532,11 @@
         "umu": "umu"
       },
       "locked": {
-        "lastModified": 1724549799,
-        "narHash": "sha256-F4lN1qmMJpJALwZ2ENb6MDSXG40om7ktZyAt7yh/DS8=",
+        "lastModified": 1725154929,
+        "narHash": "sha256-AONhBZQgiJb/teEJF7PV6EpyLLpF2ddSbY7HJNdFSxw=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "963803d3be8ed721b21326804513dec884e9d494",
+        "rev": "76446e879c956930a7f5f6f1d0440b3df67e0dda",
         "type": "github"
       },
       "original": {
@@ -632,11 +632,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1725041218,
-        "narHash": "sha256-k6MEdh4pZOXwnyYVCHAbEbSTfbroas9punPIVwsvZgA=",
+        "lastModified": 1725213346,
+        "narHash": "sha256-otX9gWWv8XhxOQR2PAN63OzP2ZatNH09eh1yFIVjRYo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b4112246dafd0b255f8cbcc39215ea437d76b55f",
+        "rev": "6e5af4a4483bd9e71a19a7a59e06fdad54c01401",
         "type": "github"
       },
       "original": {
@@ -702,11 +702,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724984647,
-        "narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=",
+        "lastModified": 1725157860,
+        "narHash": "sha256-DhqyM7XJYKj+WAEaYwMtXaYX66tA+lOd31sd5QkxLDM=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4",
+        "rev": "1fd72e343c6890f695243a37b367a1e3b90a49ee",
         "type": "github"
       },
       "original": {
@@ -725,11 +725,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723501126,
-        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
+        "lastModified": 1725201042,
+        "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
+        "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7",
         "type": "github"
       },
       "original": {

packages/plover/didoesdigital-dictionary.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/didoesdigital/steno-dictionaries",
-  "rev": "0fd024b0882688f0ef7c0b1b708d57a9e3d5c9dc",
-  "date": "2024-08-18T09:26:08+10:00",
-  "path": "/nix/store/hkyp8psnhayk9iznyrskxf7c1ymxw7rx-steno-dictionaries",
-  "sha256": "1v1h2g4bgf359389q5wv352h7vw3lvvwa211pkgbrad1vf9691mr",
-  "hash": "sha256-uYZkktuhqbzevCEIxfemg+8DRRmbF5zQSGW4t8gTMOw=",
+  "rev": "f4ae3f85b32293835e27feaed93b53bfab8941cf",
+  "date": "2024-09-01T14:54:41+10:00",
+  "path": "/nix/store/9888ylqd4dmnxbsgvfjf502mhj7ch5f2-steno-dictionaries",
+  "sha256": "073flwhcp0bzi08y9di4bf0xyv1hn1srk6h0ip149ljpa14xlxai",
+  "hash": "sha256-UXXaSVBX0kTCjQCamXWwMGzfgVsktuQRiH+ByyCnbhw=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

packages/plover/plover/default.nix

@@ -16,7 +16,7 @@
   pkg-config,
   fetchFromGitHub,
   cmarkgfm,
-  wayland,
+  wayland-scanner,
   pywayland,
   fetchPypi,
 }: let
@@ -51,7 +51,7 @@ in
     postPatch = ''
       sed -i /PyQt5/d setup.cfg
       substituteInPlace plover_build_utils/setup.py \
-        --replace "/usr/share/wayland/wayland.xml" "${wayland}/share/wayland/wayland.xml"
+        --replace "/usr/share/wayland/wayland.xml" "${wayland-scanner}/share/wayland/wayland.xml"
     '';
 
     checkInputs = [pytest mock];