commit 08e6c4d00175aa8f026aea12e03b601787d69658 · pyrox.dev/nixpkgs

nixos/tests/all-tests.nix

···

       389
       389
        
         xmonad = handleTest ./xmonad.nix {};

     

       390
       390
        
         xrdp = handleTest ./xrdp.nix {};

     

       391
       391
        
         xss-lock = handleTest ./xss-lock.nix {};

     

       392
       392
       +
         xterm = handleTest ./xterm.nix {};

     

       392
       393
        
         yabar = handleTest ./yabar.nix {};

     

       393
       394
        
         yggdrasil = handleTest ./yggdrasil.nix {};

     

       394
       395
        
         zfs = handleTest ./zfs.nix {};

+23

nixos/tests/xterm.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, ...} : {

     

       2
       2
       +
         name = "xterm";

     

       3
       3
       +
         meta = with pkgs.stdenv.lib.maintainers; {

     

       4
       4
       +
           maintainers = [ nequissimus ];

     

       5
       5
       +
         };

     

       6
       6
       +
       

     

       7
       7
       +
         machine = { pkgs, ... }:

     

       8
       8
       +
           {

     

       9
       9
       +
             imports = [ ./common/x11.nix ];

     

       10
       10
       +
             services.xserver.desktopManager.xterm.enable = false;

     

       11
       11
       +
           };

     

       12
       12
       +
       

     

       13
       13
       +
         testScript =

     

       14
       14
       +
           ''

     

       15
       15
       +
             machine.wait_for_x()

     

       16
       16
       +
             machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen &")

     

       17
       17
       +
             machine.sleep(2)

     

       18
       18
       +
             machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n")

     

       19
       19
       +
             machine.wait_for_file("/tmp/xterm_version")

     

       20
       20
       +
             assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version")

     

       21
       21
       +
             machine.screenshot("window")

     

       22
       22
       +
           '';

     

       23
       23
       +
       })

+64 -18

pkgs/applications/terminal-emulators/xterm/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper

     

       2
       2
       -
       , enableDecLocator ? true

     

       3
       3
       -
       }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig

     

       2
       2
       +
       , makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix

     

       3
       3
       +
       , gnused, coreutils, enableDecLocator ? true }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "xterm-353";

     

       6
       6
       +
         pname = "xterm";

     

       7
       7
       +
         version = "362";

     

       7
       8
        
       

     

       8
       9
        
         src = fetchurl {

     

       9
       10
        
           urls = [

     

       10
       10
       -
            "ftp://ftp.invisible-island.net/xterm/${name}.tgz"

     

       11
       11
       -
            "https://invisible-mirror.net/archives/xterm/${name}.tgz"

     

       12
       12
       -
          ];

     

       13
       13
       -
           sha256 = "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5";

     

       11
       11
       +
             "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"

     

       12
       12
       +
             "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"

     

       13
       13
       +
           ];

     

       14
       14
       +
           sha256 = "HU/+Im+o8CGFm7wwB3iP9jpGoxJC2b2ae9fr4k6BrKI=";

     

       14
       15
        
         };

     

       15
       16
        
       

     

       16
       16
       -
         buildInputs =

     

       17
       17
       -
           [ xorg.libXaw xorg.xorgproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE

     

       18
       18
       -
             ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper

     

       19
       19
       -
           ];

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           xorg.libXaw

     

       19
       19
       +
           xorg.xorgproto

     

       20
       20
       +
           xorg.libXt

     

       21
       21
       +
           xorg.libXext

     

       22
       22
       +
           xorg.libX11

     

       23
       23
       +
           xorg.libSM

     

       24
       24
       +
           xorg.libICE

     

       25
       25
       +
           ncurses

     

       26
       26
       +
           freetype

     

       27
       27
       +
           fontconfig

     

       28
       28
       +
           pkgconfig

     

       29
       29
       +
           xorg.libXft

     

       30
       30
       +
           xorg.luit

     

       31
       31
       +
           makeWrapper

     

       32
       32
       +
         ];

     

       20
       33
        
       

     

       21
       21
       -
         patches = [

     

       22
       22
       -
           ./sixel-256.support.patch

     

       23
       23
       -
         ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl

     

       24
       24
       -
           (fetchpatch {

     

       34
       34
       +
         patches = [ ./sixel-256.support.patch ]

     

       35
       35
       +
           ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {

     

       25
       36
        
             name = "posix-ptys.patch";

     

       26
       26
       -
             url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";

     

       37
       37
       +
             url =

     

       38
       38
       +
               "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";

     

       27
       39
        
             sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr";

     

       28
       40
        
           });

     

       29
       41
        
       

     
···

       62
       74
        
           install -D -t $out/share/icons/hicolor/48x48/apps icons/xterm-color_48x48.xpm

     

       63
       75
        
         '';

     

       64
       76
        
       

     

       77
       77
       +
         passthru = {

     

       78
       78
       +
           updateScript = let

     

       79
       79
       +
             # Tags that end in letters are unstable

     

       80
       80
       +
             suffixes = stdenv.lib.concatStringsSep " "

     

       81
       81
       +
               (map (c: "-c versionsort.suffix='${c}'")

     

       82
       82
       +
                 (stdenv.lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz"));

     

       83
       83
       +
           in writeScript "update.sh" ''

     

       84
       84
       +
             #!${stdenv.shell}

     

       85
       85
       +
             set -o errexit

     

       86
       86
       +
             PATH=${

     

       87
       87
       +
               stdenv.lib.makeBinPath [

     

       88
       88
       +
                 common-updater-scripts

     

       89
       89
       +
                 git

     

       90
       90
       +
                 nixfmt

     

       91
       91
       +
                 nix

     

       92
       92
       +
                 coreutils

     

       93
       93
       +
                 gnused

     

       94
       94
       +
               ]

     

       95
       95
       +
             }

     

       96
       96
       +
       

     

       97
       97
       +
             oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"

     

       98
       98
       +
             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')"

     

       99
       99
       +
       

     

       100
       100
       +
             if [ ! "$oldVersion" = "$latestTag" ]; then

     

       101
       101
       +
               update-source-version ${pname} "$latestTag" --version-key=version --print-changes

     

       102
       102
       +
               nixpkgs="$(git rev-parse --show-toplevel)"

     

       103
       103
       +
               default_nix="$nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix"

     

       104
       104
       +
               nixfmt "$default_nix"

     

       105
       105
       +
             else

     

       106
       106
       +
               echo "${pname} is already up-to-date"

     

       107
       107
       +
             fi

     

       108
       108
       +
           '';

     

       109
       109
       +
         };

     

       110
       110
       +
       

     

       65
       111
        
         meta = {

     

       66
       112
        
           homepage = "https://invisible-island.net/xterm";

     

       67
       113
        
           license = with stdenv.lib.licenses; [ mit ];

     

       68
       68
       -
           maintainers = with stdenv.lib.maintainers; [vrthra];

     

       114
       114
       +
           maintainers = with stdenv.lib.maintainers; [ nequissimus vrthra ];

     

       69
       115
        
           platforms = with stdenv.lib.platforms; linux ++ darwin;

     

       70
       116
        
         };

     

       71
       117
        
       }