aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/servers/x11/xorg')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/default.nix66
-rwxr-xr-xinfra/libkookie/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/tarballs.list18
4 files changed, 50 insertions, 62 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/default.nix
index 81ce111ecacc..27a2b47387ff 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/default.nix
@@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation {
- name = "libX11-1.6.8";
+ name = "libX11-1.7.0";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2";
- sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj";
+ url = "mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2";
+ sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation {
- name = "libXvMC-1.0.11";
+ name = "libXvMC-1.0.12";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2";
- sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja";
+ url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2";
+ sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -1157,15 +1157,15 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
- libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation {
- name = "libxcb-1.13.1";
+ libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation {
+ name = "libxcb-1.14";
builder = ./builder.sh;
src = fetchurl {
- url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2";
- sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8";
+ url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz";
+ sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5";
};
hardeningDisable = [ "bindnow" "relro" ];
- nativeBuildInputs = [ pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig python3 ];
buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@@ -1430,15 +1430,15 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
- xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation {
- name = "xcb-proto-1.13";
+ xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python3 }: stdenv.mkDerivation {
+ name = "xcb-proto-1.14.1";
builder = ./builder.sh;
src = fetchurl {
- url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2";
- sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
+ url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz";
+ sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph";
};
hardeningDisable = [ "bindnow" "relro" ];
- nativeBuildInputs = [ pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig python3 ];
buildInputs = [ ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
- name = "xf86-input-libinput-0.28.2";
+ name = "xf86-input-libinput-0.30.0";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2";
- sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq";
+ url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2";
+ sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -2522,15 +2522,15 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
- xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
- name = "xkeyboard-config-2.27";
+ xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation {
+ name = "xkeyboard-config-2.31";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2";
- sha256 = "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9";
+ url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2";
+ sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s";
};
hardeningDisable = [ "bindnow" "relro" ];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig python3 ];
buildInputs = [ libX11 xorgproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
@@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation {
- name = "xorgproto-2019.1";
+ name = "xorgproto-2020.1";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2";
- sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6";
+ url = "mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2";
+ sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
- name = "xorg-server-1.20.8";
+ name = "xorg-server-1.20.10";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2";
- sha256 = "0ih15m7gh1z1ly6z7g82bkni719yisqmbk61a1wgp82bxrmn8yyi";
+ url = "mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2";
+ sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -2731,11 +2731,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
- name = "xprop-1.2.4";
+ name = "xprop-1.2.5";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/app/xprop-1.2.4.tar.bz2";
- sha256 = "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc";
+ url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2";
+ sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ba33623b4956..b0cab5fb88ee 100755
--- a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -25,7 +25,7 @@ my %pcMap;
my %extraAttrs;
-my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" );
+my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" );
$pcMap{$_} = $_ foreach @missingPCs;
$pcMap{"freetype2"} = "freetype";
$pcMap{"libpng12"} = "libpng";
@@ -161,7 +161,7 @@ while (<>) {
}
if ($file =~ /AM_PATH_PYTHON/) {
- push @nativeRequires, "python";
+ push @nativeRequires, "python3";
}
if ($file =~ /AC_PATH_PROG\(FCCACHE/) {
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
index 018b44a663dd..02dfb7ee1f55 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
@@ -4,7 +4,7 @@
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
- mcpp, epoxy, openssl, pkgconfig, llvm_6, python3, libxslt,
+ mcpp, epoxy, openssl, pkgconfig, llvm_6, libxslt,
ApplicationServices, Carbon, Cocoa, Xplugin
}:
@@ -73,22 +73,13 @@ self: super:
mkfontdir = self.mkfontscale;
- libxcb = (super.libxcb.override {
- python = python3;
- }).overrideAttrs (attrs: {
+ libxcb = super.libxcb.overrideAttrs (attrs: {
configureFlags = [ "--enable-xkb" "--enable-xinput" ];
outputs = [ "out" "dev" "man" "doc" ];
});
libX11 = super.libX11.overrideAttrs (attrs: {
outputs = [ "out" "dev" "man" ];
- patches = [
- # Fixes an issue that happens when cross-compiling for us.
- (fetchpatch {
- url = "https://cgit.freedesktop.org/xorg/lib/libX11/patch/?id=0327c427d62f671eced067c6d9b69f4e216a8cac";
- sha256 = "11k2mx56hjgw886zf1cdf2nhv7052d5rggimfshg6lq20i38vpza";
- })
- ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -325,8 +316,9 @@ self: super:
setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
postInstall =
''
- mkdir -p $out/share
+ mkdir -p $out/share/man/man7
ln -sfn ${self.xkeyboardconfig}/etc/X11 $out/share/X11
+ ln -sfn ${self.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7
'';
});
@@ -338,10 +330,6 @@ self: super:
buildInputs = attrs.buildInputs ++ [ freetype fontconfig ];
});
- xcbproto = super.xcbproto.override {
- python = python3;
- };
-
xcbutil = super.xcbutil.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
});
@@ -469,8 +457,8 @@ self: super:
});
xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {
+ prePatch = "patchShebangs rules/merge.py";
nativeBuildInputs = attrs.nativeBuildInputs ++ [ intltool libxslt ];
-
configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
# 1: compatibility for X11/xkb location
@@ -786,7 +774,7 @@ self: super:
rev = "f66d39544bb8339130c96d282a80f87ca1606caf";
sha256 = "14rwbbn06l8qpx7s5crxghn80vgcx8jmfc7qvivh72d81r0kvywl";
};
- buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman];
+ buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ];
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros];
configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
index ae75b1384017..d4773075a251 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
+++ b/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
@@ -1,7 +1,5 @@
https://invisible-mirror.net/archives/luit/luit-20190106.tgz
https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
-https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2
-https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2
https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2
@@ -62,7 +60,7 @@ mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2
mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2
mirror://xorg/individual/app/xmore-1.0.3.tar.bz2
mirror://xorg/individual/app/xpr-1.0.5.tar.bz2
-mirror://xorg/individual/app/xprop-1.2.4.tar.bz2
+mirror://xorg/individual/app/xprop-1.2.5.tar.bz2
mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2
mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2
mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2
@@ -77,13 +75,13 @@ mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2
mirror://xorg/individual/app/xwud-1.0.5.tar.bz2
mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2
mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2
-mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2
mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
@@ -177,10 +175,11 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2
+mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2
+mirror://xorg/individual/lib/libxcb-1.14.tar.xz
mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2
mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2
@@ -206,16 +205,17 @@ mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
-mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2
+mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2
mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2
mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2
-mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2
+mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz
+mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2
mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
mirror://xorg/individual/util/imake-1.0.8.tar.bz2
mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 10:46:04 +0000