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 2024-04-16 10:41:51 +02:00
parent b014af7891
commit b322c242ce
1 changed files with 93 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

96
nixpkgs-patches/0001-handheld-daemon-1.1.0-2.6.2.patch
View file

@ -1,7 +1,7 @@
From d9e4af9ae8ed30a1ab860915c5c0ff9ae0c16dc1 Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Fri, 12 Apr 2024 13:32:24 +0200
Subject: [PATCH 1/3] handheld-daemon: 1.1.0 -> 2.6.2
Subject: [PATCH 1/6] handheld-daemon: 1.1.0 -> 2.6.2
---
pkgs/by-name/ha/handheld-daemon/package.nix | 5 +++--
@ -40,7 +40,7 @@ index bb0c9d65bfe19d..b5f25f339ffb60 100644
From 2a8d54c511bda43bea18d35d2c08f224f3352a18 Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Sat, 13 Apr 2024 15:42:25 +0200
Subject: [PATCH 2/3] handheld-daemon: update license
Subject: [PATCH 2/6] handheld-daemon: update license
---
pkgs/by-name/ha/handheld-daemon/package.nix | 2 +-
@ -63,7 +63,7 @@ index b5f25f339ffb60..f0ce6e9648e3e8 100644
From 3b96a3c082f6b0e9f7e2eabcc18cf599a0c7eb63 Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Mon, 15 Apr 2024 00:31:56 +0200
Subject: [PATCH 3/3] handheld-daemon: patch generated udev rules to use chmod
Subject: [PATCH 3/6] handheld-daemon: patch generated udev rules to use chmod
from nix store
---
@ -93,3 +93,93 @@ index f0ce6e9648e3e8..72981284e2e9c1 100644
'';
postInstall = ''
From 6a2060842db04c81b354b49a9c53bfd2262a5af3 Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Mon, 15 Apr 2024 19:57:10 +0200
Subject: [PATCH 4/6] handheld-daemon: remove unneeded coreutils dependency
---
pkgs/by-name/ha/handheld-daemon/package.nix | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 72981284e2e9c1..835c0774469354 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -5,7 +5,6 @@
, lib
, python3
, toybox
-, coreutils
}:
python3.pkgs.buildPythonApplication rec {
pname = "handheld-daemon";
@@ -41,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
sed -i -e "s|libhidapi|$hidapi/libhidapi|" src/hhd/controller/lib/hid.py
# The generated udev rules point to /bin/chroot, which does not exist in NixOS
- chmod=${ coreutils }/bin/chmod
+ chmod=${ toybox }/bin/chmod
sed -i -e "s|/bin/chmod|$chmod|" src/hhd/controller/lib/hide.py
'';
From c9e8b7cf0260618682c15f7ba601ec9827396ceb Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Mon, 15 Apr 2024 20:07:46 +0200
Subject: [PATCH 5/6] handheld-daemon: move udev rule comment
---
pkgs/by-name/ha/handheld-daemon/package.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 835c0774469354..d79457057e392c 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
# handheld-daemon contains a fork of the python module `hid`, so this hook
# is borrowed from the `hid` derivation.
+ # The generated udev rules point to /bin/chroot, which does not exist in NixOS
postPatch = ''
hidapi=${ hidapi }/lib/
test -d $hidapi || { echo "ERROR: $hidapi doesn't exist, please update/fix this build expression."; exit 1; }
sed -i -e "s|libhidapi|$hidapi/libhidapi|" src/hhd/controller/lib/hid.py
- # The generated udev rules point to /bin/chroot, which does not exist in NixOS
chmod=${ toybox }/bin/chmod
sed -i -e "s|/bin/chmod|$chmod|" src/hhd/controller/lib/hide.py
'';
From 7bea1eb24a9e84b343c3944318e74ce3442ce40c Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Mon, 15 Apr 2024 20:32:43 +0200
Subject: [PATCH 6/6] handheld-daemon: 2.6.2 -> 2.6.4
---
pkgs/by-name/ha/handheld-daemon/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index d79457057e392c..7801038ea36669 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -8,14 +8,14 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "handheld-daemon";
- version = "2.6.2";
+ version = "2.6.4";
pyproject = true;
src = fetchFromGitHub {
owner = "hhd-dev";
repo = "hhd";
rev = "v${version}";
- hash = "sha256-fsH8H6ZhiguOWI2t79GnxqAmqL/1m06RQzs+k8bUWcU=";
+ hash = "sha256-S77APtE1GGfqnv1IkZdJOSlprPOBtrqVXV60yVMvopg=";
};
propagatedBuildInputs = with python3.pkgs; [