From a624be49a2feb16fa4023bf25f67e657dd2cd37e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 12 May 2018 16:44:01 -0400 Subject: gnu: go-github-com-chmduquesne-rollinghash-adler32: Update to 0.0.0-2.abb8cba. * gnu/packages/syncthing.scm (go-github-com-chmduquesne-rollinghash-adler32): Update to 0.0.0-2.abb8cba. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index e29405a27b..79c2b0ce30 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -985,8 +985,8 @@ virtual connections from a single physical connection.") (license expat)))) (define-public go-github-com-chmduquesne-rollinghash-adler32 - (let ((commit "3dc7875a1f890f9bcf0619adb5571fc6f7d516bb") - (revision "1")) + (let ((commit "abb8cbaf9915e48ee20cae94bcd94221b61707a2") + (revision "2")) (package (name "go-github-com-chmduquesne-rollinghash-adler32") (version (git-version "0.0.0" revision commit)) @@ -999,7 +999,7 @@ virtual connections from a single physical connection.") (file-name (git-file-name name version)) (sha256 (base32 - "0frl021qdqcdyk9fccw6x1v2byvh0hls4rsrdjih5jgqpc18kx6y")))) + "0ylqb9r60q77qw0d6g9cg4yzadxzwcw74lfd25cw9yglyq0wgd3l")))) (build-system go-build-system) (arguments '(#:import-path "github.com/chmduquesne/rollinghash/adler32" -- cgit 1.4.1 From f83eadd2ad894ba14f5bd627bede6277b12a9945 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 12 May 2018 16:47:28 -0400 Subject: gnu: Update Syncthing to 0.14.48. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.48. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 79c2b0ce30..1da0acecee 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -29,7 +29,7 @@ (define-public syncthing (package (name "syncthing") - (version "0.14.47") + (version "0.14.48") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -37,7 +37,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "1wz6cwq3la5676z1c20sh4fykmjwhs410xzcnb2jfyzaldf57cwj")) + "0bxkm5jlj6l4gai23bg0y31brr80r9qllh1rdg29pahjn0c2b4ml")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet -- cgit 1.4.1 From d83c9fcb7b610533f9dc447a534800f92826b54b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Jun 2018 00:05:28 -0400 Subject: gnu: darktable: Update to 2.4.4. * gnu/packages/photo.scm (darktable): Update to 2.4.4. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 6c3c116ef6..f2d3d60ecd 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -330,7 +330,7 @@ photographic equipment.") (define-public darktable (package (name "darktable") - (version "2.4.3") + (version "2.4.4") (source (origin (method url-fetch) (uri (string-append @@ -339,7 +339,7 @@ photographic equipment.") version "/darktable-" version ".tar.xz")) (sha256 (base32 - "1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x")))) + "0kdhmiw4wxk2w9v2hms9yk8nl4ymdshnqyj0l07nivzzr6w20hwn")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; There are no tests. -- cgit 1.4.1 From 81dc1d1220849513dc96d35ba90cebf31083cd77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 00:26:35 +0200 Subject: gnu: libwacom, xf86-input-wacom: Update home page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘The Linux Wacom Project has moved.’ -- * gnu/packages/xdisorg.scm (libwacom, xf86-input-wacom)[home-page]: Update URI. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f1149b2c89..98d903999d 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -907,7 +907,7 @@ Escape key when Left Control is pressed and released on its own.") ;; libwacom includes header files that include GLib, and libinput uses ;; those header files. `(("glib" ,glib))) - (home-page "http://linuxwacom.sourceforge.net/") + (home-page "https://linuxwacom.github.io/") (synopsis "Helper library for Wacom tablet settings") (description "Libwacom is a library to help implement Wacom tablet settings. It is @@ -945,7 +945,7 @@ Wacom tablet applet.") ("libxinerama" ,libxinerama) ("libxi" ,libxi) ("eudev" ,eudev))) - (home-page "http://linuxwacom.sourceforge.net/") + (home-page "https://linuxwacom.github.io/") (synopsis "Wacom input driver for X") (description "The xf86-input-wacom driver is the wacom-specific X11 input driver for -- cgit 1.4.1 From 0ac68e726801242e90d0854258a89eedd5e48140 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 00:28:43 +0200 Subject: gnu: libwacom: Update to 0.30. * gnu/packages/xdisorg.scm (libwacom): Update to 0.30. [source]: Update URI. --- gnu/packages/xdisorg.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 98d903999d..b853ea1fdd 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -887,14 +887,15 @@ Escape key when Left Control is pressed and released on its own.") (define-public libwacom (package (name "libwacom") - (version "0.29") + (version "0.30") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/linuxwacom/libwacom/" - name "-" version ".tar.bz2")) + (uri (string-append + "https://github.com/linuxwacom/libwacom/releases/download/" + name "-" version "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1diklgcjhmvcxi9p1ifp6wcnyr6k7z9jhrlzfhzjqd6zipk01slw")))) + "0n9294f2534qcgfry4n7vmr6vy49iqym0y74a88g1h0l0ml0hd2j")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From fe0497528188e9720a1a0833900745e4539d3b95 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 00:29:20 +0200 Subject: gnu: xf86-input-wacom: Update to 0.36.1. * gnu/packages/xdisorg.scm (xf86-input-wacom): Update to 0.36.1. [source]: Update URI. --- gnu/packages/xdisorg.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b853ea1fdd..e7e9ad2975 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -920,15 +920,16 @@ Wacom tablet applet.") (define-public xf86-input-wacom (package (name "xf86-input-wacom") - (version "0.36.0") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/linuxwacom/xf86-input-wacom/" - name "-" version ".tar.bz2")) - (sha256 - (base32 - "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza")))) + (version "0.36.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/linuxwacom/xf86-input-wacom/releases/download/" + name "-" version "/" name "-" version ".tar.bz2")) + (sha256 + (base32 + "029y8varbricba2dzhzhy0ndd7lbfif411ca8c3wxzni9qmbj1ij")))) (arguments `(#:configure-flags (list (string-append "--with-sdkdir=" -- cgit 1.4.1 From 15dd85f0c3b362b0a1e41afbcbaa421cb54212fa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 01:13:56 +0200 Subject: gnu: linkchecker: Update to 9.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (linkchecker): Update to 9.4.0. [source]: Use GIT-FETCH. [inputs]: Add python2-dnspython and python2-pyxdg. [arguments]: Remove ‘remove-python-requests-version’ phase. [license]: Remove licences of unbundled inputs. --- gnu/packages/web.scm | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fb967af9f9..12a165bdc0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -73,6 +73,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages bison) #:use-module (gnu packages flex) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages kerberos) #:use-module (gnu packages gd) #:use-module (gnu packages gettext) @@ -5563,28 +5564,23 @@ Instagram and YouTube.") (define-public linkchecker (package (name "linkchecker") - (version "9.3") + (version "9.4.0") (source (origin - (method url-fetch) - (uri (pypi-uri "LinkChecker" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/linkchecker/linkchecker") + (commit (string-append "v" version)))) (sha256 (base32 - "0v8pavf0bx33xnz1kwflv0r7lxxwj7vg3syxhy2wzza0wh6sc2pf")))) + "03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187")))) (build-system python-build-system) (inputs - `(("python2-requests" ,python2-requests))) + `(("python2-dnspython" ,python2-dnspython) + ("python2-pyxdg" ,python2-pyxdg) + ("python2-requests" ,python2-requests))) (arguments - `(#: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))))) + `(#:python ,python-2)) (home-page "https://linkcheck.github.io/linkchecker") (synopsis "Check websites for broken links") (description "LinkChecker is a website validator. It checks for broken @@ -5593,15 +5589,10 @@ colored or normal text, HTML, SQL, CSV, XML or as a sitemap graph. It supports checking HTTP/1.1, HTTPS, FTP, mailto, news, nntp, telnet and local file links.") (license (list l:gpl2+ - l:bsd-2 ; linkcheck/better_exchook2.py - l:bsd-3 ; linkcheck/colorama.py - l:psfl ; linkcheck/gzip2.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 + l:bsd-2 ; linkcheck/better_exchook2.py + l:bsd-3 ; linkcheck/colorama.py + l:psfl ; linkcheck/gzip2.py + l:expat)))) ; linkcheck/mem.py (define-public cadaver (package -- cgit 1.4.1 From 58021db4d2081f520b952744b7feb0c47e69a2a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 01:46:36 +0200 Subject: gnu: ruby-connection-pool: Update to 2.2.2. * gnu/packages/ruby.scm (ruby-connection-pool): Update to 2.2.2. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e282a6f24e..f4b074dbab 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1346,13 +1346,13 @@ disable tests, have before and after blocks that run once and more.") (define-public ruby-connection-pool (package (name "ruby-connection-pool") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (rubygems-uri "connection_pool" version)) (sha256 (base32 - "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7")))) + "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler))) -- cgit 1.4.1 From c207fa5e6cdb6a12857de189444e8e4b34477a95 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 01:46:54 +0200 Subject: gnu: ruby-eventmachine: Update to 1.2.7. * gnu/packages/ruby.scm (ruby-eventmachine): Update to 1.2.7. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f4b074dbab..0756a70cfa 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3694,14 +3694,14 @@ application.") (define-public ruby-eventmachine (package (name "ruby-eventmachine") - (version "1.2.6") + (version "1.2.7") (source (origin (method url-fetch) (uri (rubygems-uri "eventmachine" version)) (sha256 (base32 - "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0")))) + "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; test suite tries to connect to google.com -- cgit 1.4.1 From 24a26227126e9da6ce326e97e14b538ff8b02a25 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 01:47:31 +0200 Subject: gnu: ruby-eventmachine: Use working home page. * gnu/packages/ruby.scm (ruby-eventmachine)[home-page]: Update URI. --- gnu/packages/ruby.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0756a70cfa..d6b113c0d9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3713,7 +3713,8 @@ application.") communications. EventMachine wraps all interactions with sockets, allowing programs to concentrate on the implementation of network protocols. It can be 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 (define-public ruby-ruby-engine -- cgit 1.4.1 From 9933a8e739ab992ba390c1e58cc3bcbd44be01ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 02:53:01 +0200 Subject: gnu: ruby-asciidoctor: Update to 1.5.7.1. * gnu/packages/ruby.scm (ruby-asciidoctor): Update to 1.5.7.1. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d6b113c0d9..e4ceac7704 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -669,14 +669,14 @@ line of code.") (define-public ruby-asciidoctor (package (name "ruby-asciidoctor") - (version "1.5.6.2") + (version "1.5.7.1") (source (origin (method url-fetch) (uri (rubygems-uri "asciidoctor" version)) (sha256 (base32 - "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f")))) + "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w")))) (build-system ruby-build-system) (arguments `(#:test-target "test:all" -- cgit 1.4.1 From bba082a1f8c13cecd006d06048ee122d5ab6da6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 02:53:50 +0200 Subject: gnu: ruby-asciidoctor: Use HTTPS home page. * gnu/packages/ruby.scm (ruby-asciidoctor)[home-page]: Use HTTPS. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e4ceac7704..5c70f5e743 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -698,7 +698,7 @@ line of code.") (description "Asciidoctor is a text processor and publishing toolchain for converting 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))) (define-public ruby-sporkmonger-rack-mount -- cgit 1.4.1 From 55f5556e243e85865e69c50bc040123345c4295b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 03:18:02 +0200 Subject: gnu: inxi: Fix man page location. * gnu/packages/admin.scm (inxi)[arguments]: Install man page to /share/man instead of /share/doc/man. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index def1fa1ed2..70dbaeb17d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2716,7 +2716,7 @@ Python loading in HPC environments.") %build-inputs))))) (invoke "gzip" "inxi.1") (install-file "inxi.1.gz" - (string-append %output "/share/doc/man/man1"))) + (string-append %output "/share/man/man1"))) #t))) (home-page "https://smxi.org/docs/inxi.htm") (synopsis "Full featured system information script") -- cgit 1.4.1 From b740a30527737f66007ec0f77b11e39438a6baa7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 03:20:08 +0200 Subject: gnu: inxi: Use GIT-FETCH. * gnu/packages/admin.scm (inxi)[source]: Use GIT-FETCH. [native-inputs]: Remove tar. [arguments]: Adjust accordingly. --- gnu/packages/admin.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 70dbaeb17d..7f2e0678fa 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2655,10 +2655,10 @@ Python loading in HPC environments.") (version "3.0.04-1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/smxi/inxi" - "/archive/" version "/inxi.tar.gz")) - (file-name (string-append real-name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/smxi/inxi") + (commit version))) (sha256 (base32 "14zxdsjgh9dbijmpp0hhvg2yiqqfwnqgcc6x8dpl1v15z1h1r7pc")))) @@ -2667,8 +2667,7 @@ Python loading in HPC environments.") `(("bash" ,bash) ("perl" ,perl))) (native-inputs - `(("gzip" ,gzip) - ("tar" ,tar))) + `(("gzip" ,gzip))) (arguments `(#:modules ((guix build utils) @@ -2682,9 +2681,9 @@ Python loading in HPC environments.") (setenv "PATH" (string-append (assoc-ref %build-inputs "bash") "/bin" ":" (assoc-ref %build-inputs "gzip") "/bin" ":" - (assoc-ref %build-inputs "perl") "/bin" ":" - (assoc-ref %build-inputs "tar") "/bin" ":")) - (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) + (assoc-ref %build-inputs "perl") "/bin" ":")) + (copy-recursively (assoc-ref %build-inputs "source") + ,(string-append real-name "-" version)) (with-directory-excursion ,(string-append real-name "-" version) (with-fluids ((%default-port-encoding #f)) (substitute* "inxi" (("/usr/bin/env perl") (which "perl")))) -- cgit 1.4.1 From 4f12e5cc7cedca15e46d30e96fb89f7c63eb43e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 03:22:34 +0200 Subject: gnu: inxi: Update to 3.0.11-1. * gnu/packages/admin.scm (inxi): Update to 3.0.11-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7f2e0678fa..5e4b873d4e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2652,7 +2652,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.0.04-1") + (version "3.0.11-1") (source (origin (method git-fetch) @@ -2661,7 +2661,7 @@ Python loading in HPC environments.") (commit version))) (sha256 (base32 - "14zxdsjgh9dbijmpp0hhvg2yiqqfwnqgcc6x8dpl1v15z1h1r7pc")))) + "07wihl4gsamq98mhxvm6k4vpphym75467cxfa19b3g5ggpyq894g")))) (build-system trivial-build-system) (inputs `(("bash" ,bash) -- cgit 1.4.1 From 60b0c2522201681cf33ac359dc57f0f0d73ef6ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 04:02:15 +0200 Subject: gnu: wcslib: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/astronomy.scm (wcslib)[arguments]: Skip the default ‘install-license-files’ phase. Don't build or test in parallel. --- gnu/packages/astronomy.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 8cf9d9e4a5..327e46e995 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -81,12 +81,17 @@ in FITS files.") `(("cfitsio" ,cfitsio))) (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/sh - (lambda _ - (substitute* "makedefs.in" - (("/bin/sh") "sh")) - #t))))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-/bin/sh + (lambda _ + (substitute* "makedefs.in" + (("/bin/sh") "sh")) + #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") (synopsis "Library which implements the FITS WCS standard") (description "The FITS \"World Coordinate System\" (@dfn{WCS}) standard -- cgit 1.4.1 From 9566bb82e50da648acbaa64ed6bdcee5a08badd4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 04:03:29 +0200 Subject: gnu: gnuastro: Update to 0.6. * gnu/packages/astronomy.scm (gnuastro): Update to 0.6. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 327e46e995..a90b93ad21 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -103,7 +103,7 @@ header.") (define-public gnuastro (package (name "gnuastro") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) @@ -111,7 +111,7 @@ header.") version ".tar.gz")) (sha256 (base32 - "10lxzxyrf30hj3bqdgprvaj9phzdi816khjmr0vmjf8pmsr8bqqr")))) + "16a212j9ghdirm11d25s5q5qw32bkjrxsh3rblfyyv29djch34w6")))) (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) -- cgit 1.4.1 From 115af78e32be7ef638a8b5d937f5995e8e2bf99e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 04:32:50 +0200 Subject: gnu: cfitsio: Update to 3.450. * gnu/packages/astronomy.scm (cfitsio): Update to 3.450. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a90b93ad21..232157da34 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -35,7 +35,7 @@ (define-public cfitsio (package (name "cfitsio") - (version "3.420") + (version "3.450") (source (origin (method url-fetch) @@ -43,7 +43,7 @@ "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" name (string-replace-substring version "." "") ".tar.gz")) (sha256 - (base32 "1f0nmki45h9kw7vxpxiav9cb6vs3qqi6zrp2lpci5yhqc5isl43c")))) + (base32 "0bmrkw6w65zb0k3mszaaqy1f4zjm2hl7njww74nb5v38wvdi4q5z")))) (build-system gnu-build-system) ;; XXX Building with curl currently breaks wcslib. It doesn't use ;; pkg-config and hence won't link with -lcurl. -- cgit 1.4.1 From 1a16b925f20b5f53f185bd9b416383aab03c994a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 04:43:46 +0200 Subject: gnu: tomb: Update to 2.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (tomb): Update to 2.5. [inputs, arguments]: Add util-linux for ‘findmnt’. --- gnu/packages/crypto.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index f96fe04900..d64cd3859a 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -358,14 +358,14 @@ no man page, refer to the home page for usage details.") (define-public tomb (package (name "tomb") - (version "2.4") + (version "2.5") (source (origin (method url-fetch) (uri (string-append "https://files.dyne.org/tomb/" "Tomb-" version ".tar.gz")) (sha256 (base32 - "1hv1w79as7swqj0n137vz8n8mwvcgwlvd91sdyssz41jarg7f1vr")))) + "12c6qldngaw520gvb02inzkhnxbl4k0dwmddrgnaf7xashy6j0wc")))) (build-system gnu-build-system) (native-inputs `(("sudo" ,sudo))) ;presence needed for 'check' phase (inputs @@ -377,7 +377,8 @@ no man page, refer to the home page for usage details.") ("mlocate" ,mlocate) ("pinentry" ,pinentry) ("qrencode" ,qrencode) - ("steghide" ,steghide))) + ("steghide" ,steghide) + ("util-linux" ,util-linux))) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) ;; TODO: Build and install gtk and qt trays @@ -400,7 +401,7 @@ no man page, refer to the home page for usage details.") (error "program not found:" program))) '("seq" "mkfs.ext4" "pinentry" "sudo" "gpg" "cryptsetup" "gettext" - "qrencode" "steghide"))))) + "qrencode" "steghide" "findmnt"))))) #t))) (delete 'check) (add-after 'wrap 'check -- cgit 1.4.1 From fcf29a7fbb2e3c00da757804a783c566f0592ea6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 05:00:42 +0200 Subject: gnu: debootstrap: Update to 1.0.101. * gnu/packages/debian.scm (debootstrap): Update to 1.0.101. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 01df30c558..d3438a1f4c 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -112,7 +112,7 @@ contains the archive keys used for that.") (define-public debootstrap (package (name "debootstrap") - (version "1.0.95") + (version "1.0.101") (source (origin (method url-fetch) @@ -120,7 +120,7 @@ contains the archive keys used for that.") name "_" version ".tar.gz")) (sha256 (base32 - "1xpd1yblcgwhri64hzgxhalpf5j8gqbmkrsm1fs0pbwiy0wdz0ry")))) + "1p1a81s8hq73byd7256iljdls389x2q7w6srgrgfmx5bl1csnzp3")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 3b295d3f4b5b73d3d27e7b187a7a31437ee3d7c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 05:05:39 +0200 Subject: gnu: python-lmdb: Update to 0.94. * gnu/packages/databases.scm (python-lmdb): Update to 0.94. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index fd5c1d73bd..0fa5bfbf54 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1931,13 +1931,13 @@ etc., and an SQL engine for performing simple SQL queries.") (define-public python-lmdb (package (name "python-lmdb") - (version "0.93") + (version "0.94") (source (origin (method url-fetch) (uri (pypi-uri "lmdb" version)) (sha256 (base32 - "0xdpb298fyl68acadbwv5801wcwfpnhc7sm4bnrq1x4bd5dhhsql")) + "1zh38gvkqw1jm5105if6rr7ccbgyxr7k2rm5ygb9ab3bq82pyaww")) (modules '((guix build utils))) (snippet ;; Delete bundled lmdb source files. -- cgit 1.4.1 From 6e3d48c2075414f0219333434a9e5c93464fbf52 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 05:17:02 +0200 Subject: gnu: linsmith: Use HTTPS home page. * gnu/packages/engineering.scm (linsmith)[home-page]: Use HTTPS. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 088c6b21b2..d3e9902a77 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -791,7 +791,7 @@ render model libraries.") `(("pkg-config" ,pkg-config) ("gtk" ,gtk+-2) ("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") (description "LinSmith is a Smith Charting program, mainly designed for educational use. As such, there is an emphasis on capabilities that improve -- cgit 1.4.1 From d193903e0cd5ad60e7219bfae050794d25c64df3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 05:17:12 +0200 Subject: gnu: linsmith: Update to 0.99.31. * gnu/packages/engineering.scm (linsmith): Update to 0.99.31. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d3e9902a77..e39927a07f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -777,7 +777,7 @@ render model libraries.") (define-public linsmith (package (name "linsmith") - (version "0.99.30") + (version "0.99.31") (source (origin (method url-fetch) (uri (string-append @@ -785,7 +785,7 @@ render model libraries.") version "/linsmith-" version ".tar.gz")) (sha256 (base32 - "18qslhr2r45rhpj4v6bjcqx189vs0bflvsj271wr7w8kvh69qwvn")))) + "13qj7n9826qc9shkkgd1p6vcpj78v4h9d67wbg45prg7rbnzkzds")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From 37b561e4ed22fb0b9599f15e6bcb4d75d7a5a498 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 05:28:24 +0200 Subject: gnu: gerbv: Update to 2.6.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (gerbv): Update to 2.6.2. [arguments]: Remove ‘autoconf’ phase... [native-inputs]: ...and remove its dependencies. --- gnu/packages/engineering.scm | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e39927a07f..4cbcf5d161 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -531,35 +531,17 @@ ready for production.") (define-public gerbv (package (name "gerbv") - (version "2.6.1") + (version "2.6.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gerbv/gerbv/gerbv-" version "/gerbv-" version ".tar.gz")) (sha256 (base32 - "0v6ry0mxi5qym4z0y0lpblxsw9dfjpgxs4c4v2ngg7yw4b3a59ks")))) + "1cw8k6ni0q8kswad03kha86fk7n06vq8p0wzsfhcnalsdshrn17i")))) (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 - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("gettext" ,gettext-minimal) - ("po4a" ,po4a) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) ("gtk" ,gtk+-2) -- cgit 1.4.1 From c648781cec1e1c334c2532b79f9572c58842cde7 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Jun 2018 12:45:12 +0200 Subject: gnu: lynx: Update to 2.8.9dev.19. * gnu/packages/web-browsers.scm (lynx): Update to 2.8.9dev.19. --- gnu/packages/web-browsers.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index d6da22152c..e36677282a 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; @@ -130,7 +131,7 @@ features including, tables, builtin image display, bookmarks, SSL and more.") (define-public lynx (package (name "lynx") - (version "2.8.9dev.18") + (version "2.8.9dev.19") (source (origin (method url-fetch) (uri (string-append @@ -138,7 +139,7 @@ features including, tables, builtin image display, bookmarks, SSL and more.") "/lynx" version ".tar.bz2")) (sha256 (base32 - "08v3n58hlrwncfvz6g76v061xwcbjgabiy5gv7ainf1li5akjwz5")))) + "17wfiad2ha4y15pmwv55j0l9z1z1pcgcasrc6hwbgv0hhdpp08q2")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) -- cgit 1.4.1 From 6a29c8d3441c414c2ce08cde3101a17dd1e16706 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Jun 2018 14:28:52 +0200 Subject: gnu: gedit: Update to 3.28.1. * gnu/packages/gnome.scm (gedit): Update to 3.28.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index befb7dc9ac..c413392506 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4659,7 +4659,7 @@ javascript engine and the GObject introspection framework.") (define-public gedit (package (name "gedit") - (version "3.28.0") + (version "3.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4667,7 +4667,7 @@ javascript engine and the GObject introspection framework.") name "-" version ".tar.xz")) (sha256 (base32 - "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv")))) + "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases -- cgit 1.4.1 From 9cf329aeccdcabf84274bb3c9bac65813770bd9c Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Jun 2018 14:29:44 +0200 Subject: gnu: gnome-terminal: Update to 3.28.2. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.28.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c413392506..078d989bf3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2733,7 +2733,7 @@ more fun.") (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.28.1") + (version "3.28.2") (source (origin (method url-fetch) @@ -2742,7 +2742,7 @@ more fun.") name "-" version ".tar.xz")) (sha256 (base32 - "1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp")))) + "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit 1.4.1 From f9036105e601cf4746eaefccd7415bf94c0ae27d Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Jun 2018 14:30:38 +0200 Subject: gnu: gnome-disk-utility: Update to 3.28.3. * gnu/packages/gnome.scm (gnome-disk-utility): Update to 3.28.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 078d989bf3..330030da1b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -535,7 +535,7 @@ and keep up to date translations of documentation.") (define-public gnome-disk-utility (package (name "gnome-disk-utility") - (version "3.28.2") + (version "3.28.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -543,7 +543,7 @@ and keep up to date translations of documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "1j3l4b1prbnixzy6srvcsjfg1dx5nqys2lmygm31ygfdq7svp3m6")))) + "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") -- cgit 1.4.1 From 89fc8aef8c218b34a1a4ef73197343d45a1061a7 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Jun 2018 14:32:17 +0200 Subject: gnu: epiphany: Update to 3.28.2.1. * gnu/packages/gnome.scm (epiphany): Update to 3.28.2.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 330030da1b..362b64d6d6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4168,7 +4168,7 @@ a secret password store, an adblocker, and a modern UI.") (define-public epiphany (package (name "epiphany") - (version "3.28.1") + (version "3.28.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4176,7 +4176,7 @@ a secret password store, an adblocker, and a modern UI.") name "-" version ".tar.xz")) (sha256 (base32 - "0zvxrwlswxadq4zbr4f73ms141d08j0lhi6rzmj83j1s3gan88md")))) + "0ba0qqsbg3cv1k1pcj971y7l8kqib5l7kbr743x9a7hbmkqfk95s")))) (build-system meson-build-system) (arguments -- cgit 1.4.1 From c7a2f7b999afc9de7f2a61ec564fbd2fe279c66b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Jun 2018 14:33:52 +0200 Subject: gnu: diffoscope: Update to 95. * gnu/packages/package-management.scm (diffoscope): Update to 95. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 1356480b81..4d6217f41c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -544,13 +544,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "94") + (version "95") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "07pcc4r9kz8zfr4pfkzk3ipgyv7m5h9vwicrzdgjpa87nbbdgjx6")))) + "0aksxxivxli6l3fylxgl771hw0h7l8x35l76cmj0d12zgx54w0a1")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 7ea56cdec0f733b2c1bd33699505e9309a9f90bc Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Jun 2018 14:35:11 +0200 Subject: gnu: you-get: Update to 0.4.1077. * gnu/packages/video.scm (you-get): Update to 0.4.1077. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4dd3e5a1ee..09b281c806 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1337,7 +1337,7 @@ other site that youtube-dl supports.") (define-public you-get (package (name "you-get") - (version "0.4.1060") + (version "0.4.1077") (source (origin (method url-fetch) (uri (string-append @@ -1346,7 +1346,7 @@ other site that youtube-dl supports.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1pq7c2ay42aan7ykpmddzh6ylq0qsq8a27pk68m5imaxi6abbwsz")))) + "04vxc91k627qgsqs8dhqajrb6vpj4pw21jlwbha28qakfiz2x11k")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos -- cgit 1.4.1 From e6fcf903ec6442e798e623bc70661372160a8e2a Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Jun 2018 09:59:15 +0200 Subject: gnu: vulkan-loader: Update URL and change name. * gnu/packages/emulators.scm: Change references from 'vulkan-icd-loader' to 'vulkan-loader'. * gnu/packages/games.scm: Change references from 'vulkan-icd-loader' to 'vulkan-loader'. * gnu/packages/video.scm: Change references from 'vulkan-icd-loader' to 'vulkan-loader'. * gnu/packages/vulkan.scm (vulkan-loader): Rename from 'vulkan-icd-loader' to 'vulkan-loader'. Update URL and hash. * gnu/packages/wine.scm: Change references from 'vulkan-icd-loader' to 'vulkan-loader'. --- gnu/packages/emulators.scm | 8 ++++---- gnu/packages/games.scm | 6 +++--- gnu/packages/video.scm | 2 +- gnu/packages/vulkan.scm | 8 ++++---- gnu/packages/wine.scm | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index c354386bd7..b798b81f8a 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -156,7 +156,7 @@ (string-append (assoc-ref inputs "font-wqy-microhei") "/share/fonts/truetype/wqy-microhei.ttc")) (libvulkan - (string-append (assoc-ref inputs "vulkan-icd-loader") + (string-append (assoc-ref inputs "vulkan-loader") "/lib/libvulkan.so"))) (chdir "docs") (invoke "bash" "-c" "g++ -O2 -std=c++11 $(freetype-config \ @@ -219,7 +219,7 @@ ("sfml" ,sfml) ("soil" ,soil) ("soundtouch" ,soundtouch) - ("vulkan-icd-loader" ,vulkan-icd-loader) + ("vulkan-loader" ,vulkan-loader) ("wxwidgets" ,wxwidgets-gtk2-3.1) ("zlib" ,zlib))) (home-page "https://dolphin-emu.org/") @@ -1069,7 +1069,7 @@ emulation community. It provides highly accurate emulation.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (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. (substitute* "gfx/common/vulkan_common.c" (("libvulkan.so") (string-append vulkan "/lib/libvulkan.so"))) @@ -1096,7 +1096,7 @@ emulation community. It provides highly accurate emulation.") ("qtbase" ,qtbase) ("sdl" ,sdl2) ("udev" ,eudev) - ("vulkan-icd-loader" ,vulkan-icd-loader) + ("vulkan-loader" ,vulkan-loader) ("wayland" ,wayland) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9408925514..e9f3e69f34 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4467,7 +4467,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.") (arguments `(#:make-flags (let ((vulkanlib (string-append (assoc-ref %build-inputs - "vulkan-icd-loader") "/lib"))) + "vulkan-loader") "/lib"))) (list "CC=gcc" "MP3LIB=mpg123" "USE_CODEC_FLAC=1" @@ -4480,7 +4480,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.") (add-after 'unpack 'fix-makefile-paths (lambda* (#:key outputs #:allow-other-keys) (let ((vulkan (assoc-ref %build-inputs - "vulkan-icd-loader")) + "vulkan-loader")) (out (assoc-ref outputs "out"))) (mkdir-p (string-append out "/bin")) (substitute* "Quake/Makefile" ((" /usr") @@ -4491,7 +4491,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.") #t)))) ,@(strip-keyword-arguments '(#:make-flags #:phases) (package-arguments quakespasm)))) - (inputs `(("vulkan-icd-loader" ,vulkan-icd-loader) + (inputs `(("vulkan-loader" ,vulkan-loader) ,@(package-inputs quakespasm))) (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, diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 09b281c806..3d3b1c7a67 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1119,7 +1119,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ("pulseaudio" ,pulseaudio) ("rsound" ,rsound) ("shaderc" ,shaderc) - ("vulkan-icd-loader" ,vulkan-icd-loader) + ("vulkan-loader" ,vulkan-loader) ("waf" ,python-waf) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ac9f6f2f25..62c5d500ff 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -157,19 +157,19 @@ interpretation of the specifications for these languages.") ;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.0. license:asl2.0))))) -(define-public vulkan-icd-loader +(define-public vulkan-loader (package - (name "vulkan-icd-loader") + (name "vulkan-loader") (version "1.1.73.0") (source (origin (method url-fetch) (uri (string-append - "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/" + "https://github.com/KhronosGroup/Vulkan-Loader/" "archive/sdk-" version ".tar.gz")) (sha256 (base32 - "1qb34j2zrc04fgs96m3k76vi4nx3sygbdcyg7pbwasr45cbdhsxb")))) + "0lvdpy6ybx5h7w15m9s2n9q3167q618clra2k7yi2cbm397ci4hn")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index d9346e2524..f602f3dee2 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -285,7 +285,7 @@ integrate Windows applications into your desktop.") ("python" ,python) ("sdl2" ,sdl2) ("util-linux" ,util-linux) ; for hexdump - ("vulkan-icd-loader" ,vulkan-icd-loader) + ("vulkan-loader" ,vulkan-loader) ("wine-staging-patchset-data" ,wine-staging-patchset-data) ,@(package-inputs wine))) (arguments -- cgit 1.4.1 From fec8d80cd10549c25e6cc6c087bd770917abe0e2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 6 Jun 2018 18:33:38 +0200 Subject: gnu: scribus: Update to 1.5.4. * gnu/packages/scribus.scm (scribus): Update to 1.5.4. [source]: Remove patches. [arguments]: Remove `patch-source' phase. --- gnu/packages/scribus.scm | 57 +++++------------------------------------------- 1 file changed, 5 insertions(+), 52 deletions(-) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index ea6418c32a..34511bcf60 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017 Nicolas Goaziou +;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. @@ -47,7 +47,7 @@ (define-public scribus (package (name "scribus") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) @@ -55,60 +55,13 @@ version "/scribus-" version ".tar.xz")) (sha256 (base32 - "0kyp45vidxa3v35ic9592db4zk3m8al26vck38q5v7z14x3hp8vk")) - (patches - (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 - '(substitute* "cmake/modules/FindLIBPODOFO.cmake" - (("find_package\\(OPENSSL\\)") "find_package(OpenSSL)"))))) + "00ys0p6h3iq77kh72dkl0qrf7qvznq18qdrgiq10gfxja1995034")) + (modules '((guix build utils))))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test target #:configure-flags - '("-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 ") "#include -#include ")) - (substitute* "scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp" - (("#include ") "#include -#include ")) - (substitute* "scribus/sclistboxpixmap.h" - (("#include ") "#include -#include -#include ")) - #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))))) + '("-DWANT_GRAPHICSMAGICK=1"))) (inputs `(("boost" ,boost) ("cairo" ,cairo) -- cgit 1.4.1 From 89a651964a098cedddd00c935c9ecd5433795766 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 6 Jun 2018 18:34:45 +0200 Subject: gnu: scribus: Add "libzmf" dependency * gnu/packages/scribus.scm (scribus)[inputs]: Add "libzmf". --- gnu/packages/scribus.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 34511bcf60..98bdf5d24e 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -82,6 +82,7 @@ ("libtiff" ,libtiff) ("libvisio" ,libvisio) ("libxml2" ,libxml2) + ("libzmf" ,libzmf) ("openssl" ,openssl) ("podofo" ,podofo) ("poppler" ,poppler) -- cgit 1.4.1 From 25133ca172d7dd436c4c08055d18f1a393037dbb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 6 Jun 2018 19:16:21 +0200 Subject: gnu: colobot: Update to 0.1.11.1-alpha. * gnu/packages/games.scm (colobot): Update to 0.1.11.1-alpha. [native-inputs]: Update "colobot-data" and "colobot-music" to 0.1.11.1-alpha. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e9f3e69f34..535f19efd4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4695,7 +4695,7 @@ Github or Gitlab.") (define-public colobot (package (name "colobot") - (version "0.1.11-alpha") + (version "0.1.11.1-alpha") (source (origin (method url-fetch) @@ -4703,7 +4703,7 @@ Github or Gitlab.") "colobot-gold-" version ".tar.gz")) (sha256 (base32 - "160rq9fp5vd0qaqr3jvzvzrcxk9cac532y8vx4cvq0a8hgylrbad")))) + "0h6f4icarramhjkxxbzz6siv3v11z5r8ghqisgr1rscw217vhmwf")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test @@ -4741,7 +4741,7 @@ Github or Gitlab.") "colobot-gold-" version ".tar.gz")) (sha256 (base32 - "1pdpsyr41g7xmk03k2g76l214f53ahk04qnkzmsv1fdbbaq7p109")))) + "0riznycx2jbxmg4m9nn3mcpqws2c0s7cn2m9skz9zj1w39r5qpjy")))) ("colobot-music" ,(origin (method url-fetch) -- cgit 1.4.1