Merge branch 'master' into core-updates

This commit is contained in:
Ricardo Wurmus 2018-06-02 13:44:43 +02:00
commit e0f8970357
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
7 changed files with 318 additions and 295 deletions

View file

@ -4188,7 +4188,7 @@ If you want to mark a folder manually as a project just create an empty
(define-public emacs-elfeed
(package
(name "emacs-elfeed")
(version "2.3.0")
(version "3.0.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/skeeto/elfeed/archive/"
@ -4196,7 +4196,7 @@ If you want to mark a folder manually as a project just create an empty
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1fd1mx0q1qb9vgdzls5ppxfriyid48blg8smgjspiazp7kxakzxv"))))
"1wkdrxr6zzqb48czqqv34l87bx8aqjk1739ddqg933aqh241kfvn"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t