From 47daebc91278f77ed8f757294539e7ac718bb3f5 Mon Sep 17 00:00:00 2001
From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 3 Jun 2024 03:55:28 -0400
Subject: chrysalis: mark update script executable

---
 pkgs/by-name/ch/chrysalis/update.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 pkgs/by-name/ch/chrysalis/update.sh

diff --git a/pkgs/by-name/ch/chrysalis/update.sh b/pkgs/by-name/ch/chrysalis/update.sh
old mode 100644
new mode 100755
-- 
cgit 1.4.1


From 2dee6a31cc7d24da18daf53085db78ce196200df Mon Sep 17 00:00:00 2001
From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 3 Jun 2024 04:08:35 -0400
Subject: chrysalis: format with nixfmt-rfc-style

---
 pkgs/by-name/ch/chrysalis/package.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix
index 40b1a4d3c4544..bc2804ad6feff 100644
--- a/pkgs/by-name/ch/chrysalis/package.nix
+++ b/pkgs/by-name/ch/chrysalis/package.nix
@@ -1,17 +1,20 @@
-{ lib, appimageTools, fetchurl }:
+{
+  lib,
+  appimageTools,
+  fetchurl,
+}:
 
 let
   pname = "chrysalis";
   version = "0.13.3";
   name = "${pname}-${version}-binary";
   src = fetchurl {
-    url =
-      "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage";
-    hash =
-      "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw==";
+    url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage";
+    hash = "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw==";
   };
   appimageContents = appimageTools.extract { inherit name src; };
-in appimageTools.wrapType2 rec {
+in
+appimageTools.wrapType2 rec {
   inherit name pname src;
 
   extraPkgs = pkgs: [ pkgs.glib ];
@@ -41,7 +44,11 @@ in appimageTools.wrapType2 rec {
     description = "Graphical configurator for Kaleidoscope-powered keyboards";
     homepage = "https://github.com/keyboardio/Chrysalis";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ aw eclairevoyant nshalman ];
+    maintainers = with maintainers; [
+      aw
+      eclairevoyant
+      nshalman
+    ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "chrysalis";
   };
-- 
cgit 1.4.1


From 44fad83afac17fb105386ce548ac66d2903e0e6c Mon Sep 17 00:00:00 2001
From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 3 Jun 2024 04:13:49 -0400
Subject: chrysalis: fix source provenance

---
 pkgs/by-name/ch/chrysalis/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix
index bc2804ad6feff..e39c1c20ea7e3 100644
--- a/pkgs/by-name/ch/chrysalis/package.nix
+++ b/pkgs/by-name/ch/chrysalis/package.nix
@@ -7,15 +7,14 @@
 let
   pname = "chrysalis";
   version = "0.13.3";
-  name = "${pname}-${version}-binary";
   src = fetchurl {
     url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage";
     hash = "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw==";
   };
-  appimageContents = appimageTools.extract { inherit name src; };
+  appimageContents = appimageTools.extract { inherit pname version src; };
 in
 appimageTools.wrapType2 rec {
-  inherit name pname src;
+  inherit pname version src;
 
   extraPkgs = pkgs: [ pkgs.glib ];
 
@@ -51,5 +50,6 @@ appimageTools.wrapType2 rec {
     ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "chrysalis";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 }
-- 
cgit 1.4.1


From f3a31652776ad9753a291b99455fe244b472b74a Mon Sep 17 00:00:00 2001
From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 3 Jun 2024 04:14:47 -0400
Subject: chrysalis: remove `meta = with lib;`

---
 pkgs/by-name/ch/chrysalis/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix
index e39c1c20ea7e3..6181f5e5eed2b 100644
--- a/pkgs/by-name/ch/chrysalis/package.nix
+++ b/pkgs/by-name/ch/chrysalis/package.nix
@@ -42,8 +42,8 @@ appimageTools.wrapType2 rec {
   meta = with lib; {
     description = "Graphical configurator for Kaleidoscope-powered keyboards";
     homepage = "https://github.com/keyboardio/Chrysalis";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       aw
       eclairevoyant
       nshalman
-- 
cgit 1.4.1


From c42401aae5bf21735b8b4db57c78c8f7e3d675e1 Mon Sep 17 00:00:00 2001
From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 3 Jun 2024 04:33:00 -0400
Subject: chrysalis: fix `pname` misuse

---
 pkgs/by-name/ch/chrysalis/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix
index 6181f5e5eed2b..8ff17c0e4c743 100644
--- a/pkgs/by-name/ch/chrysalis/package.nix
+++ b/pkgs/by-name/ch/chrysalis/package.nix
@@ -8,7 +8,7 @@ let
   pname = "chrysalis";
   version = "0.13.3";
   src = fetchurl {
-    url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage";
+    url = "https://github.com/keyboardio/chrysalis/releases/download/v${version}/chrysalis-${version}-x64.AppImage";
     hash = "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw==";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
-- 
cgit 1.4.1


From fb87f8a1d19aba69fb3297f288b049efa15619fd Mon Sep 17 00:00:00 2001
From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 3 Jun 2024 04:33:37 -0400
Subject: chrysalis: replace deprecated `--replace` with `--replace-fail`

---
 pkgs/by-name/ch/chrysalis/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix
index 8ff17c0e4c743..b7c98d736856c 100644
--- a/pkgs/by-name/ch/chrysalis/package.nix
+++ b/pkgs/by-name/ch/chrysalis/package.nix
@@ -32,7 +32,7 @@ appimageTools.wrapType2 rec {
         -t $out/share/applications
     substituteInPlace \
         $out/share/applications/Chrysalis.desktop \
-        --replace 'Exec=Chrysalis' 'Exec=${pname}'
+        --replace-fail 'Exec=Chrysalis' 'Exec=${pname}'
 
     install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps
   '';
-- 
cgit 1.4.1


From 77a8116270848082a660a12e2f35346aa218abdf Mon Sep 17 00:00:00 2001
From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 3 Jun 2024 04:33:48 -0400
Subject: chrysalis: fix `meta.mainProgram`

---
 pkgs/by-name/ch/chrysalis/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix
index b7c98d736856c..ca80efe7f820d 100644
--- a/pkgs/by-name/ch/chrysalis/package.nix
+++ b/pkgs/by-name/ch/chrysalis/package.nix
@@ -49,7 +49,8 @@ appimageTools.wrapType2 rec {
       nshalman
     ];
     platforms = [ "x86_64-linux" ];
-    mainProgram = "chrysalis";
+    # buildFHSEnv will create a symlink in $out/bin/${pname}
+    mainProgram = pname;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 }
-- 
cgit 1.4.1


From 5cca28cafa2241b776fc922df790aa38303dd9de Mon Sep 17 00:00:00 2001
From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 3 Jun 2024 04:49:06 -0400
Subject: chrysalis: remove unneeded `rec`

---
 pkgs/by-name/ch/chrysalis/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix
index ca80efe7f820d..96383fdd66672 100644
--- a/pkgs/by-name/ch/chrysalis/package.nix
+++ b/pkgs/by-name/ch/chrysalis/package.nix
@@ -13,7 +13,7 @@ let
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in
-appimageTools.wrapType2 rec {
+appimageTools.wrapType2 {
   inherit pname version src;
 
   extraPkgs = pkgs: [ pkgs.glib ];
-- 
cgit 1.4.1