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

Merge branch 'master' into core-updates

This commit is contained in:
Ricardo Wurmus 2018-06-06 22:43:37 +02:00
parent 477ee222aa 25133ca172
commit 116ca65b58
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
20 changed files with 126 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/admin.scm
View File

@ -2661,23 +2661,22 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.0.04-1") (version "3.0.11-1")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/smxi/inxi" (uri (git-reference
"/archive/" version "/inxi.tar.gz")) (url "https://github.com/smxi/inxi")
(file-name (string-append real-name "-" version ".tar.gz")) (commit version)))
(sha256 (sha256
(base32 (base32
"14zxdsjgh9dbijmpp0hhvg2yiqqfwnqgcc6x8dpl1v15z1h1r7pc")))) "07wihl4gsamq98mhxvm6k4vpphym75467cxfa19b3g5ggpyq894g"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
`(("bash" ,bash) `(("bash" ,bash)
("perl" ,perl))) ("perl" ,perl)))
(native-inputs (native-inputs
`(("gzip" ,gzip) `(("gzip" ,gzip)))
("tar" ,tar)))
(arguments (arguments
`(#:modules `(#:modules
((guix build utils) ((guix build utils)
@ -2691,9 +2690,9 @@ Python loading in HPC environments.")
(setenv "PATH" (string-append (setenv "PATH" (string-append
(assoc-ref %build-inputs "bash") "/bin" ":" (assoc-ref %build-inputs "bash") "/bin" ":"
(assoc-ref %build-inputs "gzip") "/bin" ":" (assoc-ref %build-inputs "gzip") "/bin" ":"
(assoc-ref %build-inputs "perl") "/bin" ":" (assoc-ref %build-inputs "perl") "/bin" ":"))
(assoc-ref %build-inputs "tar") "/bin" ":")) (copy-recursively (assoc-ref %build-inputs "source")
(invoke "tar" "xvf" (assoc-ref %build-inputs "source")) ,(string-append real-name "-" version))
(with-directory-excursion ,(string-append real-name "-" version) (with-directory-excursion ,(string-append real-name "-" version)
(with-fluids ((%default-port-encoding #f)) (with-fluids ((%default-port-encoding #f))
(substitute* "inxi" (("/usr/bin/env perl") (which "perl")))) (substitute* "inxi" (("/usr/bin/env perl") (which "perl"))))
@ -2725,7 +2724,7 @@ Python loading in HPC environments.")
%build-inputs))))) %build-inputs)))))
(invoke "gzip" "inxi.1") (invoke "gzip" "inxi.1")
(install-file "inxi.1.gz" (install-file "inxi.1.gz"
(string-append %output "/share/doc/man/man1"))) (string-append %output "/share/man/man1")))
#t))) #t)))
(home-page "https://smxi.org/docs/inxi.htm") (home-page "https://smxi.org/docs/inxi.htm")
(synopsis "Full featured system information script") (synopsis "Full featured system information script")

17
gnu/packages/astronomy.scm
View File

