ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 19:19:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Mark H Weaver 2018-04-12 15:22:57 -04:00
commit a368663a56
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
6 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/gnupg.scm
View file

@ -216,21 +216,19 @@ (define-public npth
(define-public gnupg
(package
(name "gnupg")
(version "2.2.5")
(version "2.2.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2"))
(sha256
(base32
"0mzgibq4dpxh3i9anmwg12xdjry28y83icafhx3j3djg5niqk89z"))))
"110rf476l3cgn52gh9ia5y0y06y2ialq9dqc12jkhnfhl9gqqkg6"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("bzip2" ,bzip2)
("curl" ,curl)
("gnutls" ,gnutls)
`(("gnutls" ,gnutls)
("libassuan" ,libassuan)
("libgcrypt" ,libgcrypt)
("libgpg-error" ,libgpg-error)

4
gnu/packages/kde.scm
View file

@ -236,7 +236,7 @@ (define-public kdevplatform
(define-public krita
(package
(name "krita")
(version "4.0.0")
(version "4.0.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -245,7 +245,7 @@ (define-public krita
"/" name "-" version ".tar.gz"))
(sha256
(base32
"0dh3bm90mxrbyvdp7x7hcf5li48j7ppkb44lls65lpn6c59r5waz"))))
"0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f

15
gnu/packages/rdf.scm
View file

@ -120,29 +120,21 @@ (define-public clucene
(define-public lrdf
(package
(name "lrdf")
(version "0.5.0")
(version "0.6.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/swh/LRDF/archive/"
(uri (string-append "https://github.com/swh/LRDF/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s"))))
"1vxii4mlcpyi16dizcmnqfl2j9gffgr986yd8ic67hvs8xy42yfm"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-out-of-tree-references
(lambda _
;; remove symlinks to files in /usr/
(delete-file-recursively "m4")
(for-each delete-file '("config.guess"
"config.sub"
"depcomp"
"install-sh"
"ltmain.sh"
"missing"))
;; remove_test depends on an out-of-tree RDF file
(substitute* "examples/Makefile.am"
(("instances_test remove_test") "instances_test")
@ -154,7 +146,6 @@ (define-public lrdf
(inputs
`(("raptor" ,raptor2)
("cyrus-sasl" ,cyrus-sasl)
("openssl" ,openssl)
("zlib" ,zlib)))
(native-inputs
`(("autoconf" ,autoconf)

4
gnu/packages/web.scm
View file

@ -6355,7 +6355,7 @@ (define-public cat-avatar-generator
(define-public nghttp2
(package
(name "nghttp2")
(version "1.31.0")
(version "1.31.1")
(source
(origin
(method url-fetch)
@ -6364,7 +6364,7 @@ (define-public nghttp2
name "-" version ".tar.xz"))
(sha256
(base32
"1ivs74v9sa2sds3dq0s7vn9bkmhr2hgwyg1an1rah3agqwnkqmrn"))))
"00z1687m4wi2gbgkijbv099l9hs1sjlyzbhh8jhn0xssx4xcifb5"))))
(build-system gnu-build-system)
(outputs (list "out"
"lib")) ; only libnghttp2

4
gnu/packages/xorg.scm
View file

@ -2445,7 +2445,7 @@ (define-public xf86-input-evdev
(define-public xf86-input-libinput
(package
(name "xf86-input-libinput")
(version "0.27.0")
(version "0.27.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -2453,7 +2453,7 @@ (define-public xf86-input-libinput
name "-" version ".tar.bz2"))
(sha256
(base32
"18v8qry7493k37bcfbfwdr4xrygyjivpzvgsj7s1dxmzn1n53c3p"))))
"1riflw6dc8fp5d74i7zfgsss0zz3z3lsj6zn2lzjm5kgmp2qvbfl"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags

11
gnu/system.scm
View file

@ -570,7 +570,16 @@ (define (default-/etc/hosts host-name)
(define* (operating-system-etc-service os)
"Return a <service> that builds containing the static part of the /etc
directory."
(let ((login.defs (plain-file "login.defs" "# Empty for now.\n"))
(let ((login.defs
(plain-file "login.defs"
(string-append
"# Default paths for non-login shells started by su(1).\n"
"ENV_PATH /run/setuid-programs:"
"/run/current-system/profile/bin:"
"/run/current-system/profile/sbin\n"
"ENV_SUPATH /run/setuid-programs:"
"/run/current-system/profile/bin:"
"/run/current-system/profile/sbin\n")))
(issue (plain-file "issue" (operating-system-issue os)))
(nsswitch (plain-file "nsswitch.conf"