From c93716a025ccf695e982d93a8148279fb58d6c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 19 Jan 2024 13:31:41 -0500 Subject: [PATCH 1/4] chrysalis: move to `pkgs/by-name` --- .../chrysalis/default.nix => by-name/ch/chrysalis/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/chrysalis/default.nix => by-name/ch/chrysalis/package.nix} (100%) diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/by-name/ch/chrysalis/package.nix similarity index 100% rename from pkgs/applications/misc/chrysalis/default.nix rename to pkgs/by-name/ch/chrysalis/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70421bfffb60..0da077a17918 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -494,8 +494,6 @@ with pkgs; banana-vera = callPackage ../development/tools/analysis/banana-vera { }; - chrysalis = callPackage ../applications/misc/chrysalis { }; - ciel = callPackage ../tools/package-management/ciel { }; circt = callPackage ../development/compilers/circt { }; From ee66b69564c67bc21fb6ef21504332c0aefe12cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 19 Jan 2024 15:41:08 -0500 Subject: [PATCH 2/4] chrysalis: add eclairevoyant, nshalman to maintainers --- 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 0852e886c54b..e25bdc181864 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -42,7 +42,7 @@ in appimageTools.wrapType2 rec { description = "A graphical configurator for Kaleidoscope-powered keyboards"; homepage = "https://github.com/keyboardio/Chrysalis"; license = licenses.gpl3Only; - maintainers = with maintainers; [ aw ]; + maintainers = with maintainers; [ aw eclairevoyant nshalman ]; platforms = [ "x86_64-linux" ]; mainProgram = "chrysalis"; }; From 6d1da3580bb9ff1fe3624aee3d2629bd6446daed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 19 Jan 2024 15:40:40 -0500 Subject: [PATCH 3/4] chrysalis: set `passthru.updateScript` --- pkgs/by-name/ch/chrysalis/package.nix | 2 ++ pkgs/by-name/ch/chrysalis/update.sh | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/ch/chrysalis/update.sh diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix index e25bdc181864..ee7a4fc7b17b 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -38,6 +38,8 @@ in appimageTools.wrapType2 rec { install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "A graphical configurator for Kaleidoscope-powered keyboards"; homepage = "https://github.com/keyboardio/Chrysalis"; diff --git a/pkgs/by-name/ch/chrysalis/update.sh b/pkgs/by-name/ch/chrysalis/update.sh new file mode 100644 index 000000000000..182d47a9285a --- /dev/null +++ b/pkgs/by-name/ch/chrysalis/update.sh @@ -0,0 +1,16 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash --pure -p curl cacert jq + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" +DRV_DIR="$PWD" + +relinfo=$(curl -sL 'https://api.github.com/repos/keyboardio/chrysalis/releases' | jq 'map(select(.prerelease == false)) | max_by(.tag_name)') +newver=$(echo "$relinfo" | jq --raw-output '.tag_name' | sed 's|^v||') +hashurl=$(echo "$relinfo" | jq --raw-output '.assets[] | select(.name == "latest-linux.yml").browser_download_url') +newhash=$(curl -sL "$hashurl" | grep -Po '^sha512: \K.*') + +sed -i package.nix \ + -e "/^ version =/ s|\".*\"|\"$newver\"|" \ + -e "/sha512-/ s|\".*\"|\"sha512-$newhash\"|" \ From cd9b5900bc7c84f0d854b32a723fdc108b2e6709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 19 Jan 2024 15:37:01 -0500 Subject: [PATCH 4/4] chrysalis: 0.13.2 -> 0.13.3 --- 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 ee7a4fc7b17b..ab4b5b5f3f8f 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -2,13 +2,13 @@ let pname = "chrysalis"; - version = "0.13.2"; + 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-WuItdQ/hDxbZZ3zulHI74NUkuYfesV/31rA1gPakCFgX2hpPrmKzwUez2vqt4N5qrGyphrR0bcelUatGZhOn5A=="; + "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw=="; }; appimageContents = appimageTools.extract { inherit name src; }; in appimageTools.wrapType2 rec {