From f88424f5d8ae28bc589a005a83ddcadd596ab5ec Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:38:39 +0300 Subject: [PATCH 1/5] karabiner-elements: format with nixfmt-rfc-style --- .../darwin/karabiner-elements/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index 367f7bc0ad44..b2e7d1235bb3 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, cpio, xar, undmg }: +{ + lib, + stdenv, + fetchurl, + cpio, + xar, + undmg, +}: stdenv.mkDerivation rec { pname = "karabiner-elements"; @@ -9,9 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-gmJwoht/Tfm5qMecmq1N6PSAIfWOqsvuHU8VDJY8bLw="; }; - outputs = [ "out" "driver" ]; + outputs = [ + "out" + "driver" + ]; - nativeBuildInputs = [ cpio xar undmg ]; + nativeBuildInputs = [ + cpio + xar + undmg + ]; unpackPhase = '' undmg $src From fa35b059552c02693c57321383eb9f3673a5feec Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:40:45 +0300 Subject: [PATCH 2/5] karabiner-elements: refactor meta --- pkgs/os-specific/darwin/karabiner-elements/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index b2e7d1235bb3..1d2d6834e0ed 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -56,11 +56,12 @@ stdenv.mkDerivation rec { passthru.updateScript = ./updater.sh; - meta = with lib; { - description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Sierra (10.12) or later"; + meta = { + changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${version}"; + description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Ventura (13) or later"; homepage = "https://karabiner-elements.pqrs.org/"; - platforms = platforms.darwin; + license = lib.licenses.unlicense; maintainers = [ ]; - license = licenses.unlicense; + platforms = lib.platforms.darwin; }; } From b941404ab94f4a96545957c2655caaf5b1ce591b Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:42:21 +0300 Subject: [PATCH 3/5] karabiner-elements: simplify updateScript --- .../darwin/karabiner-elements/default.nix | 3 ++- .../darwin/karabiner-elements/updater.sh | 13 ------------- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100755 pkgs/os-specific/darwin/karabiner-elements/updater.sh diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index 1d2d6834e0ed..d9c6360226dc 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -5,6 +5,7 @@ cpio, xar, undmg, + nix-update-script, }: stdenv.mkDerivation rec { @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { cp "$out/Library/Application Support/org.pqrs/Karabiner-Elements/package-version" "$out/Library/Application Support/org.pqrs/Karabiner-Elements/version" ''; - passthru.updateScript = ./updater.sh; + passthru.updateScript = nix-update-script { }; meta = { changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${version}"; diff --git a/pkgs/os-specific/darwin/karabiner-elements/updater.sh b/pkgs/os-specific/darwin/karabiner-elements/updater.sh deleted file mode 100755 index eb0dd7b9ce5c..000000000000 --- a/pkgs/os-specific/darwin/karabiner-elements/updater.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts -set -eo pipefail - -new_version="$(curl -s "https://api.github.com/repos/pqrs-org/Karabiner-Elements/releases/latest" | jq -r '.tag_name | ltrimstr("v")')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" - -if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date!" - exit 0 -fi - -update-source-version karabiner-elements "${new_version}" From e5aa8e21821e0591434db3ab6281569d86ebef30 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:43:30 +0300 Subject: [PATCH 4/5] karabiner-elements: switch to finalAttrs pattern --- pkgs/os-specific/darwin/karabiner-elements/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index d9c6360226dc..ac8eac4ab623 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -8,12 +8,12 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "karabiner-elements"; version = "14.13.0"; src = fetchurl { - url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${version}/Karabiner-Elements-${version}.dmg"; + url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${finalAttrs.version}/Karabiner-Elements-${finalAttrs.version}.dmg"; sha256 = "sha256-gmJwoht/Tfm5qMecmq1N6PSAIfWOqsvuHU8VDJY8bLw="; }; @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${version}"; + changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${finalAttrs.version}"; description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Ventura (13) or later"; homepage = "https://karabiner-elements.pqrs.org/"; license = lib.licenses.unlicense; maintainers = [ ]; platforms = lib.platforms.darwin; }; -} +}) From ea09687d5fa113ff6bdaba5e79850d99334664bd Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:45:54 +0300 Subject: [PATCH 5/5] karabiner-elements: 14.13.0 -> 15.0.0 Changelog: https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v15.0.0 Diff: https://github.com/pqrs-org/Karabiner-Elements/compare/v14.13.0...v15.0.0 --- pkgs/os-specific/darwin/karabiner-elements/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index ac8eac4ab623..5239bc73b842 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "karabiner-elements"; - version = "14.13.0"; + version = "15.0.0"; src = fetchurl { url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${finalAttrs.version}/Karabiner-Elements-${finalAttrs.version}.dmg"; - sha256 = "sha256-gmJwoht/Tfm5qMecmq1N6PSAIfWOqsvuHU8VDJY8bLw="; + hash = "sha256-xWCsbkP9cVnDjWFTgWl5KrR7wEpcQYM4Md99pTI/l14="; }; outputs = [