chore(voron): add nozzle cleaner, prime bucket

truelecter · Jun 22, 2024 · 747775f · 747775f
1 parent 48d6f9e
commit 747775f
Show file tree

Hide file tree

Showing 20 changed files with 444 additions and 433 deletions.
diff --git a/.github/workflows/flake-lock.yaml b/.github/workflows/flake-lock.yaml
@@ -13,10 +13,10 @@ jobs:
       - name: Install Nix
         uses: cachix/install-nix-action@v20
         with:
-          nix_path: nixpkgs=channel:nixos-23.11
+          nix_path: nixpkgs=channel:nixos-24.05
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - uses: cachix/cachix-action@v12
+      - uses: cachix/cachix-action@v15
         with:
           name: truelecter
           extraPullNames: cuda-maintainers, mic92, nix-community, nrdxp

diff --git a/cells/klipper/klipper-plugins/klipper-klippain-shaketune.nix b/cells/klipper/klipper-plugins/klipper-klippain-shaketune.nix
@@ -14,14 +14,22 @@ stdenvNoCC.mkDerivation {
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/lib/
+    mkdir -p $out/lib/extras
 
-    cp -r ./K-ShakeTune $out/lib/config
+    cp -r shaketune $out/lib/extras/
   '';
 
   passthru.klipper = {
-    config = true;
-    extras = false;
+    config = false;
+    extras = true;
+    pythonDependencies = p:
+      with p; [
+        matplotlib
+        numpy
+        scipy
+        gitpython
+        pywavelets
+      ];
   };
 
   meta = with lib; {

diff --git a/cells/klipper/packages.nix b/cells/klipper/packages.nix
@@ -30,6 +30,10 @@
       // packages;
   };
 
+  danger-klipper = packages.klipper.overrideAttrs (_: {
+    inherit (sources.danger-klipper) pname version src;
+  });
+
   excluded-plugins-from-full = ["sources"];
 in
   packages
@@ -40,15 +44,15 @@ in
       plugins = l.attrValues (l.filterAttrs (n: _: !builtins.elem n excluded-plugins-from-full) klipper-plugins);
     };
 
-    danger-klipper-full-plugins = packages.danger-klipper.override {
+    danger-klipper-full-plugins = danger-klipper.override {
       plugins = l.attrValues (l.filterAttrs (n: _: !builtins.elem n excluded-plugins-from-full) klipper-plugins);
     };
 
     danger-klipper-genconf = packages.klipper-genconf.override {
-      klipper = packages.danger-klipper;
+      klipper = danger-klipper;
     };
 
     danger-klipper-firmware = packages.klipper-firmware.override {
-      klipper = packages.danger-klipper;
+      klipper = danger-klipper;
     };
   }
diff --git a/cells/klipper/packages/danger-klipper.nix b/cells/klipper/packages/danger-klipper.nix
diff --git a/cells/klipper/packages/klippain-shaketune.nix b/cells/klipper/packages/klippain-shaketune.nix
diff --git a/cells/klipper/packages/klipper.nix b/cells/klipper/packages/klipper.nix
@@ -12,8 +12,8 @@
       lib.flatten (
         builtins.map (
           plugin:
-            if plugin.passthru ? pythonDependencies
-            then (plugin.passthru.pythonDependencies pythonPackages)
+            if plugin.passthru.klipper ? pythonDependencies
+            then (plugin.passthru.klipper.pythonDependencies pythonPackages)
             else []
         )
         plugins
@@ -68,7 +68,7 @@ in
         lib.concatStringsSep "\n" (
           builtins.map
           # Filter only plugins with extras. There was a lib function for getting output in lib/attrset.nix
-          (plugin: "ln -sf ${plugin}/lib/extras/*.py $out/lib/klippy/extras/")
+          (plugin: "ln -sf ${plugin}/lib/extras/* $out/lib/klippy/extras/")
           (builtins.filter (p: p ? klipper && p.klipper.extras) plugins)
         )
       }

diff --git a/cells/klipper/sources/generated.json b/cells/klipper/sources/generated.json
@@ -21,7 +21,7 @@
     },
     "danger-klipper": {
         "cargoLocks": null,
-        "date": "2024-06-05",
+        "date": "2024-06-17",
         "extract": null,
         "name": "danger-klipper",
         "passthru": null,
@@ -33,11 +33,11 @@
             "name": null,
             "owner": "DangerKlippers",
             "repo": "danger-klipper",
-            "rev": "d10fbe402c5d2493d51eab934d617f16a64b6d98",
-            "sha256": "sha256-RApkNFnyiDxa5JZ4vNbmDmLY2cV/dFppUk7PmXGv7Vk=",
+            "rev": "d63459732a649a433619c3128806ae5766b23445",
+            "sha256": "sha256-6X/AM0b+02P6enjmE+gZldRRyei7h8cLqvMA1DLAXEs=",
             "type": "github"
         },
-        "version": "d10fbe402c5d2493d51eab934d617f16a64b6d98"
+        "version": "d63459732a649a433619c3128806ae5766b23445"
     },
     "katapult": {
         "cargoLocks": null,
@@ -61,7 +61,7 @@
     },
     "klipper": {
         "cargoLocks": null,
-        "date": "2024-06-05",
+        "date": "2024-06-17",
         "extract": null,
         "name": "klipper",
         "passthru": null,
@@ -73,11 +73,11 @@
             "name": null,
             "owner": "Klipper3d",
             "repo": "klipper",
-            "rev": "49c0ad6369670da574f550aa878ce9f6e1899e74",
-            "sha256": "sha256-9kzOIv5FS0+FqgrMD2rtWoX1ZbidOfrh6pOalru8HWo=",
+            "rev": "11f04ba1bae774d32fd43bed4a0772c58d8df199",
+            "sha256": "sha256-nZ69Gp1Wg9kz/ntFJvyPL57yAorwrhfYHZU4bDKnzZc=",
             "type": "github"
         },
