Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5d453c87a92b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3a0f5fb2e742
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 25, 2021

  1. keybase,keybase-gui,kbfs: 5.5.2 -> 5.6.1

    @kf5grd
    kf5grd committed Jan 25, 2021
    Copy the full SHA
    5cc3d7c View commit details

  2. Merge pull request #110811 from kf5grd/master 

    keybase,keybase-gui,kbfs: 5.5.2 -> 5.6.1
    @SuperSandro2000
    SuperSandro2000 authored Jan 25, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3a0f5fb View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/tools/security/keybase/default.nix
  2. +3 −3 pkgs/tools/security/keybase/gui.nix
4 changes: 2 additions & 2 deletions pkgs/tools/security/keybase/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

buildGoPackage rec {
pname = "keybase";
version = "5.5.2";
version = "5.6.1";

goPackagePath = "github.com/keybase/client";
subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "keybase";
repo = "client";
rev = "v${version}";
sha256 = "01k50mank6cdc7q3yd8m7xi8vmyklsqlmz7hw17a35lqcsjzy9zj";
sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g";
};

patches = [
6 changes: 3 additions & 3 deletions pkgs/tools/security/keybase/gui.nix
View file
Original file line number Diff line number Diff line change
@@ -4,17 +4,17 @@
, runtimeShell, gsettings-desktop-schemas }:

let
versionSuffix = "20201016183637.d4ebf7d999";
versionSuffix = "20210125164223.f3b21527b9";
in

stdenv.mkDerivation rec {
pname = "keybase-gui";
version = "5.5.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
version = "5.6.1"; # Find latest version 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";
sha256 = "0qwbqnc6dhfnx3gdwl1lyhdsbclaxpkv3zr3dmxfx1242s64v0c1";
sha256 = "12ckfd02j0f3p3pdlwc640f61z1wzblf2414h6fkf5vzd289h35p";
};

nativeBuildInputs = [