diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-10 15:32:51 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-10 15:32:51 +0200 |
| commit | 7b38f045c04fe69001ff5c2f04486cc51a69ae82 (patch) | |
| tree | bd839f1f635dc114c84d67c1db09b74f613ec315 /gnu/packages/xorg.scm | |
| parent | 369d15674c8bb251c45a45466031a2da1640df9f (diff) | |
| parent | 256d5c6e339d59287284bb83f35c594f13bd08f9 (diff) | |
| download | patches-7b38f045c04fe69001ff5c2f04486cc51a69ae82.tar patches-7b38f045c04fe69001ff5c2f04486cc51a69ae82.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 57cea3fee5..47a7f11499 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5070,7 +5070,7 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.20.0") + (version "1.20.1") (source (origin (method url-fetch) @@ -5079,7 +5079,7 @@ over Xlib, including: name "-" version ".tar.bz2")) (sha256 (base32 - "1rnka3sp8yg2bir0bjjhwn33jikj8qd8ckqcxrs94w05bwc7v5lx")) + "0679942x1ma2p30vlvqylpjc5v1ak1pgqysnqrj82nz7dzl9zjar")) (patches (list ;; See: @@ -5093,8 +5093,7 @@ over Xlib, including: (sha256 (base32 "0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q")) - (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")) - (search-patch "xorg-server-rotate-fb.patch"))))) + (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))) (build-system gnu-build-system) (propagated-inputs `(("libpciaccess" ,libpciaccess) |