Merge branch 'master' into core-updates

This commit is contained in:
Ricardo Wurmus 2018-06-05 09:59:27 +02:00
commit 66ece08d05
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
17 changed files with 107 additions and 92 deletions

View file

@ -1265,7 +1265,7 @@ (define-public dmidecode
(define-public acpica
(package
(name "acpica")
(version "20180508")
(version "20180531")
(source (origin
(method url-fetch)
(uri (string-append
@ -1273,7 +1273,7 @@ (define-public acpica
version ".tar.gz"))
(sha256
(base32
"05fg4gcgs1jhh5ad71q1dr35vh119g8avjdy806q614yvgcwk3sx"))))
"0q7vg1nr51f3rg16vjh4glz361a64r6gpm46fqkl2jf4fq7g43g5"))))
(build-system gnu-build-system)
(native-inputs `(("flex" ,flex)
("bison" ,bison)))
@ -2482,7 +2482,7 @@ (define-public nnn
(define-public thermald
(package
(name "thermald")
(version "1.7.1")
(version "1.7.2")
(source
(origin
(method url-fetch)
@ -2490,25 +2490,15 @@ (define-public thermald
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (base32
"0isgmav3z3nb5bsdya8m3haqhzj1lyfjx7i812cqfjrh2a9msin4"))))
"15a6vb67y5wsmf0irrq7sxam18yqpz64130k83ryf24mp40h661b"))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after
'unpack 'autogen.sh-and-fix-paths
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; XXX this can probably be removed after version 1.7.1.
;; upstartconfir is hardcoded to /etc/init and the build
;; system tries to mkdir that. We don't even need upstart
;; files at all; this is a fast and kludgy workaround
(substitute* "data/Makefile.am"
(("upstartconfdir = /etc/init")
(string-append "upstartconfdir = "
out "/etc/init")))
;; Now run autogen
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(invoke "sh" "autogen.sh")
#t))))
#t)))
#:configure-flags
(let ((out (assoc-ref %outputs "out")))
(list (string-append "--sysconfdir="
@ -2530,7 +2520,7 @@ (define-public thermald
(synopsis "CPU scaling for thermal management")
(description "The Linux Thermal Daemon helps monitor and control temperature
on systems running the Linux kernel.")
;; arm and aarch64 don't have cpuid.h
;; arm and aarch64 don't have cpuid.h.
(supported-systems '("i686-linux" "x86_64-linux"))
(license license:gpl2+)))

View file

@ -3244,7 +3244,7 @@ (define-public snd
"1vm0dy5qlycqkima7y5ajzvazyjybifa803fabjcpncjz08c26vp"))))
(build-system glib-or-gtk-build-system)
(arguments
'(#:tests? #f ; no tests
`(#:tests? #f ; no tests
#:out-of-source? #f ; for the 'install-doc' phase
#:configure-flags
(let* ((out (assoc-ref %outputs "out"))
@ -3256,13 +3256,13 @@ (define-public snd
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(docdir (string-append out "/share/doc/snd")))
(mkdir-p docdir)
(doc (string-append out "/share/doc/"
,name "-" ,version)))
(for-each
(lambda (f)
(install-file f docdir))
(install-file f doc))
(find-files "." "\\.html$|COPYING"))
(copy-recursively "pix" (string-append docdir "/pix"))
(copy-recursively "pix" (string-append doc "/pix"))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)))

View file

