diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-01-22 16:07:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-22 16:07:59 -0500 |
| commit | 9a333eaa80901efe01df07eade2c16d183761fa3 (patch) | |
| tree | 4e546f9c36424bdf2f316845f011ca785d38df8f | |
| parent | Merge pull request #280330 from obsidiansystems/rapidcheck-23.05 (diff) | |
| parent | keybase: mark as broken on x86_64-darwin (diff) | |
| download | nixpkgs-origin/release-23.05.tar.gz | |
Merge pull request #279435 from eyeinsky/backport-keybase-23.05origin/release-23.05
keybase: 6.0.2 -> 6.2.4; keybase-gui: 6.0.2 -> 6.2.4; backport to 23.05
| -rw-r--r-- | pkgs/tools/security/keybase/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/security/keybase/gui.nix | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index afc2eadb63fc..beaf507a0f71 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 { @@ -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; }; } 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 = [ |