Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Flake: update nixpkgs patch

Browse source
This commit is contained in:
Toast 2025-01-14 13:49:29 +01:00
parent a60ca21925
commit b6bd1ec321
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
nixpkgs-patches/update-hhd.patch
View file

@ -1,12 +1,12 @@
From 87eb53c446492fbd4ace80bda5bb6ec94c1e19e6 Mon Sep 17 00:00:00 2001
From 32d076a87fa6611f62e050047442564b27d36bc1 Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Tue, 14 Jan 2025 10:18:45 +0100
Subject: [PATCH] handheld-daemon: 3.9.0 -> 3.10.2
---
.../0001-remove-selinux-fixes.patch | 37 +++++++++++++++++++
pkgs/by-name/ha/handheld-daemon/package.nix | 19 ++++++++--
2 files changed, 52 insertions(+), 4 deletions(-)
pkgs/by-name/ha/handheld-daemon/package.nix | 22 +++++++++--
2 files changed, 55 insertions(+), 4 deletions(-)
create mode 100644 pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch
diff --git a/pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch b/pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch
@ -53,7 +53,7 @@ index 0000000000000..2fe3ae78a1a47
+ subprocess.run(["swapon", HHD_SWAP_FILE], check=True)
+
diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 1c11cd3b59b28..f76b47225d671 100644
index 1c11cd3b59b28..aad4a57e50c22 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -11,19 +11,25 @@
@ -84,7 +84,7 @@ index 1c11cd3b59b28..f76b47225d671 100644
# This package relies on several programs expected to be on the user's PATH.
# We take a more reproducible approach by patching the absolute path to each of these required
# binaries.
@@ -41,8 +47,13 @@ python3Packages.buildPythonApplication rec {
@@ -41,8 +47,16 @@ python3Packages.buildPythonApplication rec {
substituteInPlace src/hhd/controller/physical/imu.py \
--replace-fail '"modprobe' '"${lib.getExe' kmod "modprobe"}'
@ -94,9 +94,12 @@ index 1c11cd3b59b28..f76b47225d671 100644
+ --replace-fail '"efibootmgr"' '"${lib.getExe' efibootmgr "id"}"' \
+ --replace-fail '"systemctl"' '"${lib.getExe' systemd "systemctl"}"' \
+ --replace-fail '"stat"' '"${lib.getExe' coreutils "stat"}"' \
+ --replace-fail '"btrfs"' '"${lib.getExe' btrfs-progs "btrfs"}"' \
+ --replace-fail '"swapon"' '"${lib.getExe' util-linux "swapon"}"' \
+ --replace-fail '"swapoff"' '"${lib.getExe' util-linux "swapoff"}"'
+ --replace-fail '"swapoff"' '"${lib.getExe' util-linux "swapoff"}"' \
+ --replace-fail '"fallocate"' '"${lib.getExe' util-linux "fallocate"}"' \
+ --replace-fail '"chmod"' '"${lib.getExe' coreutils "chmod"}"' \
+ --replace-fail '"mkswap"' '"${lib.getExe' util-linux "mkswap"}"' \
+ --replace-fail '"btrfs",' '"${lib.getExe' btrfs-progs "btrfs"}",'
substituteInPlace src/hhd/device/oxp/serial.py \
--replace-fail "udevadm" "${lib.getExe' systemd "udevadm"}"