diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/servers/klipper | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/servers/klipper')
| -rw-r--r-- | nixpkgs/pkgs/servers/klipper/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/servers/klipper/default.nix b/nixpkgs/pkgs/servers/klipper/default.nix index a906059b1970..5fd348797ed2 100644 --- a/nixpkgs/pkgs/servers/klipper/default.nix +++ b/nixpkgs/pkgs/servers/klipper/default.nix @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-04-24"; + version = "unstable-2023-08-01"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "b17ae55f5bd3a079ab3626b1e6fd5c60416e6ba0"; - sha256 = "sha256-e1luOJdTeSB/UNl/W91tBuuQ5f2fKfo1CSMQiE+A1T4="; + rev = "ed66982b8eb06ce8843d8b5163c6bd290e1754c9"; + sha256 = "sha256-17iWI+FEX2+liaiVpbpdp0nN7BLxdnTV8qahdsO2ZOg="; }; - sourceRoot = "source/klippy"; + sourceRoot = "${src.name}/klippy"; # NB: This is needed for the postBuild step nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeWrapper ]; - buildInputs = [ (python3.withPackages (p: with p; [ cffi pyserial greenlet jinja2 markupsafe numpy ])) ]; + buildInputs = [ (python3.withPackages (p: with p; [ can cffi pyserial greenlet jinja2 markupsafe numpy ])) ]; # we need to run this to prebuild the chelper. postBuild = '' |