From 70c8b1ec300f3fe9144837988cabd83f91287cab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 Mar 2019 08:23:42 +0100 Subject: gnu: acpica: Update to 20190215. * gnu/packages/admin.scm (acpica): Update to 20190215. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 36a76186f6..0c3f8b486e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1284,7 +1284,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20180810") + (version "20190215") (source (origin (method url-fetch) (uri (string-append @@ -1292,7 +1292,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "01drf32h0v1s8yd414rgc9bavb52yffrwpnbzfxd9sk1lwssr6v7")))) + "1iy2zwi8aicq0b5a0phfacvk1f9z1d89cx43adcf0qh82gb9m4wg")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From abfc114ae53ad059546ffe95a8c919c2d675af11 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 1 Mar 2019 16:25:59 +0100 Subject: gnu: sdl2: Add KMSDRM video backend. * gnu/packages/sdl.scm (sdl2): Add KMSDRM video backend. --- gnu/packages/sdl.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 2e125c9d23..d548db89cf 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2017 Sou Bunnbu ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2017, 2018 Rutger Helling +;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Kei Kebreau @@ -115,7 +115,8 @@ joystick, and graphics hardware.") (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) - `(append '("--disable-wayland-shared") + `(append '("--disable-wayland-shared" "--enable-video-kmsdrm" + "--disable-kmsdrm-shared") ,flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems -- cgit v1.2.3 From 0b611996b9c41e7c33d30260bbce744a9141d999 Mon Sep 17 00:00:00 2001 From: Dan Frumin Date: Fri, 1 Mar 2019 17:15:08 +0100 Subject: gnu: coq-flocq: Update to 3.1.0. * gnu/packages/coq.scm (coq-flocq): Update to 3.1.0. (coq-interval): Update to 3.4.0. Signed-off-by: Julien Lepiller --- gnu/packages/coq.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 3cd8c4cb69..5393d4273b 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -184,15 +184,15 @@ provers.") (define-public coq-flocq (package (name "coq-flocq") - (version "2.6.1") + (version "3.1.0") (source (origin (method url-fetch) ;; Use the ‘Latest version’ link for a stable URI across releases. (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "file/37454/flocq-" version ".tar.gz")) + "file/37901/flocq-" version ".tar.gz")) (sha256 (base32 - "06msp1fwpqv6p98a3i1nnkj7ch9rcq3rm916yxq8dxf51lkghrin")))) + "02szrgz9m0ac51la1lqpiv6i2g0zbgx9gz5rp0q1g00ajldyna5c")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) @@ -413,14 +413,14 @@ provides BigN, BigZ, BigQ that used to be part of Coq standard library.") (define-public coq-interval (package (name "coq-interval") - (version "3.3.0") + (version "3.4.0") (source (origin (method url-fetch) (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "file/37077/interval-" version ".tar.gz")) + "file/37524/interval-" version ".tar.gz")) (sha256 (base32 - "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903")))) + "023j9sd64brqvjdidqkn5m8d7a93zd9r86ggh573z9nkjm2m7vvg")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) -- cgit v1.2.3 From d71cab2b77627a620f7f95ec97daf1e1410cb73f Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 1 Mar 2019 19:39:55 +0100 Subject: gnu: java-tomcat: Update to 8.5.38. * gnu/packages/web.scm (java-tomcat): Update to 8.38. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d58eed5786..9e79a83088 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5432,14 +5432,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (define-public java-tomcat (package (name "java-tomcat") - (version "8.5.32") + (version "8.5.38") (source (origin (method url-fetch) (uri (string-append "mirror://apache/tomcat/tomcat-8/v" version "/src/apache-tomcat-" version "-src.tar.gz")) (sha256 (base32 - "1qjsr6zmkdciakya4jqz0ssnsk02qlmmd898c05rasfwcrpj0xi6")) + "13pbsyk39g1qph82nngp54mqycmg60rxlxwy4yszsssahrqnggb2")) (modules '((guix build utils))) ;; Delete bundled jars. (snippet -- cgit v1.2.3 From ae69b39ed441a8eb2a61f7a5ccaeb97bca7640d9 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 1 Mar 2019 20:05:27 +0100 Subject: gnu: java-eclipse-sisu-inject: Don't use unstable tarball. Using git-file-name also makes the source store-file nicer. * gnu/packages/java.scm (java-eclipse-sisu-inject)[source]: Use git-fetch and git-file-name. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9747569009..43ba9d2d17 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10622,12 +10622,14 @@ and reporting) project dependencies. It is characterized by the following: (name "java-eclipse-sisu-inject") (version "0.3.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/eclipse/sisu.inject/" - "archive/releases/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse/sisu.inject/") + (commit "releases/0.3.3"))) + (file-name (git-file-name name version)) (sha256 (base32 - "11rg6yw5nl13i65xsp4jxxgr341qcnnaan48p767h28kb07s0ajn")))) + "0gibc9x0bw0f4ls086fx73610fcspz9g2as7kcpcfhvl5znysvg7")))) (build-system ant-build-system) (arguments `(#:jar-name "eclipse-sisu-inject.jar" -- cgit v1.2.3 From 176662a19df688382a2d529e73f9750142f2c8dd Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 1 Mar 2019 22:43:32 +0100 Subject: gnu: java-eclipse-jetty-test-helper: Return #t from all phases. * gnu/packages/web.scm (java-eclipse-jetty-test-helper)[arguments]: Return #t from 'chdir' phase. --- gnu/packages/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9e79a83088..f692b8ab5c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5515,7 +5515,8 @@ technologies.") (modify-phases %standard-phases (add-before 'configure 'chdir (lambda _ - (chdir "jetty-test-helper"))) + (chdir "jetty-test-helper") + #t)) (add-before 'build 'fix-paths (lambda _ ;; TODO: -- cgit v1.2.3 From 1c492480ff90cb17b165355dc873608eff8cafa5 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Fri, 1 Mar 2019 22:47:37 +0100 Subject: gnu: java-eclipse-jetty-http-test-classes: Return #t from all phases. * gnu/packages/web.scm (java-eclipse-jetty-http-test-classes)[arguments]: Return #t from 'chdir' phase. --- gnu/packages/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f692b8ab5c..2500bd0be7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5780,7 +5780,8 @@ or embedded instantiation. This package provides the JMX management."))) (modify-phases %standard-phases (add-before 'configure 'chdir (lambda _ - (chdir "jetty-http")))))) + (chdir "jetty-http") + #t))))) (inputs `(("slf4j" ,java-slf4j-api) ("servlet" ,java-tomcat) -- cgit v1.2.3 From 00a7af0eea5a5a8fa2d554517ee1ca408ac7c425 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 1 Mar 2019 17:02:01 +0100 Subject: gnu: texlive-latex-geometry: Add missing input. * gnu/packages/tex.scm (texlive-latex-geometry)[propagated-inputs]: Add texlive-latex-oberdiek. --- gnu/packages/tex.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c028b79ad8..8c756e4676 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3101,6 +3101,8 @@ BibLaTeX, and is considered experimental.") "0yw6bjfgsli3s1dldsgb7mkr7lnk329cgdjbgs8z2xn59pmmdsn4")))) (build-system texlive-build-system) (arguments '(#:tex-directory "latex/geometry")) + (propagated-inputs + `(("texlive-latex-oberdiek" ,texlive-latex-oberdiek))) ;for ifpdf (home-page "https://www.ctan.org/pkg/geometry") (synopsis "Flexible and complete interface to document dimensions") (description -- cgit v1.2.3 From 5e9bf5a2e0602601c3b6c3756d5b05a7fc1a212a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 1 Mar 2019 17:02:48 +0100 Subject: gnu: Add texlive-fonts-adobe-times. * gnu/packages/tex.scm (texlive-fonts-adobe-times): New variable. --- gnu/packages/tex.scm | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8c756e4676..bb76c48b66 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3642,6 +3642,169 @@ differs from the EC in a number of particulars.") (license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\ texlive-2017.1/Master/texmf-dist/doc/fonts/ec/copyrite.txt")))) +(define-public texlive-fonts-adobe-times + (package + (name "texlive-fonts-adobe-times") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/type1/urw/times/")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "15vzyr7favkv1mj00qxr03s89kw78nd066fh69by93272g8p5sgd")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) + (ice-9 match)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 match)) + (let ((root (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/")) + (pkgs '(("source" . "fonts/type1/urw/times") + + ("times-afm" . "fonts/afm/adobe/times") + ("times-tfm" . "fonts/tfm/adobe/times") + ("times-vf" . "fonts/vf/adobe/times") + + ("urw-afm" . "fonts/afm/urw/times") + ("urw35vf-tfm" . "fonts/tfm/urw35vf/times") + ("urw35vf-vf" . "fonts/vf/urw35vf/times") + + ("times-tex" . "tex/latex/times") + ("dvips" . "dvips/times") + ("fonts-map" . "fonts/map/dvips/times")))) + (for-each (match-lambda + ((pkg . dir) + (let ((target (string-append root dir))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs pkg) + target)))) + pkgs) + #t)))) + (native-inputs + `(("times-afm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/afm/adobe/times")) + (revision %texlive-revision))) + (file-name (string-append name "-afm-" version "-checkout")) + (sha256 + (base32 + "1k7h6vihfc6ri2lq9ggnq2g4zq3qcgq1vd0hr486g9cqrdpys6cy")))) + ("times-tfm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/tfm/adobe/times")) + (revision %texlive-revision))) + (file-name (string-append name "-tfm-" version "-checkout")) + (sha256 + (base32 + "1hbgkjnf5xyganbznwpwszvr3iyk4bzb0ys4hd8ybawp60paadrr")))) + ("times-vf" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/vf/adobe/times")) + (revision %texlive-revision))) + (file-name (string-append name "-vf-" version "-checkout")) + (sha256 + (base32 + "18rfspnwdw9r81dy18lb4w96d09b6c4g7y80azwylalkhwdf2lfp")))) + ("urw-afm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/afm/urw/times")) + (revision %texlive-revision))) + (file-name (string-append name "-urw-afm-" version "-checkout")) + (sha256 + (base32 + "0g0xpsyn6634g0b4rpd420v7i4gkz3zr12vcy2b8csbcscjvwri5")))) + ("urw35vf-tfm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/tfm/urw35vf/times")) + (revision %texlive-revision))) + (file-name (string-append name "-urw35vf-tfm-" version "-checkout")) + (sha256 + (base32 + "0a4idlvpaqd0ypqgy1xw0rpx8q23bvssg8xq757zzn3zikj0w7pr")))) + ("urw35vf-vf" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/vf/urw35vf/times")) + (revision %texlive-revision))) + (file-name (string-append name "-urw35vf-vf-" version "-checkout")) + (sha256 + (base32 + "05mppwxd4c5x0yw50gca726f0ylc1rk8jf0jjkrriixq6rnw03di")))) + ("times-tex" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/times")) + (revision %texlive-revision))) + (file-name (string-append name "-tex-" version "-checkout")) + (sha256 + (base32 + "1gmd0x7c3vkvfzgmrsp4866rcdbyimfk3bjr91zaadc41r1i8xrp")))) + ("dvips" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/dvips/times/")) + (revision %texlive-revision))) + (file-name (string-append name "-dvips-" version "-checkout")) + (sha256 + (base32 + "1fvqpgqi7bp2q76nf5kmlhsdijxw65arqfy3ax3djwih3yg12mp0")))) + ("fonts-map" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/map/dvips/times/")) + (revision %texlive-revision))) + (file-name (string-append name "-fonts-map-" version "-checkout")) + (sha256 + (base32 + "12f00gzs2zgllkm59qdhw2xxj7lvg3p256232f1l275z3pldfqqi")))))) + (home-page "https://ctan.org/pkg/urw-base35") + (synopsis "URW Base 35 font pack for LaTeX") + (description + "This package provides a drop-in replacements for the Times font from +Adobe's basic set.") + ;; No license version specified. + (license license:gpl3+))) + (define-public texlive-fonts-rsfs (package (name "texlive-fonts-rsfs") -- cgit v1.2.3 From 96f5377d5e0fe3481bbcc3d3e0e8d496c3ea5a24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 1 Mar 2019 19:21:18 +0100 Subject: gnu: texlive-fonts-knuth-lib: Build all tfm files. * gnu/packages/tex.scm (texlive-fonts-knuth-lib)[arguments]: Build all tfm files in "build" phase. --- gnu/packages/tex.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bb76c48b66..738d49d7c7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -892,13 +892,17 @@ Computers & Typesetting series.") (string-append (getcwd) ":" mf "/share/texmf-dist/metafont/base"))) (mkdir "build") - (invoke "mf" "-progname=mf" - "-output-directory=build" - (string-append "\\" - "mode:=ljfour; " - "mag:=1; " - "batchmode; " - "input manfnt")))) + (for-each (lambda (font) + (format #t "building font ~a\n" font) + (invoke "mf" "-progname=mf" + "-output-directory=build" + (string-append "\\" + "mode:=ljfour; " + "mag:=1; " + "batchmode; " + "input " font))) + (find-files "." "(manfnt|logo.+)\\.mf$")) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 6072f82a1e6b3747d1fdc5a3a8d332d64a3e1b11 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 1 Mar 2019 23:23:09 +0100 Subject: gnu: Add texlive-latex-mflogo. * gnu/packages/tex.scm (texlive-latex-mflogo): New variable. --- gnu/packages/tex.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 738d49d7c7..a544c7d5fa 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1001,6 +1001,27 @@ class), line and circle fonts (for use in the picture environment) and LaTeX symbol fonts.") (license license:lppl1.2+))) +(define-public texlive-latex-mflogo + (package + (name "texlive-latex-mflogo") + (version (number->string %texlive-revision)) + (source + (origin + (method svn-fetch) + (uri (texlive-ref "latex" "mflogo")) + (sha256 + (base32 + "15i2ib6nvhf31g1b92c6njf7n0g29znlq7hbfp9ii7qabhcwwvrj")))) + (build-system texlive-build-system) + (arguments '(#:tex-directory "latex/mflogo")) + (home-page "http://www.ctan.org/pkg/mflogo") + (synopsis "LaTeX support for Metafont logo fonts") + (description + "This package provides LaTeX and font definition files to access the +Knuthian mflogo fonts described in The Metafontbook and to typeset Metafont +logos in LaTeX documents.") + (license license:lppl))) + (define-public texlive-fonts-amsfonts (package (name "texlive-fonts-amsfonts") -- cgit v1.2.3 From 01cf8c89de67aaa0344cef1ef2892b345635988a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 1 Mar 2019 23:23:29 +0100 Subject: gnu: Add texlive-fonts-mflogo-font. * gnu/packages/tex.scm (texlive-fonts-mflogo-font): New variable. --- gnu/packages/tex.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a544c7d5fa..b7425b5a5f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1022,6 +1022,77 @@ Knuthian mflogo fonts described in The Metafontbook and to typeset Metafont logos in LaTeX documents.") (license license:lppl))) +(define-public texlive-fonts-mflogo-font + (package + (name "texlive-fonts-mflogo-font") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/type1/hoekwater/mflogo-font")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "09fsxfpiyxjljkrb52b197728bjnkcnv3bdwm4hl6hf23mbmqadf")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) + (ice-9 match)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 match)) + (let ((root (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/")) + (pkgs '(("source" . "fonts/type1/hoekwater/mflogo-font") + ("afm" . "fonts/afm/hoekwater/mflogo-font") + ("fonts-map" . "fonts/map/dvips/mflogo-font")))) + (for-each (match-lambda + ((pkg . dir) + (let ((target (string-append root dir))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs pkg) + target)))) + pkgs) + #t)))) + (native-inputs + `(("afm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/afm/hoekwater/mflogo-font")) + (revision %texlive-revision))) + (file-name (string-append name "-afm-" version "-checkout")) + (sha256 + (base32 + "0bx1mfhhzsk9gj1pha36q2rk0jd0y285qm62zgvdvzzzlfnk8sdb")))) + ("fonts-map" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/map/dvips/mflogo-font/")) + (revision %texlive-revision))) + (file-name (string-append name "-fonts-map-" version "-checkout")) + (sha256 + (base32 + "044xrrpl8hnvj55cx2ql1ib1bcyr33nzanx5nkwxpai7fb7pg4y6")))))) + (home-page "https://www.ctan.org/pkg/mflogo-font") + (synopsis "Metafont logo font") + (description + "These fonts were created in METAFONT by Knuth, for his own publications. +At some stage, the letters P and S were added, so that the METAPOST logo could +also be expressed. The fonts were originally issued (of course) as METAFONT +source; they have since been autotraced and reissued in Adobe Type 1 format by +Taco Hoekwater.") + (license license:knuth))) + (define-public texlive-fonts-amsfonts (package (name "texlive-fonts-amsfonts") -- cgit v1.2.3 From f2d1f060c5d10407007bade4c47e41a92db5edf9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 1 Mar 2019 23:24:10 +0100 Subject: gnu: Add texlive-fonts-adobe-palatino. * gnu/packages/tex.scm (texlive-fonts-adobe-palatino): New variable. --- gnu/packages/tex.scm | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b7425b5a5f..8854a93abc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3901,6 +3901,169 @@ Adobe's basic set.") ;; No license version specified. (license license:gpl3+))) +(define-public texlive-fonts-adobe-palatino + (package + (name "texlive-fonts-adobe-palatino") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/type1/urw/palatino/")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "18dw5260c6fy7acxaqwrg3hw04kg63ijq4lkn56q5pa2g6nyylrp")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) + (ice-9 match)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 match)) + (let ((root (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/")) + (pkgs '(("source" . "fonts/type1/urw/palatino") + + ("palatino-afm" . "fonts/afm/adobe/palatino") + ("palatino-tfm" . "fonts/tfm/adobe/palatino") + ("palatino-vf" . "fonts/vf/adobe/palatino") + + ("urw-afm" . "fonts/afm/urw/palatino") + ("urw35vf-tfm" . "fonts/tfm/urw35vf/palatino") + ("urw35vf-vf" . "fonts/vf/urw35vf/palatino") + + ("palatino-tex" . "tex/latex/palatino") + ("dvips" . "dvips/palatino") + ("fonts-map" . "fonts/map/dvips/palatino")))) + (for-each (match-lambda + ((pkg . dir) + (let ((target (string-append root dir))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs pkg) + target)))) + pkgs) + #t)))) + (native-inputs + `(("palatino-afm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/afm/adobe/palatino")) + (revision %texlive-revision))) + (file-name (string-append name "-afm-" version "-checkout")) + (sha256 + (base32 + "0pxizay730cx7rb9y5bqq9dn1zxx3arc33rmdsn7l29pc51flmmi")))) + ("palatino-tfm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/tfm/adobe/palatino")) + (revision %texlive-revision))) + (file-name (string-append name "-tfm-" version "-checkout")) + (sha256 + (base32 + "1w1vm0sk9kpsy14yhyf1v1q3c6b97cgbba74g578bcwjlh810mg0")))) + ("palatino-vf" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/vf/adobe/palatino")) + (revision %texlive-revision))) + (file-name (string-append name "-vf-" version "-checkout")) + (sha256 + (base32 + "1maqfis8hpybcn9lmm8r2b1g56620lfpsncg0742c3kkjd6dh97h")))) + ("urw-afm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/afm/urw/palatino")) + (revision %texlive-revision))) + (file-name (string-append name "-urw-afm-" version "-checkout")) + (sha256 + (base32 + "0gk0xwy1fs2si5kb1j3dzgm52c8sagv32gd9dmw88m7sgh5qkd87")))) + ("urw35vf-tfm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/tfm/urw35vf/palatino")) + (revision %texlive-revision))) + (file-name (string-append name "-urw35vf-tfm-" version "-checkout")) + (sha256 + (base32 + "19aq3xwfg7vkf1qzjdxgcvcdqwpvpavq3l25y64xni72qx0kmppz")))) + ("urw35vf-vf" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/vf/urw35vf/palatino")) + (revision %texlive-revision))) + (file-name (string-append name "-urw35vf-vf-" version "-checkout")) + (sha256 + (base32 + "1lkn4p6zimrs0ah6mxsang4bicp8j7xzl016529a3f168an7mdmj")))) + ("palatino-tex" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/palatino")) + (revision %texlive-revision))) + (file-name (string-append name "-tex-" version "-checkout")) + (sha256 + (base32 + "0ng9w7i0p1nb51amla32jj86vx6p84m6qc7asam3g4x8w5jf7s27")))) + ("dvips" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/dvips/palatino/")) + (revision %texlive-revision))) + (file-name (string-append name "-dvips-" version "-checkout")) + (sha256 + (base32 + "1pdbkfmhx4kk3brh5lg6fyl9ad2kbjmkrhgcx84klnlhq01mfdhb")))) + ("fonts-map" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/map/dvips/palatino/")) + (revision %texlive-revision))) + (file-name (string-append name "-fonts-map-" version "-checkout")) + (sha256 + (base32 + "0rg13hyp652hp3gnrj5pbyb84zkqmyi1qnm8c6spcyaq8pm06l0d")))))) + (home-page "https://ctan.org/pkg/urw-base35") + (synopsis "URW Base 35 font pack for LaTeX") + (description + "This package provides a drop-in replacements for the Palatino font from +Adobe's basic set.") + ;; No license version specified. + (license license:gpl3+))) + (define-public texlive-fonts-rsfs (package (name "texlive-fonts-rsfs") -- cgit v1.2.3 From 4628315bfbb3393b287cbe1c8222a2d8b4c88adb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 1 Mar 2019 23:24:29 +0100 Subject: gnu: Add texlive-fonts-adobe-zapfding. * gnu/packages/tex.scm (texlive-fonts-adobe-zapfding): New variable. --- gnu/packages/tex.scm | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8854a93abc..165465b8bb 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4064,6 +4064,141 @@ Adobe's basic set.") ;; No license version specified. (license license:gpl3+))) +(define-public texlive-fonts-adobe-zapfding + (package + (name "texlive-fonts-adobe-zapfding") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/type1/urw/zapfding/")) + (revision %texlive-revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1sp3jblg3khp0yj121blvhph6ib09919kyrsk5x2lg258yypqyis")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) + (ice-9 match)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 match)) + (let ((root (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/")) + (pkgs '(("source" . "fonts/type1/urw/zapfding") + ("zapf-afm" . "fonts/afm/adobe/zapfding") + ("zapf-tfm" . "fonts/tfm/adobe/zapfding") + ("urw-afm" . "fonts/afm/urw/zapfding") + ("urw35vf-tfm" . "fonts/tfm/urw35vf/zapfding") + + ("zapf-tex" . "tex/latex/zapfding") + ("dvips" . "dvips/zapfding") + ("fonts-map" . "fonts/map/dvips/zapfding")))) + (for-each (match-lambda + ((pkg . dir) + (let ((target (string-append root dir))) + (mkdir-p target) + (copy-recursively (assoc-ref %build-inputs pkg) + target)))) + pkgs) + #t)))) + (native-inputs + `(("zapf-afm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/afm/adobe/zapfding")) + (revision %texlive-revision))) + (file-name (string-append name "-afm-" version "-checkout")) + (sha256 + (base32 + "0qvl4w1bfcpiakkd8rvkism46qnvzj9w7x4r8z9m0y7mspbkblyr")))) + ("zapf-tfm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/tfm/adobe/zapfding")) + (revision %texlive-revision))) + (file-name (string-append name "-tfm-" version "-checkout")) + (sha256 + (base32 + "1i8mh9xsl8l4cgsg3nl4ha9q6m55j122riclaxsvkc5ka83432qm")))) + ("urw-afm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/afm/urw/zapfding")) + (revision %texlive-revision))) + (file-name (string-append name "-urw-afm-" version "-checkout")) + (sha256 + (base32 + "0m4qndqh7ji723ff82c5c1q8ziqvblbaip7vx05vnl15fqbsnfx1")))) + ("urw35vf-tfm" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/tfm/urw35vf/zapfding")) + (revision %texlive-revision))) + (file-name (string-append name "-urw35vf-tfm-" version "-checkout")) + (sha256 + (base32 + "167g2x6mpjfqh0w1fhjbw14qcx6ridrj2zm1bd8bi0l2d7phj28m")))) + ("zapf-tex" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/tex/latex/zapfding")) + (revision %texlive-revision))) + (file-name (string-append name "-tex-" version "-checkout")) + (sha256 + (base32 + "0hp7i8f6nbrg7irrwc8fd7n1hrzjysa84d6iyivwlc65v9p7lmd0")))) + ("dvips" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/dvips/zapfding/")) + (revision %texlive-revision))) + (file-name (string-append name "-dvips-" version "-checkout")) + (sha256 + (base32 + "1f18sc4qwxykd786zhn6szcrycqvpvfhlcim71aamxmwghakd7fa")))) + ("fonts-map" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/fonts/map/dvips/zapfding/")) + (revision %texlive-revision))) + (file-name (string-append name "-fonts-map-" version "-checkout")) + (sha256 + (base32 + "17kwxmdrgz2fb072hx57a3pidcrhbgayphx11zyld2hv9149pkyl")))))) + (home-page "https://ctan.org/pkg/urw-base35") + (synopsis "URW Base 35 font pack for LaTeX") + (description + "This package provides a drop-in replacements for the Zapfding font from +Adobe's basic set.") + ;; No license version specified. + (license license:gpl3+))) + (define-public texlive-fonts-rsfs (package (name "texlive-fonts-rsfs") -- cgit v1.2.3 From 4f2ee8e285715998bf097386287e3f4efc0a94b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 1 Mar 2019 23:25:20 +0100 Subject: gnu: teximpatient: Build with texlive-union. * gnu/packages/tex.scm (teximpatient)[source]: Use url-fetch/tarbomb, so that we can... [arguments]: ...remove the custom "unpack" phase; disable tests instead of deleting the "check" phase; add phase "fix-packaging-error". [native-inputs]: Replace texlive with a texlive-union containing texlive-latex-amsfonts, texlive-fonts-amsfonts, texlive-fonts-adobe-palatino, texlive-fonts-adobe-zapfding, texlive-fonts-knuth-lib, texlive-fonts-mflogo-font, and texlive-generic-pdftex. --- gnu/packages/tex.scm | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 165465b8bb..85bb79087f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5493,13 +5493,12 @@ PDF documents.") develop documents with LaTeX, in a single application.") (license license:gpl2+))) - (define-public teximpatient (package (name "teximpatient") (version "2.4") (source (origin - (method url-fetch) + (method url-fetch/tarbomb) (uri (string-append "mirror://gnu/" name "/" name "-" version ".tar.gz")) (sha256 @@ -5507,25 +5506,28 @@ develop documents with LaTeX, in a single application.") "0h56w22d99dh4fgld4ssik8ggnmhmrrbnrn1lnxi1zr0miphn1sd")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:tests? #f ; there are none + #:phases (modify-phases %standard-phases - (delete 'check) - ;; Unfortunately some mistakes have been made in packaging. - ;; Work around them here ... - (replace 'unpack - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((srcdir "teximpatient-2.4")) - (system* "tar" "-xzf" (assoc-ref inputs "source") - (string-append "--one-top-level=" srcdir)) - (delete-file (string-append srcdir "/book.pdf")) - (install-file (car - (find-files - (assoc-ref inputs "automake") - "^install-sh$")) - srcdir) - (chdir srcdir))))))) + (add-after 'unpack 'fix-packaging-error + (lambda* (#:key inputs #:allow-other-keys) + ;; This file should have been part of the tarball. + (install-file (car + (find-files + (assoc-ref inputs "automake") + "^install-sh$")) + ".") + ;; Remove generated file. + (delete-file "book.pdf") + #t))))) (native-inputs - `(("texlive" ,texlive) + `(("texlive" ,(texlive-union (list texlive-latex-amsfonts + texlive-fonts-amsfonts + texlive-fonts-adobe-palatino + texlive-fonts-adobe-zapfding + texlive-fonts-knuth-lib + texlive-fonts-mflogo-font + texlive-generic-pdftex))) ("automake" ,automake))) (home-page "https://www.gnu.org/software/teximpatient/") (synopsis "Book on TeX, plain TeX and Eplain") -- cgit v1.2.3 From 38ab167fe73cc543279f6d6d6f87fd62dc03ec58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 Mar 2019 15:23:37 +0100 Subject: gnu: perl-net-dns: Update to 1.19. * gnu/packages/networking.scm (perl-net-dns): Update to 1.19. --- gnu/packages/networking.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index d43bf619d9..f7477230a6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -912,7 +912,7 @@ private (reserved).") (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.18") + (version "1.19") (source (origin (method url-fetch) @@ -923,8 +923,7 @@ private (reserved).") (string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-" version ".tar.gz"))) (sha256 - (base32 - "1lx902cbvlfl63bqfdrnyavmfwbjvrfdnwgdc1dgs1wpzja19kjj")))) + (base32 "1myc23vz0m42yyg8iw7bf1pdrmx9ql6fhl2vwk1vwf55v6yphqi0")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) -- cgit v1.2.3 From 23e3094b87f80a810f25f76a8f8c2f1c52344933 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 Mar 2019 18:42:27 +0100 Subject: gnu: opensmtpd: Remove unused arguments. * gnu/packages/mail.scm (opensmtpd)[arguments]: Remove unused procedure arguments to 'patch-FHS-file-names' phase. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a9c8b9f4e6..90bd79ae3c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2017,7 +2017,7 @@ transfer protocols.") (modify-phases %standard-phases ;; Fix some incorrectly hard-coded external tool file names. (add-after 'unpack 'patch-FHS-file-names - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (substitute* "smtpd/smtpctl.c" (("/bin/cat") (which "cat")) (("/bin/sh") (which "sh"))) -- cgit v1.2.3 From 4fdd4d33125099fa2b5e5ea98a0c2bc16451b344 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 1 Mar 2019 23:50:54 +0100 Subject: gnu: bundler: Update to 1.17.3. * gnu/packaqes/ruby.scm (bundler): Update to 1.17.3. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 6da7109d14..a81535aade 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -645,13 +645,13 @@ expectations and mocks frameworks.") (define-public bundler (package (name "bundler") - (version "1.15.4") + (version "1.17.3") (source (origin (method url-fetch) (uri (rubygems-uri "bundler" version)) (sha256 (base32 - "0wl4r7wbwdq68xidfv4hhzfb1spb6lmhbspwlzrg4pf1l6ipxlgs")))) + "0ln3gnk7cls81gwsbxvrmlidsfd78s6b2hzlm4d4a9wbaidzfjxw")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; avoid dependency cycles -- cgit v1.2.3 From 7a0479bb7b8535acad2bf36c7a0b0498a1313422 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 1 Mar 2019 19:30:51 -0500 Subject: gnu: Add WireGuard. * gnu/packages/vpn.scm (wireguard): New variable. --- gnu/packages/vpn.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index e135fdef17..f15b111a92 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018 Meiyo Peng +;;; Copyright © 2019 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -449,3 +450,68 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers ;; This project contains a bundled lwIP. lwIP is also released under the ;; 3-clause BSD license. (license license:bsd-3))) + +(define-public wireguard + (package + (name "wireguard") + (version "0.0.20190123") + (source (origin + (method url-fetch) + (uri (string-append "https://git.zx2c4.com/WireGuard/snapshot/" + "WireGuard-" version ".tar.xz")) + (sha256 + (base32 + "16yzzy4i0z2zslmyr3kppkvkrxryzwdil6v270w9w5mg65v3rlgd")))) + (build-system gnu-build-system) + (outputs '("out" ; The WireGuard userspace tools + "kernel-patch")) ; A patch to build Linux with WireGuard support + (arguments + `(#:make-flags + (list "CC=gcc" + "WITH_BASHCOMPLETION=yes" + ;; Build and install the helper script wg-quick(8). + "WITH_WGQUICK=yes" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "SYSCONFDIR=" (assoc-ref %outputs "out") "/etc")) + #:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 textual-ports)) + #:phases + (modify-phases %standard-phases + ;; There is no ./configure script. + (delete 'configure) + ;; Until WireGuard is added to the upstream Linux kernel, it is + ;; distributed as a kernel patch generated by this script. + (add-after 'patch-source-shebangs 'make-patch + (lambda* (#:key outputs #:allow-other-keys) + (let* ((output (string-append (assoc-ref outputs "kernel-patch") + "/wireguard.patch")) + (patch-builder "./contrib/kernel-tree/create-patch.sh") + (port (open-input-pipe patch-builder)) + (str (get-string-all port))) + (close-pipe port) + (mkdir-p (dirname output)) + (call-with-output-file output + (lambda (port) + (format port "~a" str)))) + #t)) + (add-after 'make-patch 'chdir + (lambda _ + (chdir "src/tools") + #t)) + ;; Otherwise the 'install-license-file' phase installs nothing. + ;; + (add-after 'install 'reset-cwd + (lambda _ + (chdir "../..") + #t))))) + (inputs + `(("libmnl" ,libmnl))) + (home-page "https://www.wireguard.com/") + (synopsis "Tools for configuring WireGuard") + (description "This package provides the userspace tools for setting and +retrieving configuration of WireGuard network tunnel interfaces, and a patch +that can be applied to a Linux kernel source tree in order to build it with +WireGuard support.") + (license license:gpl2))) -- cgit v1.2.3 From b8f924274b1e522e56145b2a4bed844a636aa0c7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 2 Mar 2019 16:15:12 +0100 Subject: gnu: emacs-desktop-environment: Update to 20190301. * gnu/packages/emacs-xyz.scm (emacs-desktop-environment): Update to 20190301. --- gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 36cc005549..86dbfe6d53 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11161,29 +11161,30 @@ autosuggestions with: (license license:gpl3+))) (define-public emacs-desktop-environment - (package - (name "emacs-desktop-environment") - (version "0.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DamienCassou/desktop-environment.git") - (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1fal3yfmqg10cb53qsf5gsq2gvyz9w16wmlpnpjwjzwnjfn6l73r")))) - (build-system emacs-build-system) - (home-page "https://gitlab.petton.fr/DamienCassou/desktop-environment") - (synopsis "Control your GNU/Linux desktop environment from Emacs") - (description - "This package helps you control your GNU/Linux desktop from Emacs. + (let ((commit "a9eba14f2b5b8070f78dca839ca8259736e346a6")) + (package + (name "emacs-desktop-environment") + (version (git-version "0.2.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.petton.fr/DamienCassou/desktop-environment") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0x73x5hy7w55jrzy3xvqhk90rrsznmxjqvsvwhh21qznv5w269xz")))) + (build-system emacs-build-system) + (home-page "https://gitlab.petton.fr/DamienCassou/desktop-environment") + (synopsis "Control your GNU/Linux desktop environment from Emacs") + (description + "This package helps you control your GNU/Linux desktop from Emacs. With @code{desktop-environment}, you can control the brightness and volume as well as take screenshots and lock your screen. The package depends on the availability of shell commands to do the hard work for us. These commands can be changed by customizing the appropriate variables.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-org-caldav (package -- cgit v1.2.3 From b17c892320cf67148da5a52b2394dd8c3a0703c6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 2 Mar 2019 18:39:49 +0100 Subject: gnu: lyx: Update to 2.3.2-2. * gnu/packages/tex.scm (lyx): Update to 2.3.2-2. [source]: Remove patch. [arguments]: Adjust configure flags; add build phase "fix-compilation-with-boost-1.69"; remove phase "patch-installer"; create missing file in phase "setenv-check". [inputs]: Add mythes. [propagated-inputs]: Replace texlive with a texlive-union containing texlive-fonts-ec. --- gnu/packages/tex.scm | 79 ++++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 36 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 85bb79087f..f7f8fc3296 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5539,20 +5539,19 @@ and Karl Berry.") (define-public lyx (package (name "lyx") - (version "2.2.3") + (version "2.3.2-2") (source (origin - (method url-fetch) - (uri (string-append "http://ftp.lyx.org/pub/lyx/stable/2.2.x/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "0xvaz0i371nn2ndinc0d3ywj76ivb62649a4sdgwbivisiahd2fj")) - (patches (search-patches "lyx-2.2.3-fix-test.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "3rdparty") - #t)))) + (method url-fetch) + (uri (string-append "http://ftp.lyx.org/pub/lyx/stable/2.3.x/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "0vr0qwis6rhind6azfa270hqxci7rj8qb1kk5x6lm80mc34nvrqi")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "3rdparty") + #t)))) (build-system cmake-build-system) (arguments `(#:configure-flags `("-DLYX_USE_QT=QT5" @@ -5562,56 +5561,64 @@ and Karl Berry.") ,(string-append "-DLYX_INSTALL_PREFIX=" (assoc-ref %outputs "out") ;; Exact name and level is necessary. - "/lyx2.2")) + "/lyx2.3")) #:phases (modify-phases %standard-phases + ;; See ;; https://www.lyx.org/trac/changeset/3a123b90af838b08680471d87170c38e56787df9/lyxgit + (add-after 'unpack 'fix-compilation-with-boost-1.69 + (lambda _ + (substitute* "src/support/FileName.cpp" + (("^template struct boost::detail::crc_table_t.*") "")) + #t)) (add-after 'unpack 'patch-python (lambda* (#:key inputs #:allow-other-keys) (substitute* '("src/support/os.cpp") - (("\"python ") - (string-append "\"" - (assoc-ref inputs "python-2") - "/bin/python "))) - #t)) - (add-after 'patch-python 'patch-installer - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("/usr/local/man/man1") - (string-append (assoc-ref outputs "out") - "/share/man/man1"))) + (("\"python ") + (string-append "\"" + (assoc-ref inputs "python") + "/bin/python "))) #t)) (add-after 'patch-python 'patch-desktop-file (lambda* (#:key outputs #:allow-other-keys) (substitute* "lib/lyx.desktop.in" - (("Exec=") - (string-append "Exec=" - (assoc-ref outputs "out") - "/"))) + (("Exec=") + (string-append "Exec=" + (assoc-ref outputs "out") + "/"))) #t)) (add-before 'check 'setenv-check (lambda _ - (setenv "LYX_DIR_22x" (string-append (getcwd) "/../lyx-" + ;; Create missing file that would cause tests to fail. + (with-output-to-file (string-append "../lyx-" + ,version + "/src/tests/check_layout.cmake") + (const #t)) + (setenv "LYX_DIR_23x" (string-append (getcwd) "/../lyx-" ,version "/lib")) #t)) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (mkdir-p (string-append out "/bin")) - (symlink "../lyx2.2/bin/lyx2.2" - (string-append out "/bin/lyx2.2")) + (symlink "../lyx2.3/bin/lyx2.3" + (string-append out "/bin/lyx2.3")) #t)))))) (inputs `(("boost" ,boost) - ("hunspell" ,hunspell) ; Note: Could also use aspell instead. + ("hunspell" ,hunspell) ; Note: Could also use aspell instead. ("libx11" ,libx11) - ("python-2" ,python-2) + ("mythes" ,mythes) + ("python" ,python-2) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) (propagated-inputs - `(("texlive" ,texlive))) ; article.cls is in texmf-dist. + `(("texlive" ,(texlive-union (list texlive-fonts-ec))))) + ;; FIXME: Python 3.7.0 cannot be used because the test infrastructure + ;; "requires a bytes-like object, not 'str'". This may be fixed with + ;; upgrades to Python. (native-inputs - `(("python-2" ,python-2) + `(("python" ,python-2) ("pkg-config" ,pkg-config) ("bc" ,bc))) (home-page "https://www.lyx.org/") -- cgit v1.2.3 From e5a0348962b9dbf222c3a96c3fad7c460dd5a5ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 2 Mar 2019 22:15:26 +0200 Subject: gnu: lyx: Parameterize more version variables. * gnu/packages/tex.scm (lyx)[source]: Parameterize the version string. [arguments]: Parameterize version variables in 'configre-flags and in the custom phases 'setenv-check and 'install-symlink. --- gnu/packages/tex.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f7f8fc3296..3248076818 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016, 2018 Efraim Flashner +;;; Copyright © 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus @@ -5542,7 +5542,8 @@ and Karl Berry.") (version "2.3.2-2") (source (origin (method url-fetch) - (uri (string-append "http://ftp.lyx.org/pub/lyx/stable/2.3.x/" + (uri (string-append "http://ftp.lyx.org/pub/lyx/stable/" + (version-major+minor version) ".x/" name "-" version ".tar.gz")) (sha256 (base32 @@ -5561,7 +5562,7 @@ and Karl Berry.") ,(string-append "-DLYX_INSTALL_PREFIX=" (assoc-ref %outputs "out") ;; Exact name and level is necessary. - "/lyx2.3")) + "/lyx" ,(version-major+minor version))) #:phases (modify-phases %standard-phases ;; See ;; https://www.lyx.org/trac/changeset/3a123b90af838b08680471d87170c38e56787df9/lyxgit @@ -5593,15 +5594,19 @@ and Karl Berry.") ,version "/src/tests/check_layout.cmake") (const #t)) - (setenv "LYX_DIR_23x" (string-append (getcwd) "/../lyx-" - ,version "/lib")) + (setenv (string-append "LYX_DIR_" + (string-join + (string-split + ,(version-major+minor version) #\-)) "x") + (string-append (getcwd) "/../lyx-" ,version "/lib")) #t)) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (mkdir-p (string-append out "/bin")) - (symlink "../lyx2.3/bin/lyx2.3" - (string-append out "/bin/lyx2.3")) + (symlink (string-append "../lyx" ,(version-major+minor version) + "/bin/lyx" ,(version-major+minor version)) + (string-append out "/bin/lyx" ,(version-major+minor version))) #t)))))) (inputs `(("boost" ,boost) -- cgit v1.2.3 From c335df433fe890612521e51b2a12f313c5ba17c5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 2 Mar 2019 22:04:53 +0100 Subject: gnu: pigx-chipseq: Update to 0.0.31. * gnu/packages/bioinformatics.scm (pigx-chipseq): Update to 0.0.31. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 23976ceda0..982cb7a984 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12902,7 +12902,7 @@ expression report comparing samples in an easily configurable manner.") (define-public pigx-chipseq (package (name "pigx-chipseq") - (version "0.0.21") + (version "0.0.31") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/" @@ -12910,7 +12910,7 @@ expression report comparing samples in an easily configurable manner.") "/pigx_chipseq-" version ".tar.gz")) (sha256 (base32 - "0psgdzlnx5xwhlhpss5yvmnl7yv19y9742l97m04f7awd8w74gxs")))) + "0l3vd9xwqzap3mmyj8xwqp84kj7scbq308diqnwg2albphl75xqs")))) (build-system gnu-build-system) ;; parts of the tests rely on access to the network (arguments '(#:tests? #f)) -- cgit v1.2.3 From 966c56f8c6a458e1dce189c92f16d31aabe4ab66 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 15:07:10 +0100 Subject: gnu: talloc: Update to 2.1.16. * gnu/packages/samba.scm (talloc): Update to 2.1.16. [native-inputs]: Add WHICH. [inputs]: Change from PYTHON-2 to PYTHON. (talloc/static)[arguments]: Adjust GCC command line. --- gnu/packages/samba.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 5ddc8748f3..346ec7c142 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) + #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages crypto) #:use-module (gnu packages cups) @@ -240,14 +241,14 @@ Desktops into Active Directory environments using the winbind daemon.") (define-public talloc (package (name "talloc") - (version "2.1.14") + (version "2.1.16") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/talloc/talloc-" version ".tar.gz")) (sha256 (base32 - "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di")))) + "1aajda08yf7njgvg6r21ccxlvkarb9bwvf4jqh8yn3871a1zcnqr")))) (build-system gnu-build-system) (arguments '(#:phases @@ -260,8 +261,10 @@ Desktops into Active Directory environments using the winbind daemon.") (let ((out (assoc-ref outputs "out"))) (invoke "./configure" (string-append "--prefix=" out)))))))) + (native-inputs + `(("which" ,which))) (inputs - `(("python" ,python-2))) + `(("python" ,python))) (home-page "https://talloc.samba.org") (synopsis "Hierarchical, reference counted memory pool system") (description @@ -288,7 +291,8 @@ destructors. It is the core memory allocator used in Samba.") (replace 'build (lambda _ (invoke "gcc" "-c" "-Ibin/default" "-I" "lib/replace" - "-I." "-Wall" "-g" "talloc.c") + "-I." "-Wall" "-g" "-D__STDC_WANT_LIB_EXT1__=1" + "talloc.c") (invoke "ar" "rc" "libtalloc.a" "talloc.o"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 1ca20daa13589d932847f57040615a08bbd6c14e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 15:07:34 +0100 Subject: gnu: tevent: Update to 0.9.39. * gnu/packages/samba.scm (tevent): Update to 0.9.39. [native-inputs]: Add WHICH. Change PYTHON-2 to PYTHON. --- gnu/packages/samba.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 346ec7c142..44519dde57 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -308,14 +308,14 @@ destructors. It is the core memory allocator used in Samba.") (define-public tevent (package (name "tevent") - (version "0.9.37") + (version "0.9.39") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/tevent/tevent-" version ".tar.gz")) (sha256 (base32 - "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn")))) + "1rnln76ngd2b8lgqvfa9iscy6jizwycj85nfp9zd46b1c760z3gn")))) (build-system gnu-build-system) (arguments '(#:phases @@ -329,7 +329,8 @@ destructors. It is the core memory allocator used in Samba.") "--bundled-libraries=NONE"))))))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2))) + ("python" ,python) + ("which" ,which))) (propagated-inputs `(("talloc" ,talloc))) ; required by tevent.pc (synopsis "Event system library") -- cgit v1.2.3 From 97dcedbd2ad20da2fb8a4bc36212d2690cb7abd7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 15:11:07 +0100 Subject: gnu: tdb: Update to 1.3.18. * gnu/packages/databases.scm (tdb): Update to 1.3.18. [native-inputs]: Add WHICH. Change PYTHON-2 to PYTHON. --- gnu/packages/databases.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9c003cbdb7..d913d72874 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1030,14 +1030,14 @@ changes.") (define-public tdb (package (name "tdb") - (version "1.3.16") + (version "1.3.18") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/tdb/tdb-" version ".tar.gz")) (sha256 (base32 - "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva")))) + "1drnsdh1w0px35r0y7l7g59yvyr67mvcsdrli4wab0mwi07b8mn1")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1054,7 +1054,8 @@ changes.") ;; ("docbook-xsl" ,docbook-xsl) ;; ("libxml2" ,libxml2) ;; ("libxslt" ,libxslt) - ("python" ,python-2))) ;for the Waf build system + ("python" ,python) ;for the Waf build system + ("which" ,which))) (home-page "https://tdb.samba.org/") (synopsis "Trivial database") (description -- cgit v1.2.3 From 4422a8c60eef95b2460b462c1493d74433e29d5c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 15:05:05 +0100 Subject: gnu: ldb: Update to 1.6.2. * gnu/packages/samba.scm (ldb): Update to 1.6.2. [native-inputs]: Change from PYTHON-2 to PYTHON. Add WHICH. --- gnu/packages/samba.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 44519dde57..d90d12e665 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -344,14 +344,14 @@ many event types, including timers, signals, and the classic file descriptor eve (define-public ldb (package (name "ldb") - (version "1.4.3") + (version "1.6.2") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-" version ".tar.gz")) (sha256 (base32 - "07vacwr941y2x31yl9knsr2rpffz5pqabvqds6sbyngqxy4r785c")) + "1kiwlra6nfkb5n870k2db41jrm59bq9lxqmil4v7ignblgsdfdwb")) (modules '((guix build utils))) (snippet '(begin @@ -381,7 +381,8 @@ many event types, including timers, signals, and the classic file descriptor eve (native-inputs `(("cmocka" ,cmocka) ("pkg-config" ,pkg-config) - ("python" ,python-2))) + ("python" ,python) + ("which" ,which))) (propagated-inputs ;; ldb.pc refers to all these. `(("talloc" ,talloc) -- cgit v1.2.3 From e99e9e6f21d16d19c2aac57bbe09b2a3ac9f30bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 15:37:39 +0100 Subject: gnu: WebKitGTK: Update to 2.22.7. * gnu/packages/webkit.scm (webkitgtk-2.22): Update to 2.22.7. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 91c6c7d02a..7a4818609e 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -168,14 +168,14 @@ HTML/CSS applications to full-fledged web browsers.") (define-public webkitgtk-2.22 (package/inherit webkitgtk (name "webkitgtk") - (version "2.22.6") + (version "2.22.7") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z")))) + "1zrhmz90sn30zgyflj4i86fsscws10xsi2kfs87nj2nd0pbggrjb")))) (native-inputs `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) -- cgit v1.2.3 From 794e0664bd634a42e9e7aac6ac84f93bcfaa9fbe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 15:50:56 +0100 Subject: gnu: ungoogled-chromium: Update to 72.0.3626.121-0.a80839c [fixes CVE-2019-5786]. * gnu/packages/chromium.scm (%chromium-version): Update to 72.0.3626.121. (ungoogled-chromium-source): Update hash. --- gnu/packages/chromium.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index c80a51dedc..7d49b06ce3 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -224,7 +224,7 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %chromium-version "72.0.3626.119") +(define %chromium-version "72.0.3626.121") (define %ungoogled-revision "a80839c418de8843dfcd6c13a557f12d26a0a17a") (define package-revision "0") @@ -245,7 +245,7 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "0ylig933xzn6c0018nxq95xhl0wkxcm95fdiy2c7s4a4h3hkr5dk")))) + "07xwmlvmzfga61nrimqmzl7s29jb4kc94nkzwwlb7sh6nr55a7jc")))) (ungoogled-source (origin (method git-fetch) -- cgit v1.2.3 From b0251c71c7b80f420f30218bc7cfd829db5aa521 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 15:55:52 +0100 Subject: gnu: libsecret: Update to 0.18.8. * gnu/packages/gnome.scm (libsecret): Update to 0.18.8. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 55032fdd77..8c5cb1709f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2683,7 +2683,7 @@ and the GLib main loop, to integrate well with GNOME applications.") (define-public libsecret (package (name "libsecret") - (version "0.18.7") + (version "0.18.8") (source (origin (method url-fetch) (uri (string-append @@ -2692,7 +2692,7 @@ and the GLib main loop, to integrate well with GNOME applications.") name "-" version ".tar.xz")) (sha256 (base32 - "11ylmcfx6ff7xd1gpi58i2nbma83lz2xg0g2dq23w6snqhgzwrhd")))) + "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From b4e1f1ae1088ad6020f0acf9e09622a827042f21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 16:01:39 +0100 Subject: gnu: audit: Update to 2.8.5. * gnu/packages/admin.scm (audit): Update to 2.8.5. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0c3f8b486e..2bc1c325a3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1856,13 +1856,13 @@ platform-specific methods.") (package (name "audit") (home-page "https://people.redhat.com/sgrubb/audit/") - (version "2.8.4") + (version "2.8.5") (source (origin (method url-fetch) (uri (string-append home-page "audit-" version ".tar.gz")) (sha256 (base32 - "0f4ci6ffznnmgblwgv7ich9mjfk3p6y5l6m6h3chhmzw156nj454")))) + "1dzcwb2q78q7x41shcachn7f4aksxbxd470yk38zh03fch1l2p8f")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--with-python=no" -- cgit v1.2.3 From 0d6f2ea13a5f7788144daf4f361bf8235c3d3744 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 16:06:23 +0100 Subject: gnu: appstream-glib: Update to 0.7.15. * gnu/packages/glib.scm (appstream-glib): Update to 0.7.15. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 5148a6aec3..5877c5f2dc 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -783,7 +783,7 @@ programming langauage. It also contains the utility (define-public appstream-glib (package (name "appstream-glib") - (version "0.7.14") + (version "0.7.15") (source (origin (method url-fetch) (uri (string-append "https://people.freedesktop.org/~hughsient/" @@ -791,7 +791,7 @@ programming langauage. It also contains the utility "appstream-glib-" version ".tar.xz")) (sha256 (base32 - "0n0s99jmx2sx5895lcvmfjwa9r0f06i71495dpn9v9frz4asvk3d")))) + "17ram4j3cvs78si0gi1labarr91pw68zn8kam41cqbvlwdyr89vy")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 5a222ebaee19f9c7055a4afae686faca747ba799 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Mar 2019 19:18:15 +0100 Subject: gnu: python-dask: Update to 1.1.3. * gnu/packages/python-xyz.scm (python-dask): Update to 1.1.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dc5a020b11..f6c217f346 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14694,14 +14694,14 @@ append on old values. Partd excels at shuffling operations.") (define-public python-dask (package (name "python-dask") - (version "1.0.0") + (version "1.1.3") (source (origin (method url-fetch) (uri (pypi-uri "dask" version)) (sha256 (base32 - "1xwz8h020ipwav2p5gcq9pskya1cvzd6hjyvd06dvr3w5lxlmym1")))) + "03ykmq46q2hh7mn68vcxkgylybjaj3r0kfspaiymdmqmjzpjivr5")))) (build-system python-build-system) ;; A single test out of 5000+ fails. This test is marked as xfail when ;; pytest-xdist is used. -- cgit v1.2.3 From 35556d7da01f00ffdbc9b3218ef2669dd28e3b62 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 3 Mar 2019 00:17:30 +0100 Subject: gnu: musescore: Update to 3.0.4. * gnu/packages/music.scm (musescore): Update to 3.0.4. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index aa001ffe34..46af70f9d7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3637,7 +3637,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (define-public musescore (package (name "musescore") - (version "3.0.3") + (version "3.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -3646,7 +3646,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (file-name (git-file-name name version)) (sha256 (base32 - "1drgmivqs2c5xck7dy5y9xf41wfnnj7n84069h273q96b783cx3f")) + "05cn4j5f7xr438lgl0by3lrc7wckdgicdn4jrvxfqic8hv81sca7")) (modules '((guix build utils))) (snippet ;; Un-bundle OpenSSL and remove unused libraries. -- cgit v1.2.3 From d74656ea020558a31e06c9068ae360310d8b70cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 3 Mar 2019 09:23:29 +0100 Subject: gnu: eolie: Update to 0.9.52. * gnu/packages/gnome.scm (eolie): Update to 0.9.52. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8c5cb1709f..277b3108a5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4191,15 +4191,15 @@ work and the interface is well tested.") (define-public eolie (package (name "eolie") - (version "0.9.45") + (version "0.9.52") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/eolie/" - "uploads/020f3f686e2b938731752a1d9f5bfa7e/" + "uploads/d95bf72958276c80dfaca8cce0e4e92c/" "eolie-" version ".tar.xz")) (sha256 (base32 - "0371p7g13r0b7zjc48fdcil43ddwpmyvkd2a4vv6ifsqmny6kl42")))) + "1s3b0rkm8sxmhzzi624snzqvz61i1rja5wxyzw6jg2kcdjcylwln")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From dbb1ef51c8e6b83fb58aafe93b4a712c3539a12b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 3 Mar 2019 10:21:58 +0100 Subject: gnu: wine-staging: Update to 4.3. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 4.3. * gnu/packages/wine.scm (wine-staging): Update to 4.3. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 67da5b455e..02561c5442 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -310,7 +310,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.2") + (version "4.3") (source (origin (method git-fetch) @@ -320,7 +320,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "1dhv6y60g64bj3kgfknbfzxfzmy686dh7svxlvi4lfis2faikxmk")))) + "14plsw52s4w0wpm0rici8b7amb51krdrby03652isvzxqr4ndip6")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -366,7 +366,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "1ysvq2jyvh7r27iwpsrlrwzj672jnrihry91bx3m3fysz3sl3ld1")))) + "1d0gbwc8ll4mfxilw9j4vdzqlnracr6y8iss27nfg1qh0q7vbf9x")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) -- cgit v1.2.3 From ea3510f8a7f0fe7add54d072b077236756ab3c54 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 3 Mar 2019 10:54:38 +0100 Subject: gnu: Add faudio. * gnu/packages/audio.scm (faudio): New variable. --- gnu/packages/audio.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d395a52f29..70bbc3e49a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Leo Famulari +;;; Copyright © 2019 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; @@ -87,6 +88,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdf) #:use-module (gnu packages readline) + #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages telephony) #:use-module (gnu packages tls) @@ -3673,3 +3675,29 @@ surround).") high-quality editing and playback of audio, and is based on the JUCE library.") (license license:lgpl3+))) + +(define-public faudio + (package + (name "faudio") + (version "19.03") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FNA-XNA/FAudio.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "0v5l67ixr5kd9jz5sza8xgzxamqnlgn3gs1q8gg6ir60g0jvzbd4")))) + (arguments + '(#:tests? #f ; No tests. + #:configure-flags '("-DFFMPEG=ON"))) + (build-system cmake-build-system) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("ffmpeg" ,ffmpeg) + ("sdl2" ,sdl2))) + (home-page "https://github.com/FNA-XNA/FAudio") + (synopsis "XAudio reimplementation") + (description "FAudio is an XAudio reimplementation that focuses solely on +developing fully accurate DirectX Audio runtime libraries.") + (license license:zlib))) -- cgit v1.2.3 From 0fa3d705d2f5821c9d116267fa9e2c6b3f69c846 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 3 Mar 2019 10:52:46 +0100 Subject: gnu: wine-staging: Add faudio support. * gnu/packages/wine.scm (wine-staging)[inputs]: Add faudio. [arguments]: Adjust patchinstall.sh to faudio. * gnu/packages/wine.scm (wine64-staging)[arguments]: Adjust patchinstall.sh to faudio. --- gnu/packages/wine.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 02561c5442..6d2d9ea09b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -368,6 +368,7 @@ integrate Windows applications into your desktop.") (base32 "1d0gbwc8ll4mfxilw9j4vdzqlnracr6y8iss27nfg1qh0q7vbf9x")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf + ("faudio" ,faudio) ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) ("libva" ,libva) @@ -406,7 +407,10 @@ integrate Windows applications into your desktop.") (script (string-append (assoc-ref %build-inputs "wine-staging-patchset-data") "/share/wine-staging/patches/patchinstall.sh"))) - (invoke script (string-append "DESTDIR=" ".") "--all") + ;; Exclude specific patches that conflict with FAudio. + (invoke script (string-append "DESTDIR=" ".") "--all" "-W" + "xaudio2-revert" "-W" "xaudio2_CommitChanges" "-W" + "xaudio2_7-WMA_support" "-W" "xaudio2_7-CreateFX-FXEcho") #t))) (add-after 'configure 'patch-dlopen-paths ;; Hardcode dlopened sonames to absolute paths. @@ -482,7 +486,10 @@ integrated into the main branch.") (script (string-append (assoc-ref %build-inputs "wine-staging-patchset-data") "/share/wine-staging/patches/patchinstall.sh"))) - (invoke script (string-append "DESTDIR=" ".") "--all") + ;; Exclude specific patches that conflict with FAudio. + (invoke script (string-append "DESTDIR=" ".") "--all" "-W" + "xaudio2-revert" "-W" "xaudio2_CommitChanges" "-W" + "xaudio2_7-WMA_support" "-W" "xaudio2_7-CreateFX-FXEcho") #t))) (add-after 'install 'copy-wine32-binaries (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From d2f555f59b7089176f92b674f8b78a6b9c3f4bcf Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 21 Feb 2019 01:14:59 +0100 Subject: gnu: Add emacs-isearch+. * gnu/packages/emacs-xyz.scm (emacs-isearch+): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 86dbfe6d53..dda5500f9d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018, 2019 Brett Gilio ;;; Copyright © 2019 Dimakakos Dimos +;;; Copyright © 2019 Brian Leung ;;; ;;; This file is part of GNU Guix. ;;; @@ -11131,6 +11132,29 @@ my_thing reload} all the time. It offers a consistent UI over different init systems.") (license license:gpl3+))) +(define-public emacs-isearch+ + (let ((commit "95e49af9dbf0254e095a11f115e101b52659520a") + (revision "1")) + (package + (name "emacs-isearch+") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsmirror/isearch-plus.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xhd9zgknf4lvzyf4apirpd7spb1hbpzkvys00a7pkmd0vvahk0v")))) + (build-system emacs-build-system) + (home-page "https://www.emacswiki.org/emacs/isearch+.el") + (synopsis "Extensions to @code{isearch.el}") + (description "This package extends @code{isearch} with advice, dynamic +filters, highlighting of regexp group levels, and more.") + (license license:gpl2+)))) + (define-public emacs-esh-autosuggest (package (name "emacs-esh-autosuggest") -- cgit v1.2.3 From 4f889375f2e3c0606e83280cd7deee5c58e11cd4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 17:29:56 +0200 Subject: gnu: libopenshot: Fix tests on other architectures. * gnu/packages/video.scm (libopenshot)[source]: Add patch. * gnu/packages/patches/libopenshot-fixup-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/patches/libopenshot-fixup-tests.patch | 148 +++++++++++++++++++++ gnu/packages/video.scm | 3 +- 3 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libopenshot-fixup-tests.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index c27bf9749e..974195b4bb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -976,6 +976,7 @@ dist_patch_DATA = \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ + %D%/packages/patches/libopenshot-fixup-tests.patch \ %D%/packages/patches/libopenshot-tests-with-system-libs.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \ %D%/packages/patches/libmad-armv7-thumb-pt1.patch \ diff --git a/gnu/packages/patches/libopenshot-fixup-tests.patch b/gnu/packages/patches/libopenshot-fixup-tests.patch new file mode 100644 index 0000000000..9a0bcc5e8f --- /dev/null +++ b/gnu/packages/patches/libopenshot-fixup-tests.patch @@ -0,0 +1,148 @@ +From 691536f2f8a9ed7322fedb24d489db08c70705b9 Mon Sep 17 00:00:00 2001 +From: "Dr. Tobias Quathamer" +Date: Sat, 18 Nov 2017 13:54:22 +0100 +Subject: [PATCH] This the combination of two patches: + https://sources.debian.org/data/main/libo/libopenshot/0.2.2+dfsg1-1/debian/patches/0003-Fix-failing-tests-by-using-a-fault-tolerance.patch + https://sources.debian.org/data/main/libo/libopenshot/0.2.2+dfsg1-1/debian/patches/0004-Add-some-more-fault-tolerance-for-arm64.patch + +Together they should fix the test suite on all architectures +--- + tests/FFmpegReader_Tests.cpp | 9 ++++----- + tests/ImageWriter_Tests.cpp | 8 ++++---- + tests/Timeline_Tests.cpp | 28 ++++++++++++++-------------- + 3 files changed, 22 insertions(+), 23 deletions(-) + +diff --git a/tests/FFmpegReader_Tests.cpp b/tests/FFmpegReader_Tests.cpp +index 53563ca..07fc41e 100644 +--- a/tests/FFmpegReader_Tests.cpp ++++ b/tests/FFmpegReader_Tests.cpp +@@ -95,8 +95,8 @@ TEST(FFmpegReader_Check_Video_File) + int pixel_index = 112 * 4; // pixel 112 (4 bytes per pixel) + + // Check image properties on scanline 10, pixel 112 +- CHECK_EQUAL(21, (int)pixels[pixel_index]); +- CHECK_EQUAL(191, (int)pixels[pixel_index + 1]); ++ CHECK_CLOSE(21, (int)pixels[pixel_index], 1); ++ CHECK_CLOSE(191, (int)pixels[pixel_index + 1], 2); + CHECK_EQUAL(0, (int)pixels[pixel_index + 2]); + CHECK_EQUAL(255, (int)pixels[pixel_index + 3]); + +@@ -109,8 +109,8 @@ TEST(FFmpegReader_Check_Video_File) + + // Check image properties on scanline 10, pixel 112 + CHECK_EQUAL(0, (int)pixels[pixel_index]); +- CHECK_EQUAL(96, (int)pixels[pixel_index + 1]); +- CHECK_EQUAL(188, (int)pixels[pixel_index + 2]); ++ CHECK_CLOSE(96, (int)pixels[pixel_index + 1], 1); ++ CHECK_CLOSE(188, (int)pixels[pixel_index + 2], 1); + CHECK_EQUAL(255, (int)pixels[pixel_index + 3]); + + // Close reader +@@ -209,4 +209,3 @@ TEST(FFmpegReader_Multiple_Open_and_Close) + // Close reader + r.Close(); + } +- +diff --git a/tests/ImageWriter_Tests.cpp b/tests/ImageWriter_Tests.cpp +index 107ee39..d10c8bd 100644 +--- a/tests/ImageWriter_Tests.cpp ++++ b/tests/ImageWriter_Tests.cpp +@@ -73,9 +73,9 @@ TEST(ImageWriter_Test_Gif) + int pixel_index = 230 * 4; // pixel 230 (4 bytes per pixel) + + // Check image properties +- CHECK_EQUAL(20, (int)pixels[pixel_index]); +- CHECK_EQUAL(18, (int)pixels[pixel_index + 1]); +- CHECK_EQUAL(11, (int)pixels[pixel_index + 2]); ++ CHECK_CLOSE(20, (int)pixels[pixel_index], 5); ++ CHECK_CLOSE(18, (int)pixels[pixel_index + 1], 2); ++ CHECK_CLOSE(11, (int)pixels[pixel_index + 2], 2); + CHECK_EQUAL(255, (int)pixels[pixel_index + 3]); + } +-#endif +\ No newline at end of file ++#endif +diff --git a/tests/Timeline_Tests.cpp b/tests/Timeline_Tests.cpp +index 8c81579..4d861a6 100644 +--- a/tests/Timeline_Tests.cpp ++++ b/tests/Timeline_Tests.cpp +@@ -119,8 +119,8 @@ TEST(Timeline_Check_Two_Track_Video) + int pixel_index = 230 * 4; // pixel 230 (4 bytes per pixel) + + // Check image properties +- CHECK_EQUAL(21, (int)f->GetPixels(pixel_row)[pixel_index]); +- CHECK_EQUAL(191, (int)f->GetPixels(pixel_row)[pixel_index + 1]); ++ CHECK_CLOSE(21, (int)f->GetPixels(pixel_row)[pixel_index], 2); ++ CHECK_CLOSE(191, (int)f->GetPixels(pixel_row)[pixel_index + 1], 2); + CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]); + CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]); + +@@ -128,17 +128,17 @@ TEST(Timeline_Check_Two_Track_Video) + f = t.GetFrame(2); + + // Check image properties +- CHECK_EQUAL(176, (int)f->GetPixels(pixel_row)[pixel_index]); ++ CHECK_CLOSE(176, (int)f->GetPixels(pixel_row)[pixel_index], 1); + CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 1]); +- CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index + 2]); ++ CHECK_CLOSE(186, (int)f->GetPixels(pixel_row)[pixel_index + 2], 1); + CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]); + + // Get frame + f = t.GetFrame(3); + + // Check image properties +- CHECK_EQUAL(23, (int)f->GetPixels(pixel_row)[pixel_index]); +- CHECK_EQUAL(190, (int)f->GetPixels(pixel_row)[pixel_index + 1]); ++ CHECK_CLOSE(23, (int)f->GetPixels(pixel_row)[pixel_index], 1); ++ CHECK_CLOSE(190, (int)f->GetPixels(pixel_row)[pixel_index + 1], 2); + CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]); + CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]); + +@@ -146,8 +146,8 @@ TEST(Timeline_Check_Two_Track_Video) + f = t.GetFrame(24); + + // Check image properties +- CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index]); +- CHECK_EQUAL(106, (int)f->GetPixels(pixel_row)[pixel_index + 1]); ++ CHECK_CLOSE(186, (int)f->GetPixels(pixel_row)[pixel_index], 1); ++ CHECK_CLOSE(106, (int)f->GetPixels(pixel_row)[pixel_index + 1], 1); + CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]); + CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]); + +@@ -155,8 +155,8 @@ TEST(Timeline_Check_Two_Track_Video) + f = t.GetFrame(5); + + // Check image properties +- CHECK_EQUAL(23, (int)f->GetPixels(pixel_row)[pixel_index]); +- CHECK_EQUAL(190, (int)f->GetPixels(pixel_row)[pixel_index + 1]); ++ CHECK_CLOSE(23, (int)f->GetPixels(pixel_row)[pixel_index], 1); ++ CHECK_CLOSE(190, (int)f->GetPixels(pixel_row)[pixel_index + 1], 2); + CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 2]); + CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]); + +@@ -165,17 +165,17 @@ TEST(Timeline_Check_Two_Track_Video) + + // Check image properties + CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index]); +- CHECK_EQUAL(94, (int)f->GetPixels(pixel_row)[pixel_index + 1]); +- CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index + 2]); ++ CHECK_CLOSE(94, (int)f->GetPixels(pixel_row)[pixel_index + 1], 1); ++ CHECK_CLOSE(186, (int)f->GetPixels(pixel_row)[pixel_index + 2], 1); + CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]); + + // Get frame + f = t.GetFrame(4); + + // Check image properties +- CHECK_EQUAL(176, (int)f->GetPixels(pixel_row)[pixel_index]); ++ CHECK_CLOSE(176, (int)f->GetPixels(pixel_row)[pixel_index], 1); + CHECK_EQUAL(0, (int)f->GetPixels(pixel_row)[pixel_index + 1]); +- CHECK_EQUAL(186, (int)f->GetPixels(pixel_row)[pixel_index + 2]); ++ CHECK_CLOSE(186, (int)f->GetPixels(pixel_row)[pixel_index + 2], 1); + CHECK_EQUAL(255, (int)f->GetPixels(pixel_row)[pixel_index + 3]); + + // Close reader +-- +2.21.0 + diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 52f151bd78..c51352dcf8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3222,7 +3222,8 @@ create smoother and stable videos.") (string-append set " CACHE PATH " "\"Python bindings directory\")"))) #t)) - (patches (search-patches "libopenshot-tests-with-system-libs.patch")))) + (patches (search-patches "libopenshot-fixup-tests.patch" + "libopenshot-tests-with-system-libs.patch")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 277becbbb7beee43c2e0fa5e2b038882c07200cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 17:30:33 +0200 Subject: gnu: libopenshot: Remove bundled libraries. * gnu/packages/video.scm (libopenshot)[source]: Add snippet to remove bundled libraries. --- gnu/packages/video.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c51352dcf8..d61e11eecd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3221,6 +3221,7 @@ create smoother and stable videos.") (("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set) (string-append set " CACHE PATH " "\"Python bindings directory\")"))) + (delete-file-recursively "thirdparty") #t)) (patches (search-patches "libopenshot-fixup-tests.patch" "libopenshot-tests-with-system-libs.patch")))) -- cgit v1.2.3 From ad656e70b69f65914b87cb334ffef9547f597508 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 17:31:16 +0200 Subject: gnu: libopenshot: Build with modular qt. * gnu/packages/video.scm (libopenshot)[propagated-inputs]: Remove qt, add qtbase, qtmultimedia. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d61e11eecd..221b3a8ad0 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3237,7 +3237,8 @@ create smoother and stable videos.") ("imagemagick" ,imagemagick) ("jsoncpp" ,jsoncpp) ("libopenshot-audio" ,libopenshot-audio) - ("qt" ,qt) ;widgets, core, gui, multimedia, and multimediawidgets + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) ("zeromq" ,zeromq))) (arguments `(#:configure-flags -- cgit v1.2.3 From ae63b2c582d565fe7c3f7a18d9b9c1f1ee438931 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 19:57:08 +0200 Subject: gnu: avidemux: Update to 2.7.1. * gnu/packages/video.scm (avidemux): Update to 2.7.1. [arguments]: Update bundled ffmpeg to 3.3.7. --- gnu/packages/video.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 221b3a8ad0..782f6a0c64 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1764,7 +1764,7 @@ for use with HTML5 video.") (define-public avidemux (package (name "avidemux") - (version "2.6.12") + (version "2.7.1") (source (origin (method url-fetch) (uri (string-append @@ -1772,7 +1772,7 @@ for use with HTML5 video.") name "_" version ".tar.gz")) (sha256 (base32 - "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn")) + "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w")) (patches (search-patches "avidemux-install-to-lib.patch")))) (build-system cmake-build-system) (native-inputs @@ -1810,19 +1810,19 @@ for use with HTML5 video.") (add-before 'patch-source-shebangs 'unpack-ffmpeg (lambda _ (with-directory-excursion "avidemux_core/ffmpeg_package" - (invoke "tar" "xf" "ffmpeg-2.7.6.tar.bz2") - (delete-file "ffmpeg-2.7.6.tar.bz2")) + (invoke "tar" "xf" "ffmpeg-3.3.7.tar.bz2") + (delete-file "ffmpeg-3.3.7.tar.bz2")) #t)) (add-after 'patch-source-shebangs 'repack-ffmpeg (lambda _ (with-directory-excursion "avidemux_core/ffmpeg_package" - (substitute* "ffmpeg-2.7.6/configure" + (substitute* "ffmpeg-3.3.7/configure" (("#! /bin/sh") (string-append "#!" (which "sh")))) - (invoke "tar" "cjf" "ffmpeg-2.7.6.tar.bz2" "ffmpeg-2.7.6" + (invoke "tar" "cjf" "ffmpeg-3.3.7.tar.bz2" "ffmpeg-3.3.7" ;; avoid non-determinism in the archive "--sort=name" "--mtime=@0" "--owner=root:0" "--group=root:0") - (delete-file-recursively "ffmpeg-2.7.6")) + (delete-file-recursively "ffmpeg-3.3.7")) #t)) (replace 'configure (lambda _ -- cgit v1.2.3 From 3261a732804f7bcaa90279072cdc7e60afd62dd5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 19:57:48 +0200 Subject: gnu: avidemux: Build with modular qt. * gnu/packages/video.scm (avidemux)[inputs]: Remove qt, add qtbase, qttools. --- gnu/packages/video.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 782f6a0c64..bf9cb155f2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1794,9 +1794,8 @@ for use with HTML5 video.") ("perl" ,perl) ("pulseaudio" ,pulseaudio) ("python" ,python-wrapper) - ("qt" ,qt) ; FIXME: reenable modular qt after update - requires building - ;("qtbase" ,qtbase) with -std=gnu++11. - ;("qttools" ,qttools) + ("qtbase" ,qtbase) + ("qttools" ,qttools) ("sdl" ,sdl) ("sqlite" ,sqlite) ("yasm" ,yasm) -- cgit v1.2.3 From d60213967a4df2ad46502046c8061314b0da2bc1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Mar 2019 08:24:24 +0100 Subject: gnu: emacs-magit: Update to 2.90.1. * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 2.90.1. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dda5500f9d..d6da8a91d0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -254,16 +254,16 @@ on stdout instead of using a socket as the Emacsclient does.") (define-public emacs-magit (package (name "emacs-magit") - (version "2.13.1") + (version "2.90.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/magit/magit") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1kmjjcvhcb21qi6kmrlhf92ync8va5l41n9ban8kj25h7dbqyiym")))) + "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4")))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-minimal))) -- cgit v1.2.3 From 3a56c5183668ddec64c10f32ded193d3d86692f2 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Mar 2019 08:24:41 +0100 Subject: gnu: emacs-magit-todos: Update to 1.1.7. * gnu/packages/emacs-xyz.scm (emacs-magit-todos): Update to 1.1.7. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d6da8a91d0..9efd857b86 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12150,7 +12150,7 @@ buffers – other modes on the TODO list). (define-public emacs-magit-todos (package (name "emacs-magit-todos") - (version "1.1") + (version "1.1.7") (source (origin (method git-fetch) @@ -12160,7 +12160,7 @@ buffers – other modes on the TODO list). (file-name (git-file-name name version)) (sha256 (base32 - "1mvzbxshr6zjdim3jd368ar1hy5l7n22i03cpvzdmrw83kkwdyhd")))) + "0qagdxpik64n4rw9scy451ws5sw00v64ri9g2dcw7b66bx2c6c6w")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From 3499638ef87191d458f3e07455a9a0fefe76c085 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Mar 2019 08:31:41 +0100 Subject: gnu: emacs-evil-magit: Update to 20190224. * gnu/packages/emacs-xyz.scm (emacs-evil-magit): Update to 20190224. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9efd857b86..42d4e37a22 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11264,10 +11264,10 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (deprecated-package "emacs-evil-ediff" emacs-evil-collection)) (define-public emacs-evil-magit - (let ((commit "dbf5a646a7ce1c35c229dfdc423bd5ecd927a3a8")) + (let ((commit "e2fec5877994c0c19f0c25fa01f3d22cb0ab38ba")) (package (name "emacs-evil-magit") - (version (git-version "0.4.2" "1" commit)) + (version (git-version "0.4.2" "2" commit)) (source (origin (method git-fetch) @@ -11277,7 +11277,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0ya0dkviq4pi92ab69a4j674y5r1hc1x3x7r7hlm97ag3a6zfkav")))) + "134v7s03jvbhm70mavwab85r09i68g2a5bvriirh0chz1av2y16v")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) -- cgit v1.2.3 From b6fd7f5003c725e4e43f71287c33980bad0903a4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Mar 2019 12:17:13 +0100 Subject: gnu: emacs-helm-emms: Update to 20190304. * gnu/packages/emacs-xyz.scm (emacs-helm-emms): Update to 20190304. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 42d4e37a22..cd18d56e66 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11533,10 +11533,10 @@ you searched for and execute it, or view its documentation.") (license license:gpl3+)))) (define-public emacs-helm-emms - (let ((commit "d3f9bdef8ff0d093eaf6e26af50ea905ab53fdec")) + (let ((commit "b785cb845a98a643eba9d5d53c9c0b4e6810a3cd")) (package (name "emacs-helm-emms") - (version (git-version "1.3" "1" commit)) + (version (git-version "1.3" "2" commit)) (source (origin (method git-fetch) @@ -11546,7 +11546,7 @@ you searched for and execute it, or view its documentation.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0bdb8xp0yp3gijpa9i2rc17gfzjhzlm92vdzw93i10qpd1xhj4aa")))) + "1595r09y3rmwd46nnhvjja3hb8j2ila295ijxv61cg52ws4wginh")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit v1.2.3 From e7a53914f15fa0e86ec583b115aca9e4ff6c69a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 4 Mar 2019 13:54:47 +0100 Subject: gnu: python-matplotlib-documentation: Fix build. * gnu/packages/python-xyz.scm (python-matplotlib-documentation) [native-inputs]: Add python-ipykernel; replace texlive with a texlive-union consisting of texlive-latex-amsfonts, texlive-latex-amsmath, texlive-latex-enumitem, texlive-latex-expdlist, texlive-latex-preview, texlive-latex-type1cm, texlive-latex-ucs, texlive-generic-pdftex, texlive-fonts-amsfonts, texlive-fonts-ec, texlive-fonts-adobe-times, and texlive-fonts-txfonts. [arguments]: Do not build PDF, remove PDF-related changes; patch to avoid dependency on network resources. --- gnu/packages/python-xyz.scm | 51 ++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f6c217f346..09c7e2db38 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3537,9 +3537,24 @@ toolkits.") ("python-sphinx-gallery" ,python-sphinx-gallery) ("python-numpydoc" ,python-numpydoc) ("python-ipython" ,python-ipython) + ("python-ipykernel" ,python-ipykernel) ("python-mock" ,python-mock) ("graphviz" ,graphviz) - ("texlive" ,texlive) + ("texlive" ,(texlive-union (list texlive-latex-amsfonts + texlive-latex-amsmath + texlive-latex-enumitem + texlive-latex-expdlist + texlive-latex-geometry + texlive-latex-preview + texlive-latex-type1cm + texlive-latex-ucs + + texlive-generic-pdftex + + texlive-fonts-amsfonts + texlive-fonts-ec + texlive-fonts-adobe-times + texlive-fonts-txfonts))) ("texinfo" ,texinfo) ,@(package-native-inputs python-matplotlib))) (arguments @@ -3549,15 +3564,24 @@ toolkits.") (replace 'build (lambda _ (chdir "doc") - ;; Produce pdf in 'A4' format. + (setenv "PYTHONPATH" + (string-append (getenv "PYTHONPATH") + ":" (getcwd) "/../examples/units")) (substitute* "conf.py" - (("latex_paper_size = 'letter'") "") - ;; latex_paper_size is deprecated -> set paper size using - ;; latex_elements - (("latex_elements\\['pointsize'\\] = '11pt'" match) - ;; insert at a point where latex_elements{} is defined: - (string-append match "\nlatex_elements['papersize'] = 'a4paper'"))) - (invoke "make" "SPHINXBUILD=sphinx-build" "html" "latex" "texinfo"))) + ;; Don't use git. + (("^SHA = check_output.*") + (string-append "SHA = \"" ,version "\"\n")) + ;; Don't fetch intersphinx files from the Internet + (("^explicit_order_folders" m) + (string-append "intersphinx_mapping = {}\n" m)) + (("'sphinx.ext.intersphinx',") "") + ;; Disable URL embedding which requires internet access. + (("'https://docs.scipy.org/doc/numpy'") "None") + (("'https://docs.scipy.org/doc/scipy/reference'") "None")) + (invoke "make" + "SPHINXBUILD=sphinx-build" + "SPHINXOPTS=" ; don't abort on warnings + "html" "texinfo"))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((data (string-append (assoc-ref outputs "out") "/share")) @@ -3575,12 +3599,9 @@ toolkits.") (string-append "@image{matplotlib-figures/" file))) (symlink (string-append html "/_images") "./matplotlib-figures") - (system* "makeinfo" "--no-split" - "-o" "matplotlib.info" "matplotlib.texi")) - (copy-file "build/texinfo/matplotlib.info" - (string-append info "/matplotlib.info")) - (copy-file "build/latex/Matplotlib.pdf" - (string-append doc "/Matplotlib.pdf"))) + (invoke "makeinfo" "--no-split" + "-o" "matplotlib.info" "matplotlib.texi")) + (install-file "build/texinfo/matplotlib.info" info)) #t))))) (home-page (package-home-page python-matplotlib)) (synopsis "Documentation for the python-matplotlib package") -- cgit v1.2.3 From 4254b480c938dd429772cbb78301539c6bd972d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 4 Mar 2019 15:00:05 +0100 Subject: gnu: Add r-capushe. * gnu/packages/cran.scm (r-capushe): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 54031fa87a..cc23c53f4c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10681,3 +10681,24 @@ functions are provided.") help you to better understand object oriented programming in R, particularly using @code{S3}.") (license license:gpl3))) + +(define-public r-capushe + (package + (name "r-capushe") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "capushe" version)) + (sha256 + (base32 + "1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc")))) + (build-system r-build-system) + (propagated-inputs `(("r-mass" ,r-mass))) + (home-page "https://cran.r-project.org/web/packages/capushe/index.html") + (synopsis "Calibrating penalities using slope heuristics") + (description + "This package provides tools for the calibration of penalized criteria +for model selection. The calibration methods available are based on the slope +heuristics.") + (license license:gpl2+))) -- cgit v1.2.3 From 3a0babacdcd1f6d3691c777b64d8fd3527eefb42 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 4 Mar 2019 15:00:18 +0100 Subject: gnu: Add r-htscluster. * gnu/packages/bioconductor.scm (r-htscluster): New variable. --- gnu/packages/bioconductor.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9057158cde..ae9d7070c3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1199,3 +1199,32 @@ sequencing data.") algorithm to segment DNA copy number data and identify genomic regions with abnormal copy number.") (license license:gpl2+))) + +;; This is a CRAN package, but it uncharacteristically depends on a +;; Bioconductor package. +(define-public r-htscluster + (package + (name "r-htscluster") + (version "2.0.8") + (source + (origin + (method url-fetch) + (uri (cran-uri "HTSCluster" version)) + (sha256 + (base32 + "0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg")))) + (properties `((upstream-name . "HTSCluster"))) + (build-system r-build-system) + (propagated-inputs + `(("r-capushe" ,r-capushe) + ("r-edger" ,r-edger) + ("r-plotrix" ,r-plotrix))) + (home-page "https://cran.r-project.org/web/packages/HTSCluster") + (synopsis "Clustering high-throughput transcriptome sequencing (HTS) data") + (description + "This package provides a Poisson mixture model is implemented to cluster +genes from high-throughput transcriptome sequencing (RNA-seq) data. Parameter +estimation is performed using either the EM or CEM algorithm, and the slope +heuristics are used for model selection (i.e., to choose the number of +clusters).") + (license license:gpl3+))) -- cgit v1.2.3 From 94be7c8b2aad43a311bc210104637b31515f80a1 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Thu, 7 Feb 2019 17:43:47 +0100 Subject: gnu: emacs: Add modules support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs): Add modules support in configure-flags. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 821065c56f..7b7fc7fa0f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -115,6 +115,7 @@ (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no check target + #:configure-flags (list "--with-modules") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-/bin/pwd -- cgit v1.2.3 From e32099732c37959e2899430f833eef6558373b91 Mon Sep 17 00:00:00 2001 From: Lprndn Date: Thu, 24 Jan 2019 13:29:21 +0100 Subject: gnu: Add arcan. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/arcan.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/arcan.scm | 158 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 gnu/packages/arcan.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 974195b4bb..449ee8367d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -65,6 +65,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/antivirus.scm \ %D%/packages/apl.scm \ %D%/packages/apr.scm \ + %D%/packages/arcan.scm \ %D%/packages/aspell.scm \ %D%/packages/assembly.scm \ %D%/packages/astronomy.scm \ diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm new file mode 100644 index 0000000000..606499ba1f --- /dev/null +++ b/gnu/packages/arcan.scm @@ -0,0 +1,158 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 L p R n d n +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages arcan) + #:use-module (guix build-system cmake) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (gnu packages apr) + #:use-module (gnu packages audio) + #:use-module (gnu packages compression) + #:use-module (gnu packages databases) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages libusb) + #:use-module (gnu packages lua) + #:use-module (gnu packages ocr) + #:use-module (gnu packages pcre) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ruby) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages video) + #:use-module (gnu packages xdisorg)) + +(define-public arcan + (let ((commit "b4dd1fbd1938492ff4b269189d3c8524be7450a9") + (revision "1")) + (package + (name "arcan") + (version (git-version "0.5.5.2" revision commit)) + (source (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/letoram/arcan.git") + (commit commit))) + (sha256 + (base32 "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DVIDEO_PLATFORM=egl-dri" "-DBUILTIN_LUA=off" + "-DSTATIC_OPENAL=off""-DENABLE_LWA=on" + "-DSTATIC_SQLITE3=off" "-DSTATIC_FREETYPE=off" + "-DSHMIF_TUI_ACCEL=on") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cmake-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/platform/cmake/modules/FindGBMKMS.cmake" + (("/usr/local/include/libdrm") + (string-append (assoc-ref inputs "libdrm") + "/include/libdrm"))) + (substitute* "src/platform/cmake/modules/FindAPR.cmake" + (("/usr/local/apr/include/apr-1") + (string-append (assoc-ref inputs "apr") + "/include/apr-1"))) + #t)) + ;; Normally, it tries to fetch patched openal with git + ;; but copying files manually in the right place seems to work too. + (add-after 'unpack 'prepare-static-openal + (lambda* (#:key inputs #:allow-other-keys) + (let ((arcan-openal (assoc-ref inputs "arcan-openal"))) + (copy-recursively arcan-openal "external/git/openal")) + #t)) + (add-after 'prepare-static-openal 'generate-man + (lambda _ + (with-directory-excursion "doc" + (invoke "ruby" "docgen.rb" "mangen")) + #t)) + (add-before 'configure 'chdir + (lambda _ + (chdir "src") + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/arcan") + `("ARCAN_RESOURCEPATH" ":" suffix + (,(string-append out "/share/arcan/resources"))) + `("ARCAN_STATEBASEPATH" ":" = + ("$HOME/.arcan/resources/savestates")) + `("ARCAN_STATEPATH" ":" = + ("$HOME/.arcan/resources/savestates")) + `("ARCAN_BINPATH" ":" = + (,(string-append out "/bin/arcan_frameserver"))))) + #t))) + #:tests? #f)) + (native-search-paths + (list (search-path-specification + (variable "ARCAN_APPLBASEPATH") + (separator #f) + (files '("share/arcan/appl"))) + (search-path-specification + (variable "ARCAN_SCRIPTPATH") + (separator #f) + (files '("share/arcan/scripts"))))) + (inputs + `(("apr" ,apr) + ("ffmpeg" ,ffmpeg) + ("freetype" ,freetype) + ("glib" ,glib) + ("glu" ,glu) + ("harfbuzz" ,harfbuzz) + ("libdrm" ,libdrm) + ("libusb" ,libusb) + ("libxkbcommon" ,libxkbcommon) + ("lua" ,luajit) + ("lzip" ,lzip) + ("openal" ,openal) + ("pcre" ,pcre) + ("sqlite" ,sqlite) + ("tesseract-ocr" ,tesseract-ocr) + ("leptonica" ,leptonica) + ("vlc" ,vlc) + ;; To build arcan_lwa, we need a patched version of openal. + ;; https://github.com/letoram/arcan/wiki/packaging + ("arcan-openal" ,(origin + (method git-fetch) + (file-name "arcan-openal-0.5.4") + (uri (git-reference + (url "https://github.com/letoram/openal.git") + (commit "1c7302c580964fee9ee9e1d89ff56d24f934bdef"))) + (sha256 + (base32 + "0dcxcnqjkyyqdr2yk84mprvkncy5g172kfs6vc4zrkklsbkr8yi2")))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("ruby" ,ruby))) ; For documentation and testing + (home-page "https://arcan-fe.com") + (synopsis "Display server, multimedia framework and game engine (egl-dri)") + (description "Arcan is a development framework for creating virtually +anything from user interfaces for specialized embedded applications +all the way to full-blown desktop environments. At its heart lies a multimedia +engine programmable using Lua.") + ;; https://github.com/letoram/arcan/blob/master/COPYING + (license (list license:gpl2+ + license:lgpl2.0 + license:lgpl2.0+ + license:public-domain + license:bsd-3))))) -- cgit v1.2.3 From c36448131dfea5ddb13338d9059d53f5a752c144 Mon Sep 17 00:00:00 2001 From: Lprndn Date: Thu, 24 Jan 2019 13:34:26 +0100 Subject: gnu: Add arcan-sdl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/arcan.scm (arcan-sdl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/arcan.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 606499ba1f..0dfbf33901 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -21,6 +21,7 @@ #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages apr) #:use-module (gnu packages audio) #:use-module (gnu packages compression) @@ -36,9 +37,11 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ruby) + #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) #:use-module (gnu packages video) - #:use-module (gnu packages xdisorg)) + #:use-module (gnu packages xdisorg) + #:use-module (srfi srfi-1)) (define-public arcan (let ((commit "b4dd1fbd1938492ff4b269189d3c8524be7450a9") @@ -156,3 +159,21 @@ engine programmable using Lua.") license:lgpl2.0+ license:public-domain license:bsd-3))))) + +(define-public arcan-sdl + (package + (inherit arcan) + (name "arcan-sdl") + (inputs + `(("sdl" ,sdl) + ,@(fold alist-delete (package-inputs arcan) + '("libdrm")))) + (arguments + `(,@(ensure-keyword-arguments + (package-arguments arcan) + '(#:configure-flags + '("-DVIDEO_PLATFORM=sdl" "-DBUILTIN_LUA=off" + "-DSTATIC_OPENAL=off" "-DDISABLE_JIT=off" + "-DENABLE_LWA=on" "-DSTATIC_SQLITE3=off" + "-DSTATIC_FREETYPE=off" "-DSHMIF_TUI_ACCEL=on"))))) + (synopsis "Combined display server, multimedia framework and game engine (SDL)"))) -- cgit v1.2.3 From e7ed996c531b5077f4466d8b9801a3509f00e0e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 17:11:50 +0200 Subject: gnu: mkvtoolnix: Update to 31.0.0. * gnu/packages/video.scm (mkvtoolnix): Update to 31.0.0. [arguments]: Remove unneeded 'with-extra-includes' flag, add flags to disable update checks and not use precompiled headers. --- gnu/packages/video.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bf9cb155f2..76fdec9f2f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -316,7 +316,7 @@ H.264 (MPEG-4 AVC) video streams.") (define-public mkvtoolnix (package (name "mkvtoolnix") - (version "13.0.0") + (version "31.0.0") (source (origin (method url-fetch) @@ -324,7 +324,7 @@ H.264 (MPEG-4 AVC) video streams.") name "-" version ".tar.xz")) (sha256 (base32 - "0hknnnnx9661igm1r73dc7aqxnnrl5a8yvyvr1nhd9ymn2klwpl5")) + "0d8va2iamzc7y3wi71z8mk2vnqvnkgwb2p7casdfp37400x8r2pr")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled libraries. @@ -368,16 +368,15 @@ H.264 (MPEG-4 AVC) video streams.") (assoc-ref %build-inputs "docbook-xsl") "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl)) - (string-append "--with-extra-includes=" - (assoc-ref %build-inputs "nlohmann-json-cpp") - "/include/nlohmann")) + "--enable-update-check=no" + "--enable-precompiled-headers=no") #:phases (modify-phases %standard-phases (add-before 'configure 'add-googletest - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (symlink - (string-append (assoc-ref %build-inputs "googletest") - "/include/gtest") "lib/gtest") + (string-append (assoc-ref inputs "googletest") + "/include/gtest") "lib/gtest") #t)) (replace 'build (lambda _ -- cgit v1.2.3 From f3395a7b4dcf04bad2c07d6de414014a3d227483 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 17:13:30 +0200 Subject: gnu: mkvtoolnix: Unbundle more libraries. * gnu/packages/video.scm (mkvtoolnix)[source]: Remove more bundled libraries. [inputs]: Add fmt, cmark. --- gnu/packages/video.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 76fdec9f2f..93ebfe09d5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -112,6 +112,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages m4) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -119,6 +120,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -329,7 +331,8 @@ H.264 (MPEG-4 AVC) video streams.") (snippet '(begin ;; Delete bundled libraries. (for-each delete-file-recursively - '("lib/libebml" + '("lib/fmt" + "lib/libebml" "lib/libmatroska" "lib/nlohmann-json" "lib/pugixml" @@ -339,9 +342,11 @@ H.264 (MPEG-4 AVC) video streams.") (inputs `(("boost" ,boost) ("bzip2" ,bzip2) + ("cmark" ,cmark) ("libebml" ,libebml) - ("flac" ,flac) ("file" ,file) + ("flac" ,flac) + ("fmt" ,fmt) ("libmatroska" ,libmatroska) ("libogg" ,libogg) ("libvorbis" ,libvorbis) -- cgit v1.2.3 From 662ff659ec6fb2ab2c7b01a5d05d7b72f21f3820 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 17:15:01 +0200 Subject: gnu: mkvtoolnix: Use modular qt. * gnu/packages/video.scm (mkvtoolnix)[inputs]: Remove qt, add qtbase, qtmultimedia. [native-inputs]: Add qttools. --- gnu/packages/video.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 93ebfe09d5..8e229f1d49 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -352,7 +352,8 @@ H.264 (MPEG-4 AVC) video streams.") ("libvorbis" ,libvorbis) ("lzo" ,lzo) ("pugixml" ,pugixml) - ("qt" ,qt) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) ("utfcpp" ,utfcpp) ("zlib" ,zlib))) (native-inputs @@ -364,6 +365,7 @@ H.264 (MPEG-4 AVC) video streams.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a) + ("qttools" ,qttools) ("ruby" ,ruby))) (arguments `(#:configure-flags -- cgit v1.2.3 From c9d2d3104bf3554d8c1b476aed5992f000017f7a Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 4 Mar 2019 16:18:17 +0100 Subject: gnu: looking-glass-client: Update to commit 182c475. * gnu/packages/virtualization.scm (looking-glass-client): Update to commit 182c475. Rename from lookingglass to looking-glass-client. Add deprecated-package lookingglass. --- gnu/packages/virtualization.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8d9d2335ee..47e24460f9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -796,10 +796,10 @@ incremental backups of running QEMU virtual machines via QMP, the QEMU Machine Protocol.") (license license:gpl3+))) -(define-public lookingglass - (let ((commit "41f4166aedeba65892f6db4de4de467aec9a2052")) +(define-public looking-glass-client + (let ((commit "182c4752d57690da7f99d5e788de9b8baea33895")) (package - (name "lookingglass") + (name "looking-glass-client") (version (string-append "a12-" (string-take commit 7))) (source (origin @@ -809,7 +809,7 @@ Machine Protocol.") (file-name (git-file-name name version)) (sha256 (base32 - "1sjxf4zy7h0zprla3s6dfwsxhmkrwhlhj07svf5bk5ij20bs0dc2")))) + "02bq46ndmzq9cihazzn7xq1x7q5nzm7iw4l9lqzihxcxp9famkhw")))) (build-system cmake-build-system) (inputs `(("fontconfig" ,fontconfig) ("glu" ,glu) @@ -847,6 +847,9 @@ monitor/GPU.") (supported-systems '("i686-linux" "x86_64-linux")) (license license:gpl2+)))) +(define-public lookingglass + (deprecated-package "lookingglass" looking-glass-client)) + (define-public runc (package (name "runc") -- cgit v1.2.3 From 0132f3e67f1a8907ef5132477f6ad678c8d594a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 17:35:05 +0200 Subject: gnu: emacs-minimal: Don't inherit configure-flags. * gnu/packages/emacs.scm (emacs-minimal)[arguments]: Move configure-flags lower than inherited package-arguments so it won't be overwritten. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7b7fc7fa0f..34b70fe9e8 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -202,11 +202,11 @@ languages.") (synopsis "The extensible text editor (used only for byte-compilation)") (build-system gnu-build-system) (arguments - `(#:configure-flags (list "--with-gnutls=no") - ,@(substitute-keyword-arguments (package-arguments emacs) + `(,@(substitute-keyword-arguments (package-arguments emacs) ((#:phases phases) `(modify-phases ,phases - (delete 'install-site-start)))))) + (delete 'install-site-start)))) + #:configure-flags (list "--with-gnutls=no"))) (inputs `(("ncurses" ,ncurses))) (native-inputs -- cgit v1.2.3 From 74fea1e2df38afc772313b3bd6658c4a337a1e1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 4 Mar 2019 16:37:09 +0100 Subject: gnu: lyx: Remove obsolete patch. * gnu/packages/patches/lyx-2.2.3-fix-test.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/lyx-2.2.3-fix-test.patch | 13 ------------- 2 files changed, 14 deletions(-) delete mode 100644 gnu/packages/patches/lyx-2.2.3-fix-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 449ee8367d..41c10c82bc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1030,7 +1030,6 @@ dist_patch_DATA = \ %D%/packages/patches/luminance-hdr-qt-printer.patch \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/lxsession-use-gapplication.patch \ - %D%/packages/patches/lyx-2.2.3-fix-test.patch \ %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-client-test-32bit.patch \ diff --git a/gnu/packages/patches/lyx-2.2.3-fix-test.patch b/gnu/packages/patches/lyx-2.2.3-fix-test.patch deleted file mode 100644 index 10b7d2a3a9..0000000000 --- a/gnu/packages/patches/lyx-2.2.3-fix-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -See https://www.lyx.org/trac/ticket/10800#comment:17 -diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx -index feff755cd2..2c7f2ace5c 100644 ---- a/src/tex2lyx/test/test-structure.lyx.lyx -+++ b/src/tex2lyx/test/test-structure.lyx.lyx -@@ -212,7 +212,7 @@ This causes the - \begin_inset Flex Flex:Strong - status collapsed - --\begin_layout Standard -+\begin_layout Plain Layout - logikalmkup - \end_layout -- cgit v1.2.3 From 96f39b2a6e03d36582108efb11f915b08c454b7c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 4 Mar 2019 17:10:28 +0100 Subject: gnu: Add java-jblas. * gnu/packages/java-maths.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/java-maths.scm | 89 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 gnu/packages/java-maths.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 41c10c82bc..01addbd371 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -251,6 +251,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/iso-codes.scm \ %D%/packages/java.scm \ %D%/packages/java-compression.scm \ + %D%/packages/java-maths.scm \ %D%/packages/javascript.scm \ %D%/packages/jemalloc.scm \ %D%/packages/jrnl.scm \ diff --git a/gnu/packages/java-maths.scm b/gnu/packages/java-maths.scm new file mode 100644 index 0000000000..6c22f2938d --- /dev/null +++ b/gnu/packages/java-maths.scm @@ -0,0 +1,89 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Ricardo Wurmus +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages java-maths) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix utils) + #:use-module (guix build-system ant) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages gcc) + #:use-module (gnu packages java) + #:use-module (gnu packages maths) + #:use-module (gnu packages ruby)) + +(define-public java-jblas + (package + (name "java-jblas") + (version "1.2.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mikiobraun/jblas.git") + (commit (string-append "jblas-" version)))) + (sha256 + (base32 + "0afh48hq8i8li5z11x415c8slwsfrlib0w1xjfbg186mximqvv3g")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are none + #:configure-flags + (list (string-append "--libpath=" + (assoc-ref %build-inputs "openblas") + "/lib") + "--build-type=openblas") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (map make-file-writable + (find-files "." ".*")) + #t)) + (add-before 'build 'setenv-JAVA_HOME + (lambda* (#:key inputs #:allow-other-keys) + (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) + #t)) + (add-after 'build 'build-jar + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "M2_HOME" (assoc-ref outputs "out")) + (invoke "ant" "jar" (string-append "-Dversion=" ,version)))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((target (string-append (assoc-ref outputs "out") + "/share/java"))) + (mkdir-p target) + (install-file (string-append "jblas-" ,version ".jar") target)) + #t))))) + (inputs + `(("openblas" ,openblas))) + (native-inputs + `(("ant" ,ant) + ("ruby" ,ruby) ; for configure script + ("gfortran" ,gfortran) + ("jdk" ,icedtea "jdk"))) + (home-page "http://jblas.org") + (synopsis "Linear algebra for Java") + (description + "jblas is a fast linear algebra library for Java. jblas is based on BLAS +and LAPACK, the de-facto industry standard for matrix computations, and uses +state-of-the-art implementations for all its computational routines, making +jBLAS very fast.") + (license license:bsd-3))) -- cgit v1.2.3 From ad257ec8b578b21fc36b142396324df9e6613d4a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Mar 2019 18:36:28 +0100 Subject: gnu: thermald: Update to 1.8. * gnu/packages/admin.scm (thermald): Update to 1.8. [source]: Add patch. * gnu/packages/patches/thermald-make-int-max32-visible.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 7 ++++--- .../patches/thermald-make-int-max32-visible.patch | 24 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/thermald-make-int-max32-visible.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 01addbd371..60448f9404 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1277,6 +1277,7 @@ dist_patch_DATA = \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ %D%/packages/patches/thefuck-test-environ.patch \ + %D%/packages/patches/thermald-make-int-max32-visible.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ %D%/packages/patches/tinyxml-use-stl.patch \ %D%/packages/patches/tipp10-fix-compiling.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2bc1c325a3..f425c2947c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2523,7 +2523,7 @@ make it a perfect utility on modern distros.") (define-public thermald (package (name "thermald") - (version "1.7.2") + (version "1.8") (source (origin (method git-fetch) @@ -2532,8 +2532,9 @@ make it a perfect utility on modern distros.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1cs2pq8xvfnsvrhg2bxawk4kn3z1qmfrnpnhs178pvfbglzh15hc")))) + (base32 "1g1l7k8yxj8bl1ysdx8v6anv1s7xk9j072y44gwki70dy48n7j92")) + (patches + (search-patches "thermald-make-int-max32-visible.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/thermald-make-int-max32-visible.patch b/gnu/packages/patches/thermald-make-int-max32-visible.patch new file mode 100644 index 0000000000..eddbb23547 --- /dev/null +++ b/gnu/packages/patches/thermald-make-int-max32-visible.patch @@ -0,0 +1,24 @@ +From 5fb947886bf1e40475edf930fb2b284c24c8cb9a Mon Sep 17 00:00:00 2001 +From: Sanel Zukan +Date: Sun, 23 Dec 2018 00:04:34 +0100 +Subject: [PATCH] Make sure INT_MAX32 is visible. + +--- + src/thd_trip_point.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/thd_trip_point.h b/src/thd_trip_point.h +index 0eedc95..89eb083 100644 +--- a/src/thd_trip_point.h ++++ b/src/thd_trip_point.h +@@ -29,6 +29,10 @@ + #include "thd_sys_fs.h" + #include "thd_preference.h" + #include "thd_cdev.h" ++ ++#define __STDC_LIMIT_MACROS ++#include ++ + #include + #include + #include // std::sort -- cgit v1.2.3 From 02eae558fc2a71a9425eb8f8698afe452edebb4b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Mar 2019 19:02:52 +0100 Subject: gnu: calcurse: Fix documentation directory. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/calcurse.scm (calcurse)[arguments]: Set ‘--docdir’ in #:configure-flags' and add ‘respect-docdir’ phase to use it. --- gnu/packages/calcurse.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/calcurse.scm b/gnu/packages/calcurse.scm index 22b54d47ac..0dff9081f0 100644 --- a/gnu/packages/calcurse.scm +++ b/gnu/packages/calcurse.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2017 Eric Bavier ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,15 +46,25 @@ ;; The ical tests all want to create a ".calcurse" directory, and may ;; fail with "cannot create directory '.calcurse': File exists" if run ;; concurently. - `(#:parallel-tests? #f + `(#:configure-flags + (list (string-append "--docdir=" (assoc-ref %outputs "out") + "/share/doc/" ,name "-" ,version)) + #:parallel-tests? #f ;; Since this tzdata is only used for tests and not referenced by the ;; built package, used the "fixed" obsolete version of tzdata and ensure ;; it does not sneak in to the closure. #:disallowed-references (,tzdata-for-tests) #:phases (modify-phases %standard-phases + (add-after 'unpack 'respect-docdir + ;; doc/Makefile disregards ./configure's --docdir option. + (lambda _ + (substitute* "doc/Makefile.in" + (("(docdir =) .*" _ match) + (format "~a @docdir@\n" match))) + #t)) (add-before 'check 'check-setup (lambda* (#:key inputs #:allow-other-keys) - (setenv "TZDIR" ;for test/ical-007.sh + (setenv "TZDIR" ; for test/ical-007.sh (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))))))) (home-page "https://www.calcurse.org") -- cgit v1.2.3 From 171234d572e720e06c34e83814d63fcadda06378 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Mar 2019 19:04:12 +0100 Subject: gnu: calcurse: Update to 4.4.0. * gnu/packages/calcurse.scm (calcurse): Update to 4.4.0. --- gnu/packages/calcurse.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/calcurse.scm b/gnu/packages/calcurse.scm index 0dff9081f0..559688470e 100644 --- a/gnu/packages/calcurse.scm +++ b/gnu/packages/calcurse.scm @@ -30,15 +30,14 @@ (define-public calcurse (package (name "calcurse") - (version "4.3.0") + (version "4.4.0") (source (origin - (method url-fetch) - (uri (string-append "https://calcurse.org/files/calcurse-" - version ".tar.gz")) - (sha256 - (base32 - "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i")))) + (method url-fetch) + (uri (string-append "https://calcurse.org/files/calcurse-" + version ".tar.gz")) + (sha256 + (base32 "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (native-inputs `(("tzdata" ,tzdata-for-tests))) -- cgit v1.2.3 From 7d3a78e731c87f336ea70597b6ae7506078d8931 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Mar 2019 19:42:10 +0100 Subject: gnu: emacs-orgit: Update to 20190304. * gnu/packages/emacs-xyz.scm (emacs-orgit): Update to 20190304. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cd18d56e66..712dafae90 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13186,10 +13186,10 @@ recursively. The results are cached for speed.") (license license:gpl3+))) (define-public emacs-orgit - (let ((commit "ddb830c38cb71e5cf86db7fa62d6ee88ab3962d5")) + (let ((commit "2456436a7e64d26bcf455b3890a586acaa3e7f93")) (package (name "emacs-orgit") - (version (git-version "1.5.1" "1" commit)) + (version (git-version "1.5.1" "2" commit)) (home-page "https://github.com/magit/orgit") (source (origin (method git-fetch) @@ -13199,7 +13199,7 @@ recursively. The results are cached for speed.") (file-name (git-file-name name version)) (sha256 (base32 - "0fy4n71yskfkjl6w9mzrw3pfd5lp8f48g2c9bxiwg7mwzsmsb9nb")))) + "1i52dq2ynddb1irgigr5mdwfbfd3bvm1f29jnzd7nlc0nk186nvh")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 3d03fed47fc9a9af784a026a8ac76418f609b639 Mon Sep 17 00:00:00 2001 From: Dan Frumin Date: Mon, 4 Mar 2019 16:36:02 +0100 Subject: gnu: coq-coquelicot: Update to 3.0.2. * gnu/packages/coq.scm (coq-coquelicot): Update to 3.0.2. Signed-off-by: Julien Lepiller --- gnu/packages/coq.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 5393d4273b..83f5cd29af 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -327,14 +327,14 @@ part of the distribution.") (define-public coq-coquelicot (package (name "coq-coquelicot") - (version "3.0.1") + (version "3.0.2") (source (origin (method url-fetch) (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "file/37045/coquelicot-" version ".tar.gz")) + "file/37523/coquelicot-" version ".tar.gz")) (sha256 (base32 - "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r")))) + "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) @@ -348,12 +348,6 @@ part of the distribution.") "/lib/coq/user-contrib/Coquelicot")) #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-coq8.8 - (lambda _ - ; appcontext has been removed from coq 8.8 - (substitute* "theories/AutoDerive.v" - (("appcontext") "context")) - #t)) (add-before 'configure 'fix-remake (lambda _ (substitute* "remake.cpp" -- cgit v1.2.3 From 2850d877720f97ef1ac6a760043bce4ac2b0af1b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 21:52:38 +0200 Subject: gnu: dehydrated: Don't use unstable tarball. * gnu/packages/tls.scm (dehydrated)[source]: Use release tarball. [native-inputs]: Add gzip, tar. [arguments]: Unzip tarball before installing. Install license file. --- gnu/packages/tls.scm | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6b131657f9..26a2eaa2a7 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018 Leo Famulari -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Nils Gillmann ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus @@ -929,14 +929,13 @@ extensions.") (name "dehydrated") (version "0.6.2") (source (origin - (method url-fetch/tarbomb) + (method url-fetch) (uri (string-append - "https://github.com/lukas2511/dehydrated/archive/v" - version ".tar.gz")) + "https://github.com/lukas2511/dehydrated/releases/download/" + "v" version "/dehydrated-" version ".tar.gz")) (sha256 (base32 - "03p80yj6bnzjc6dkp5hb9wpplmlrla8n5src71cnzw4rj53q8cqn")) - (file-name (string-append name "-" version ".tar.gz")))) + "03p80yj6bnzjc6dkp5hb9wpplmlrla8n5src71cnzw4rj53q8cqn")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -944,15 +943,20 @@ extensions.") (begin (use-modules (guix build utils)) (let* ((source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "tar")) + (gz (assoc-ref %build-inputs "gzip")) (out (assoc-ref %outputs "out")) (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/")) (bash (in-vicinity (assoc-ref %build-inputs "bash") "bin"))) - (mkdir-p bin) + + (setenv "PATH" (string-append gz "/bin")) + (invoke (string-append tar "/bin/tar") "xvf" source) + (chdir (string-append ,name "-" ,version)) + + (install-file "dehydrated" bin) + (install-file "LICENSE" (string-append doc ,name "-" ,version)) (with-directory-excursion bin - (copy-file - (in-vicinity source (string-append "/dehydrated-" ,version - "/dehydrated")) - (in-vicinity bin "dehydrated")) (patch-shebang "dehydrated" (list bash)) ;; Do not try to write in the store. @@ -983,6 +987,9 @@ extensions.") ("grep" ,grep) ("openssl" ,openssl) ("sed" ,sed))) + (native-inputs + `(("gzip" ,gzip) + ("tar" ,tar))) (home-page "https://dehydrated.io/") (synopsis "Let's Encrypt/ACME client implemented as a shell script") (description "Dehydrated is a client for signing certificates with an -- cgit v1.2.3 From 433e3154302246b3009b44e7d8da266919ef0af8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:09:07 +0000 Subject: gnu: Add ruby-open4. Also add a copyright line, as I've obviously neglected to do that in the past. * gnu/packages/ruby.scm (ruby-open4): New variable. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a81535aade..89ee5211be 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2018 Alex Vong ;;; @@ -1172,6 +1173,40 @@ complexity.") (home-page "https://github.com/ThoughtWorksStudios/saikuro_treemap") (license license:expat))) +(define-public ruby-open4 + (package + (name "ruby-open4") + (version "1.3.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "open4" version)) + (sha256 + (base32 + "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "rakefile" + ;; Update the Rakefile so it works + (("-rubygems") "-rrubygems") + (("Config") "RbConfig")) + #t)) + (add-before 'check 'set-LIB + (lambda _ + ;; This is used in the rakefile when running the tests + (setenv "LIB" "open4") + #t))))) + (synopsis "Open child processes from Ruby and manage them easily") + (description + "@code{Open4} is a Ruby library to run child processes and manage their +input and output.") + (home-page "https://github.com/ahoward/open4") + (license license:ruby))) + (define-public ruby-options (package (name "ruby-options") -- cgit v1.2.3 From 353b7eb8c5e35beb94b4ad7208a0d72704e7c9fb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:10:12 +0000 Subject: gnu: Add ruby-hamster. * gnu/packages/ruby.scm (ruby-hamster): New variable. --- gnu/packages/ruby.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 89ee5211be..521ad35936 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1562,6 +1562,52 @@ failure.") (home-page "https://github.com/thekompanee/fuubar") (license license:expat))) +(define-public ruby-hamster + (package + (name "ruby-hamster") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "hamster" version)) + (sha256 + (base32 + "1n1lsh96vnyc1pnzyd30f9prcsclmvmkdb3nm5aahnyizyiy6lar")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + ;; pry is a debugging tool, and is unnecessary when running the + ;; tests + (substitute* "spec/lib/hamster/vector/insert_spec.rb" + (("require 'pry'") "")) + (substitute* "spec/spec_helper.rb" + (("require \"pry\"") "") + ;; CodeClimate is an online service, and is unnecessary for + ;; running the tests + (("require \"codeclimate-test-reporter\"") "") + (("CodeClimate.*\n") "")) + #t)) + ;; No Rakefile is included, so run rspec directly. + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (propagated-inputs + `(("ruby-concurrent" ,ruby-concurrent))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (synopsis "Efficient, immutable, thread-safe collection classes for Ruby") + (description + "Hamster provides 6 persistent data structures: @code{Hash}, @code{Vector}, +@code{Set}, @code{SortedSet}, @code{List}, and @code{Deque} (which works as an +immutable queue or stack).") + (home-page "https://github.com/hamstergem/hamster") + (license license:expat))) + (define-public ruby-hashdiff (package (name "ruby-hashdiff") -- cgit v1.2.3 From b32225187bcd54749b9d6fcf10c0deaf350775c5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:10:24 +0000 Subject: gnu: Add ruby-lino. * gnu/packages/ruby.scm (ruby-lino): New variable. --- gnu/packages/ruby.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 521ad35936..5ed1231d58 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1326,6 +1326,31 @@ the GNOME Libxml2 XML toolkit.") (home-page "https://xml4r.github.com/libxml-ruby") (license license:expat))) +(define-public ruby-lino + (package + (name "ruby-lino") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "lino" version)) + (sha256 + (base32 + "11d29g0fk372b9fcpyr0k6hxm2b4j4igpysmi542hgbbgqgp9cd3")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (propagated-inputs + `(("ruby-hamster" ,ruby-hamster) + ("ruby-open4" ,ruby-open4))) + (synopsis "Build and execute commands in Ruby") + (description + "@code{Lino} provides an interface to run external commands. It provides +an interface to add options as well as managing the standard input, output and +error streams.") + (home-page "https://github.com/tobyclemson/lino") + (license license:expat))) + (define-public ruby-xml-simple (package (name "ruby-xml-simple") -- cgit v1.2.3 From a714c30f96d8714cfb4a9cc48cfa05ea5ce9a01a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:10:34 +0000 Subject: gnu: Add ruby-terraform. * gnu/packages/ruby.scm (ruby-terraform): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5ed1231d58..5cf0cf0ade 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3812,6 +3812,29 @@ of terminal output.") ;; There is no mention of the "or later" clause. (license license:gpl2))) +(define-public ruby-terraform + (package + (name "ruby-terraform") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ruby-terraform" version)) + (sha256 + (base32 + "13zjkp71cd19j2ds2h9rqwcfr1zdg5nsh63p89l6qcsc9z39z324")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (propagated-inputs + `(("ruby-lino" ,ruby-lino))) + (synopsis "Ruby wrapper around the Terraform command line interface") + (description + "This package provides a Ruby wrapper around the Terraform command line +interface so that Terraform can be more easily invoked from Ruby code.") + (home-page "https://github.com/infrablocks/ruby_terraform") + (license license:expat))) + (define-public ruby-pstree (package (name "ruby-pstree") -- cgit v1.2.3 From dbbe88d383d6f17084e3ff5b4ffd82b18654a8be Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:10:44 +0000 Subject: gnu: Add ruby-que. * gnu/packages/ruby.scm (ruby-que): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5cf0cf0ade..847f499b45 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6114,6 +6114,27 @@ requirement specifications systems like Cucumber.") (home-page "https://rubyworks.github.io/qed") (license license:bsd-2))) +(define-public ruby-que + (package + (name "ruby-que") + (version "1.0.0.beta3") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "que" version)) + (sha256 + (base32 + "0gr9pb814d4qj3ds98g6cjrdk7wv0yg8aqbm7c1lmgl87jkg8q04")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (synopsis "Job queue using PostgreSQL written in Ruby") + (description + "This package provides a job queue that uses PostgreSQL for storing jobs +and locking between worker processes.") + (home-page "https://github.com/chanks/que") + (license license:expat))) + (define-public ruby-ae (package (name "ruby-ae") -- cgit v1.2.3 From 2a9ce5cb3eaf4c8b86e99653adb35105065896cc Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:10:55 +0000 Subject: gnu: Add ruby-rbnacl. * gnu/packages/ruby.scm (ruby-rbnacl): New variable. --- gnu/packages/ruby.scm | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 847f499b45..73130b67ec 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) #:use-module (gnu packages rails) @@ -1413,6 +1414,63 @@ same log file.") (home-page "https://github.com/bdurand/lumberjack") (license license:expat))) +(define-public ruby-rbnacl + (package + (name "ruby-rbnacl") + (version "6.0.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rbnacl" version)) + (sha256 + (base32 + "0ajxy5kj2jw09wdsla3jmha8w07vj5l14288xr9djpl327g3lzhn")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + ;; Coveralls relates to a network service, and Rubocop to code + ;; linting and both are unnecessary to run the tests + (substitute* "Gemfile" + ((".*rubocop.*") "\n") + ((".*guard-rspec.*") "\n") + ((".*coveralls.*") "\n")) + (substitute* "spec/spec_helper.rb" + (("require \"coveralls\"") "") + (("Coveralls.wear!") "")) + #t)) + (add-after 'unpack 'use-libsodium-from-store + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("lib/rbnacl/init.rb" + "lib/rbnacl/sodium.rb") + (("ffi_lib \\[.+\\]") + (string-append "ffi_lib [\"" + (assoc-ref inputs "libsodium") "/lib/libsodium.so" + "\"]"))) + #t)) + ;; Run Rspec directly to avoid the Rubocop dependency in the Rakefile + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (propagated-inputs + `(("ruby-ffi" ,ruby-ffi))) + (inputs + `(("libsodium" ,libsodium))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Ruby FFI binding to libsodium") + (description + "This package provides Ruby FFI bindings to the Networking and +Cryptography (NaCl) library, also known as libsodium. This provides a +high-level toolkit for building cryptographic systems and protocols.") + (home-page "https://github.com/crypto-rb/rbnacl") + (license license:expat))) + (define-public ruby-nenv (package (name "ruby-nenv") -- cgit v1.2.3 From 2a8581ac38d66035002fedaca6280eac82f527c1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:11:06 +0000 Subject: gnu: Add ruby-jwt. * gnu/packages/ruby.scm (ruby-jwt): New variable. --- gnu/packages/ruby.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 73130b67ec..c74e9f9b66 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4030,6 +4030,44 @@ a native C extension.") (home-page "https://flori.github.com/json") (license license:ruby))) +(define-public ruby-jwt + (package + (name "ruby-jwt") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "jwt" version)) + (sha256 + (base32 + "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + (substitute* "spec/spec_helper.rb" + (("require 'simplecov.*") "\n") + ;; Use [].each to disable running the SimpleCov configuration + ;; block + (("SimpleCov\\.configure") "[].each") + (("require 'codeclimate-test-reporter'") "") + (("require 'codacy-coverage'") "") + (("Codacy::Reporter\\.start") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-rbnacl" ,ruby-rbnacl))) + (synopsis "Ruby implementation of the JSON Web Token standard") + (description + "This package provides a pure Ruby implementation of the RFC 7519 OAuth +@acronym{JWT, JSON Web Token} standard.") + (home-page "https://github.com/jwt/ruby-jwt") + (license license:expat))) + ;; Even though this package only provides bindings for a Mac OSX API it is ;; required by "ruby-listen" at runtime. (define-public ruby-rb-fsevent -- cgit v1.2.3 From ca914b5bb1165b4b6624f2c41800ea2880a7f320 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:12:12 +0000 Subject: gnu: Add ruby-multi-xml. * gnu/packages/ruby.scm (ruby-multi-xml): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c74e9f9b66..15efd72470 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3098,6 +3098,27 @@ options and parsing command line flags.") (base32 "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n")))))) +(define-public ruby-multi-xml + (package + (name "ruby-multi-xml") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "multi_xml" version)) + (sha256 + (base32 + "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (synopsis "Swappable XML backends for Ruby") + (description + "@code{MultiXml} provides swappable XML backends utilizing either LibXML, +Nokogiri, Ox, or REXML.") + (home-page "https://github.com/sferik/multi_xml") + (license license:expat))) + (define-public ruby-multipart-post (package (name "ruby-multipart-post") -- cgit v1.2.3 From 92b3750059f3e9a0b4998788af20399e990897dc Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:12:31 +0000 Subject: gnu: Add ruby-oauth2. * gnu/packages/ruby.scm (ruby-oauth2): New variable. --- gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 15efd72470..7adaca8144 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1174,6 +1174,33 @@ complexity.") (home-page "https://github.com/ThoughtWorksStudios/saikuro_treemap") (license license:expat))) +(define-public ruby-oauth2 + (package + (name "ruby-oauth2") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "oauth2" version)) + (sha256 + (base32 + "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (propagated-inputs + `(("ruby-faraday" ,ruby-faraday) + ("ruby-jwt" ,ruby-jwt) + ("ruby-multi-json" ,ruby-multi-json) + ("ruby-multi-xml" ,ruby-multi-xml) + ("ruby-rack" ,ruby-rack))) + (synopsis "Ruby wrapper for the OAuth 2.0") + (description + "This package provides a Ruby wrapper for the OAuth 2.0 protocol built +with a similar style to the original OAuth spec.") + (home-page "https://github.com/oauth-xx/oauth2") + (license license:expat))) + (define-public ruby-open4 (package (name "ruby-open4") -- cgit v1.2.3 From 29dc48231d510837b5f41ad080a9b49090c4aa2b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:12:56 +0000 Subject: gnu: Add ruby-omniauth. * gnu/packags/ruby.scm (ruby-omniauth): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7adaca8144..946eef1fcc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1201,6 +1201,30 @@ with a similar style to the original OAuth spec.") (home-page "https://github.com/oauth-xx/oauth2") (license license:expat))) +(define-public ruby-omniauth + (package + (name "ruby-omniauth") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "omniauth" version)) + (sha256 + (base32 + "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (propagated-inputs + `(("ruby-hashie" ,ruby-hashie) + ("ruby-rack" ,ruby-rack))) + (synopsis "Generalized Rack framework for multiple-provider authentication") + (description + "This package provides a generalized Rack framework for multiple-provider +authentication.") + (home-page "https://github.com/omniauth/omniauth") + (license license:expat))) + (define-public ruby-open4 (package (name "ruby-open4") -- cgit v1.2.3 From e32c99d23ea2927bf9ce2a974f6e5b27f2d28f35 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:13:14 +0000 Subject: gnu: Add ruby-warden. * gnu/packages/ruby.scm (ruby-warden): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 946eef1fcc..06ec2e7129 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5815,6 +5815,29 @@ support to both Ruby and JRuby. It uses @code{unf_ext} on CRuby and (home-page "https://github.com/knu/ruby-unf") (license license:bsd-2))) +(define-public ruby-warden + (package + (name "ruby-warden") + (version "1.2.8") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "warden" version)) + (sha256 + (base32 + "1fr9n9i9r82xb6i61fdw4xgc7zjv7fsdrr4k0njchy87iw9fl454")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (propagated-inputs + `(("ruby-rack" ,ruby-rack))) + (synopsis "Rack middleware providing authentication") + (description + "Warden is a Rack-based middleware that provides a mechanism for +authentication in Ruby web applications.") + (home-page "https://github.com/wardencommunity/warden") + (license license:expat))) + (define-public ruby-webmock-2 (package (name "ruby-webmock") -- cgit v1.2.3 From e42eecdb78130d9910d5569d8f7d220ad45f1bb8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:13:34 +0000 Subject: gnu: Add ruby-warden-oauth2. * gnu/packages/ruby.scm (ruby-warden-oauth2): New variable. --- gnu/packages/ruby.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 06ec2e7129..a98b531837 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5838,6 +5838,54 @@ authentication in Ruby web applications.") (home-page "https://github.com/wardencommunity/warden") (license license:expat))) +(define-public ruby-warden-oauth2 + (package + (name "ruby-warden-oauth2") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "warden-oauth2" version)) + (sha256 + (base32 + "1z9154lvzrnnfjbjkmirh4n811nygp6pm2fa6ikr7y1ysa4zv3cz")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + (substitute* "Gemfile" + ;; All of these gems relate to development, and are unnecessary + ;; when running the tests + (("gem 'guard-bundler'") "") + (("gem 'guard'") "") + (("gem 'guard-rspec'") "") + (("gem 'rb-fsevent'") "") + (("gem 'pry'") "") + (("gem 'growl'") "")) + #t)) + ;; The test suite doesn't work with rspec@2, and this is incompatible + ;; with the current version of Rake, so invoke Rspec directly + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "bundle" "exec" "rspec")) + #t))))) + (propagated-inputs + `(("ruby-warden" ,ruby-warden))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec-2) + ("ruby-rack-test" ,ruby-rack-test))) + (synopsis "OAuth 2.0 strategies for Warden") + (description + "This library extends Warden to support OAuth 2.0 authorized API +requests.") + (home-page "https://github.com/opperator/warden-oauth2") + (license license:expat))) + (define-public ruby-webmock-2 (package (name "ruby-webmock") -- cgit v1.2.3 From ad6471d41574a145474bdf5b197c63417192157c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:13:59 +0000 Subject: gnu: Add ruby-with-advisory-lock. * gnu/packages/rails.scm (ruby-with-advisory-lock): New variable. --- gnu/packages/rails.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 2d7ccceff7..754539f546 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -413,6 +413,34 @@ application bootup, plugins, generators, and Rake tasks.") "https://github.com/rails/sprockets-rails") (license license:expat))) +(define-public ruby-with-advisory-lock + (package + (name "ruby-with-advisory-lock") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "with_advisory_lock" version)) + (sha256 + (base32 + "1k37hxgmaqgsd54gplm5xim9nw3ghvqsbzaw7q4q64ha1nbd9a41")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; TODO Tests require a running MySQL service + (propagated-inputs + `(("ruby-activerecord" ,ruby-activerecord))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-yard" ,ruby-yard) + ("ruby-mysql2" ,ruby-mysql2))) + (synopsis "Advisory locking for ActiveRecord") + (description + "The With advisory lock gem adds advisory locking to ActiveRecord for +PostgreSQL and MySQL. SQLite is also supported, but this uses the filesystem +for locks.") + (home-page "https://closuretree.github.io/with_advisory_lock/") + (license license:expat))) + (define-public ruby-rails (package (name "ruby-rails") -- cgit v1.2.3 From d6084cdb12f85b4e6bf3db8485a44cc9514cfab5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:14:11 +0000 Subject: gnu: Add ruby-omniauth-oauth2. * gnu/packages/ruby.scm (ruby-omniauth-oauth2): New variable. --- gnu/packages/ruby.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a98b531837..19d7cc9023 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1225,6 +1225,48 @@ authentication.") (home-page "https://github.com/omniauth/omniauth") (license license:expat))) +(define-public ruby-omniauth-oauth2 + (package + (name "ruby-omniauth-oauth2") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "omniauth-oauth2" version)) + (sha256 + (base32 + "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + ;; The coveralls gem submits coverage information to an online + ;; service, and is unnecessary when running the tests + (substitute* "Gemfile" + ((".*coveralls\"") "")) + (substitute* "spec/helper.rb" + (("require \"coveralls\"") "") + (("Coveralls::SimpleCov::Formatter") "")) + #t))))) + (propagated-inputs + `(("ruby-oauth2" ,ruby-oauth2) + ("ruby-omniauth" ,ruby-omniauth))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-rack-test" ,ruby-rack-test) + ("ruby-webmock" ,ruby-webmock-2))) + (synopsis "Abstract OAuth2 strategy for OmniAuth") + (description + "This library provides a generic OAuth2 strategy for OmniAuth. It +doesn't provide a way to gather user information, so should be used as a +building block for authentication strategies.") + (home-page "https://github.com/omniauth/omniauth-oauth2") + (license license:expat))) + (define-public ruby-open4 (package (name "ruby-open4") -- cgit v1.2.3 From 93dc8684cf5f72d88dbd969f6d363e2a6381314a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:14:31 +0000 Subject: gnu: Add ruby-test-construct. * gnu/packages/ruby.scm (ruby-test-construct): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 19d7cc9023..3ac75cc237 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2242,6 +2242,29 @@ use GNU gettext tools for maintenance.") (home-page "http://ranguba.org/packnga/") (license license:lgpl2.0+))) +(define-public ruby-test-construct + (package + (name "ruby-test-construct") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "test_construct" version)) + (sha256 + (base32 + "1a2ym3l068d0pxzzr95kvqx87zpdsarxslz9ygd4qfm9frrz0kgj")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler) + ("ruby-mocha" ,ruby-mocha) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Creates temporary files and directories for testing") + (description + "TestConstruct is a @acronym{DSL, Domain Specific Language} for creating +temporary files and directories during tests.") + (home-page "https://github.com/bhb/test_construct") + (license license:expat))) + (define-public ruby-test-unit (package (name "ruby-test-unit") -- cgit v1.2.3 From 450a3f7f2b44b5965cf14a2fc95ce1191ae6ab96 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:14:39 +0000 Subject: gnu: Add ruby-minitest-around. * gnu/packages/ruby.scm (ruby-minitest-around): New variable. --- gnu/packages/ruby.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3ac75cc237..3adacfee2f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2842,6 +2842,40 @@ facilities supporting TDD, BDD, mocking, and benchmarking.") (delete-file "test/minitest/test_minitest_spec.rb") #t))))))) +(define-public ruby-minitest-around + (package + (name "ruby-minitest-around") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "minitest-around" version)) + (sha256 + (base32 + "15ywnqx0719jl9c25yqfshmwcir57i5f4hr1ra9v9vay9ylcwndr")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'extract-gemspec 'remove-unnecessary-dependency-versions + (lambda _ + (substitute* "minitest-around.gemspec" + (("%q.*") "%q, [\">= 0\"])\n")) + #t))))) + (propagated-inputs + `(("ruby-minitest" ,ruby-minitest))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-cucumber" ,ruby-cucumber) + ("ruby-bump" ,ruby-bump) + ("ruby-test-construct" ,ruby-test-construct))) + (synopsis "Run code around tests in Minitest") + (description + "This library provides a way to run code around tests in Minitest, +written using either the unit test or spec style.") + (home-page "https://github.com/splattael/minitest-around") + (license license:expat))) + (define-public ruby-minitest-sprint (package (name "ruby-minitest-sprint") -- cgit v1.2.3 From 7fe1be1879f0de516dbca7217540606bb81b0da6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:14:49 +0000 Subject: gnu: Add libsass. * gnu/packages/web.scm (libsass): New variable. --- gnu/packages/web.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2500bd0be7..15762f05d4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Pierre Langlois ;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2017, 2019 Christopher Baines ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Gábor Boskovits @@ -1248,6 +1249,40 @@ minimum to provide high performance operation.") ;; bundled CuTest framework uses a different non-copyleft license. (license (list l:asl2.0 (l:non-copyleft "file://test/CuTest-README.txt"))))) +(define-public libsass + (package + (name "libsass") + (version "3.5.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sass/libsass.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0830pjcvhzxh6yixj82x5k5r1xnadjqzi16kp53213icbly0r9ma")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'bootstrap 'set-LIBSASS_VERSION + (lambda _ + (setenv "LIBSASS_VERSION" ,version) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (home-page "https://sass-lang.com/libsass") + (synopsis "SASS Compiler, implemented as a C/C++ library") + (description + "LibSass is a @acronym{SASS,Syntactically awesome style sheets} compiler +library designed for portability and efficiency. To actually compile SASS +stylesheets, you'll need to use another program that uses this library, +@var{sassc} for example.") + (license l:expat))) + (define-public sassc ;; libsass must be statically linked and it isn't included in the sassc ;; release tarballs, hence this odd package recipe. -- cgit v1.2.3 From 8c1501577962e90c6b01762be7c0a5be4c97d6ba Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:15:13 +0000 Subject: gnu: sassc: Update and improve the package. Now that libsass is packaged, change the sassc package to build a dynamically linked binary. Also update the version, and change the source to the Git repository, rather than the archives from GitHub. * gnu/packages/web.scm (sassc): Update to 3.5.0. [source]: Change to the Git repository. [arguments]: Tweak to link against libsass. --- gnu/packages/web.scm | 95 +++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 49 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 15762f05d4..d9b7def67b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1284,56 +1284,53 @@ stylesheets, you'll need to use another program that uses this library, (license l:expat))) (define-public sassc - ;; libsass must be statically linked and it isn't included in the sassc - ;; release tarballs, hence this odd package recipe. - (let* ((version "3.4.5") - (libsass - (origin - (method url-fetch) - (uri (string-append - "https://github.com/sass/libsass/archive/" - version ".tar.gz")) - (file-name (string-append "libsass-" version ".tar.gz")) - (sha256 - (base32 - "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x"))))) - (package - (name "sassc") - (version version) - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/sass/sassc/archive/" - version ".tar.gz")) - (file-name (string-append "sassc-" version ".tar.gz")) - (sha256 - (base32 - "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags - (list "CC=gcc" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:test-target "test" - ;; FIXME: "make test" rebuilds the application and gets lost in a - ;; non-existing directory. - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'bootstrap) - (delete 'configure) - (add-after 'unpack 'unpack-libsass-and-set-path - (lambda* (#:key inputs #:allow-other-keys) - (invoke "tar" "xvf" (assoc-ref inputs "libsass")) - (setenv "SASS_LIBSASS_PATH" - (string-append (getcwd) "/libsass-" ,version)) - #t))))) - (inputs - `(("libsass" ,libsass))) - (synopsis "CSS pre-processor") - (description "SassC is a compiler written in C for the CSS pre-processor + (package + (name "sassc") + (version "3.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sass/sassc.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jsfz1zg4gwk0dq8i92ll12axs3s70wsdsmdyi71zx8zmvib5nl6")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + ;; I don't believe sassc contains any tests + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-Makefile + (lambda _ + (substitute* "Makefile" + (("build-shared: \\$\\(RESOURCES\\) \\$\\(OBJECTS\\) \\$\\(LIB_SHARED\\)") + "build-shared: $(RESOURCES) $(OBJECTS)") + (("\\$\\(SASSC_EXE\\): libsass build") + "$(SASSC_EXE): build") + (("install: libsass-install-\\$\\(BUILD\\) \\\\") + "install: \\")) + #t)) + ;; This phase fails for some reason + (delete 'bootstrap) + ;; There is no configure script + (delete 'configure) + (add-before 'build 'setup-environment + (lambda _ + (setenv "BUILD" "shared") + (setenv "SASSC_VERSION" ,version) + #t))))) + (inputs + `(("libsass" ,libsass))) + (synopsis "CSS pre-processor") + (description "SassC is a compiler written in C for the CSS pre-processor language known as SASS.") - (home-page "http://sass-lang.com/libsass") - (license l:expat)))) + (home-page "http://sass-lang.com/libsass") + (license l:expat))) (define-public perl-apache-logformat-compiler -- cgit v1.2.3 From 9efc888d97afef7ed921aede7cc8a9275faeaf9e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:16:49 +0000 Subject: gnu: Add ruby-sassc. * gnu/packages/ruby.scm (ruby-sassc): New variable. --- gnu/packages/ruby.scm | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3adacfee2f..b3c19808a6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7415,6 +7415,81 @@ the @file{spec} directory.") features that don't exist yet like variables, nesting, mixins and inheritance.") (license license:expat))) +(define-public ruby-sassc + (package + (name "ruby-sassc") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "sassc" version)) + (sha256 + (base32 + "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; TODO: This would be better as a snippet, but the ruby-build-system + ;; doesn't seem to support that + (add-after 'unpack 'remove-libsass + (lambda _ + (delete-file-recursively "ext") + #t)) + (add-after 'unpack 'dont-check-the-libsass-version + (lambda _ + (substitute* "test/native_test.rb" + (("assert_equal.*Native\\.version") "")) + #t)) + (add-after 'unpack 'remove-git-from-gemspec + (lambda _ + (substitute* "sassc.gemspec" + (("`git ls-files -z`") "`find . -type f -print0 |sort -z`") + (("`git submodule --quiet foreach pwd`") "''")) + #t)) + (add-after 'unpack 'remove-extensions-from-gemspec + (lambda _ + (substitute* "sassc.gemspec" + (("\\[\"ext/Rakefile\"\\]") "[]")) + #t)) + (add-after 'unpack 'fix-Rakefile + (lambda _ + (substitute* "Rakefile" + (("test: 'libsass:compile'") ":test")) + #t)) + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + (substitute* "test/test_helper.rb" + (("require \"pry\"") "")) + #t)) + (add-before 'build 'patch-native.rb + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lib/sassc/native.rb" + ((".*gem_root = spec.gem_dir") "") + (("ffi_lib .*\n") + (string-append + "ffi_lib '" (assoc-ref inputs "libsass") "/lib/libsass.so'"))) + #t)) + ;; The gemspec still references the libsass files, so just keep the + ;; one in the gem. + (delete 'extract-gemspec)))) + (propagated-inputs + `(("ruby-ffi" ,ruby-ffi) + ("ruby-rake" ,ruby-rake))) + (inputs + `(("libsass" ,libsass))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-minitest-around" ,ruby-minitest-around) + ("ruby-test-construct" ,ruby-test-construct))) + (synopsis "Use libsss from Ruby") + (description + "This library provides Ruby q@acronym{FFI, Foreign Function Interface} +bindings to the libsass library. This enables rendering +@acronym{SASS,Syntactically awesome style sheets} from Ruby code.") + (home-page "https://github.com/sass/sassc-ruby") + (license license:expat))) + (define-public ruby-jekyll-sass-converter (package (name "ruby-jekyll-sass-converter") -- cgit v1.2.3 From 76b732fbc36713136c2bc4228c24890284a94f08 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:20:09 +0000 Subject: gnu: Add ruby-markaby. * gnu/packages/ruby.scm (ruby-markaby): New variable. --- gnu/packages/ruby.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b3c19808a6..a547f5d8ae 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2290,6 +2290,43 @@ It allows writing tests, checking results and automated testing in Ruby.") (home-page "https://test-unit.github.io/") (license (list license:psfl license:ruby)))) +(define-public ruby-markaby + (package + (name "ruby-markaby") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "markaby" version)) + (sha256 + (base32 + "1j4jc31ycydbkh5h3q6zwidzpavg3g5mbb5lqyaczd3jrq78rd7i")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; Run rspec manually without using the Rakefile, as the versions of + ;; Rake and RSpec 2 are incompatible: + ;; + ;; NoMethodError: undefined method `last_comment' + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (propagated-inputs + `(("ruby-builder" ,ruby-builder))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec-2))) + (synopsis "Write HTML pages in pure Ruby") + (description + "Markaby allows writing HTML packages in pure Ruby. This is similar to +the functionality provided by @acronym{ERB, Embeded Ruby}, but without the +mixture of HTML and additional ERB syntax.") + (home-page "http://markaby.github.io/") + (license license:expat))) + (define-public ruby-maruku (package (name "ruby-maruku") -- cgit v1.2.3 From 09e2b0af40f08a2f279d67bc0db3a1a28962405b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:20:19 +0000 Subject: gnu: Add ruby-temple. * gnu/packages/ruby.scm (ruby-temple): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a547f5d8ae..4cf938f6f5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2170,6 +2170,29 @@ localization.") (home-page "https://github.com/ruby-gettext/locale") (license (list license:lgpl3+ license:ruby)))) +(define-public ruby-temple + (package + (name "ruby-temple") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "temple" version)) + (sha256 + (base32 + "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-tilt" ,ruby-tilt) + ("ruby-bacon" ,ruby-bacon) + ("ruby-erubis" ,ruby-erubis))) + (synopsis "Template compilation framework in Ruby") + (description + "Temple is an abstraction and framework for compiling templates to pure +Ruby.") + (home-page "https://github.com/judofyr/temple") + (license license:expat))) + (define-public ruby-text (package (name "ruby-text") -- cgit v1.2.3 From 8ea991e3afafd512830d613fe5e5be14314a8a4c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:20:27 +0000 Subject: gnu: Add ruby-haml. * gnu/packages/ruby.scm (ruby-haml): New variable. --- gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4cf938f6f5..0b48adfff0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1738,6 +1738,33 @@ failure.") (home-page "https://github.com/thekompanee/fuubar") (license license:expat))) +(define-public ruby-haml + (package + (name "ruby-haml") + (version "5.0.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "haml" version)) + (sha256 + (base32 + "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests + (propagated-inputs + `(("ruby-tilt" ,ruby-tilt) + ("ruby-temple" ,ruby-temple))) + (synopsis "Haml is a Ruby library to generate HTML documents") + (description + "@acronym{Haml, HTML Abstraction Markup Language} is a layer on top of +HTML or XML that is designed to express the structure of documents using +indentation rather than closing tags. It was originally envisioned as a +plugin for Ruby on Rails, but it can function as a stand-alone templating +engine.") + (home-page "http://haml.info/") + (license license:expat))) + (define-public ruby-hamster (package (name "ruby-hamster") -- cgit v1.2.3 From bcbb3cc907b112da16565cadd322a544f93ccd05 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Feb 2019 17:20:45 +0000 Subject: gnu: Add ruby-tilt. * gnu/packages/ruby.scm (ruby-tilt): New variable. --- gnu/packages/ruby.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0b48adfff0..53df4cf9fc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3820,6 +3820,52 @@ file or directories are modified.") (home-page "http://guardgem.org/") (license license:expat))) +(define-public ruby-tilt + (package + (name "ruby-tilt") + (version "2.0.9") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "tilt" version)) + (sha256 + (base32 + "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-some-dependencies + (lambda _ + (substitute* "Gemfile" + ;; TODO ronn is used for generating the manual + (("gem 'ronn'.*") "\n") + ;; ruby-haml has a runtime dependency on ruby-tilt, so don't + ;; pass it in as a native-input + (("gem 'haml'.*") "\n") + ;; TODO Not all of these gems are packaged for Guix yet: + ;; less, coffee-script, livescript, babel-transpiler, + ;; typescript-node + (("if can_execjs") "if false") + ;; Disable the secondary group to reduce the number of + ;; dependencies. None of the normal approaches work, so patch + ;; the Gemfile instead. + (("group :secondary") "[].each")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-yard" ,ruby-yard) + ("ruby-builder" ,ruby-builder) + ("ruby-erubis" ,ruby-erubis) + ("ruby-markaby" ,ruby-markaby) + ("ruby-sassc" ,ruby-sassc))) + (synopsis "Generic interface to multiple Ruby template engines") + (description + "Tilt is a thin interface over a number of different Ruby template +engines in an attempt to make their usage as generic as possible.") + (home-page "https://github.com/rtomayko/tilt/") + (license license:expat))) + (define-public ruby-thread-safe (package (name "ruby-thread-safe") -- cgit v1.2.3 From dcbe674c86b3a93ff269e9f4925a2d61213165bf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 4 Mar 2019 21:04:16 +0100 Subject: gnu: python-redis: Update to 3.2.0. * gnu/packages/databases.scm (python-redis): Update to 3.2.0. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d913d72874..4afedf8ba1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2478,13 +2478,13 @@ reasonable substitute.") (define-public python-redis (package (name "python-redis") - (version "2.10.6") + (version "3.2.0") (source (origin (method url-fetch) (uri (pypi-uri "redis" version)) (sha256 - (base32 "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52")))) + (base32 "0m1b88wg1w6xdwg0siky5k86x8sh6smhbr42ixz41ra81lv34jbj")))) (build-system python-build-system) ;; Tests require a running Redis server (arguments '(#:tests? #f)) -- cgit v1.2.3 From 865c76ea3b6ac7cc8f58ae3663523c38162ae2b7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 4 Mar 2019 21:07:03 +0100 Subject: gnu: python-rq: Update to 0.13.0. * gnu/packages/databases.scm (python-rq): Update to 0.13.0. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4afedf8ba1..29f5d65866 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2503,13 +2503,13 @@ reasonable substitute.") (define-public python-rq (package (name "python-rq") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri "rq" version)) (sha256 - (base32 "16d8kni57xlnah2hawy4xgw21xrv3f64j5q5shyp3zxx4yd9iibs")))) + (base32 "0xvapd2bxnyq480i48bdkddzlqmv2axbsq85rlfy8k3al8zxxxrf")))) (build-system python-build-system) (propagated-inputs `(("python-click" ,python-click) -- cgit v1.2.3 From f55fe42b36806aa4e87b21a830bb13d3c99d0291 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 4 Mar 2019 21:09:12 +0100 Subject: gnu: python-django-redis: Update to 4.10.0. * gnu/packages/django.scm (python-django-redis): Update to 4.10.0. --- gnu/packages/django.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index bce84449e1..054088ddef 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -638,22 +638,22 @@ support, and optional data-URI image and font embedding.") (define-public python-django-redis (package (name "python-django-redis") - (version "4.7.0") + (version "4.10.0") (source (origin (method url-fetch) (uri (pypi-uri "django-redis" version)) (sha256 (base32 - "0yyyxv8n9l9dhs893jsqwg2cxqkkc79g719n9dzzzqgkzialv1c1")))) + "1rxcwnv9ik0swkwvfqdi9i9baw6n8if5pj6q63fjh4p9chw3j2xg")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - (and (zero? (system* "redis-server" "--daemonize" "yes")) - (with-directory-excursion "tests" - (zero? (system* "python" "runtests.py"))))))))) + (invoke "redis-server" "--daemonize" "yes") + (with-directory-excursion "tests" + (invoke "python" "runtests.py"))))))) (native-inputs `(("python-fakeredis" ,python-fakeredis) ("python-hiredis" ,python-hiredis) -- cgit v1.2.3 From 1396837184fd5e119f8e1978714d4f1804ded9c3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 4 Mar 2019 21:14:28 +0100 Subject: gnu: python-django-rq: Update to 1.3.0. * gnu/packages/django.scm (python-django-rq): Update to 1.3.0. --- gnu/packages/django.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 054088ddef..beda8e23cd 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -675,25 +675,26 @@ support, and optional data-URI image and font embedding.") (define-public python-django-rq (package (name "python-django-rq") - (version "0.9.4") + (version "1.3.0") (source (origin (method url-fetch) (uri (pypi-uri "django-rq" version)) (sha256 (base32 - "04v8ilfdp10bk31fxgh4cn083gsn5m06342cnpm5d10nd8hc0vky")))) + "0xh6qa7i779vh58lwwv6yk0wx8bi38mvmpz79grnl2cl8531r928")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - (and (zero? (system* "redis-server" "--daemonize" "yes")) - (zero? (system* "django-admin.py" "test" "django_rq" - "--settings=django_rq.test_settings" - "--pythonpath=")))))))) + (invoke "redis-server" "--daemonize" "yes") + (invoke "django-admin.py" "test" "django_rq" + "--settings=django_rq.tests.settings" + "--pythonpath=")))))) (native-inputs - `(("redis" ,redis))) + `(("python-mock" ,python-mock) + ("redis" ,redis))) (propagated-inputs `(("python-django" ,python-django) ("python-rq" ,python-rq))) -- cgit v1.2.3 From 9597c550052553133d992772b6d994c72c1a03cf Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 4 Mar 2019 21:21:00 +0100 Subject: gnu: python2-openid: Fix package. * gnu/packages/python-web (python2-openid)[arguments]: Disable tests. --- gnu/packages/python-web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 839f48ce4f..e25b68153d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -600,7 +600,9 @@ for clients and servers.") (build-system python-build-system) (arguments ;; Python 3 support is in `python3-openid`, a separate package. - `(#:python ,python-2)) + `(#:python ,python-2 + ;; Tests aren't initialized correctly. + #:tests? #f)) (home-page "https://github.com/openid/python-openid") (synopsis "OpenID support for servers and consumers") (description "This library provides OpenID authentication for Python, both -- cgit v1.2.3 From add6635281ee069893689a8f771cc3af3eb68f8d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 4 Mar 2019 21:27:40 +0100 Subject: gnu: python-django-allauth: Update to 0.39.1. * gnu/packages/django.scm (python-django-allauth): Update to 0.39.1. --- gnu/packages/django.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index beda8e23cd..0754c80390 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -218,14 +218,14 @@ them do this.") (define-public python-django-allauth (package (name "python-django-allauth") - (version "0.30.0") + (version "0.39.1") (source (origin (method url-fetch) (uri (pypi-uri "django-allauth" version)) (sha256 (base32 - "1fslqc5qqb0b66yscvkyjwfv8cnbfx5nlkpnwimyb3pf1nc1w7r3")))) + "17l0acpr3cihdndzccjhgv58f9z170v2qwx7w0b8w6235x646i24")))) (build-system python-build-system) (arguments '(#:phases @@ -234,19 +234,20 @@ them do this.") (add-before 'check 'skip-test-requiring-network-access (lambda _ (substitute* "allauth/socialaccount/providers/openid/tests.py" + (("import override_settings") "import tag, override_settings") (("def test_login") - "from django.test import tag - @tag('requires-web') + "@tag('requires-web') def test_login")))) (replace 'check (lambda _ + ;; TODO: investigate why this test fails + (delete-file "allauth/socialaccount/providers/cern/tests.py") (setenv "DJANGO_SETTINGS_MODULE" "test_settings") - (zero? (system* - "django-admin" + (invoke "django-admin" "test" "allauth" "--verbosity=2" - "--exclude-tag=requires-web"))))))) + "--exclude-tag=requires-web")))))) (propagated-inputs `(("python-openid" ,python-openid) ("python-requests" ,python-requests) -- cgit v1.2.3 From b95d758b33e6d4b00b94964be051ac93dbe7fae9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 4 Mar 2019 21:51:03 +0100 Subject: gnu: pootle: Update to 2.8.2. * gnu/packages/django.scm (pootle): Update to 2.8.2. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 0754c80390..9bb81621d9 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -790,14 +790,14 @@ static files.") (define-public pootle (package (name "pootle") - (version "2.8.0rc5") + (version "2.8.2") (source (origin (method url-fetch) (uri (pypi-uri "Pootle" version ".tar.bz2")) (sha256 (base32 - "0m6qcpkcy22dk3ad5y2k8851kqg2w6vrkywgy4vabwbacd7r1mvn")))) + "1ng8igq0alsqzasgxdh3fb23581anyzp121h9041pwdzzv98kn4m")))) (build-system python-build-system) (arguments `(; pootle supports only python2. -- cgit v1.2.3 From cb505b27eb0c20b8546e24bab844a195c386d30e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 13:47:26 +0100 Subject: gnu: xorg-server: Don't use NAME in source URI. * gnu/packages/xorg.scm (xorg-server)[source](uri): Hard-code NAME. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fcfb500854..d027f317c2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5093,7 +5093,7 @@ over Xlib, including: (method url-fetch) (uri (string-append "mirror://xorg/individual/xserver/" - name "-" version ".tar.bz2")) + "xorg-server-" version ".tar.bz2")) (sha256 (base32 "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v")) -- cgit v1.2.3 From 248f651e77ed07d3650420850eca806d10761d20 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 13:48:09 +0100 Subject: gnu: xorg-server: Update to 1.20.4. * gnu/packages/xorg.scm (xorg-server): Update to 1.20.4. (xorg-server-for-tests): Stay on version 1.20.3. --- gnu/packages/xorg.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d027f317c2..7350580b77 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017 John Darrington -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice @@ -5087,7 +5087,7 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.20.3") + (version "1.20.4") (source (origin (method url-fetch) @@ -5096,7 +5096,7 @@ over Xlib, including: "xorg-server-" version ".tar.bz2")) (sha256 (base32 - "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v")) + "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy")) (patches (list ;; See: @@ -5218,7 +5218,16 @@ draggable titlebars and borders.") (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server)))) + (inherit xorg-server) + (version "1.20.3") + (source (origin + (inherit (package-source xorg-server)) + (uri (string-append + "mirror://xorg/individual/xserver/" + "xorg-server-" version ".tar.bz2")) + (sha256 + (base32 + "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"))))))) (define-public xorg-server-xwayland (package -- cgit v1.2.3 From 6a7ef08aa9f2180e736cd17e6d7a4e4c1776ebfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 13:49:06 +0100 Subject: gnu: liblo: Update to 0.30. * gnu/packages/audio.scm (liblo): Update to 0.30. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 70bbc3e49a..395cdfed0d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1741,14 +1741,14 @@ essential distortions.") (define-public liblo (package (name "liblo") - (version "0.29") + (version "0.30") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/liblo/liblo/" version "/liblo-" version ".tar.gz")) (sha256 (base32 - "0sn0ckc1d0845mhsaa62wf7f9v0c0ykiq796a30ja5096kib9qdc")))) + "06wdjzxjdshr6hyl4c94yvg3jixiylap8yjs8brdfpm297gck9rh")))) (build-system gnu-build-system) (arguments `(;; liblo test FAILED -- cgit v1.2.3 From 5ae458befc803fe357210fef343cf322d9f4bade Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 14:32:19 +0100 Subject: gnu: rocksdb: Update to 5.18.3. * gnu/packages/databases.scm (rocksdb): Update to 5.18.3. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 29f5d65866..482d399a97 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -836,7 +836,7 @@ types are supported, as is encryption.") (define-public rocksdb (package (name "rocksdb") - (version "5.15.10") + (version "5.18.3") (source (origin (method git-fetch) (uri (git-reference @@ -845,7 +845,7 @@ types are supported, as is encryption.") (file-name (git-file-name name version)) (sha256 (base32 - "0q26frbj9pykarcfa0yxgwncxlvsqhjkby0jrbfs1a8srja688r4")) + "1v2slmmr1dsgf8z0qcfg1y9x1al96859rg48b66p9nsawczd5zv9")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3