fix(flake): use nixos-24.05

truelecter · May 27, 2024 · 5c7830c · 5c7830c
1 parent 56d8c3e
commit 5c7830c
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 18 deletions.
diff --git a/cells/klipper/packages/katapult-firmware.nix b/cells/klipper/packages/katapult-firmware.nix
@@ -34,7 +34,7 @@ in
       avrdude
       stm32flash
       pkg-config
-      wxGTK32 # Required for bossac
+      # wxGTK32 # Required for bossac
     ];
 
     preBuild = "cp ${firmwareConfig} ./.config";

diff --git a/cells/klipper/packages/klipper-firmware.nix b/cells/klipper/packages/klipper-firmware.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     avrdude
     stm32flash
     pkg-config
-    wxGTK32 # Required for bossac
+    # wxGTK32 # Required for bossac
   ];
 
   preBuild = "cp ${firmwareConfig} ./.config";

diff --git a/cells/klipper/packages/mainsail.nix b/cells/klipper/packages/mainsail.nix
@@ -26,15 +26,28 @@ in
       zip
     ];
 
+    dontNpmBuild = true;
+
+    buildPhase = ''
+      runHook preBuild
+
+      npx vite build
+
+      runHook postBuild
+    '';
+
     prePatch = ''
       export CYPRESS_INSTALL_BINARY=0
       export CYPRESS_RUN_BINARY=${cypress}/bin/Cypress
     '';
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/share
-      rm dist/mainsail.zip
       cp -r dist $out/share/mainsail
+
+      runHook postInstall
     '';
 
     passthru.npmDepsHash = mkNpmDepsHashCalculator sources.mainsail.src;

diff --git a/cells/klipper/packages/moonraker.nix b/cells/klipper/packages/moonraker.nix
@@ -24,7 +24,15 @@
       preprocess-cancellation
       jinja2
       dbus-next
-      apprise
+      (
+        apprise.overrideAttrs (o: rec {
+          disabledTests =
+            o.disabledTests
+            ++ [
+              "test_plugin_zulip"
+            ];
+        })
+      )
       libgpiod
     ]);
 in

diff --git a/cells/minecraft-servers/modules/_options-backup-restic.nix b/cells/minecraft-servers/modules/_options-backup-restic.nix
@@ -16,6 +16,7 @@
     "user"
     "paths"
     "environmentFile"
+    "runCheck"
   ];
 in {
   options =

diff --git a/cells/nixos/hosts/oracle/minecraft-servers/litv3.nix b/cells/nixos/hosts/oracle/minecraft-servers/litv3.nix
@@ -16,6 +16,7 @@
       exclude = [
         "dumps"
         "logs"
+        "bluemap"
       ];
       pruneOpts = [
         "--keep-daily 3"

diff --git a/cells/nixos/hosts/voron/hardware-configuration.nix b/cells/nixos/hosts/voron/hardware-configuration.nix
@@ -73,13 +73,13 @@
     i2c-tools
   ];
 
-  environment.etc."u-boot-cm4".source = pkgs.ubootRaspberryPi4_64bit.override {
-    extraConfig = ''
-      CONFIG_USB_STORAGE=y
-      CONFIG_USB_XHCI_BRCM=y
-    '';
-    extraPatches = [
-      ./patches/xhci-uboot.patch
-    ];
-  };
+  # environment.etc."u-boot-cm4".source = pkgs.ubootRaspberryPi4_64bit.override {
+  #   extraConfig = ''
+  #     CONFIG_USB_STORAGE=y
+  #     CONFIG_USB_XHCI_BRCM=y
+  #   '';
+  #   extraPatches = [
+  #     ./patches/xhci-uboot.patch
+  #   ];
+  # };
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -83,7 +83,7 @@
   inputs = {
     latest.url = "github:nixos/nixpkgs/nixos-unstable";
     k8s.url = "github:nixos/nixpkgs/3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3";
-    nixos.url = "github:nixos/nixpkgs/release-24.05";
+    nixos.url = "github:nixos/nixpkgs/nixos-24.05";
     nixpkgs.follows = "nixos";
 
     darwin = {