nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: vigra: Update to a development snapshot. 

* gnu/packages/image.scm (vigra): Update to a git snapshot to fix build
  problems with the current python-numpy.
This commit is contained in:
Andreas Enge 2016-03-05 00:30:56 +01:00
parent d7c4619bd1
commit 451b5c5dc6
1 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/image.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2014 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2014 Ricardo Wurmus <rekado@elephly.net>
@ -44,6 +44,7 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
@ -545,16 +546,20 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.")
(home-page "http://freeimage.sourceforge.net"))) (home-page "http://freeimage.sourceforge.net")))
(define-public vigra (define-public vigra
(let ((commit "a378732"))
(package (package
(name "vigra") (name "vigra")
(version "1.10.0") (version (string-append "1.10.0-1-" commit))
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://hci.iwr.uni-heidelberg.de/vigra/vigra-" (uri (git-reference
version "-src.tar.gz")) (url "https://github.com/ukoethe/vigra.git")
(sha256 (base32 (commit commit)))
"16d0jvz3k49niljg9qvvlyxxl15yk0300xkymvyznlmvn1hs7m22")))) (file-name (string-append name "-" version))
(sha256
(base32
"0gvbfrnss1vnkmajsv716yy317j4mx5kn1rxrblxqqyghws47jm5"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
@ -596,7 +601,7 @@ processing and analysis library that puts its main emphasis on customizable
algorithms and data structures. It is particularly strong for algorithms and data structures. It is particularly strong for
multi-dimensional image processing.") multi-dimensional image processing.")
(license license:expat) (license license:expat)
(home-page "https://hci.iwr.uni-heidelberg.de/vigra"))) (home-page "https://hci.iwr.uni-heidelberg.de/vigra"))))
(define-public libwebp (define-public libwebp
(package (package