diff options
| author | Leo Famulari <leo@famulari.name> | 2016-07-22 18:57:40 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-07-22 18:58:31 -0400 |
| commit | d227260d2f7833b6bdc55b8e3792378626ef3b69 (patch) | |
| tree | 26d47d5d8ee8efb102323bca215429a8f8fe1095 /gnu/packages/gl.scm | |
| parent | d778fa5ff6f4a860919eaf13db3f84cfc68cbee8 (diff) | |
| parent | 26ad4adb5568c6ff370f446431b079520fb09615 (diff) | |
| download | guix-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar guix-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar.gz | |
Merge branch 'master' into core-updates
Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 7fa79bbde3..f36d15a9b9 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -80,7 +80,7 @@ as ASCII text.") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/project/freeglut/freeglut/" + "mirror://sourceforge/freeglut/freeglut/" version "/freeglut-" version ".tar.gz")) (sha256 (base32 @@ -121,7 +121,7 @@ the X-Consortium license.") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/project/ftgl/FTGL%20Source/2.1.3~rc5/" + "mirror://sourceforge/ftgl/FTGL%20Source/2.1.3~rc5/" "ftgl-" version ".tar.gz")) (sha256 (base32 @@ -358,10 +358,8 @@ glxgears, glxheads, and glxinfo.") (version "1.11.0") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/glew/glew-" - version - ".tgz")) + (uri (string-append "mirror://sourceforge/glew/glew/" version + "/glew-" version ".tgz")) (sha256 (base32 "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9")) |