push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,56 @@
{
replaceVars,
lib,
buildGoModule,
fetchFromGitHub,
gnupg,
}:
buildGoModule rec {
pname = "keybase";
version = "6.5.1";
modRoot = "go";
subPackages = [
"kbnm"
"keybase"
];
dontRenameImports = true;
src = fetchFromGitHub {
owner = "keybase";
repo = "client";
rev = "v${version}";
hash = "sha256-B3vedsxQM4FDZVpkMKR67DF7FtaTPhGIJ1e2lViKYzg=";
};
vendorHash = "sha256-uw1tiaYoMpMXCYt5bPL5OBbK09PJmAQYQDrDwuPShxU=";
patches = [
(replaceVars ./fix-paths-keybase.patch {
gpg = "${gnupg}/bin/gpg";
gpg2 = "${gnupg}/bin/gpg2";
})
];
tags = [ "production" ];
ldflags = [
"-s"
"-w"
];
meta = with lib; {
homepage = "https://www.keybase.io/";
description = "Keybase official command-line utility and service";
mainProgram = "keybase";
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [
avaq
np
rvolosatovs
Br1ght0ne
shofius
ryand56
];
license = licenses.bsd3;
};
}

View File

@@ -0,0 +1,16 @@
diff --git a/go/libkb/gpg_cli.go b/go/libkb/gpg_cli.go
index 3c7c6257..ae8f7e2f 100644
--- a/go/libkb/gpg_cli.go
+++ b/go/libkb/gpg_cli.go
@@ -54,9 +54,9 @@ func (g *GpgCLI) Configure(mctx MetaContext) (err error) {
if len(prog) > 0 {
err = canExec(prog)
} else {
- prog, err = exec.LookPath("gpg2")
+ prog, err = exec.LookPath("@gpg2@")
if err != nil {
- prog, err = exec.LookPath("gpg")
+ prog, err = exec.LookPath("@gpg@")
}
}
if err != nil {

View File

@@ -0,0 +1,152 @@
{
stdenv,
lib,
fetchurl,
alsa-lib,
atk,
cairo,
cups,
udev,
libdrm,
libgbm,
dbus,
expat,
fontconfig,
freetype,
gdk-pixbuf,
glib,
gtk3,
libappindicator-gtk3,
libnotify,
nspr,
nss,
pango,
systemd,
xorg,
autoPatchelfHook,
wrapGAppsHook3,
runtimeShell,
gsettings-desktop-schemas,
}:
let
versionSuffix = "20250428154451.19f9cfeddb";
in
stdenv.mkDerivation rec {
pname = "keybase-gui";
version = "6.5.1"; # 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-PCKi1lavGwLbCoMTMG4h6PJTIzwRAu542eYqDDKzU4Y=";
};
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook3
];
buildInputs = [
alsa-lib
atk
cairo
cups
dbus
expat
fontconfig
freetype
gdk-pixbuf
glib
gsettings-desktop-schemas
gtk3
libappindicator-gtk3
libnotify
nspr
nss
pango
systemd
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxcb
libdrm
libgbm
];
runtimeDependencies = [
(lib.getLib udev)
libappindicator-gtk3
];
dontBuild = true;
dontConfigure = true;
dontPatchELF = true;
unpackPhase = ''
ar xf $src
tar xf data.tar.xz
'';
installPhase = ''
mkdir -p $out/bin
mv usr/share $out/share
mv opt/keybase $out/share/
cat > $out/bin/keybase-gui <<EOF
#!${runtimeShell}
checkFailed() {
if [ "\$NIX_SKIP_KEYBASE_CHECKS" = "1" ]; then
return
fi
echo "Set NIX_SKIP_KEYBASE_CHECKS=1 if you want to skip this check." >&2
exit 1
}
if [ ! -S "\$XDG_RUNTIME_DIR/keybase/keybased.sock" ]; then
echo "Keybase service doesn't seem to be running." >&2
echo "You might need to run: keybase service" >&2
checkFailed
fi
if [ -z "\$(keybase status | grep kbfsfuse)" ]; then
echo "Could not find kbfsfuse client in keybase status." >&2
echo "You might need to run: kbfsfuse" >&2
checkFailed
fi
exec $out/share/keybase/Keybase \''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} "\$@"
EOF
chmod +x $out/bin/keybase-gui
substituteInPlace $out/share/applications/keybase.desktop \
--replace run_keybase $out/bin/keybase-gui
'';
meta = with lib; {
homepage = "https://www.keybase.io/";
description = "Keybase official GUI";
mainProgram = "keybase-gui";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [
avaq
rvolosatovs
puffnfresh
np
Br1ght0ne
shofius
ryand56
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.bsd3;
};
}

View File

@@ -0,0 +1,37 @@
{
lib,
buildGoModule,
keybase,
}:
buildGoModule {
pname = "kbfs";
inherit (keybase) src version vendorHash;
modRoot = "go";
subPackages = [
"kbfs/kbfsfuse"
"kbfs/redirector"
"kbfs/kbfsgit/git-remote-keybase"
];
tags = [ "production" ];
ldflags = [
"-s"
"-w"
];
meta = with lib; {
homepage = "https://keybase.io/docs/kbfs";
description = "Keybase filesystem";
maintainers = with maintainers; [
avaq
rvolosatovs
bennofs
np
shofius
];
license = licenses.bsd3;
};
}