;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017 John Darrington <jmd@gnu.org>
-;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
(define-public editres
(package
(name "editres")
- (version "1.0.6")
+ (version "1.0.7")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1w2d5hb5pw9ii2jlf4yjlp899402zfwc8hdkpdr3i1fy1cjd2riv"))))
+ "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(define-public iceauth
(package
(name "iceauth")
- (version "1.0.7")
+ (version "1.0.8")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"))))
+ "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"))))
(build-system gnu-build-system)
(inputs
`(("libice" ,libice)))
(define-public libxshmfence
(package
(name "libxshmfence")
- (version "1.2")
+ (version "1.3")
(source (origin
(method url-fetch)
(uri (string-append
name "-" version ".tar.bz2"))
(sha256
(base32
- "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"))))
+ "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("xproto" ,xproto)))
(define-public libpciaccess
(package
(name "libpciaccess")
- (version "0.13.5")
+ (version "0.14")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m"))))
+ "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x"))))
(build-system gnu-build-system)
(arguments
'(;; Make sure libpciaccess can read compressed 'pci.ids' files as
(define-public mkfontscale
(package
(name "mkfontscale")
- (version "1.1.2")
+ (version "1.1.3")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"))))
+ "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y"))))
(build-system gnu-build-system)
(inputs
`(("zlib" ,zlib)
(define-public xbacklight
(package
(name "xbacklight")
- (version "1.2.1")
+ (version "1.2.2")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp"))))
+ "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1"))))
(build-system gnu-build-system)
(inputs
`(("libxcb" ,libxcb)
(define-public xbitmaps
(package
(name "xbitmaps")
- (version "1.1.1")
+ (version "1.1.2")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"))))
+ "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
(define-public xcursor-themes
(package
(name "xcursor-themes")
- (version "1.0.4")
+ (version "1.0.5")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3"))))
+ "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf"))))
(build-system gnu-build-system)
(inputs
`(("libxcursor" ,libxcursor)
(define-public xdriinfo
(package
(name "xdriinfo")
- (version "1.0.5")
+ (version "1.0.6")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc"))))
+ "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"))))
(build-system gnu-build-system)
(inputs
`(("mesa" ,mesa)
(define-public xf86-input-libinput
(package
(name "xf86-input-libinput")
- (version "0.26.0")
+ (version "0.27.1")
(source (origin
(method url-fetch)
(uri (string-append
name "-" version ".tar.bz2"))
(sha256
(base32
- "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"))))
+ "1riflw6dc8fp5d74i7zfgsss0zz3z3lsj6zn2lzjm5kgmp2qvbfl"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
(define-public xf86-video-ati
(package
(name "xf86-video-ati")
- (version "7.10.0")
+ (version "18.0.1")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0yafix56vkqglw243cwb94nv91vbjv12sqh29x1bap0hwd1dclgf"))))
+ "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
("xxf86driproto" ,xf86driproto)
(define-public xf86-video-vesa
(package
(name "xf86-video-vesa")
- (version "2.3.4")
+ (version "2.4.0")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv"))))
+ "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z"))))
(build-system gnu-build-system)
(inputs `(("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)))
(define xkbcomp-intermediate ; used as input for xkeyboard-config
(package
(name "xkbcomp-intermediate")
- (version "1.4.0")
+ (version "1.4.1")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"))))
+ "0djp7bb0ch2ddwmc1bkg4fddxdvamiiz375x0r0ni5dcb37w93bl"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
(define-public xkeyboard-config
(package
(name "xkeyboard-config")
- (version "2.21")
+ (version "2.23.1")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h"))))
+ "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra"))))
(build-system gnu-build-system)
(inputs
`(("gettext" ,gettext-minimal)
(define-public xkill
(package
(name "xkill")
- (version "1.0.4")
+ (version "1.0.5")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8"))))
+ "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"))))
(build-system gnu-build-system)
(inputs
`(("libxmu" ,libxmu)
(define-public xlsclients
(package
(name "xlsclients")
- (version "1.1.3")
+ (version "1.1.4")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx"))))
+ "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"))))
(build-system gnu-build-system)
(inputs
`(("libxcb" ,libxcb)))
(define-public xlsfonts
(package
(name "xlsfonts")
- (version "1.0.5")
+ (version "1.0.6")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"))))
+ "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
(define-public xfontsel
(package
(name "xfontsel")
- (version "1.0.5")
+ (version "1.0.6")
(source (origin
(method url-fetch)
(uri (string-append
version ".tar.bz2"))
(sha256
(base32
- "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p"))))
+ "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(define-public xpr
(package
(name "xpr")
- (version "1.0.4")
+ (version "1.0.5")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"))))
+ "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
(define-public xprop
(package
(name "xprop")
- (version "1.2.2")
+ (version "1.2.3")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv"))))
+ "06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
(define-public xrdb
(package
(name "xrdb")
- (version "1.1.0")
+ (version "1.1.1")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk"))))
+ "1dqp486nd5sagbg572kl0k839nwvpqnb7jvppyb7jj5vrpkss8rd"))))
(build-system gnu-build-system)
(inputs
`(("libxmu" ,libxmu)
(define-public xrefresh
(package
(name "xrefresh")
- (version "1.0.5")
+ (version "1.0.6")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj"))))
+ "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"))))
(build-system gnu-build-system)
(inputs
`(("libx11" ,libx11)))
(define-public xset
(package
(name "xset")
- (version "1.2.3")
+ (version "1.2.4")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3"))))
+ "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
(define-public xsetroot
(package
(name "xsetroot")
- (version "1.1.1")
+ (version "1.1.2")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1nf3ii31m1knimbidaaym8p61fq3blv8rrdr2775yhcclym5s8ds"))))
+ "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"))))
(build-system gnu-build-system)
(inputs
`(("libxmu" ,libxmu)
(define-public xwd
(package
(name "xwd")
- (version "1.0.6")
+ (version "1.0.7")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv"))))
+ "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"))))
(build-system gnu-build-system)
(inputs
`(("libxt" ,libxt)
(define-public xwininfo
(package
(name "xwininfo")
- (version "1.1.3")
+ (version "1.1.4")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1"))))
+ "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"))))
(build-system gnu-build-system)
(inputs
`(("libx11" ,libx11)
(define-public xwud
(package
(name "xwud")
- (version "1.0.4")
+ (version "1.0.5")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"))))
+ "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
common definitions and porting layer.")
(license license:x11)))
+(define-public xorgproto
+ (package
+ (name "xorgproto")
+ (version "2018.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://xorg/individual/proto/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"))))
+ (build-system gnu-build-system)
+ (propagated-inputs
+ ;; To get util-macros in (almost?) all package inputs.
+ `(("util-macros" ,util-macros)))
+ (home-page "https://cgit.freedesktop.org/xorg/proto/xorgproto")
+ (synopsis "Xorg protocol headers")
+ (description
+ "This package provides the headers and specification documents defining
+the core protocol and (many) extensions for the X Window System.")
+ (license license:x11)))
;; packages of height 2 in the propagated-inputs tree
(define-public libxfont2
(package
(inherit libxfont)
- (version "2.0.1")
- (replacement libxfont2-2.0.3)
+ (version "2.0.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/lib/libXfont2-"
version ".tar.bz2"))
(sha256
(base32
- "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"))))))
-
-;; Fixes the following security vulnerabilities:
-;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-13720
-;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-13722
-;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-16612
-(define-public libxfont2-2.0.3
- (package
- (inherit libxfont2)
- (version "2.0.3")
- (source
- (origin
- (inherit (package-source libxfont2))
- (uri (string-append "mirror://xorg/individual/lib/libXfont2-"
- version ".tar.bz2"))
- (sha256
- (base32
- "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf"))))))
+ "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf"))))))
(define-public libxi
(package
(define-public libxcursor
(package
(name "libxcursor")
- (version "1.1.14")
- (replacement libxcursor-1.1.15)
+ (version "1.1.15")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv"))))
+ "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9"))))
(build-system gnu-build-system)
(propagated-inputs
`(("libx11" ,libx11)
(description "Xorg Cursor management library.")
(license license:x11)))
-;; For CVE-2017-16612.
-(define-public libxcursor-1.1.15
- (package
- (inherit libxcursor)
- (version "1.1.15")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://xorg/individual/lib/libXcursor-"
- version ".tar.bz2"))
- (sha256
- (base32
- "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9"))))))
-
(define-public libxt
(package
(name "libxt")
(define-public twm
(package
(name "twm")
- (version "1.0.9")
+ (version "1.0.10")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://xorg/individual/app/" name "-"
version
- ".tar.gz"))
+ ".tar.bz2"))
(sha256
(base32
- "1s1r00x8add3f27xjqxg6q7mwplwrb72gakbh4y6j052as25wchw"))))
+ "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"))))
(build-system gnu-build-system)
(inputs
`(("libxt" ,libxt)
(define-public xinit
(package
(name "xinit")
- (version "1.3.4")
+ (version "1.4.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/app/xinit-"
version ".tar.bz2"))
(sha256
(base32
- "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m"))))
+ "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213"))))
(build-system gnu-build-system)
(inputs
`(("xproto" ,xproto)
(define-public xmessage
(package
(name "xmessage")
- (version "1.0.4")
+ (version "1.0.5")
(source
(origin
(method url-fetch)
".tar.gz"))
(sha256
(base32
- "1jmcac1xbwplbxfl75sr6w3zqhx1khpdzlqippjsr31cjp1rjc48"))))
+ "0sw0b0cbrjl44brw7qi1jkm61xd7a1lpj04418c6iqk6mf83llwr"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(define-public xterm
(package
(name "xterm")
- (version "331")
+ (version "332")
(source (origin
(method url-fetch)
(uri (list
name "-" version ".tgz")))
(sha256
(base32
- "047gk58hvj64974sg259ss5gixj7pac6halmjfz4cc6r1yimds4s"))))
+ "0zdjiik4ravc3zld5c9i2ndrvazjmwiwbgl2c21348762wki2jsx"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts"
(define-public perl-x11-xcb
(package
(name "perl-x11-xcb")
- (version "0.16")
+ (version "0.17")
(source (origin
(method url-fetch)
(uri (string-append
"X11-XCB-" version ".tar.gz"))
(sha256
(base32
- "14mnvr1001py2z1n43l18yaw0plwvjg5pcsyc7k81sa0amw8ahzw"))))
+ "12qyf98s5hbybmh0mblpz50c00i68srq73w5rw31m2dhclj8n96q"))))
(build-system perl-build-system)
(arguments
'(;; Disable parallel build to prevent a race condition.
(define-public xpra
(package
(name "xpra")
- (version "2.2.2")
+ (version "2.2.6")
(source
(origin
(method url-fetch)
version ".tar.xz"))
(sha256
(base32
- "16m21gr904k6ap0aq73i8ls3g94srpqmn3v6cx844qdy2lg7j0hk"))))
+ "1zyynghhzjbgnmzcibm17wpj9f7jy31d7dr373li8cwg2yl2swyz"))))
(build-system python-build-system)
(inputs `(("ffmpeg" ,ffmpeg)
("flac" ,flac)
("python2-rencode" ,python2-rencode)
("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)
- ("python2-cython", python2-cython)))
+ ("python2-cython" ,python2-cython)))
(arguments
`(#:python ,python-2 ;; no full Python 3 support yet
#:configure-flags '("--with-tests"
(substitute* "setup.py"
(("/usr/lib/")
(string-append (assoc-ref outputs "out") "/lib/")))
+ ;; Use Xvfb with '-nolisten local' to disable abstract X11 sockets.
(substitute* "./xpra/scripts/config.py"
((":.*join.*xvfb.*")
(string-append ": \"" (assoc-ref inputs "xorg-server")
"/bin/Xvfb +extension Composite"
" -screen 0 5760x2560x24+32 -dpi 96 -nolisten"
- " tcp -noreset -auth $XAUTHORITY\",\n")))
+ " tcp -nolisten local -noreset -auth"
+ " $XAUTHORITY\",\n")))
(substitute* "./xpra/scripts/config.py"
(("socket-dir.*: \"\",")
"socket-dir\" : \"~/.xpra\","))