From 039b37366f8e220e0f957e340b4972703ca64715 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 09:04:04 +0000 Subject: [PATCH 1/3] keybase: 6.0.2 -> 6.2.4 --- pkgs/tools/security/keybase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index afc2eadb63fc..d29f17679c85 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "keybase"; - version = "6.0.2"; + version = "6.2.4"; modRoot = "go"; subPackages = [ "kbnm" "keybase" ]; @@ -16,9 +16,9 @@ buildGoModule rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-JiYufEsoj/98An2qKdm/Uu4YHJr6ttc/VHn4kMgkuwI="; + hash = "sha256-z7vpCUK+NU7xU9sNBlQnSy9sjXD7/m8jSRKfJAgyyN8="; }; - vendorSha256 = "sha256-D8b/pvmBGCnaRuf92FYgRcSSbN59Yu0CHKxAybdYjS4="; + vendorHash = "sha256-tXEEVEfjoKub2A4m7F3hDc5ABJ+R+axwX1+1j7e3BAM="; patches = [ (substituteAll { From f1c8d80ef5d258ec1dd98dfa536a4bf90ac2e0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20L=C3=A4ll?= Date: Tue, 2 Jan 2024 22:46:09 +0200 Subject: [PATCH 2/3] keybase-gui: 6.0.2 -> 6.2.4 --- 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 6b218de45dc2..8541b02d583e 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 = "20220610191041.a459abf326"; + versionSuffix = "20240101011938.ae7e4a1c15"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "6.0.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "6.2.4"; # 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-FMhbMSuJHq5d5E0dTVAk02y85UXmhtKZYk4qcbnhRxI="; + hash = "sha256-XyGb9F83z8+OSjxOaO5k+h2qIY78ofS/ZfTXki54E5Q="; }; nativeBuildInputs = [ From c26ee97c273ea4073767f3502ac720aa7643d6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20L=C3=A4ll?= Date: Tue, 16 Jan 2024 17:54:46 +0200 Subject: [PATCH 3/3] keybase: mark as broken on x86_64-darwin Error from CI job "OfBorg / keybase, keybase-gui, keybase-gui.passthru.tests, keybase.passthru.tests on x86_64-darwin": ``` > In file included from /nix/store/xxbz3p03wa8wlbhb8c91ndh3f2rad1jp-apple-framework-CoreMedia/Library/Frameworks/CoreMedia.framework/Headers/CMSampleBuffer.h:56: > In file included from /nix/store/xxbz3p03wa8wlbhb8c91ndh3f2rad1jp-apple-framework-CoreMedia/Library/Frameworks/CoreMedia.framework/Headers/CMFormatDescription.h:27: > /nix/store/bvqircp5apqaqyk57r8m4z38hfbdabfq-apple-framework-AudioToolbox/Library/Frameworks/AudioToolbox.framework/Headers/AudioFormat.h:161:8: error: redefinition of 'AudioFormatListItem' > struct AudioFormatListItem > ^ > /nix/store/a67qmarhk5cca9a4s19r0ys3q99kyndp-apple-framework-CoreAudioTypes-11.0.0/Library/Frameworks/CoreAudioTypes.framework/Headers/CoreAudioBaseTypes.h:1412:8: note: previous definition is here > struct AudioFormatListItem > ^ > 1 error generated. For full logs, run 'nix log /nix/store/2avqqjb3svdzmnqn608vm79z2w9vx8zj-keybase-6.2.4.drv'. ``` From: https://github.com/NixOS/nixpkgs/pull/279435/checks?check_run_id=20351324899 --- pkgs/tools/security/keybase/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index d29f17679c85..beaf507a0f71 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -38,5 +38,7 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne shofius ]; license = licenses.bsd3; + + broken = stdenv.isDarwin && stdenv.isx86_64; }; }