-        "version": "49c0ad6369670da574f550aa878ce9f6e1899e74"
+        "version": "11f04ba1bae774d32fd43bed4a0772c58d8df199"
     },
     "klipper-ercf": {
         "cargoLocks": null,
@@ -181,7 +181,7 @@
     },
     "klipper-klippain-shaketune": {
         "cargoLocks": null,
-        "date": "2024-04-29",
+        "date": "2024-06-19",
         "extract": null,
         "name": "klipper-klippain-shaketune",
         "passthru": null,
@@ -193,11 +193,11 @@
             "name": null,
             "owner": "Frix-x",
             "repo": "klippain-shaketune",
-            "rev": "56a5502d81a9071b1a40f5da4138f195eb6bf8ec",
-            "sha256": "sha256-JR7wiPDKLHYxpumZqBMaFRSaigsm7uiEi67Z0aIied8=",
+            "rev": "90ed7aca3c70b7a208ab65d3e1a9284f1f6be122",
+            "sha256": "sha256-uAE6La5pDzLY9iNmuC9oZVkZiGlRFlLF5KOoKKhkVPA=",
             "type": "github"
         },
-        "version": "56a5502d81a9071b1a40f5da4138f195eb6bf8ec"
+        "version": "90ed7aca3c70b7a208ab65d3e1a9284f1f6be122"
     },
     "klipper-led_effect": {
         "cargoLocks": null,
@@ -241,7 +241,7 @@
     },
     "klipper-screen": {
         "cargoLocks": null,
-        "date": "2024-06-07",
+        "date": "2024-06-13",
         "extract": null,
         "name": "klipper-screen",
         "passthru": null,
@@ -253,11 +253,11 @@
             "name": null,
             "owner": "jordanruthe",
             "repo": "KlipperScreen",
-            "rev": "55526347a03125429e274ceed2811f0150ed6e57",
-            "sha256": "sha256-Fk3EIK+wAi4zkjS0HutF5f4aEUrPooLtCklkCermoWw=",
+            "rev": "98c6ca5dfaf09bdd2834a6509c2cc5724f1560cf",
+            "sha256": "sha256-trgxFwC+Zas7lpmghdOeTr2dEBBmdiWN6yha8JrKzik=",
             "type": "github"
         },
-        "version": "55526347a03125429e274ceed2811f0150ed6e57"
+        "version": "98c6ca5dfaf09bdd2834a6509c2cc5724f1560cf"
     },
     "klipper-z-calibration": {
         "cargoLocks": null,
@@ -273,11 +273,11 @@
             "name": null,
             "owner": "protoloft",
             "repo": "klipper_z_calibration",
-            "rev": "v1.0.2",
-            "sha256": "sha256-QDsr09aIP09pI2r18atTRvbbMBS0rbjeiWOSnp9nRUk=",
+            "rev": "v1.1.0",
+            "sha256": "sha256-8hXtWWpwNKQPxElcZYkJuCXYyRoiBBZc/Yj7LpT1O3w=",
             "type": "github"
         },
-        "version": "v1.0.2"
+        "version": "v1.1.0"
     },
     "klipper_tmc_autotune": {
         "cargoLocks": null,
@@ -355,7 +355,7 @@
     },
     "mainsail": {
         "cargoLocks": null,
-        "date": "2024-06-03",
+        "date": "2024-06-14",
         "extract": null,
         "name": "mainsail",
         "passthru": null,
@@ -367,15 +367,15 @@
             "name": null,
             "owner": "mainsail-crew",
             "repo": "mainsail",
-            "rev": "f96e00608058f39eef577bd980d94b88b34a1f7d",
-            "sha256": "sha256-L/pUKAe3iVQ1Rji6KVEBJRpXeMQrtS98wIWxEgwixCA=",
+            "rev": "b5599ef5f6b650f7cd63121ed6f6393cd6877f33",
+            "sha256": "sha256-ARt559EuQG+3pOdNt4IUCyO2F/H7MzOPdWGY/Utfap8=",
             "type": "github"
         },
-        "version": "f96e00608058f39eef577bd980d94b88b34a1f7d"
+        "version": "b5599ef5f6b650f7cd63121ed6f6393cd6877f33"
     },
     "mobileraker-companion": {
         "cargoLocks": null,
-        "date": "2024-06-03",
+        "date": "2024-06-14",
         "extract": null,
         "name": "mobileraker-companion",
         "passthru": null,
@@ -387,11 +387,11 @@
             "name": null,
             "owner": "Clon1998",
             "repo": "mobileraker_companion",
-            "rev": "ea7277eea3062a43f4668f6b8f108d0d40c62688",
-            "sha256": "sha256-KWKMXX2NGYZbT4vL/iIisn2KyuTx5LT8AsUbXEFsIRc=",
+            "rev": "9968ffbc1ad81721be4a425187eebe7272abaf27",
+            "sha256": "sha256-7DcQ0GG5yzRUQXuflQpL8eM12utFdUCxX7DJlAyOU+s=",
             "type": "github"
         },
-        "version": "ea7277eea3062a43f4668f6b8f108d0d40c62688"
+        "version": "9968ffbc1ad81721be4a425187eebe7272abaf27"
     },
     "moonraker": {
         "cargoLocks": null,