Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #279435 from eyeinsky/backport-keybase-23.05

keybase: 6.0.2 -> 6.2.4; keybase-gui: 6.0.2 -> 6.2.4; backport to 23.05

authored by Nick Cao and committed by GitHub 9a333eaa a1982c92

Changed files
+8 -6
pkgs
tools
security
+5 -3
pkgs/tools/security/keybase/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "keybase"; 8 - version = "6.0.2"; 8 + version = "6.2.4"; 9 9 10 10 modRoot = "go"; 11 11 subPackages = [ "kbnm" "keybase" ]; ··· 16 16 owner = "keybase"; 17 17 repo = "client"; 18 18 rev = "v${version}"; 19 - sha256 = "sha256-JiYufEsoj/98An2qKdm/Uu4YHJr6ttc/VHn4kMgkuwI="; 19 + hash = "sha256-z7vpCUK+NU7xU9sNBlQnSy9sjXD7/m8jSRKfJAgyyN8="; 20 20 }; 21 - vendorSha256 = "sha256-D8b/pvmBGCnaRuf92FYgRcSSbN59Yu0CHKxAybdYjS4="; 21 + vendorHash = "sha256-tXEEVEfjoKub2A4m7F3hDc5ABJ+R+axwX1+1j7e3BAM="; 22 22 23 23 patches = [ 24 24 (substituteAll { ··· 38 38 platforms = platforms.linux ++ platforms.darwin; 39 39 maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne shofius ]; 40 40 license = licenses.bsd3; 41 + 42 + broken = stdenv.isDarwin && stdenv.isx86_64; 41 43 }; 42 44 }
+3 -3
pkgs/tools/security/keybase/gui.nix
··· 4 4 , runtimeShell, gsettings-desktop-schemas }: 5 5 6 6 let 7 - versionSuffix = "20220610191041.a459abf326"; 7 + versionSuffix = "20240101011938.ae7e4a1c15"; 8 8 in 9 9 10 10 stdenv.mkDerivation rec { 11 11 pname = "keybase-gui"; 12 - version = "6.0.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages 12 + version = "6.2.4"; # Find latest version and versionSuffix from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages 13 13 14 14 src = fetchurl { 15 15 url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; 16 - hash = "sha256-FMhbMSuJHq5d5E0dTVAk02y85UXmhtKZYk4qcbnhRxI="; 16 + hash = "sha256-XyGb9F83z8+OSjxOaO5k+h2qIY78ofS/ZfTXki54E5Q="; 17 17 }; 18 18 19 19 nativeBuildInputs = [