@ -755,7 +755,7 @@ (define-public lz4
(string-append "prefix=" (assoc-ref %outputs "out")))
#:phases (modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(home-page "http://www.lz4.org")
(home-page "https://www.lz4.org")
(synopsis "Compression algorithm focused on speed")
(description "LZ4 is a lossless compression algorithm, providing
compression speed at 400 MB/s per core (0.16 Bytes/cycle). It also features an

View file

@ -11,6 +11,7 @@
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -53,6 +54,7 @@ (define-module (gnu packages disk)
#:use-module (gnu packages guile)
#:use-module (gnu packages compression)
#:use-module (gnu packages vim)
#:use-module (gnu packages w3m)
#:use-module (gnu packages xml))
(define-public parted
@ -516,12 +518,28 @@ (define-public ranger
(base32
"1lnzkrxcnlwnyi3z0v8ybyp8d5rm26qm35rr68kbs2lbs06inha0"))))
(build-system python-build-system)
(inputs
`(("w3m" ,w3m)))
(native-inputs ;for tests
`(("python-pytest" ,python-pytest)
("python-pylint" ,python-pylint)
("python-flake8" ,python-flake8)
("which" ,which)))
(arguments '(#:test-target "test"))
(arguments
'(#:test-target "test"
#:phases
(modify-phases %standard-phases
(add-after 'configure 'wrap-program
;; Tell 'ranger' where 'w3mimgdisplay' is.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(ranger (string-append out "/bin/ranger"))
(w3m (assoc-ref inputs "w3m"))
(w3mimgdisplay (string-append w3m
"/libexec/w3m/w3mimgdisplay")))
(wrap-program ranger
`("W3MIMGDISPLAY_PATH" ":" prefix (,w3mimgdisplay)))
#t))))))
(home-page "https://ranger.github.io/")
(synopsis "Console file manager")
(description "ranger is a console file manager with Vi key bindings. It

View file

@ -35,7 +35,7 @@ (define-module (gnu packages fvwm)
(define-public fvwm
(package
(name "fvwm")
(version "2.6.7")
(version "2.6.8")
(source (origin
(method url-fetch)
(uri (string-append
@ -43,7 +43,7 @@ (define-public fvwm
version "/" name "-" version ".tar.gz"))
(sha256
(base32
"0wzghjgy65pkn31rgl14fngizw7nbkzbxsfa670xmrndpmd4sr81"))))
"0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv"))))
(build-system gnu-build-system)
(arguments
`(#:phases

View file

@ -4,6 +4,7 @@
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -138,7 +139,7 @@ (define-public lxqt-session
(define-public lxqt-build-tools
(package
(name "lxqt-build-tools")
(version "0.4.0")
(version "0.5.0")
(source
(origin
(method url-fetch)
@ -147,10 +148,10 @@ (define-public lxqt-build-tools
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
"1llbrjbgabxlq933a8cpg03b3mdmvd8983csnd4f7vrcj51nv0xh"))))
"13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;No tests
`(#:tests? #f)) ; no tests
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib)))

View file

@ -1369,6 +1369,7 @@ (define-public isync
`(("perl" ,perl)))
(inputs
`(("bdb" ,bdb)
("cyrus-sasl" ,cyrus-sasl)
("openssl" ,openssl)
("zlib" ,zlib)))
(home-page "http://isync.sourceforge.net/")

View file

@ -2592,9 +2592,12 @@ (define-public beets
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-HOME
(lambda _ (setenv "HOME" (string-append (getcwd) "/tmp"))))
(lambda _
(setenv "HOME" (string-append (getcwd) "/tmp"))
#t))
(replace 'check
(lambda _ (zero? (system* "nosetests" "-v")))))))
(lambda _
(invoke "nosetests" "-v"))))))
(native-inputs
`(("python-beautifulsoup4" ,python-beautifulsoup4)
("python-flask" ,python-flask)

View file

@ -30,7 +30,7 @@ (define-module (gnu packages nano)
(define-public nano
(package
(name "nano")
(version "2.9.7")
(version "2.9.8")
(source
(origin
(method url-fetch)
@ -38,7 +38,7 @@ (define-public nano
version ".tar.xz"))
(sha256
(base32
"1ga4sdk3ikx1ilggc6c77vyfpbmq3nrhg6svgglpf5sv60bv0jmn"))))
"122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2"))))
(build-system gnu-build-system)
(inputs
`(("gettext" ,gettext-minimal)

View file

@ -985,7 +985,7 @@ (define-public pdfposter
(define-public pdfgrep
(package
(name "pdfgrep")
(version "2.0.1")
(version "2.1.1")
(source
(origin
(method url-fetch)
@ -993,7 +993,7 @@ (define-public pdfgrep
name "-" version ".tar.gz"))
(sha256
(base32
"07llkrkcfjwd3ybai9ad10ybhr0biffcplmy7lw4fb87nd2dfw03"))))
"02qcl5kmr5qzjfc99qpbpfb1890bxlrq3r208gnding51zrmb09c"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

View file

@ -1236,7 +1236,7 @@ (define-public perl-test-warnings
(define-public perl-test-without-module
(package
(name "perl-test-without-module")
(version "0.18")
(version "0.20")
(source
(origin
(method url-fetch)
@ -1244,7 +1244,7 @@ (define-public perl-test-without-module
"Test-Without-Module-" version ".tar.gz"))
(sha256
(base32
"0zwc2dk5srd02j4p049w77m89iw5nbff381rmhcbaz8x2w5kdhz2"))))
"0955ib9cz1naz7a2v6lx78kj29q7ihmdn51im6wd1im669yfp6lf"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Test-Without-Module/")
(synopsis "Test fallback behaviour in absence of modules")

View file

@ -1140,7 +1140,7 @@ (define-public perl-class-inspector
(define-public perl-class-load
(package
(name "perl-class-load")
(version "0.23")
(version "0.24")
(source
(origin
(method url-fetch)
@ -1148,12 +1148,13 @@ (define-public perl-class-load
"Class-Load-" version ".tar.gz"))
(sha256
(base32
"13xjfh4fadq4pkq7fcj42b26544jl7gqdg2y3imnra9fwxwsbg7j"))))
"0dnacm959vi5819h6cdl5qpi89fr81p6smbsqx7m6in18vd87f8b"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build-tiny" ,perl-module-build-tiny)
("perl-test-fatal" ,perl-test-fatal)
("perl-test-requires" ,perl-test-requires)))
("perl-test-needs" ,perl-test-needs)
("perl-test-without-module" ,perl-test-without-module)))
(propagated-inputs
`(("perl-package-stash" ,perl-package-stash)
("perl-data-optlist" ,perl-data-optlist)
@ -1170,7 +1171,7 @@ (define-public perl-class-load
(define-public perl-class-load-xs
(package
(name "perl-class-load-xs")
(version "0.09")
(version "0.10")
(source
(origin
(method url-fetch)
@ -1178,11 +1179,12 @@ (define-public perl-class-load-xs
"Class-Load-XS-" version ".tar.gz"))
(sha256
(base32
"1aivalms81s3a2cj053ncgnmkpgl7vspna8ajlkqir7rdn8kpv5v"))))
"1ldd4a306hjagm5v9j0gjg8y7km4v3q45bxxqmj2bzgb6vsjrhjv"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-fatal" ,perl-test-fatal)
("perl-test-requires" ,perl-test-requires)))
("perl-test-needs" ,perl-test-needs)
("perl-test-without-module" ,perl-test-without-module)))
(inputs `(("perl-class-load" ,perl-class-load)))
(home-page "http://search.cpan.org/dist/Class-Load-XS/")
(synopsis "XS implementation of parts of Class::Load")
@ -1472,7 +1474,7 @@ (define-public perl-config-ini
(define-public perl-context-preserve
(package
(name "perl-context-preserve")
(version "0.02")
(version "0.03")
(source
(origin
(method url-fetch)
@ -1480,7 +1482,7 @@ (define-public perl-context-preserve
"Context-Preserve-" version ".tar.gz"))
(sha256
(base32
"0qkjj1qifr87zlfpfnn21gdyrpfgilh8zp3b53008m2ax02k87gc"))))
"07zxgmb11bn4zj3w9g1zwbb9iv4jyk5q7hc0nv59knvv5i64m489"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-exception" ,perl-test-exception)
@ -2154,7 +2156,7 @@ (define-public perl-date-simple
(define-public perl-datetime
(package
(name "perl-datetime")
(version "1.46")
(version "1.49")
(source
(origin
(method url-fetch)
@ -2162,7 +2164,7 @@ (define-public perl-datetime
"DateTime-" version ".tar.gz"))
(sha256
(base32
"1247d2q2gm912bxj88a0sr5gvj2nx4a7n6z1smkq16iy21cziz79"))))
"0hbw4zq1562slnz7g7hyhfhyq98dzkk3i5g21x3xra5cvfix93kh"))))
(build-system perl-build-system)
(native-inputs
`(("perl-cpan-meta-check" ,perl-cpan-meta-check)
@ -2455,7 +2457,7 @@ (define-public perl-datetime-locale
(define-public perl-datetime-timezone
(package
(name "perl-datetime-timezone")
(version "2.17")
(version "2.19")
(source
(origin
(method url-fetch)
@ -2463,7 +2465,7 @@ (define-public perl-datetime-timezone
"DateTime-TimeZone-" version ".tar.gz"))
(sha256
(base32
"1ckhjw7h545306b02p6ra60y8zxqnbqr2lsy7c1wib8libf0l2hx"))))
"1y54bsgq886sg35fgmxgj8wwmgs4l83qhwa0g3zv8w9d43z2w6dr"))))
(build-system perl-build-system)
(native-inputs
`(("perl-test-fatal" ,perl-test-fatal)
@ -3079,7 +3081,7 @@ (define-public perl-eval-closure
(define-public perl-exception-class
(package
(name "perl-exception-class")
(version "1.39")
(version "1.44")
(source
(origin
(method url-fetch)
@ -3087,7 +3089,7 @@ (define-public perl-exception-class
"Exception-Class-" version ".tar.gz"))
(sha256
(base32
"10r06v6568s33p6h9f9ml0iabc07id86mjkf74gy7ld6d5m7b741"))))
"03gf4cdgrjnljgrlxkvbh2cahsyzn0zsh2zcli7b1lrqn7wgpwrk"))))
(build-system perl-build-system)
(propagated-inputs
`(("perl-devel-stacktrace" ,perl-devel-stacktrace)
@ -3487,7 +3489,7 @@ (define-public perl-file-path
(define-public perl-file-pushd
(package
(name "perl-file-pushd")
(version "1.014")
(version "1.016")
(source
(origin
(method url-fetch)
@ -3497,7 +3499,7 @@ (define-public perl-file-pushd
".tar.gz"))
(sha256
(base32
"02rlqvyy7gly3dsqwaa81aisyy9c791b8xvwzczcbgmcwgzkgaxm"))))
"1p3wz5jnddd87wkwl4x3fc3ncprahdxdzwqd4scb10r98h4pyfnp"))))
(build-system perl-build-system)
(home-page
"http://search.cpan.org/dist/File-pushd/")
@ -3961,15 +3963,15 @@ (define-public perl-hash-merge
(define-public perl-hash-multivalue
(package
(name "perl-hash-multivalue")
(version "0.15")
(version "0.16")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/M/MI/MIYAGAWA/"
(uri (string-append "mirror://cpan/authors/id/A/AR/ARISTOTLE/"
"Hash-MultiValue-" version ".tar.gz"))
(sha256
(base32
"1jc37kwpa1fl88va8bd1p95h0vjv1gsvmn7pc2pxj62ga6x0wpc0"))))
"1x3k7h542xnigz0b8vsfiq580p5r325wi5b8mxppiqk8mbvis636"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Hash-MultiValue/")
(synopsis "Store multiple values per key")
@ -4618,7 +4620,7 @@ (define-public perl-log-report
(define-public perl-libintl-perl
(package
(name "perl-libintl-perl")
(version "1.28")
(version "1.29")
(source
(origin
(method url-fetch)
@ -4626,7 +4628,7 @@ (define-public perl-libintl-perl
"libintl-perl-" version ".tar.gz"))
(sha256
(base32
"1gafrfvicjclqlz6i62jx2iqbq878yn3ws86waz2sqbd3gxz5svv"))))
"1cgvrgh4axd8jlr6497ndgphgvgnqc1axd306460hskdvc85z4vq"))))
(build-system perl-build-system)
(arguments
`(#:phases
@ -4912,15 +4914,15 @@ (define-public perl-memoize
(define-public perl-memoize-expirelru
(package
(name "perl-memoize-expirelru")
(version "0.55")
(version "0.56")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/B/BP/BPOWERS/"
(uri (string-append "mirror://cpan/authors/id/N/NE/NEILB/"
"Memoize-ExpireLRU-" version ".tar.gz"))
(sha256
(base32
"0klk0vj78lr259mnv1rbxib8gzf2cfp4zhkhbcxyhadkkl73myvj"))))
"1xnp3jqabl4il5kfadlqimbxhzsbm7gpwrgw0m5s5fdsrc0n70zf"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Memoize-ExpireLRU/")
(synopsis "Expiry plug-in for Memoize that adds LRU cache expiration")
@ -5176,15 +5178,15 @@ (define-public perl-module-implementation
(define-public perl-module-install
(package
(name "perl-module-install")
(version "1.14")
(version "1.19")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/B/BI/BINGOS/"
(uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
"Module-Install-" version ".tar.gz"))
(sha256
(base32
"0j8dz87k60i1khd9xadd8kl6bgm9s5s5zl86rzsz5bq36siz00iz"))))
"06q12cm97yh4p7qbm0a2p96996ii6ss59qy57z0f7f9svy6sflqs"))))
(build-system perl-build-system)
(native-inputs
`(("perl-yaml-tiny" ,perl-yaml-tiny)))
@ -5550,7 +5552,7 @@ (define-public perl-moosex-markasmethods
(define-public perl-moosex-methodattributes
(package
(name "perl-moosex-methodattributes")
(version "0.29")
(version "0.31")
(source
(origin
(method url-fetch)
@ -5558,7 +5560,7 @@ (define-public perl-moosex-methodattributes
"MooseX-MethodAttributes-" version ".tar.gz"))
(sha256
(base32
"1pz3i67gadfmgzj87m1xp2ilcg3yhppdylcng2h6c11dy0a06hdk"))))
"1whd10w7bm3dwaj7gpgw40bci9vvb2zmxs4349ifji91hvinwqck"))))
(build-system perl-build-system)
(native-inputs
`(("perl-module-build-tiny" ,perl-module-build-tiny)
@ -6976,7 +6978,7 @@ (define-public perl-pod-simple
(define-public perl-posix-strftime-compiler
(package
(name "perl-posix-strftime-compiler")
(version "0.41")
(version "0.42")
(source
(origin
(method url-fetch)
@ -6984,10 +6986,10 @@ (define-public perl-posix-strftime-compiler
"POSIX-strftime-Compiler-" version ".tar.gz"))
(sha256
(base32
"0f9p3hx0vqx8zg5v24pz0s4zc8ln100c7c91ks681wq02phqj2v7"))))
"04dcn2n4rfkj8p24vj2p17vvis40l87pf2vdqp0vqm5jg3fjnn16"))))
(build-system perl-build-system)
(native-inputs `(("perl-module-build" ,perl-module-build)))
(arguments `(#:tests? #f)) ;TODO: Timezone test failures
(arguments `(#:tests? #f)) ; TODO: Timezone test failures
(home-page "http://search.cpan.org/dist/POSIX-strftime-Compiler/")
(synopsis "GNU C library compatible strftime for loggers and servers")
(description "POSIX::strftime::Compiler provides GNU C library compatible
@ -8151,15 +8153,15 @@ (define-public perl-text-aligner
(define-public perl-text-balanced
(package
(name "perl-text-balanced")
(version "2.02")
(version "2.03")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/A/AD/ADAMK/"
(uri (string-append "mirror://cpan/authors/id/S/SH/SHAY/"
"Text-Balanced-" version ".tar.gz"))
(sha256
(base32
"1d3mba2sjpp044h16pkf231cksa34ripaz6rmgxp0ygpl917az57"))))
"1j4jjw6bg6ik8cn1mimw54rvg4h0qf4hm9k63y9572sny3w56xq5"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Text-Balanced/")
(synopsis "Extract delimited text sequences from strings")
@ -9229,7 +9231,7 @@ (define-public perl-parse-recdescent
(define-public perl-parse-yapp
(package
(name "perl-parse-yapp")
(version "1.2")
(version "1.21")
(source
(origin
(method url-fetch)
@ -9239,7 +9241,7 @@ (define-public perl-parse-yapp
".tar.gz"))
(sha256
(base32
"16p4qgqg28cy76ylcf4wq1r693gqpx8xq0w32b3564i67h49zljb"))))
"1r8kbyk0qd4ficmabj753kjpq0ib0csk01169w7jxflg62cfj41q"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/Parse-Yapp/")
(synopsis "Generate and use LALR parsers")

View file

@ -312,14 +312,14 @@ (define-public python2-html5-parser
(define-public python-pycurl
(package
(name "python-pycurl")
(version "7.43.0.1")
(version "7.43.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://dl.bintray.com/pycurl/pycurl/pycurl-"
version ".tar.gz"))
(sha256
(base32 "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3"))))
(base32 "1915kb04k1j4y6k1dx1sgnbddxrl9r1n4q928if2lkrdm73xy30g"))))
(build-system python-build-system)
(arguments
;; The tests attempt to access external web servers, so we cannot run

View file

@ -4,7 +4,7 @@
;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;;
@ -57,8 +57,8 @@ (define-public ccid
(source (origin
(method url-fetch)
(uri (string-append
"https://alioth.debian.org/frs/download.php/file/4238/"
"ccid-" version ".tar.bz2"))
"https://ccid.apdu.fr/files/"
name "-" version ".tar.bz2"))
(sha256
(base32
"0kdqmbma6sclsrbxy9w85h7cs0v11if4nc2r9v09613k8pl2lhx5"))))
@ -79,7 +79,7 @@ (define-public ccid
(inputs
`(("libusb" ,libusb)
("pcsc-lite" ,pcsc-lite)))
(home-page "https://pcsclite.alioth.debian.org/ccid.html")
(home-page "https://ccid.apdu.fr/")
(synopsis "PC/SC driver for USB smart card devices")
(description
"This package provides a PC/SC IFD handler implementation for devices
@ -157,8 +157,8 @@ (define-public pcsc-lite
(source (origin
(method url-fetch)
(uri (string-append
"https://alioth.debian.org/frs/download.php/file/4235/"
"pcsc-lite-" version ".tar.bz2"))
"https://pcsclite.apdu.fr/files/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"))))
@ -171,7 +171,7 @@ (define-public pcsc-lite
("pkg-config" ,pkg-config)))
(inputs
`(("libudev" ,eudev)))
(home-page "https://pcsclite.alioth.debian.org/pcsclite.html")
(home-page "https://pcsclite.apdu.fr/")
(synopsis "Middleware to access a smart card using PC/SC")
(description
"pcsc-lite provides an interface to communicate with smartcards and

View file

@ -341,8 +341,8 @@ (define-public sent
("libx11" ,libx11)
("libxft" ,libxft)
("fontconfig" ,fontconfig)))
(synopsis "Plaintext presentation tool")
(description "Sent uses plaintext files and PNG images to create slideshow
(synopsis "Plain-text presentation tool")
(description "Sent uses plain-text files and PNG images to create slideshow
presentations. Each paragraph represents a slide in the presentation.
Especially for presentations using the Takahashi method this is very nice and
allows you to write down the presentation for a quick lightning talk within a

View file

@ -115,7 +115,7 @@ (define-public asn1c
(define-public p11-kit
(package
(name "p11-kit")
(version "0.23.11")
(version "0.23.12")
(source
(origin
(method url-fetch)
@ -123,7 +123,7 @@ (define-public p11-kit
"download/" version "/p11-kit-" version ".tar.gz"))
(sha256
(base32
"0asaxbypvns5xf9hb5jy0kijz0b3hp1s8likhywmry3klpdchhxj"))))
"00ylbx2gxrm9bv6w4y3qf8z30vpdkqaa8z1y22hy27fv34py5fjq"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

View file

@ -53,7 +53,7 @@ (define (bioconductor-uri name version)
(list (string-append "https://bioconductor.org/packages/release/bioc/src/contrib/"
name "_" version ".tar.gz")
;; TODO: use %bioconductor-version from (guix import cran)
(string-append "https://bioconductor.org/packages/3.6/bioc/src/contrib/Archive/"
(string-append "https://bioconductor.org/packages/3.7/bioc/src/contrib/Archive/"
name "_" version ".tar.gz")))
(define %r-build-system-modules