aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/xorg.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-02-02 10:52:24 -0500
committerLeo Famulari <leo@famulari.name>2017-02-02 10:52:24 -0500
commite8c83d04e176f205b30b3d470f22ee5e1c686331 (patch)
tree30a95626ea31414a6319b93f50eea1e69b87a619 /gnu/packages/xorg.scm
parentd9b4cbc2a168ca3d248c5abf1f1d14c1808e6a20 (diff)
parentde643f0c15677665acce73db9c28c5488e623633 (diff)
downloadguix-e8c83d04e176f205b30b3d470f22ee5e1c686331.tar
guix-e8c83d04e176f205b30b3d470f22ee5e1c686331.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r--gnu/packages/xorg.scm45
1 files changed, 40 insertions, 5 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 7a534592b4..f9719c77fb 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1930,7 +1930,7 @@ server.")
(define-public xauth
(package
(name "xauth")
- (version "1.0.9")
+ (version "1.0.10")
(source
(origin
(method url-fetch)
@@ -1940,7 +1940,7 @@ server.")
".tar.bz2"))
(sha256
(base32
- "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn"))))
+ "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs"))))
(build-system gnu-build-system)
(inputs
`(("libxmu" ,libxmu)
@@ -2014,6 +2014,41 @@ the same way.")
legacy X clients.")
(license license:x11)))
+(define-public xcalc
+ (package
+ (name "xcalc")
+ (version "1.0.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://xorg/individual/app/" name "-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1lg8xwj0nr8anbd77n3cs87s57sr4gmb3pxs3k22a28n6ndcvmbz"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after
+ 'configure 'mutate-makefile
+ (lambda _
+ (substitute* "Makefile"
+ (("^appdefaultdir = .*$")
+ (string-append "appdefaultdir = " %output
+ ,%app-defaults-dir "\n")))
+ #t)))))
+ (inputs
+ `(("libxaw" ,libxaw)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (home-page "https://www.x.org/wiki/")
+ (synopsis "Hand calculator for the X Window system")
+ (description "Xcalc is a scientific calculator desktop accessory that can
+emulate a TI-30 or an HP-10C.")
+ (license license:x11)))
+
(define-public xcb-proto
(package
@@ -2770,10 +2805,10 @@ X server.")
(define-public xf86-video-intel
- (let ((commit "d1672806a5222f00dcc2eb24ccddd03f727f71bc"))
+ (let ((commit "9fe04af4bce3057e3e94a6bf36a3d8d2e48d592c"))
(package
(name "xf86-video-intel")
- (version (string-append "2.99.917-1-" (string-take commit 7)))
+ (version (string-append "2.99.917-2-" (string-take commit 7)))
(source
(origin
;; there's no current tarball
@@ -2783,7 +2818,7 @@ X server.")
(commit commit)))
(sha256
(base32
- "16hfcj11lbn6lp0hgrixidbfb7mghm1yn4lynmymm985w1gg0n72"))
+ "06nnm9kjvmwxazp2ki0i5x1xv03bysfgpw30nd2jlf71qllybxml"))
(file-name (string-append name "-" version))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)