pyrox.dev
Merge pull request #198021 from razielgn/mosh-1.4.0
mosh: 1.3.2 -> 1.4.0
authored by Thiago Kenji Okada and committed by GitHub 1069eaec 9616649b
+7
-18
pkgs/tools/networking/mosh/default.nix
+7
-18
pkgs/tools/networking/mosh/default.nix
···
1
-
{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config
1
+
{ lib, stdenv, fetchFromGitHub, zlib, protobuf, ncurses, pkg-config
2
2
, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion
3
3
, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }:
4
4
5
5
stdenv.mkDerivation rec {
6
6
pname = "mosh";
7
-
version = "1.3.2";
7
+
version = "1.4.0";
8
8
9
-
src = fetchurl {
10
-
url = "https://mosh.org/mosh-${version}.tar.gz";
11
-
sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s";
9
+
src = fetchFromGitHub {
10
+
owner = "mobile-shell";
11
+
repo = pname;
12
+
rev = "mosh-${version}";
13
+
hash = "sha256-tlSsHu7JnXO+sorVuWWubNUNdb9X0/pCaiGG5Y0X/g8=";
12
14
};
13
15
14
16
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perl ];
···
23
25
./ssh_path.patch
24
26
./mosh-client_path.patch
25
27
./utempter_path.patch
26
-
# Fix w/c++17, ::bind vs std::bind
27
-
(fetchpatch {
28
-
url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch";
29
-
sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm";
30
-
})
31
28
# Fix build with bash-completion 2.10
32
29
./bash_completion_datadir.patch
33
30
];
34
31
35
32
postPatch = ''
36
-
# Fix build with Xcode 12.5 toolchain/case-insensitive filesystems
37
-
# Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538;
38
-
# remove on next upstream release.
39
-
patch -p0 < ${fetchpatch {
40
-
url = "https://raw.githubusercontent.com/macports/macports-ports/70ca3f65e622c17582fd938602d800157ed951c3/net/mosh/files/patch-version-subdir.diff";
41
-
sha256 = "1yyh6d07y9zbdx4fb0r56zkq9nd9knwzj22v4dfi55k4k42qxapd";
42
-
}}
43
-
44
33
substituteInPlace scripts/mosh.pl \
45
34
--subst-var-by ssh "${openssh}/bin/ssh" \
46
35
--subst-var-by mosh-client "$out/bin/mosh-client"