We had a mosh release

This commit is contained in:
Julien Malka 2022-11-03 01:09:10 +01:00
parent 8976722bf8
commit f2be4eab3f
Signed by: Luj
GPG key ID: 6FC74C847011FD83
5 changed files with 1 additions and 100 deletions

View file

@ -56,14 +56,12 @@
nixosConfigurations = builtins.mapAttrs (name: value: (mkMachine { host = name; host-config = value; modules = self.nixosModules; system = luj.machines.${name}.arch; })) (importConfig ./machines);
packages."x86_64-linux" = {
tinystatus = import ./packages/tinystatus { inherit pkgs; };
mosh = pkgs.callPackage ./packages/mosh { };
flaresolverr = pkgs.callPackage ./packages/flaresolverr { };
htpdate = pkgs.callPackage ./packages/htpdate { };
authelia = pkgs.callPackage ./packages/authelia { };
};
packages."aarch64-linux" = {
tinystatus = import ./packages/tinystatus { pkgs = pkgsrpi; };
mosh = pkgsrpi.callPackage ./packages/mosh { };
flaresolverr = pkgsrpi.callPackage ./packages/flaresolverr { };
htpdate = pkgsrpi.callPackage ./packages/htpdate { };
};

View file

@ -22,7 +22,6 @@ in
home-manager.nixosModules.home-manager
simple-nixos-mailserver.nixosModule
{
home-manager.useUserPackages = true;
home-manager.useGlobalPkgs = true;
nixpkgs.overlays = [
overlay-unstable
@ -31,7 +30,6 @@ in
tinystatus = prev.pkgs.callPackage ../packages/tinystatus { };
jackett = prev.unstable.jackett;
radarr = prev.unstable.radarr;
mosh = prev.pkgs.callPackage ../packages/mosh { };
flaresolverr = prev.pkgs.callPackage ../packages/flaresolverr { };
htpdate = prev.pkgs.callPackage ../packages/htpdate { };
authelia = prev.pkgs.callPackage ../packages/authelia { };
@ -39,6 +37,7 @@ in
tailscale = prev.unstable.tailscale;
nodePackages = prev.unstable.nodePackages;
linkal = inputs.linkal.defaultPackage."${system}";
mosh = prev.unstable.mosh;
})
];
}

View file

@ -1,20 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 3ad983d..ff8ff96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -476,13 +476,7 @@ AS_IF([echo "$protobuf_LIBS" | grep -q -- -pthread],
# Bash completion needs to ask where it goes if >= 2.0 is installed.
AS_IF([test "$install_completion" != no],
- [PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
- [if test "$prefix" = "NONE"; then
- completions="`pkg-config --variable=completionsdir bash-completion`"
- else
- completions="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`"
- fi],
- [completions="${sysconfdir}/bash_completion.d"])
+ [completions="`pkg-config --define-variable=datadir=$datadir --variable=completionsdir bash-completion`"]
AC_SUBST([completions])])
AC_CONFIG_FILES([

View file

@ -1,62 +0,0 @@
{ pkgs, lib, stdenv, fetchFromGithub, fetchpatch, zlib, protobuf, ncurses, pkg-config
, makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion
, withUtempter ? stdenv.isLinux, libutempter }:
stdenv.mkDerivation rec {
pname = "mosh";
version = "1.3.2";
src = pkgs.fetchFromGitHub {
owner = "mobile-shell";
repo = pname;
rev = "378dfa6aa5778cf168646ada7f52b6f4a8ec8e41";
sha256 = "LJssBMrICVgaZtTvZTO6bYMFO4fQ330lIUkWzDSyf7o=";
};
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
buildInputs = [ protobuf ncurses zlib openssl ]
++ (with perlPackages; [ perl IOTty ])
++ lib.optional withUtempter libutempter;
enableParallelBuilding = true;
patches = [
./ssh_path.patch
./bash_completion_datadir.patch
];
preConfigure = ''
./autogen.sh
'';
NIX_CFLAGS_COMPILE = "-O2";
configureFlags = [ "--enable-completion" ]
++ lib.optional withUtempter "--with-utempter";
postInstall = ''
wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
'';
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
meta = with lib; {
homepage = "https://mosh.org/";
description = "Mobile shell (ssh replacement)";
longDescription = ''
Remote terminal application that allows roaming, supports intermittent
connectivity, and provides intelligent local echo and line editing of
user keystrokes.
Mosh is a replacement for SSH. It's more robust and responsive,
especially over Wi-Fi, cellular, and long-distance links.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ viric SuperSandro2000 ];
platforms = platforms.unix;
};
}

View file

@ -1,14 +0,0 @@
diff --git i/scripts/mosh.pl w/scripts/mosh.pl
index c511482..55bf5f3 100755
--- i/scripts/mosh.pl
+++ w/scripts/mosh.pl
@@ -66,7 +66,7 @@ my $use_remote_ip = 'proxy';
my $family = 'prefer-inet';
my $port_request = undef;
-my @ssh = ('ssh');
+my @ssh = ('@ssh@');
my $term_init = 1;