diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-02-21 14:31:36 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-21 14:31:36 +0100 |
| commit | 8505eb19a4071f563811d4fe33471441c2db58b7 (patch) | |
| tree | 123241c704e7d1a88eb4efe2793a6898e2e72216 /gnu/packages/gl.scm | |
| parent | 3b88f3767d9f3ad2cc64173525cd53d429bfe7e7 (diff) | |
| parent | b097a3387ea78797104f97eef445f5da6278c922 (diff) | |
| download | guix-8505eb19a4071f563811d4fe33471441c2db58b7.tar.gz | |
Merge branch 'staging' into core-updates
Conflicts: gnu/local.mk: Missing mention of gdk-pixbuf-list-dir.patch in the commit log really confused me here... It's from 8c6b077bfae (staging). gnu/packages/xorg.scm: xkeyboard-config updated both places.
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index a3862f1ec3..7f97277541 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -197,7 +197,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "13.0.3") + (version "13.0.4") (source (origin (method url-fetch) @@ -205,7 +205,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz")) (sha256 (base32 - "03m4gc6qc50lb0ic06f83r3yl0x4lmj2zjq3sl60vl3nq7jqpanr")) + "09p740qvmf4vqnpgxxlizk0dhdhj6i519qsbbrc8hpxxyzl7qpd9")) (patches (search-patches "mesa-wayland-egl-symbols-check-mips.patch")))) (build-system gnu-build-system) |