@ -35,7 +35,7 @@
(define-public cfitsio (define-public cfitsio
(package (package
(name "cfitsio") (name "cfitsio")
(version "3.420") (version "3.450")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -43,7 +43,7 @@
"http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/"
name (string-replace-substring version "." "") ".tar.gz")) name (string-replace-substring version "." "") ".tar.gz"))
(sha256 (sha256
(base32 "1f0nmki45h9kw7vxpxiav9cb6vs3qqi6zrp2lpci5yhqc5isl43c")))) (base32 "0bmrkw6w65zb0k3mszaaqy1f4zjm2hl7njww74nb5v38wvdi4q5z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; XXX Building with curl currently breaks wcslib. It doesn't use ;; XXX Building with curl currently breaks wcslib. It doesn't use
;; pkg-config and hence won't link with -lcurl. ;; pkg-config and hence won't link with -lcurl.
@ -81,12 +81,17 @@ in FITS files.")
`(("cfitsio" ,cfitsio))) `(("cfitsio" ,cfitsio)))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-/bin/sh (add-before 'configure 'patch-/bin/sh
(lambda _ (lambda _
(substitute* "makedefs.in" (substitute* "makedefs.in"
(("/bin/sh") "sh")) (("/bin/sh") "sh"))
#t))))) #t))
(delete 'install-license-files)) ; installed by ‘make install’
;; Both the build and tests fail randomly when run in parallel.
#:parallel-build? #f
#:parallel-tests? #f))
(home-page "https://www.atnf.csiro.au/people/mcalabre/WCS") (home-page "https://www.atnf.csiro.au/people/mcalabre/WCS")
(synopsis "Library which implements the FITS WCS standard") (synopsis "Library which implements the FITS WCS standard")
(description "The FITS \"World Coordinate System\" (@dfn{WCS}) standard (description "The FITS \"World Coordinate System\" (@dfn{WCS}) standard
@ -98,7 +103,7 @@ header.")
(define-public gnuastro (define-public gnuastro
(package (package
(name "gnuastro") (name "gnuastro")
(version "0.5") (version "0.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -106,7 +111,7 @@ header.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"10lxzxyrf30hj3bqdgprvaj9phzdi816khjmr0vmjf8pmsr8bqqr")))) "16a212j9ghdirm11d25s5q5qw32bkjrxsh3rblfyyv29djch34w6"))))
(inputs (inputs
`(("cfitsio" ,cfitsio) `(("cfitsio" ,cfitsio)
("gsl" ,gsl) ("gsl" ,gsl)

9
gnu/packages/crypto.scm
View File

@ -363,14 +363,14 @@ no man page, refer to the home page for usage details.")
(define-public tomb (define-public tomb
(package (package
(name "tomb") (name "tomb")
(version "2.4") (version "2.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://files.dyne.org/tomb/" (uri (string-append "https://files.dyne.org/tomb/"
"Tomb-" version ".tar.gz")) "Tomb-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1hv1w79as7swqj0n137vz8n8mwvcgwlvd91sdyssz41jarg7f1vr")))) "12c6qldngaw520gvb02inzkhnxbl4k0dwmddrgnaf7xashy6j0wc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("sudo" ,sudo))) ;presence needed for 'check' phase (native-inputs `(("sudo" ,sudo))) ;presence needed for 'check' phase
(inputs (inputs
@ -382,7 +382,8 @@ no man page, refer to the home page for usage details.")
("mlocate" ,mlocate) ("mlocate" ,mlocate)
("pinentry" ,pinentry) ("pinentry" ,pinentry)
("qrencode" ,qrencode) ("qrencode" ,qrencode)
("steghide" ,steghide))) ("steghide" ,steghide)
("util-linux" ,util-linux)))
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
;; TODO: Build and install gtk and qt trays ;; TODO: Build and install gtk and qt trays
@ -405,7 +406,7 @@ no man page, refer to the home page for usage details.")
(error "program not found:" program))) (error "program not found:" program)))
'("seq" "mkfs.ext4" "pinentry" "sudo" '("seq" "mkfs.ext4" "pinentry" "sudo"
"gpg" "cryptsetup" "gettext" "gpg" "cryptsetup" "gettext"
"qrencode" "steghide"))))) "qrencode" "steghide" "findmnt")))))
#t))) #t)))
(delete 'check) (delete 'check)
(add-after 'wrap 'check (add-after 'wrap 'check

4
gnu/packages/databases.scm
View File

@ -1927,13 +1927,13 @@ etc., and an SQL engine for performing simple SQL queries.")
(define-public python-lmdb (define-public python-lmdb
(package (package
(name "python-lmdb") (name "python-lmdb")
(version "0.93") (version "0.94")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "lmdb" version)) (uri (pypi-uri "lmdb" version))
(sha256 (sha256
(base32 (base32
"0xdpb298fyl68acadbwv5801wcwfpnhc7sm4bnrq1x4bd5dhhsql")) "1zh38gvkqw1jm5105if6rr7ccbgyxr7k2rm5ygb9ab3bq82pyaww"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete bundled lmdb source files. ;; Delete bundled lmdb source files.

4
gnu/packages/debian.scm
View File

@ -112,7 +112,7 @@ contains the archive keys used for that.")
(define-public debootstrap (define-public debootstrap
(package (package
(name "debootstrap") (name "debootstrap")
(version "1.0.95") (version "1.0.101")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -120,7 +120,7 @@ contains the archive keys used for that.")
name "_" version ".tar.gz")) name "_" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1xpd1yblcgwhri64hzgxhalpf5j8gqbmkrsm1fs0pbwiy0wdz0ry")))) "1p1a81s8hq73byd7256iljdls389x2q7w6srgrgfmx5bl1csnzp3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

8
gnu/packages/emulators.scm
View File

@ -156,7 +156,7 @@
(string-append (assoc-ref inputs "font-wqy-microhei") (string-append (assoc-ref inputs "font-wqy-microhei")
"/share/fonts/truetype/wqy-microhei.ttc")) "/share/fonts/truetype/wqy-microhei.ttc"))
(libvulkan (libvulkan
(string-append (assoc-ref inputs "vulkan-icd-loader") (string-append (assoc-ref inputs "vulkan-loader")
"/lib/libvulkan.so"))) "/lib/libvulkan.so")))
(chdir "docs") (chdir "docs")
(invoke "bash" "-c" "g++ -O2 -std=c++11 $(freetype-config \ (invoke "bash" "-c" "g++ -O2 -std=c++11 $(freetype-config \
@ -219,7 +219,7 @@
("sfml" ,sfml) ("sfml" ,sfml)
("soil" ,soil) ("soil" ,soil)
("soundtouch" ,soundtouch) ("soundtouch" ,soundtouch)
("vulkan-icd-loader" ,vulkan-icd-loader) ("vulkan-loader" ,vulkan-loader)
("wxwidgets" ,wxwidgets-gtk2-3.1) ("wxwidgets" ,wxwidgets-gtk2-3.1)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://dolphin-emu.org/") (home-page "https://dolphin-emu.org/")
@ -1072,7 +1072,7 @@ emulation community. It provides highly accurate emulation.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(etc (string-append out "/etc")) (etc (string-append out "/etc"))
(vulkan (assoc-ref inputs "vulkan-icd-loader"))) (vulkan (assoc-ref inputs "vulkan-loader")))
;; Hard-code the path to libvulkan.so. ;; Hard-code the path to libvulkan.so.
(substitute* "gfx/common/vulkan_common.c" (substitute* "gfx/common/vulkan_common.c"
(("libvulkan.so") (string-append vulkan "/lib/libvulkan.so"))) (("libvulkan.so") (string-append vulkan "/lib/libvulkan.so")))
@ -1099,7 +1099,7 @@ emulation community. It provides highly accurate emulation.")
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("sdl" ,sdl2) ("sdl" ,sdl2)
("udev" ,eudev) ("udev" ,eudev)
("vulkan-icd-loader" ,vulkan-icd-loader) ("vulkan-loader" ,vulkan-loader)
("wayland" ,wayland) ("wayland" ,wayland)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs

30
gnu/packages/engineering.scm
View File

@ -533,35 +533,17 @@ ready for production.")
(define-public gerbv (define-public gerbv
(package (package
(name "gerbv") (name "gerbv")
(version "2.6.1") (version "2.6.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gerbv/gerbv/gerbv-" (uri (string-append "mirror://sourceforge/gerbv/gerbv/gerbv-"
version "/gerbv-" version ".tar.gz")) version "/gerbv-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0v6ry0mxi5qym4z0y0lpblxsw9dfjpgxs4c4v2ngg7yw4b3a59ks")))) "1cw8k6ni0q8kswad03kha86fk7n06vq8p0wzsfhcnalsdshrn17i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'autoconf
(lambda _
;; Build rules contain references to Russian translation, but the
;; needed files are missing; see
;; http://sourceforge.net/p/gerbv/bugs/174/
(delete-file "po/LINGUAS")
(substitute* "man/Makefile.am"
(("PO_FILES= gerbv.ru.1.in.po") "")
(("man_MANS = gerbv.1 gerbv.ru.1") "man_MANS = gerbv.1"))
(zero? (system* "autoreconf" "-vfi")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("pkg-config" ,pkg-config)))
("automake" ,automake)
("libtool" ,libtool)
("gettext" ,gettext-minimal)
("po4a" ,po4a)
("pkg-config" ,pkg-config)))
(inputs (inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
("gtk" ,gtk+-2) ("gtk" ,gtk+-2)
@ -779,7 +761,7 @@ render model libraries.")
(define-public linsmith (define-public linsmith
(package (package
(name "linsmith") (name "linsmith")
(version "0.99.30") (version "0.99.31")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -787,13 +769,13 @@ render model libraries.")
version "/linsmith-" version ".tar.gz")) version "/linsmith-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"18qslhr2r45rhpj4v6bjcqx189vs0bflvsj271wr7w8kvh69qwvn")))) "13qj7n9826qc9shkkgd1p6vcpj78v4h9d67wbg45prg7rbnzkzds"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("gtk" ,gtk+-2) ("gtk" ,gtk+-2)
("libgnome" ,libgnomeui))) ("libgnome" ,libgnomeui)))
(home-page "http://jcoppens.com/soft/linsmith/index.en.php") (home-page "https://jcoppens.com/soft/linsmith/index.en.php")
(synopsis "Smith Charting program") (synopsis "Smith Charting program")
(description "LinSmith is a Smith Charting program, mainly designed for (description "LinSmith is a Smith Charting program, mainly designed for
educational use. As such, there is an emphasis on capabilities that improve educational use. As such, there is an emphasis on capabilities that improve

12
gnu/packages/games.scm
View File

@ -4484,7 +4484,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
(arguments (arguments
`(#:make-flags `(#:make-flags
(let ((vulkanlib (string-append (assoc-ref %build-inputs (let ((vulkanlib (string-append (assoc-ref %build-inputs
"vulkan-icd-loader") "/lib"))) "vulkan-loader") "/lib")))
(list "CC=gcc" (list "CC=gcc"
"MP3LIB=mpg123" "MP3LIB=mpg123"
"USE_CODEC_FLAC=1" "USE_CODEC_FLAC=1"
@ -4497,7 +4497,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
(add-after 'unpack 'fix-makefile-paths (add-after 'unpack 'fix-makefile-paths
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((vulkan (assoc-ref %build-inputs (let ((vulkan (assoc-ref %build-inputs
"vulkan-icd-loader")) "vulkan-loader"))
(out (assoc-ref outputs "out"))) (out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/bin")) (mkdir-p (string-append out "/bin"))
(substitute* "Quake/Makefile" ((" /usr") (substitute* "Quake/Makefile" ((" /usr")
@ -4508,7 +4508,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
#t)))) #t))))
,@(strip-keyword-arguments '(#:make-flags #:phases) ,@(strip-keyword-arguments '(#:make-flags #:phases)
(package-arguments quakespasm)))) (package-arguments quakespasm))))
(inputs `(("vulkan-icd-loader" ,vulkan-icd-loader) (inputs `(("vulkan-loader" ,vulkan-loader)
,@(package-inputs quakespasm))) ,@(package-inputs quakespasm)))
(description "vkquake is a modern engine for id software's Quake 1. (description "vkquake is a modern engine for id software's Quake 1.
It includes support for 64 bit CPUs, custom music playback, a new sound driver, It includes support for 64 bit CPUs, custom music playback, a new sound driver,
@ -4710,7 +4710,7 @@ Github or Gitlab.")
(define-public colobot (define-public colobot
(package (package
(name "colobot") (name "colobot")
(version "0.1.11-alpha") (version "0.1.11.1-alpha")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4718,7 +4718,7 @@ Github or Gitlab.")
"colobot-gold-" version ".tar.gz")) "colobot-gold-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"160rq9fp5vd0qaqr3jvzvzrcxk9cac532y8vx4cvq0a8hgylrbad")))) "0h6f4icarramhjkxxbzz6siv3v11z5r8ghqisgr1rscw217vhmwf"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;no test `(#:tests? #f ;no test
@ -4756,7 +4756,7 @@ Github or Gitlab.")
"colobot-gold-" version ".tar.gz")) "colobot-gold-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1pdpsyr41g7xmk03k2g76l214f53ahk04qnkzmsv1fdbbaq7p109")))) "0riznycx2jbxmg4m9nn3mcpqws2c0s7cn2m9skz9zj1w39r5qpjy"))))
("colobot-music" ("colobot-music"
,(origin ,(origin
(method url-fetch) (method url-fetch)

16
gnu/packages/gnome.scm
View File

@ -536,7 +536,7 @@ and keep up to date translations of documentation.")
(define-public gnome-disk-utility (define-public gnome-disk-utility
(package (package
(name "gnome-disk-utility") (name "gnome-disk-utility")
(version "3.28.2") (version "3.28.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -544,7 +544,7 @@ and keep up to date translations of documentation.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1j3l4b1prbnixzy6srvcsjfg1dx5nqys2lmygm31ygfdq7svp3m6")))) "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") `(("glib:bin" ,glib "bin")
@ -2743,7 +2743,7 @@ more fun.")
(define-public gnome-terminal (define-public gnome-terminal
(package (package
(name "gnome-terminal") (name "gnome-terminal")
(version "3.28.1") (version "3.28.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2752,7 +2752,7 @@ more fun.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp")))) "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -4180,7 +4180,7 @@ a secret password store, an adblocker, and a modern UI.")
(define-public epiphany (define-public epiphany
(package (package
(name "epiphany") (name "epiphany")
(version "3.28.1") (version "3.28.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -4188,7 +4188,7 @@ a secret password store, an adblocker, and a modern UI.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0zvxrwlswxadq4zbr4f73ms141d08j0lhi6rzmj83j1s3gan88md")))) "0ba0qqsbg3cv1k1pcj971y7l8kqib5l7kbr743x9a7hbmkqfk95s"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
@ -4683,7 +4683,7 @@ javascript engine and the GObject introspection framework.")
(define-public gedit (define-public gedit
(package (package
(name "gedit") (name "gedit")
(version "3.28.0") (version "3.28.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -4691,7 +4691,7 @@ javascript engine and the GObject introspection framework.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv")))) "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:phases `(#:phases

4
gnu/packages/package-management.scm
View File

@ -544,13 +544,13 @@ transactions from C or Python.")
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "94") (version "95")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256
(base32 (base32
"07pcc4r9kz8zfr4pfkzk3ipgyv7m5h9vwicrzdgjpa87nbbdgjx6")))) "0aksxxivxli6l3fylxgl771hw0h7l8x35l76cmj0d12zgx54w0a1"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases

4
gnu/packages/photo.scm
View File

@ -330,7 +330,7 @@ photographic equipment.")
(define-public darktable (define-public darktable
(package (package
(name "darktable") (name "darktable")
(version "2.4.3") (version "2.4.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -339,7 +339,7 @@ photographic equipment.")
version "/darktable-" version ".tar.xz")) version "/darktable-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x")))) "0kdhmiw4wxk2w9v2hms9yk8nl4ymdshnqyj0l07nivzzr6w20hwn"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; There are no tests. `(#:tests? #f ; There are no tests.

17
gnu/packages/ruby.scm
View File

@ -669,14 +669,14 @@ line of code.")
(define-public ruby-asciidoctor (define-public ruby-asciidoctor
(package (package
(name "ruby-asciidoctor") (name "ruby-asciidoctor")
(version "1.5.6.2") (version "1.5.7.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "asciidoctor" version)) (uri (rubygems-uri "asciidoctor" version))
(sha256 (sha256
(base32 (base32
"0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f")))) "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:test-target "test:all" `(#:test-target "test:all"
@ -698,7 +698,7 @@ line of code.")
(description (description
"Asciidoctor is a text processor and publishing toolchain for converting "Asciidoctor is a text processor and publishing toolchain for converting
AsciiDoc content to HTML5, DocBook 5 (or 4.5) and other formats.") AsciiDoc content to HTML5, DocBook 5 (or 4.5) and other formats.")
(home-page "http://asciidoctor.org") (home-page "https://asciidoctor.org")
(license license:expat))) (license license:expat)))
(define-public ruby-sporkmonger-rack-mount (define-public ruby-sporkmonger-rack-mount
@ -1346,13 +1346,13 @@ disable tests, have before and after blocks that run once and more.")
(define-public ruby-connection-pool (define-public ruby-connection-pool
(package (package
(name "ruby-connection-pool") (name "ruby-connection-pool")
(version "2.2.1") (version "2.2.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "connection_pool" version)) (uri (rubygems-uri "connection_pool" version))
(sha256 (sha256
(base32 (base32
"17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7")))) "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(native-inputs (native-inputs
`(("bundler" ,bundler))) `(("bundler" ,bundler)))
@ -3694,14 +3694,14 @@ application.")
(define-public ruby-eventmachine (define-public ruby-eventmachine
(package (package
(name "ruby-eventmachine") (name "ruby-eventmachine")
(version "1.2.6") (version "1.2.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "eventmachine" version)) (uri (rubygems-uri "eventmachine" version))
(sha256 (sha256
(base32 (base32
"08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0")))) "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
'(#:tests? #f)) ; test suite tries to connect to google.com '(#:tests? #f)) ; test suite tries to connect to google.com
@ -3713,7 +3713,8 @@ application.")
communications. EventMachine wraps all interactions with sockets, allowing communications. EventMachine wraps all interactions with sockets, allowing
programs to concentrate on the implementation of network protocols. It can be programs to concentrate on the implementation of network protocols. It can be
used to create both network servers and clients.") used to create both network servers and clients.")
(home-page "http://rubyeventmachine.com") ;; The ‘official’ rubyeventmachine.com domain is now registrar-squatted.
(home-page "https://github.com/eventmachine/eventmachine")
(license (list license:ruby license:gpl3)))) ; GPLv3 only AFAICT (license (list license:ruby license:gpl3)))) ; GPLv3 only AFAICT
(define-public ruby-ruby-engine (define-public ruby-ruby-engine

60
gnu/packages/scribus.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -47,7 +47,7 @@
(define-public scribus (define-public scribus
(package (package
(name "scribus") (name "scribus")
(version "1.5.3") (version "1.5.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -55,62 +55,13 @@
version "/scribus-" version ".tar.xz")) version "/scribus-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0kyp45vidxa3v35ic9592db4zk3m8al26vck38q5v7z14x3hp8vk")) "00ys0p6h3iq77kh72dkl0qrf7qvznq18qdrgiq10gfxja1995034"))
(patches (modules '((guix build utils)))))
(list
(origin
(method url-fetch)
(uri (string-append "https://github.com/scribusproject/scribus/commit/"
"61186c7ef083046b7e0c908952e8a773e2787d82.patch"))
(file-name "scribus-fix-poppler-0.58-breakage.patch")
(sha256
(base32 "189qw9xmgz01xz1w1bi9lzrp399zk1j1iz5qdhchdrhgnd69b7ly")))
(origin
(method url-fetch)
(uri (string-append "https://github.com/scribusproject/scribus/commit/"
"d82b1c989bd0e79b5611521f671adbfb94996e5e.patch"))
(file-name "scribus-fix-poppler-packaging.patch")
(sha256
(base32 "1p9s18jjvj2h0ba1xvk1zhmnn4f4n3ykrgb56mjd6in30h0vrykx")))))
(modules '((guix build utils)))
(snippet
;; Fix typo. Equivalent to patch at
;; https://bugs.scribus.net/view.php?id=14850
'(begin
(substitute* "cmake/modules/FindLIBPODOFO.cmake"
(("find_package\\(OPENSSL\\)") "find_package(OpenSSL)"))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;no test target `(#:tests? #f ;no test target
#:configure-flags #:configure-flags
'("-DWANT_GRAPHICSMAGICK=1") '("-DWANT_GRAPHICSMAGICK=1")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
;; Fix build against Qt 5.11.
(substitute* "scribus/plugins/tools/lenseffects/lensdialog.cpp"
(("#include <cmath>") "#include <cmath>
#include <QStyleOptionGraphicsItem>"))
(substitute* "scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp"
(("#include <QGraphicsItem>") "#include <QGraphicsItem>
#include <QStyleOptionGraphicsItem>"))
(substitute* "scribus/sclistboxpixmap.h"
(("#include <QVariant>") "#include <QVariant>
#include <QStyleOptionViewItem>
#include <QAbstractItemDelegate>"))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Fix "ImportError: No module named _sysconfigdata_nd" where
;; Scribus checks PATH and eventually runs system's Python
;; instead of package's.
(let* ((out (assoc-ref outputs "out"))
(py2 (assoc-ref inputs "python")))
(wrap-program (string-append out "/bin/scribus")
`("PATH" ":" prefix (,(string-append py2 "/bin")))))
#t)))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("cairo" ,cairo) ("cairo" ,cairo)
@ -131,6 +82,7 @@
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("libvisio" ,libvisio) ("libvisio" ,libvisio)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libzmf" ,libzmf)
("openssl" ,openssl) ("openssl" ,openssl)
("podofo" ,podofo) ("podofo" ,podofo)
("poppler" ,poppler) ("poppler" ,poppler)

10
gnu/packages/syncthing.scm
View File

@ -29,7 +29,7 @@
(define-public syncthing (define-public syncthing
(package (package
(name "syncthing") (name "syncthing")
(version "0.14.47") (version "0.14.48")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/syncthing/syncthing" (uri (string-append "https://github.com/syncthing/syncthing"
@ -37,7 +37,7 @@
"/syncthing-source-v" version ".tar.gz")) "/syncthing-source-v" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1wz6cwq3la5676z1c20sh4fykmjwhs410xzcnb2jfyzaldf57cwj")) "0bxkm5jlj6l4gai23bg0y31brr80r9qllh1rdg29pahjn0c2b4ml"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Delete bundled ("vendored") free software source code. ;; Delete bundled ("vendored") free software source code.
(snippet '(begin (snippet '(begin
@ -991,8 +991,8 @@ virtual connections from a single physical connection.")
(license expat)))) (license expat))))
(define-public go-github-com-chmduquesne-rollinghash-adler32 (define-public go-github-com-chmduquesne-rollinghash-adler32
(let ((commit "3dc7875a1f890f9bcf0619adb5571fc6f7d516bb") (let ((commit "abb8cbaf9915e48ee20cae94bcd94221b61707a2")
(revision "1")) (revision "2"))
(package (package
(name "go-github-com-chmduquesne-rollinghash-adler32") (name "go-github-com-chmduquesne-rollinghash-adler32")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -1005,7 +1005,7 @@ virtual connections from a single physical connection.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0frl021qdqcdyk9fccw6x1v2byvh0hls4rsrdjih5jgqpc18kx6y")))) "0ylqb9r60q77qw0d6g9cg4yzadxzwcw74lfd25cw9yglyq0wgd3l"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/chmduquesne/rollinghash/adler32" '(#:import-path "github.com/chmduquesne/rollinghash/adler32"

6
gnu/packages/video.scm
View File

@ -1117,7 +1117,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("rsound" ,rsound) ("rsound" ,rsound)
("shaderc" ,shaderc) ("shaderc" ,shaderc)
("vulkan-icd-loader" ,vulkan-icd-loader) ("vulkan-loader" ,vulkan-loader)
("waf" ,python-waf) ("waf" ,python-waf)
("wayland" ,wayland) ("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols) ("wayland-protocols" ,wayland-protocols)
@ -1336,7 +1336,7 @@ other site that youtube-dl supports.")
(define-public you-get (define-public you-get
(package (package
(name "you-get") (name "you-get")
(version "0.4.1060") (version "0.4.1077")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1345,7 +1345,7 @@ other site that youtube-dl supports.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1pq7c2ay42aan7ykpmddzh6ylq0qsq8a27pk68m5imaxi6abbwsz")))) "04vxc91k627qgsqs8dhqajrb6vpj4pw21jlwbha28qakfiz2x11k"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
`(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos

8
gnu/packages/vulkan.scm
View File

@ -157,19 +157,19 @@ interpretation of the specifications for these languages.")
;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.0. ;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.0.
license:asl2.0))))) license:asl2.0)))))
(define-public vulkan-icd-loader (define-public vulkan-loader
(package (package
(name "vulkan-icd-loader") (name "vulkan-loader")
(version "1.1.73.0") (version "1.1.73.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/" "https://github.com/KhronosGroup/Vulkan-Loader/"
"archive/sdk-" version ".tar.gz")) "archive/sdk-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1qb34j2zrc04fgs96m3k76vi4nx3sygbdcyg7pbwasr45cbdhsxb")))) "0lvdpy6ybx5h7w15m9s2n9q3167q618clra2k7yi2cbm397ci4hn"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh".

5
gnu/packages/web-browsers.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -130,7 +131,7 @@ features including, tables, builtin image display, bookmarks, SSL and more.")
(define-public lynx (define-public lynx
(package (package
(name "lynx") (name "lynx")
(version "2.8.9dev.18") (version "2.8.9dev.19")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -138,7 +139,7 @@ features including, tables, builtin image display, bookmarks, SSL and more.")
"/lynx" version ".tar.bz2")) "/lynx" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"08v3n58hlrwncfvz6g76v061xwcbjgabiy5gv7ainf1li5akjwz5")))) "17wfiad2ha4y15pmwv55j0l9z1z1pcgcasrc6hwbgv0hhdpp08q2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("perl" ,perl))) ("perl" ,perl)))

33
gnu/packages/web.scm
View File

@ -73,6 +73,7 @@
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages gd) #:use-module (gnu packages gd)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
@ -5559,28 +5560,23 @@ Instagram and YouTube.")
(define-public linkchecker (define-public linkchecker
(package (package
(name "linkchecker") (name "linkchecker")
(version "9.3") (version "9.4.0")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (pypi-uri "LinkChecker" version)) (uri (git-reference
(url "https://github.com/linkchecker/linkchecker")
(commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0v8pavf0bx33xnz1kwflv0r7lxxwj7vg3syxhy2wzza0wh6sc2pf")))) "03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
`(("python2-requests" ,python2-requests))) `(("python2-dnspython" ,python2-dnspython)
("python2-pyxdg" ,python2-pyxdg)
("python2-requests" ,python2-requests)))
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2))
#:phases
(modify-phases %standard-phases
;; Remove faulty python-requests version check. This has been fixed
;; upstream, and can be removed in version 9.4.
(add-after 'unpack 'remove-python-requests-version
(lambda _
(substitute* "linkcheck/__init__.py"
(("requests.__version__ <= '2.2.0'") "False"))
#t)))))
(home-page "https://linkcheck.github.io/linkchecker") (home-page "https://linkcheck.github.io/linkchecker")
(synopsis "Check websites for broken links") (synopsis "Check websites for broken links")
(description "LinkChecker is a website validator. It checks for broken (description "LinkChecker is a website validator. It checks for broken
@ -5592,12 +5588,7 @@ file links.")
l:bsd-2 ; linkcheck/better_exchook2.py l:bsd-2 ; linkcheck/better_exchook2.py
l:bsd-3 ; linkcheck/colorama.py l:bsd-3 ; linkcheck/colorama.py
l:psfl ; linkcheck/gzip2.py l:psfl ; linkcheck/gzip2.py
l:expat ; linkcheck/mem.py l:expat)))) ; linkcheck/mem.py
;; FIXME: Unbundle dnspython and miniboa
;; This issue has been raised upstream
;; https://github.com/wummel/linkchecker/issues/729
l:isc ; third_party/dnspython
l:asl2.0)))) ; third_party/miniboa
(define-public cadaver (define-public cadaver
(package (package

2
gnu/packages/wine.scm
View File

@ -286,7 +286,7 @@ integrate Windows applications into your desktop.")
("python" ,python) ("python" ,python)
("sdl2" ,sdl2) ("sdl2" ,sdl2)
("util-linux" ,util-linux) ; for hexdump ("util-linux" ,util-linux) ; for hexdump
("vulkan-icd-loader" ,vulkan-icd-loader) ("vulkan-loader" ,vulkan-loader)
("wine-staging-patchset-data" ,wine-staging-patchset-data) ("wine-staging-patchset-data" ,wine-staging-patchset-data)
,@(package-inputs wine))) ,@(package-inputs wine)))
(arguments (arguments

24
gnu/packages/xdisorg.scm
View File

@ -882,14 +882,15 @@ Escape key when Left Control is pressed and released on its own.")
(define-public libwacom (define-public libwacom
(package (package
(name "libwacom") (name "libwacom")
(version "0.29") (version "0.30")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/linuxwacom/libwacom/" (uri (string-append
name "-" version ".tar.bz2")) "https://github.com/linuxwacom/libwacom/releases/download/"
name "-" version "/" name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1diklgcjhmvcxi9p1ifp6wcnyr6k7z9jhrlzfhzjqd6zipk01slw")))) "0n9294f2534qcgfry4n7vmr6vy49iqym0y74a88g1h0l0ml0hd2j"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -902,7 +903,7 @@ Escape key when Left Control is pressed and released on its own.")
;; libwacom includes header files that include GLib, and libinput uses ;; libwacom includes header files that include GLib, and libinput uses
;; those header files. ;; those header files.
`(("glib" ,glib))) `(("glib" ,glib)))
(home-page "http://linuxwacom.sourceforge.net/") (home-page "https://linuxwacom.github.io/")
(synopsis "Helper library for Wacom tablet settings") (synopsis "Helper library for Wacom tablet settings")
(description (description
"Libwacom is a library to help implement Wacom tablet settings. It is "Libwacom is a library to help implement Wacom tablet settings. It is
@ -914,15 +915,16 @@ Wacom tablet applet.")
(define-public xf86-input-wacom (define-public xf86-input-wacom
(package (package
(name "xf86-input-wacom") (name "xf86-input-wacom")
(version "0.36.0") (version "0.36.1")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://sourceforge/linuxwacom/xf86-input-wacom/" "https://github.com/linuxwacom/xf86-input-wacom/releases/download/"
name "-" version ".tar.bz2")) name "-" version "/" name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza")))) "029y8varbricba2dzhzhy0ndd7lbfif411ca8c3wxzni9qmbj1ij"))))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-sdkdir=" (list (string-append "--with-sdkdir="
@ -940,7 +942,7 @@ Wacom tablet applet.")
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxi" ,libxi) ("libxi" ,libxi)
("eudev" ,eudev))) ("eudev" ,eudev)))
(home-page "http://linuxwacom.sourceforge.net/") (home-page "https://linuxwacom.github.io/")
(synopsis "Wacom input driver for X") (synopsis "Wacom input driver for X")
(description (description
"The xf86-input-wacom driver is the wacom-specific X11 input driver for "The xf86-input-wacom driver is the wacom-specific X11 input driver for