nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

mosh: 1.3.2 -> 1.4.0

Browse Source 
https://github.com/mobile-shell/mosh/releases/tag/mosh-1.4.0
This commit is contained in:
Federico Ravasio 2022-10-27 07:16:53 +00:00
parent bd545b559f
commit c902c12e41
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/tools/networking/mosh/default.nix
View File

@ -1,14 +1,16 @@
{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config { lib, stdenv, fetchFromGitHub, zlib, protobuf, ncurses, pkg-config
, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion , makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion
, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: , withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mosh"; pname = "mosh";
version = "1.3.2"; version = "1.4.0";
src = fetchurl { src = fetchFromGitHub {
url = "https://mosh.org/mosh-${version}.tar.gz"; owner = "mobile-shell";
sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; repo = pname;
rev = "mosh-${version}";
hash = "sha256-tlSsHu7JnXO+sorVuWWubNUNdb9X0/pCaiGG5Y0X/g8=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perl ]; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perl ];
@ -23,24 +25,11 @@ stdenv.mkDerivation rec {
./ssh_path.patch ./ssh_path.patch
./mosh-client_path.patch ./mosh-client_path.patch
./utempter_path.patch ./utempter_path.patch
# Fix w/c++17, ::bind vs std::bind
(fetchpatch {
url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch";
sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm";
})
# Fix build with bash-completion 2.10 # Fix build with bash-completion 2.10
./bash_completion_datadir.patch ./bash_completion_datadir.patch
]; ];
postPatch = '' postPatch = ''
# Fix build with Xcode 12.5 toolchain/case-insensitive filesystems
# Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538;
# remove on next upstream release.
patch -p0 < ${fetchpatch {
url = "https://raw.githubusercontent.com/macports/macports-ports/70ca3f65e622c17582fd938602d800157ed951c3/net/mosh/files/patch-version-subdir.diff";
sha256 = "1yyh6d07y9zbdx4fb0r56zkq9nd9knwzj22v4dfi55k4k42qxapd";
}}
substituteInPlace scripts/mosh.pl \ substituteInPlace scripts/mosh.pl \
--subst-var-by ssh "${openssh}/bin/ssh" \ --subst-var-by ssh "${openssh}/bin/ssh" \
--subst-var-by mosh-client "$out/bin/mosh-client" --subst-var-by mosh-client "$out/bin/mosh-client"