Unverified Commit 389024e9 authored by Vladimír Čunát's avatar Vladimír Čunát Committed by GitHub
Browse files

xorg-server: 21.1.21 -> 21.1.22 (#510184)

parents 382a29b8 c652ef26

pkgs/by-name/xo/xorg-server/package.nix

+5 −2
Original line number Diff line number Diff line
@@ -57,7 +57,10 @@ 
}:

stdenv.mkDerivation (finalAttrs: {

  pname = "xorg-server";

  version = "21.1.21";

  # `xvfb` inherits `version` and `src` from here, leading to many rebuilds. If

  # necessary, these can be moved out of lockstep in order to merge updates

  # quickly.

  version = "21.1.22";



  outputs = [

    "out"
@@ -66,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { 


  src = fetchurl {

    url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";

    hash = "sha256-wMvlVFs/ZFuuYCS4MNHRFUqVY1BoOk5Ssv/1sPoatRk=";

    hash = "sha256-GiQsiRfEm6KczB9gIWE9iiuYBd0NJxpmrp0J9LC7BrM=";

  };



  patches = lib.optionals stdenv.hostPlatform.isDarwin [

pkgs/by-name/xv/xvfb/package.nix

+8 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
  ninja,

  pkg-config,

  xorg-server,

  fetchurl,

  dri-pkgconfig-stub,

  libdrm,

  libGL,
@@ -37,7 +38,13 @@ 
stdenv.mkDerivation (finalAttrs: {

  pname = "xvfb";



  inherit (xorg-server) src version;

  #FIXME: go back to xorg-server version on nixpkgs staging

  #inherit (xorg-server) src version;

  version = "21.1.21";

  src = fetchurl {

    url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";

    hash = "sha256-wMvlVFs/ZFuuYCS4MNHRFUqVY1BoOk5Ssv/1sPoatRk=";

  };



  strictDeps = true;