Merge branch 'master' into core-updates
This commit is contained in:
commit
a368663a56
|
@ -216,21 +216,19 @@ compatible to GNU Pth.")
|
|||
(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)
|
||||
|
|
|
@ -236,7 +236,7 @@ plugins, as well as code to create plugins, or complete applications.")
|
|||
(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 @@ plugins, as well as code to create plugins, or complete applications.")
|
|||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dh3bm90mxrbyvdp7x7hcf5li48j7ppkb44lls65lpn6c59r5waz"))))
|
||||
"0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
|
|
@ -120,29 +120,21 @@ Java Lucene text search engine API to C++.")
|
|||
(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 @@ Java Lucene text search engine API to C++.")
|
|||
(inputs
|
||||
`(("raptor" ,raptor2)
|
||||
("cyrus-sasl" ,cyrus-sasl)
|
||||
("openssl" ,openssl)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
|
|
|
@ -6355,7 +6355,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
|
|||
(define-public nghttp2
|
||||
(package
|
||||
(name "nghttp2")
|
||||
(version "1.31.0")
|
||||
(version "1.31.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -6364,7 +6364,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ivs74v9sa2sds3dq0s7vn9bkmhr2hgwyg1an1rah3agqwnkqmrn"))))
|
||||
"00z1687m4wi2gbgkijbv099l9hs1sjlyzbhh8jhn0xssx4xcifb5"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs (list "out"
|
||||
"lib")) ; only libnghttp2
|
||||
|
|
|
@ -2445,7 +2445,7 @@ including most mice, keyboards, tablets and touchscreens.")
|
|||
(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 @@ including most mice, keyboards, tablets and touchscreens.")
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"18v8qry7493k37bcfbfwdr4xrygyjivpzvgsj7s1dxmzn1n53c3p"))))
|
||||
"1riflw6dc8fp5d74i7zfgsss0zz3z3lsj6zn2lzjm5kgmp2qvbfl"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
|
|
|
@ -570,7 +570,16 @@ This is the GNU system. Welcome.\n")
|
|||
(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"
|
||||
|
|
Loading…
Reference in New Issue