Merge pull request #104018 from NeQuissimus/xterm_update

xterm: 353 -> 362, add test, add update script
This commit is contained in:
Tim Steinbach 2020-11-17 12:15:19 -05:00 committed by GitHub
commit 08e6c4d001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 88 additions and 18 deletions

View File

@ -389,6 +389,7 @@ in
xmonad = handleTest ./xmonad.nix {};
xrdp = handleTest ./xrdp.nix {};
xss-lock = handleTest ./xss-lock.nix {};
xterm = handleTest ./xterm.nix {};
yabar = handleTest ./yabar.nix {};
yggdrasil = handleTest ./yggdrasil.nix {};
zfs = handleTest ./zfs.nix {};

23
nixos/tests/xterm.nix Normal file
View File

@ -0,0 +1,23 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "xterm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
};
machine = { pkgs, ... }:
{
imports = [ ./common/x11.nix ];
services.xserver.desktopManager.xterm.enable = false;
};
testScript =
''
machine.wait_for_x()
machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen &")
machine.sleep(2)
machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n")
machine.wait_for_file("/tmp/xterm_version")
assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version")
machine.screenshot("window")
'';
})

View File

@ -1,29 +1,41 @@
{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper
, enableDecLocator ? true
}:
{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig
, makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix
, gnused, coreutils, enableDecLocator ? true }:
stdenv.mkDerivation rec {
name = "xterm-353";
pname = "xterm";
version = "362";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${name}.tgz"
"https://invisible-mirror.net/archives/xterm/${name}.tgz"
];
sha256 = "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5";
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
];
sha256 = "HU/+Im+o8CGFm7wwB3iP9jpGoxJC2b2ae9fr4k6BrKI=";
};
buildInputs =
[ xorg.libXaw xorg.xorgproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper
];
buildInputs = [
xorg.libXaw
xorg.xorgproto
xorg.libXt
xorg.libXext
xorg.libX11
xorg.libSM
xorg.libICE
ncurses
freetype
fontconfig
pkgconfig
xorg.libXft
xorg.luit
makeWrapper
];
patches = [
./sixel-256.support.patch
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
patches = [ ./sixel-256.support.patch ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
name = "posix-ptys.patch";
url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";
url =
"https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";
sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr";
});
@ -62,10 +74,44 @@ stdenv.mkDerivation rec {
install -D -t $out/share/icons/hicolor/48x48/apps icons/xterm-color_48x48.xpm
'';
passthru = {
updateScript = let
# Tags that end in letters are unstable
suffixes = stdenv.lib.concatStringsSep " "
(map (c: "-c versionsort.suffix='${c}'")
(stdenv.lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz"));
in writeScript "update.sh" ''
#!${stdenv.shell}
set -o errexit
PATH=${
stdenv.lib.makeBinPath [
common-updater-scripts
git
nixfmt
nix
coreutils
gnused
]
}
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
latestTag="$(git ${suffixes} ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:ThomasDickey/xterm-snapshots.git 'xterm-*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^xterm-||g')"
if [ ! "$oldVersion" = "$latestTag" ]; then
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
nixpkgs="$(git rev-parse --show-toplevel)"
default_nix="$nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix"
nixfmt "$default_nix"
else
echo "${pname} is already up-to-date"
fi
'';
};
meta = {
homepage = "https://invisible-island.net/xterm";
license = with stdenv.lib.licenses; [ mit ];
maintainers = with stdenv.lib.maintainers; [vrthra];
maintainers = with stdenv.lib.maintainers; [ nequissimus vrthra ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}