From a024f81d841c96a5187e0b2570b2ade953f9a760 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 23 Aug 2024 17:10:26 -0600 Subject: [PATCH 1/3] keybase-gui: 6.2.4 -> 6.4.0 --- pkgs/tools/security/keybase/gui.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 666425e4d3d0..40252063bf00 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20240101011938.ae7e4a1c15"; + versionSuffix = "20240821175720.3212f60cc5"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "6.2.4"; # Find latest version and versionSuffix from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "6.4.0"; # Find latest version and versionSuffix from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - hash = "sha256-XyGb9F83z8+OSjxOaO5k+h2qIY78ofS/ZfTXki54E5Q="; + hash = "sha256-OGuckMUXDzfHIMhQagYJZObV4W6LufqTeIiCg+c5MjM="; }; nativeBuildInputs = [ From 265d9a2adb8b082cb141b1e1ce9e6d14190337eb Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sat, 2 Nov 2024 20:25:04 -0600 Subject: [PATCH 2/3] keybase-gui: add `NIXOS_OZONE_WL` support --- pkgs/tools/security/keybase/gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 40252063bf00..4d1d3d6c8d78 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { checkFailed fi - exec $out/share/keybase/Keybase "\$@" + exec $out/share/keybase/Keybase \''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} "\$@" EOF chmod +x $out/bin/keybase-gui From a90b34f9e76b685baada90f62ee2330d129b98ca Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 8 Nov 2024 15:43:00 -0700 Subject: [PATCH 3/3] keybase{-gui}: add myself as maintainer --- pkgs/tools/security/keybase/default.nix | 2 +- pkgs/tools/security/keybase/gui.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 103066261a19..b75dd1eb202d 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { homepage = "https://www.keybase.io/"; description = "Keybase official command-line utility and service"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ avaq np rvolosatovs Br1ght0ne shofius ]; + maintainers = with maintainers; [ avaq np rvolosatovs Br1ght0ne shofius ryand56 ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 4d1d3d6c8d78..3beeaac77b28 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { description = "Keybase official GUI"; mainProgram = "keybase-gui"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne shofius ]; + maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne shofius ryand56 ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsd3; };