commit 26648d29d4a3c322782016a626acb5500e0cf54f · pyrox.dev/nixpkgs

+1

nixos/tests/all-tests.nix

···

       201
       201
        
         jitsi-meet = handleTest ./jitsi-meet.nix {};

     

       202
       202
        
         k3s = handleTest ./k3s.nix {};

     

       203
       203
        
         kafka = handleTest ./kafka.nix {};

     

       204
       204
       +
         kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};

     

       204
       205
        
         keepalived = handleTest ./keepalived.nix {};

     

       205
       206
        
         keepassxc = handleTest ./keepassxc.nix {};

     

       206
       207
        
         kerberos = handleTest ./kerberos/default.nix {};

+21

nixos/tests/kbd-setfont-decompress.nix

···

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

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "kbd-setfont-decompress";

     

       4
       4
       +
       

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ oxalica ];

     

       6
       6
       +
       

     

       7
       7
       +
         machine = { ... }: {};

     

       8
       8
       +
       

     

       9
       9
       +
         testScript = ''

     

       10
       10
       +
           machine.succeed("gzip -cd ${pkgs.terminus_font}/share/consolefonts/ter-v16b.psf.gz >font.psf")

     

       11
       11
       +
           machine.succeed("gzip <font.psf >font.psf.gz")

     

       12
       12
       +
           machine.succeed("bzip2 <font.psf >font.psf.bz2")

     

       13
       13
       +
           machine.succeed("xz <font.psf >font.psf.xz")

     

       14
       14
       +
           machine.succeed("zstd <font.psf >font.psf.zst")

     

       15
       15
       +
           # setfont returns 0 even on error.

     

       16
       16
       +
           assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.gz  2>&1") == ""

     

       17
       17
       +
           assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.bz2 2>&1") == ""

     

       18
       18
       +
           assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.xz  2>&1") == ""

     

       19
       19
       +
           assert machine.succeed("PATH= ${pkgs.kbd}/bin/setfont font.psf.zst 2>&1") == ""

     

       20
       20
       +
         '';

     

       21
       21
       +
       })

+14 -1

pkgs/os-specific/linux/kbd/default.nix

···

       8
       8
        
       , check

     

       9
       9
        
       , pam

     

       10
       10
        
       , coreutils

     

       11
       11
       +
       , gzip

     

       12
       12
       +
       , bzip2

     

       13
       13
       +
       , xz

     

       14
       14
       +
       , zstd

     

       11
       15
        
       }:

     

       12
       16
        
       

     

       13
       17
        
       stdenv.mkDerivation rec {

     
···

       38
       42
        
             mv fgGIod/trf{,-fgGIod}.map

     

       39
       43
        
             mv colemak/{en-latin9,colemak}.map

     

       40
       44
        
             popd

     

       45
       45
       +
       

     

       46
       46
       +
             # Fix paths to decompressors. Trailing space to avoid replacing `xz` in `".xz"`.

     

       47
       47
       +
             substituteInPlace src/libkbdfile/kbdfile.c \

     

       48
       48
       +
               --replace 'gzip '  '${gzip}/bin/gzip ' \

     

       49
       49
       +
               --replace 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \

     

       50
       50
       +
               --replace 'xz '    '${xz.bin}/bin/xz ' \

     

       51
       51
       +
               --replace 'zstd '  '${zstd.bin}/bin/zstd '

     

       41
       52
        
           '';

     

       42
       53
        
       

     

       43
       54
        
         postInstall = ''

     
···

       50
       61
        
         buildInputs = [ check pam ];

     

       51
       62
        
         nativeBuildInputs = [ autoreconfHook pkg-config flex ];

     

       52
       63
        
       

     

       53
       53
       -
         passthru.tests = nixosTests.keymap;

     

       64
       64
       +
         passthru.tests = {

     

       65
       65
       +
           inherit (nixosTests) keymap kbd-setfont-decompress;

     

       66
       66
       +
         };

     

       54
       67
        
       

     

       55
       68
        
         meta = with lib; {

     

       56
       69
        
           homepage = "https://kbd-project.org/";