commit 3321fa3e4c8821c09c9ec023602f3c01ef6ce77c · pyrox.dev/nixpkgs

-1

nixos/modules/config/console.nix

···

       195
       195
        
                   "${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup"

     

       196
       196
        
                   "${config.boot.initrd.systemd.package.kbd}/bin/setfont"

     

       197
       197
        
                   "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys"

     

       198
       198
       -
                   "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed

     

       199
       198
        
                 ]

     

       200
       199
        
                 ++ lib.optionals (cfg.font != null && lib.hasPrefix builtins.storeDir cfg.font) [

     

       201
       200
        
                   "${cfg.font}"

+68 -59

pkgs/by-name/kb/kbd/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         fetchurl,

     

       4
       4
       +
         fetchgit,

     

       5
       5
        
         nixosTests,

     

       6
       6
        
         autoreconfHook,

     

       7
       7
        
         pkg-config,

     

       8
       8
        
         flex,

     

       9
       9
       +
         perl,

     

       10
       10
       +
         bison,

     

       11
       11
       +
         autoPatchelfHook,

     

       9
       12
        
         check,

     

       10
       13
        
         pam,

     

       11
       14
        
         bash,

     

       12
       15
        
         bashNonInteractive,

     

       13
       16
        
         coreutils,

     

       14
       14
       -
         gzip,

     

       17
       17
       +
         zlib,

     

       15
       18
        
         bzip2,

     

       16
       19
        
         xz,

     

       17
       20
        
         zstd,

     

       18
       21
        
         gitUpdater,

     

       22
       22
       +
         pkgsCross,

     

       19
       23
        
         withVlock ? true,

     

       20
       20
       -
         compress ? false,

     

       21
       24
        
       }:

     

       22
       25
        
       

     

       23
       23
       -
       stdenv.mkDerivation rec {

     

       26
       26
       +
       stdenv.mkDerivation {

     

       24
       27
        
         pname = "kbd";

     

       25
       25
       -
         version = "2.8.0";

     

       28
       28
       +
         version = "2.8.0-unstable-2025-08-12";

     

       26
       29
        
       

     

       27
       30
        
         __structuredAttrs = true;

     

       28
       31
        
       

     

       29
       29
       -
         src = fetchurl {

     

       30
       30
       -
           url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";

     

       31
       31
       -
           hash = "sha256-AfWAbafR009ZS3sqauGrIyFTRM8QZOjtzTqQ/vl3ahE=";

     

       32
       32
       +
         src = fetchgit {

     

       33
       33
       +
           url = "https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git";

     

       34
       34
       +
           rev = "46295167a55643e941c8cdcfd2cb76bd138c851c";

     

       35
       35
       +
           hash = "sha256-m1aVfsEme/BnyJogOPvGcOrSJfli8B/TrGxOm4POt0w=";

     

       32
       36
        
         };

     

       33
       37
        
       

     

       34
       38
        
         # vlock is moved into its own output, since it depends on pam. This

     
···

       43
       47
        
           "vlock"

     

       44
       48
        
         ];

     

       45
       49
        
       

     

       46
       46
       -
         configureFlags = [

     

       47
       47
       -
           "--enable-optional-progs"

     

       48
       48
       -
           "--enable-libkeymap"

     

       49
       49
       -
           "--disable-nls"

     

       50
       50
       -
           (lib.enableFeature withVlock "vlock")

     

       51
       51
       -
         ]

     

       52
       52
       -
         ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [

     

       53
       53
       -
           "ac_cv_func_malloc_0_nonnull=yes"

     

       54
       54
       -
           "ac_cv_func_realloc_0_nonnull=yes"

     

       55
       55
       -
         ]

     

       56
       56
       -
         ++ lib.optionals (!compress) [

     

       57
       57
       -
           "--disable-compress"

     

       58
       58
       -
         ];

     

       59
       59
       -
       

     

       60
       50
        
         patches = [

     

       61
       51
        
           ./search-paths.patch

     

       62
       52
        
         ];

     
···

       73
       63
        
           mv fgGIod/trf{,-fgGIod}.map

     

       74
       64
        
           mv colemak/{en-latin9,colemak}.map

     

       75
       65
        
           popd

     

       66
       66
       +
         '';

     

       76
       67
        
       

     

       77
       77
       -
           sed -i '

     

       78
       78
       -
             1i prefix:=$(vlock)

     

       79
       79
       -
             1i bindir := $(vlock)/bin' \

     

       80
       80
       -
             src/vlock/Makefile.in \

     

       81
       81
       -
             src/vlock/Makefile.am

     

       82
       82
       -
         ''

     

       83
       83
       -
         + lib.optionalString compress ''

     

       84
       84
       -
           # Fix paths to decompressors. Trailing space to avoid replacing `xz` in `".xz"`.

     

       85
       85
       -
           substituteInPlace src/libkbdfile/kbdfile.c \

     

       86
       86
       -
             --replace-fail 'gzip '  '${gzip}/bin/gzip ' \

     

       87
       87
       -
             --replace-fail 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \

     

       88
       88
       -
             --replace-fail 'xz '    '${xz.bin}/bin/xz ' \

     

       89
       89
       -
             --replace-fail 'zstd '  '${zstd.bin}/bin/zstd '

     

       68
       68
       +
         preConfigure = ''

     

       69
       69
       +
           # Perl and Bash only used during build time

     

       70
       70
       +
           patchShebangs --build contrib/

     

       90
       71
        
         '';

     

       91
       72
        
       

     

       73
       73
       +
         configureFlags = [

     

       74
       74
       +
           "--enable-optional-progs"

     

       75
       75
       +
           "--enable-libkeymap"

     

       76
       76
       +
           "--disable-nls"

     

       77
       77
       +
           (lib.enableFeature withVlock "vlock")

     

       78
       78
       +
         ]

     

       79
       79
       +
         ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [

     

       80
       80
       +
           "ac_cv_func_malloc_0_nonnull=yes"

     

       81
       81
       +
           "ac_cv_func_realloc_0_nonnull=yes"

     

       82
       82
       +
         ];

     

       83
       83
       +
       

     

       84
       84
       +
         strictDeps = true;

     

       92
       85
        
         enableParallelBuilding = true;

     

       93
       86
        
       

     

       94
       94
       -
         postInstall = ''

     

       95
       95
       -
           for s in unicode_{start,stop}; do

     

       96
       96
       -
             substituteInPlace ''${!outputBin}/bin/$s \

     

       97
       97
       -
               --replace-fail /usr/bin/tty ${coreutils}/bin/tty

     

       98
       98
       -
             moveToOutput "bin/$s" "$scripts"

     

       99
       99
       -
           done

     

       100
       100
       -
         '';

     

       87
       87
       +
         nativeBuildInputs = [

     

       88
       88
       +
           autoreconfHook

     

       89
       89
       +
           pkg-config

     

       90
       90
       +
           flex

     

       91
       91
       +
           perl

     

       92
       92
       +
           bison

     

       93
       93
       +
           autoPatchelfHook # for patching dlopen()

     

       94
       94
       +
         ];

     

       101
       95
        
       

     

       102
       102
       -
         buildInputs = [

     

       96
       96
       +
         nativeCheckInputs = [

     

       103
       97
        
           check

     

       98
       98
       +
         ];

     

       99
       99
       +
       

     

       100
       100
       +
         buildInputs = [

     

       101
       101
       +
           zlib

     

       102
       102
       +
           bzip2

     

       103
       103
       +
           xz

     

       104
       104
       +
           zstd

     

       104
       105
        
           bash

     

       105
       106
        
         ]

     

       106
       107
        
         ++ lib.optionals withVlock [ pam ];

     

       107
       108
        
       

     

       108
       108
       -
         NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isStatic "-laudit";

     

       109
       109
       -
         nativeBuildInputs = [

     

       110
       110
       -
           autoreconfHook

     

       111
       111
       -
           pkg-config

     

       112
       112
       -
           flex

     

       113
       113
       -
         ];

     

       114
       114
       -
         strictDeps = true;

     

       109
       109
       +
         postInstall = ''

     

       110
       110
       +
           substituteInPlace $out/bin/unicode_{start,stop} \

     

       111
       111
       +
             --replace-fail /usr/bin/tty ${coreutils}/bin/tty

     

       112
       112
       +
       

     

       113
       113
       +
           moveToOutput bin/unicode_start $scripts

     

       114
       114
       +
           moveToOutput bin/unicode_stop $scripts

     

       115
       115
       +
         ''

     

       116
       116
       +
         + lib.optionalString withVlock ''

     

       117
       117
       +
           moveToOutput bin/vlock $vlock

     

       118
       118
       +
           moveToOutput etc/pam.d/vlock $vlock

     

       119
       119
       +
         '';

     

       115
       120
        
       

     

       116
       116
       -
         outputChecks.out.disallowedRequisites = lib.optionals (!compress) [

     

       121
       121
       +
         outputChecks.out.disallowedRequisites = [

     

       117
       122
        
           bash

     

       118
       123
        
           bashNonInteractive

     

       119
       124
        
         ];

     

       120
       125
        
       

     

       121
       121
       -
         passthru.tests = {

     

       122
       122
       -
           inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;

     

       123
       123
       -
         };

     

       124
       126
        
         passthru = {

     

       125
       125
       -
           gzip = gzip;

     

       126
       127
        
           updateScript = gitUpdater {

     

       127
       128
        
             # No nicer place to find latest release.

     

       128
       129
        
             url = "https://github.com/legionus/kbd.git";

     

       129
       130
        
             rev-prefix = "v";

     

       130
       131
        
           };

     

       132
       132
       +
           tests = {

     

       133
       133
       +
             cross =

     

       134
       134
       +
               let

     

       135
       135
       +
                 systemString = if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform";

     

       136
       136
       +
               in

     

       137
       137
       +
               pkgsCross.${systemString}.kbd;

     

       138
       138
       +
             inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;

     

       139
       139
       +
           };

     

       131
       140
        
         };

     

       132
       141
        
       

     

       133
       133
       -
         meta = with lib; {

     

       142
       142
       +
         meta = {

     

       134
       143
        
           homepage = "https://kbd-project.org/";

     

       135
       144
        
           description = "Linux keyboard tools and keyboard maps";

     

       136
       136
       -
           platforms = platforms.linux;

     

       137
       137
       -
           license = licenses.gpl2Plus;

     

       138
       138
       -
           maintainers = with maintainers; [ davidak ];

     

       145
       145
       +
           platforms = lib.platforms.linux;

     

       146
       146
       +
           license = lib.licenses.gpl2Plus;

     

       147
       147
       +
           maintainers = with lib.maintainers; [ davidak ];

     

       139
       148
        
         };

     

       140
       149
        
       }

-4

pkgs/top-level/all-packages.nix

···

       12470
       12470
        
       

     

       12471
       12471
        
         kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };

     

       12472
       12472
        
       

     

       12473
       12473
       -
         kbdCompressed = callPackage ../by-name/kb/kbd/package.nix {

     

       12474
       12474
       -
           compress = true;

     

       12475
       12475
       -
         };

     

       12476
       12476
       -
       

     

       12477
       12473
        
         kexi = libsForQt5.callPackage ../applications/office/kexi { };

     

       12478
       12474
        
       

     

       12479
       12475
        
         kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };