Unverified Commit 63135243 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

kmscon: 9.3.0 -> 9.3.1, test `$TERM` (#488538)

parents d8cf6385 06d12de3

nixos/tests/kmscon.nix

+3 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ 
  enableOCR = true;



  testScript = ''

    machine.succeed(":")

    # ^ this create a screen

    machine.wait_for_unit("multi-user.target")



    with subtest("ensure we can open a tty"):

      machine.wait_for_text("machine login:")
@@ -38,6 +37,8 @@ 
      machine.wait_for_text("Password:")

      machine.send_chars("foobar\n")

      machine.wait_for_text("alice@machine")

      machine.send_chars("echo $TERM\n")

      machine.wait_for_text("xterm-256color")

      machine.screenshot("tty.png")

  '';

}

pkgs/by-name/km/kmscon/package.nix

+17 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
  pango,

  pkg-config,

  docbook_xsl,

  docbook_xml_dtd_42,

  libxslt,

  libgbm,

  ninja,
@@ -23,13 +24,13 @@ 
}:

stdenv.mkDerivation (finalAttrs: {

  pname = "kmscon";

  version = "9.3.0";

  version = "9.3.1";



  src = fetchFromGitHub {

    owner = "kmscon";

    repo = "kmscon";

    tag = "v${finalAttrs.version}";

    hash = "sha256-vdM/3n3Y2FM+PLDgVuU10kkNLCSzTrFI35CaY5NxWks=";

    hash = "sha256-pH+dBcUKXrVh9/y6mNWmYBx6HVbuSZX/F2sCG/Yj5UQ=";

  };



  strictDeps = true;
@@ -60,10 +61,23 @@ stdenv.mkDerivation (finalAttrs: { 
    libxslt # xsltproc

  ];



  outputs = [

    "out"

    "man"

  ];



  patches = [

    ./sandbox.patch # Generate system units where they should be (nix store) instead of /etc/systemd/system

  ];



  postPatch = ''

    for i in ./docs/man/*.in; do

      substituteInPlace "''${i}" \

        --replace-fail "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \

                       "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd"

    done

  '';



  passthru = {

    tests.kmscon = nixosTests.kmscon;

    updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
@@ -73,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { 
    description = "KMS/DRM based System Console";

    mainProgram = "kmscon";

    homepage = "https://www.freedesktop.org/wiki/Software/kmscon/";

    changelog = "https://github.com/kmscon/kmscon/releases/tag/v${finalAttrs.version}";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ ccicnce113424 ];

    platforms = lib.platforms.linux;

pkgs/by-name/li/libtsm/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { 
  meta = {

    description = "Terminal-emulator State Machine";

    homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/";

    changelog = "https://github.com/kmscon/libtsm/releases/tag/v${finalAttrs.version}";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ ccicnce113424 ];

    platforms = lib.platforms.linux;