Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ab018f754bc9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66d8a2bda511
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 9, 2020

  1. xorg.xorgserver: 1.20.7 -> 1.20.8

    https://lists.x.org/archives/xorg-announce/2020-March/003041.html
    
    This release contains a fix for XWayland which removes a buffer swap
    race between XWayland and the compositor. This resulted in flickering in
    previous versions.
    Emantor committed Apr 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    colemickens Cole Mickens
    Copy the full SHA
    aa4ec3b View commit details

Commits on Apr 10, 2020

  1. Merge pull request #84811 from Emantor/bump/20.03/xorg_server

    [20.03] xorg.xorgserver: 1.20.7 -> 1.20.8
    worldofpeace authored Apr 10, 2020
    Copy the full SHA
    66d8a2b View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 pkgs/servers/x11/xorg/default.nix
  2. +1 −1 pkgs/servers/x11/xorg/tarballs.list
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/default.nix
Original file line number Diff line number Diff line change
@@ -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.7";
name = "xorg-server-1.20.8";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2;
sha256 = "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx";
url = "mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2";
sha256 = "0ih15m7gh1z1ly6z7g82bkni719yisqmbk61a1wgp82bxrmn8yyi";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs.list
Original file line number Diff line number Diff line change
@@ -218,4 +218,4 @@ 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.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2