From a41f2a9ba2bf2d8e33c9da919b8a31933de342ed Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:33:13 +0200 Subject: [PATCH 1/7] goku: format with `nixfmt-rfc-style` --- pkgs/os-specific/darwin/goku/default.nix | 39 ++++++++++++------------ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 4babe83c6351..e361186f27c5 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -1,31 +1,30 @@ -{ lib -, stdenv -, fetchurl -, unzip -, joker +{ + lib, + stdenv, + fetchurl, + unzip, + joker, }: stdenv.mkDerivation rec { pname = "goku"; version = "0.6.0"; - src = if stdenv.hostPlatform.isAarch64 then - fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip"; - hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; - } - else fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; - hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ="; - }; + src = + if stdenv.hostPlatform.isAarch64 then + fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip"; + hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; + } + else + fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; + hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ="; + }; - nativeBuildInputs = [ - unzip - ]; + nativeBuildInputs = [ unzip ]; - buildInputs = [ - joker - ]; + buildInputs = [ joker ]; sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else "."; From 00baf6001ca54c985f17288383fccca957fcd5b0 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:33:56 +0200 Subject: [PATCH 2/7] goku: use `finalAttrs` pattern --- pkgs/os-specific/darwin/goku/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index e361186f27c5..5271a7d45a20 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -6,19 +6,19 @@ joker, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goku"; version = "0.6.0"; src = if stdenv.hostPlatform.isAarch64 then fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip"; + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip"; hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; } else fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku.zip"; hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.nikitavoloboev ]; platforms = platforms.darwin; }; -} +}) From 855ce12c2a9f08307010f3f66deadf37101e0de6 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:34:39 +0200 Subject: [PATCH 3/7] goku: remove `with lib;` from `meta` --- pkgs/os-specific/darwin/goku/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 5271a7d45a20..339809a9c4a4 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { cp gokuw $out/bin ''; - meta = with lib; { + meta = { description = "Karabiner configurator"; homepage = "https://github.com/yqrashawn/GokuRakuJoudo"; - license = licenses.gpl3; - maintainers = [ maintainers.nikitavoloboev ]; - platforms = platforms.darwin; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nikitavoloboev ]; + platforms = lib.platforms.darwin; }; }) From 2ba3e897135ae2fdb16ec37972ad3ea80ad73fe8 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:36:42 +0200 Subject: [PATCH 4/7] goku: add `passthru.updateScript` --- pkgs/os-specific/darwin/goku/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 339809a9c4a4..a07877b893f0 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -4,6 +4,7 @@ fetchurl, unzip, joker, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -28,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else "."; + passthru.updateScript = nix-update-script { }; + installPhase = '' chmod +x goku chmod +x gokuw From 027352dc05195333ab8319a0b7a5ff133722609c Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 14:39:09 +0000 Subject: [PATCH 5/7] goku: 0.6.0 -> 0.7.2 Changelog: https://github.com/yqrashawn/GokuRakuJoudo/releases/tag/v0.7.2 Diff: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.6.0...v0.7.2 --- pkgs/os-specific/darwin/goku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index a07877b893f0..15746e52309e 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goku"; - version = "0.6.0"; + version = "0.7.2"; src = if stdenv.hostPlatform.isAarch64 then fetchurl { url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip"; - hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; + hash = "sha256-mjz1JD12U23Pi8kumELtT9ENhXpX8Db4LUS3DOtP5GM="; } else fetchurl { From 2490a405c2edfbb3b8b57124710403728c93f584 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:43:37 +0200 Subject: [PATCH 6/7] goku: `stdenv` -> `stdenvNoCC` --- pkgs/os-specific/darwin/goku/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 15746e52309e..e97f1b51e12a 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -1,18 +1,18 @@ { lib, - stdenv, + stdenvNoCC, fetchurl, unzip, joker, nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "goku"; version = "0.7.2"; src = - if stdenv.hostPlatform.isAarch64 then + if stdenvNoCC.hostPlatform.isAarch64 then fetchurl { url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip"; hash = "sha256-mjz1JD12U23Pi8kumELtT9ENhXpX8Db4LUS3DOtP5GM="; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ joker ]; - sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else "."; + sourceRoot = if stdenvNoCC.hostPlatform.isAarch64 then "goku" else "."; passthru.updateScript = nix-update-script { }; From e68e39d98812c16625326f8acb077ae3ec7c803a Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:46:26 +0200 Subject: [PATCH 7/7] goku: refactor `installPhase` --- pkgs/os-specific/darwin/goku/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index e97f1b51e12a..70f76836709d 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -32,11 +32,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; installPhase = '' - chmod +x goku - chmod +x gokuw - mkdir -p $out/bin - cp goku $out/bin - cp gokuw $out/bin + runHook preInstall + mkdir -p "$out/bin" + chmod +x {goku,gokuw} + cp {goku,gokuw} "$out/bin" + runHook postInstall ''; meta = {