Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

klipper: init at 0.8.0 #98917

Merged
merged 2 commits into from Oct 12, 2020
Merged

klipper: init at 0.8.0 #98917

merged 2 commits into from Oct 12, 2020

Conversation

lovesegfault
Copy link
Member

Motivation for this change

I need this to run the 3D printer I'm building. The firmware runs a daemon on a RPi that talks/commands it, which is what is being packaged here.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@lovesegfault lovesegfault force-pushed the klipper-init branch 3 times, most recently from 795c04f to 6754732 Compare September 27, 2020 06:16
cole-h
cole-h reviewed Sep 27, 2020
View reviewed changes
nixos/modules/services/misc/klipper.nix Outdated Show resolved Hide resolved
nixos/modules/services/misc/klipper.nix Outdated Show resolved Hide resolved
@lovesegfault lovesegfault force-pushed the klipper-init branch 2 times, most recently from efa7d8d to fb8ef7a Compare September 27, 2020 07:32
cole-h
cole-h requested changes Sep 28, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last nit I have is: I would separate this into two commits: klipper: init at 0.8.0, and nixos/klipper: init.

(Brownie points for using lib instead of stdenv.lib :) )

@lovesegfault
Copy link
Member Author

Last nit I have is: I would separate this into two commits: klipper: init at 0.8.0, and nixos/klipper: init.

(Brownie points for using lib instead of stdenv.lib :) )

Done!

@lovesegfault lovesegfault force-pushed the klipper-init branch 2 times, most recently from 0b8751b to fc80004 Compare September 29, 2020 07:12
cole-h
cole-h approved these changes Sep 29, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM, thanks!

flokli
flokli requested changes Sep 29, 2020
View reviewed changes
nixos/modules/services/misc/klipper.nix Outdated Show resolved Hide resolved
nixos/modules/services/misc/klipper.nix Outdated Show resolved Hide resolved
nixos/modules/services/misc/klipper.nix Outdated Show resolved Hide resolved
pkgs/servers/klipper/default.nix Outdated Show resolved Hide resolved
pkgs/servers/klipper/default.nix Outdated Show resolved Hide resolved
pkgs/servers/klipper/default.nix Outdated Show resolved Hide resolved
@lovesegfault lovesegfault force-pushed the klipper-init branch 3 times, most recently from 8fb8fd8 to 24dce9e Compare October 8, 2020 03:26
@lovesegfault
Copy link
Member Author

Alright, I've tested this today and it works 🥳

@lovesegfault lovesegfault mentioned this pull request Oct 8, 2020
Merged
10 tasks
andir
andir requested changes Oct 8, 2020
View reviewed changes
Copy link
Member

@andir andir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some minor comments but looks good otherwise.

nixos/modules/services/misc/klipper.nix Show resolved Hide resolved
nixos/modules/services/misc/klipper.nix Outdated Show resolved Hide resolved
pkgs/servers/klipper/default.nix Outdated Show resolved Hide resolved
jtojnar
jtojnar reviewed Oct 9, 2020
View reviewed changes
pkgs/servers/klipper/default.nix Outdated Show resolved Hide resolved
pkgs/servers/klipper/default.nix Outdated Show resolved Hide resolved
pkgs/servers/klipper/default.nix Outdated Show resolved Hide resolved
pkgs/servers/klipper/default.nix Show resolved Hide resolved
@lovesegfault lovesegfault force-pushed the klipper-init branch 3 times, most recently from a2cb9df to dcef04d Compare October 10, 2020 01:53
@flokli flokli merged commit 399a2ab into NixOS:master Oct 12, 2020
dominikh
dominikh reviewed May 3, 2023
View reviewed changes
nixos/modules/services/misc/klipper.nix
message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it.";
}];

environment.etc."klipper.cfg".source = format.generate "klipper.cfg" cfg.settings;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know I'm several years late, but why are we putting the klipper.cfg in /etc? We later pass the path to klipper, which means it shouldn't need to be in /etc?

@lovesegfault lovesegfault deleted the klipper-init branch May 4, 2023 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dominikh dominikh dominikh left review comments

@cole-h cole-h cole-h approved these changes

@flokli flokli Awaiting requested review from flokli

@andir andir Awaiting requested review from andir

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@lovesegfault @dominikh @flokli @andir @jtojnar @cole-h