Unverified Commit 1766c845 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #318438: xkeyboard_config: 2.41 -> 2.42 

...into staging
parents 2ae2c768 41dc236d

pkgs/servers/x11/xorg/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -3898,11 +3898,11 @@ self: with self; { 
  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: {

    pname = "xkeyboard-config";

    version = "2.41";

    version = "2.42";

    builder = ./builder.sh;

    src = fetchurl {

      url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.41.tar.xz";

      sha256 = "13vjvyg1fjvsqzqkpxzigvv94v154mcb2gba4d80spi9aywxcb7h";

      url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.42.tar.xz";

      sha256 = "01q8gs7lnx9d7iz29pal7a3whz7njmgjcpzhy82wa7zhq6znxc56";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;

pkgs/servers/x11/xorg/overrides.nix

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ self: super: 


  xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {

    prePatch = ''

      patchShebangs rules/merge.py rules/compat/map-variants.py rules/xml2lst.pl

      patchShebangs rules/merge.py rules/compat/map-variants.py rules/generate-options-symbols.py rules/xml2lst.pl

    '';

    nativeBuildInputs = attrs.nativeBuildInputs ++ [

      meson

pkgs/servers/x11/xorg/tarballs.list

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz 
mirror://xorg/individual/app/xwud-1.0.6.tar.xz

mirror://xorg/individual/data/xbitmaps-1.1.3.tar.xz

mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz

mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.41.tar.xz

mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.42.tar.xz

mirror://xorg/individual/doc/xorg-docs-1.7.3.tar.xz

mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.1.tar.xz

mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2