Flake: update nixpkgs patches
This commit is contained in:
parent
e952cfa34f
commit
0f6f51975d
1 changed files with 130 additions and 17 deletions
|
|
@ -1,7 +1,7 @@
|
|||
From 18cd88064d152491d5ba19602db5c5d65bc2d685 Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Thu, 18 Apr 2024 11:22:24 +0200
|
||||
Subject: [PATCH 1/6] handheld-daemon-ui: init at 3.1.1
|
||||
Subject: [PATCH 01/10] handheld-daemon-ui: init at 3.1.1
|
||||
|
||||
---
|
||||
.../by-name/ha/handheld-daemon-ui/package.nix | 39 +++++++++++++++++++
|
||||
|
|
@ -10,7 +10,7 @@ Subject: [PATCH 1/6] handheld-daemon-ui: init at 3.1.1
|
|||
|
||||
diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
new file mode 100644
|
||||
index 000000000000000..81d318d88b5abd3
|
||||
index 0000000000000..81d318d88b5ab
|
||||
--- /dev/null
|
||||
+++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
@@ -0,0 +1,39 @@
|
||||
|
|
@ -54,17 +54,18 @@ index 000000000000000..81d318d88b5abd3
|
|||
+ };
|
||||
+}
|
||||
|
||||
From 8ebb1f0976c79c74eb0cea3975c348e36d86a7d1 Mon Sep 17 00:00:00 2001
|
||||
From 49fc133081344cbe155eefd7189a6cff2e8b6c6b Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Wed, 10 Jul 2024 12:59:01 +0200
|
||||
Subject: [PATCH 2/6] handheld-daemon: add options for handheld-daemon-ui
|
||||
Subject: [PATCH 02/10] nixos/handheld-daemon: add options for
|
||||
handheld-daemon-ui
|
||||
|
||||
---
|
||||
.../modules/services/hardware/handheld-daemon.nix | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
index 6c9d5aa3e22c86b..e8e283bca894130 100644
|
||||
index 6c9d5aa3e22c8..e8e283bca8941 100644
|
||||
--- a/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
@@ -11,6 +11,11 @@ in
|
||||
|
|
@ -104,17 +105,18 @@ index 6c9d5aa3e22c86b..e8e283bca894130 100644
|
|||
ExecStart = "${ lib.getExe cfg.package } --user ${ cfg.user }";
|
||||
Nice = "-12";
|
||||
|
||||
From 1b034ab22605b29195dabce893282b05077d0fe7 Mon Sep 17 00:00:00 2001
|
||||
From a8cbef4271d515e2733f3f9a32843135e3d255a5 Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Thu, 11 Jul 2024 12:11:00 +0200
|
||||
Subject: [PATCH 3/6] handheld-daemon: enable ui when enabling handheld-daemon
|
||||
Subject: [PATCH 03/10] nixos/handheld-daemon: enable ui when enabling
|
||||
handheld-daemon
|
||||
|
||||
---
|
||||
nixos/modules/services/hardware/handheld-daemon.nix | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
index e8e283bca894130..d78bae5e9bc4833 100644
|
||||
index e8e283bca8941..d78bae5e9bc48 100644
|
||||
--- a/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
@@ -25,6 +25,7 @@ in
|
||||
|
|
@ -126,17 +128,17 @@ index e8e283bca894130..d78bae5e9bc4833 100644
|
|||
cfg.package
|
||||
(mkIf cfg.ui.enable cfg.ui.package)
|
||||
|
||||
From 0686e34bb16f8538e28b0795a8e5957ead5abdf0 Mon Sep 17 00:00:00 2001
|
||||
From 76e8f25d02d909e23dfb00bd02cb276dc4cf5c1c Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Tue, 8 Oct 2024 10:51:00 +0200
|
||||
Subject: [PATCH 4/6] handheld-daemon-ui: 3.1.1 -> 3.2.1
|
||||
Subject: [PATCH 04/10] handheld-daemon-ui: 3.1.1 -> 3.2.1
|
||||
|
||||
---
|
||||
pkgs/by-name/ha/handheld-daemon-ui/package.nix | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
index 81d318d88b5abd3..028ceeb58f05e96 100644
|
||||
index 81d318d88b5ab..028ceeb58f05e 100644
|
||||
--- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
+++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
@@ -5,11 +5,11 @@
|
||||
|
|
@ -163,17 +165,17 @@ index 81d318d88b5abd3..028ceeb58f05e96 100644
|
|||
mkdir -p $out/share/applications
|
||||
substitute ${extractedFiles}/hhd-ui.desktop \
|
||||
|
||||
From d602ac7ac385613c082fe5b87b8462b2a2627a3e Mon Sep 17 00:00:00 2001
|
||||
From 1843526bfdf5b5015ab9a070cfad122ec4cfb290 Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Tue, 8 Oct 2024 11:14:00 +0200
|
||||
Subject: [PATCH 5/6] handheld-daemon-ui: fix desktop item category
|
||||
Subject: [PATCH 05/10] handheld-daemon-ui: fix desktop item category
|
||||
|
||||
---
|
||||
pkgs/by-name/ha/handheld-daemon-ui/package.nix | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
index 028ceeb58f05e96..1aa8266ece44849 100644
|
||||
index 028ceeb58f05e..1aa8266ece448 100644
|
||||
--- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
+++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
@@ -23,7 +23,8 @@ appimageTools.wrapType2 {
|
||||
|
|
@ -187,17 +189,17 @@ index 028ceeb58f05e96..1aa8266ece44849 100644
|
|||
'';
|
||||
|
||||
|
||||
From 09b2e9dcb32eb3d6eaa4ba0e65cf7102b50d1d13 Mon Sep 17 00:00:00 2001
|
||||
From 9ff4790805b08d7b0ff1d501606eb4ee2c28f675 Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Tue, 8 Oct 2024 11:40:05 +0200
|
||||
Subject: [PATCH 6/6] handheld-daemon-ui: copy icon to correct folder
|
||||
Subject: [PATCH 06/10] handheld-daemon-ui: copy icon to correct folder
|
||||
|
||||
---
|
||||
pkgs/by-name/ha/handheld-daemon-ui/package.nix | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
index 1aa8266ece44849..a1131ea5c23d64a 100644
|
||||
index 1aa8266ece448..a1131ea5c23d6 100644
|
||||
--- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
+++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
@@ -25,7 +25,9 @@ appimageTools.wrapType2 {
|
||||
|
|
@ -211,3 +213,114 @@ index 1aa8266ece44849..a1131ea5c23d64a 100644
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
From b70ac1d16444ae765c3273acb5a3bab27cdc06c6 Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Tue, 8 Oct 2024 18:47:43 +0200
|
||||
Subject: [PATCH 07/10] nixos/handheld-daemon: replace mkIf with lib.optional
|
||||
|
||||
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
|
||||
---
|
||||
nixos/modules/services/hardware/handheld-daemon.nix | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
index d78bae5e9bc48..02684426b578d 100644
|
||||
--- a/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
@@ -28,8 +28,7 @@ in
|
||||
services.handheld-daemon.ui.enable = mkDefault true;
|
||||
environment.systemPackages = [
|
||||
cfg.package
|
||||
- (mkIf cfg.ui.enable cfg.ui.package)
|
||||
- ];
|
||||
+ ] ++ lib.optional cfg.ui.enable cfg.ui.package;
|
||||
services.udev.packages = [ cfg.package ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
|
||||
From ac8bb4e8ba115162e7140a47b55c0264ec8d830b Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Thu, 10 Oct 2024 11:08:48 +0200
|
||||
Subject: [PATCH 08/10] nixos/handheld-daemon: add correct ui package to
|
||||
service path
|
||||
|
||||
---
|
||||
nixos/modules/services/hardware/handheld-daemon.nix | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
index 02684426b578d..cb20682ec592e 100644
|
||||
--- a/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
|
||||
@@ -40,7 +40,7 @@ in
|
||||
restartIfChanged = true;
|
||||
|
||||
path = mkIf cfg.ui.enable [
|
||||
- pkgs.handheld-daemon-ui
|
||||
+ cfg.ui.package
|
||||
pkgs.lsof
|
||||
];
|
||||
|
||||
|
||||
From 4f5a6840aed497f33ad61cd3a629288cde8c6dd2 Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Wed, 6 Nov 2024 22:36:59 +0100
|
||||
Subject: [PATCH 09/10] handheld-daemon-ui: get rid off 'with lib'
|
||||
|
||||
Co-authored-by: Arne Keller <2012gdwu+github@posteo.de>
|
||||
---
|
||||
pkgs/by-name/ha/handheld-daemon-ui/package.nix | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
index a1131ea5c23d6..92946c9fe0cd2 100644
|
||||
--- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
+++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
@@ -30,13 +30,13 @@ appimageTools.wrapType2 {
|
||||
cp ${extractedFiles}/hhd-ui.png $iconDir
|
||||
'';
|
||||
|
||||
- meta = with lib; {
|
||||
- description = "The main UI for the Handheld Daemon";
|
||||
+ meta = {
|
||||
+ description = "UI for the Handheld Daemon";
|
||||
homepage = "https://github.com/hhd-dev/hhd-ui";
|
||||
- license = licenses.gpl3Only;
|
||||
- maintainers = with maintainers; [ toast ];
|
||||
+ license = lib.licenses.gpl3Only;
|
||||
+ maintainers = with lib.maintainers; [ toast ];
|
||||
mainProgram = "hhd-ui";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
- sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
||||
From fb63f605c5a14c23d596d070fffc9e89da59526e Mon Sep 17 00:00:00 2001
|
||||
From: Toast <39011842+toast003@users.noreply.github.com>
|
||||
Date: Fri, 15 Nov 2024 10:49:15 +0100
|
||||
Subject: [PATCH 10/10] handheld-daemon-ui: 3.2.1 -> 3.2.3
|
||||
|
||||
---
|
||||
pkgs/by-name/ha/handheld-daemon-ui/package.nix | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
index 92946c9fe0cd2..00c830bd3fc67 100644
|
||||
--- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
+++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "handheld-daemon-ui";
|
||||
- version = "3.2.1";
|
||||
+ version = "3.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage";
|
||||
- hash = "sha256-RRXVoeWOO/pR+CAEY0J6Buf/RhA+G0PdxGQVMdAHfwA=";
|
||||
+ hash = "sha256-VhJrOvE+BebJIAeQlwOOsPfqSrvBnJQavGT7glTrG2o=";
|
||||
};
|
||||
extractedFiles = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue