From ff68ddb032774c65279372c6d4bfab5d8825977e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 12:37:25 +0200 Subject: gnu: ungoogled-chromium: Build against ICU 64. * gnu/packages/icu4c.scm (icu4c-64): New public variable. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change ICU4C to ICU4C-64. --- gnu/packages/chromium.scm | 6 +++++- gnu/packages/icu4c.scm | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index e357556956..79828ef589 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -714,7 +714,11 @@ from forcing GEXP-PROMISE." ("glib" ,glib) ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) - ("icu4c" ,icu4c) + + ;; Build against ICU 64 to prevent a localization problem in version 75 + ;; and later: . + ("icu4c" ,icu4c-64) + ("jsoncpp" ,jsoncpp) ("lcms" ,lcms) ("libevent" ,libevent) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 6e93d6aed9..512967a305 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ (define-module (gnu packages icu4c) #:use-module (gnu packages) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) @@ -81,6 +83,22 @@ C/C++ part.") (license x11) (home-page "http://site.icu-project.org/"))) +(define-public icu4c-64 + (package + (inherit icu4c) + (version "64.2") + (source (origin + (inherit (package-source icu4c)) + (uri (string-append + "http://download.icu-project.org/files/icu4c/" version "/icu4c-" + (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) + "-src.tgz")) + (sha256 + (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) + (native-inputs + `(;; For tests. + ("python" ,python))))) + (define-public java-icu4j (package (name "java-icu4j") -- cgit 1.4.1 From 1307aa4427160c11d6ab84c5b2e96ea172fa0f1e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 13:36:58 +0200 Subject: gnu: mbedtls-apache: Update to 2.16.2. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.16.2. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 8e20101e51..ea6dfda931 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -834,7 +834,7 @@ then ported to the GNU / Linux environment.") (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.16.1") + (version "2.16.2") (source (origin (method url-fetch) @@ -844,7 +844,7 @@ then ported to the GNU / Linux environment.") version "-apache.tgz")) (sha256 (base32 - "08zz88gcb2jmpfsgy5b6qc3li6l39yw1dbimd18aziyd889nvl7b")))) + "1906hbwlkq32075hca4vjad03dcc36aycvmaz8yvhr3ygg6lz0x6")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 5dd0269244da42066133d19055c9eb82b9e9ae20 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 13:37:22 +0200 Subject: gnu: miniupnpc: Update to 2.1.20190625. * gnu/packages/upnp.scm (miniupnpc): Update to 2.1.20190625. --- gnu/packages/upnp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 3f3d80f576..a085fe9747 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -32,14 +32,14 @@ (define-public miniupnpc (package (name "miniupnpc") - (version "2.1.20190408") + (version "2.1.20190625") (source (origin (method url-fetch) (uri (string-append "https://miniupnp.tuxfamily.org/files/" name "-" version ".tar.gz")) (sha256 - (base32 "1v0l2m8j7r6jiy871d6v11ls243xqn6s3856iwd3bmk5c37npi50")))) + (base32 "1yqp0d8x5ldjfma5x2vhpg1aaafdg0470ismccixww3rzpbza8w7")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) -- cgit 1.4.1 From a3d1a3487a34820d2a0b3d5e6206e4df1c77c15c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 20:14:58 +0200 Subject: gnu: gtksourceviewmm: Build against gtksourceview@3. * gnu/packages/gtk.scm (gtksourceviewmm)[propagated-inputs]: Change GTKSOURCEVIEW to GTKSOURCEVIEW-3. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2776bd31a3..3f835f51e5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1182,7 +1182,7 @@ extensive documentation, including API reference and a tutorial.") ;; In 'Requires' of gtksourceviewmm-3.0.pc. `(("glibmm" ,glibmm) ("gtkmm" ,gtkmm) - ("gtksourceview" ,gtksourceview))) + ("gtksourceview" ,gtksourceview-3))) (synopsis "C++ interface to the GTK+ 'GtkTextView' widget") (description "gtksourceviewmm is a portable C++ library that extends the standard GTK+ -- cgit 1.4.1 From 037bef7db4f67b1f7df879f8e41a971308ce8128 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 1 Jul 2019 12:08:08 +0200 Subject: gnu: behave: Fix build. * gnu/packages/check.scm (behave)[propagated-inputs]: Add python-importlib-metadata. --- gnu/packages/check.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9bc5036cf6..dae2b0e1d9 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1924,7 +1924,8 @@ backported from Python 2.7 for Python 2.4+.") ("python-pyhamcrest" ,python-pyhamcrest) ("python-pytest" ,python-pytest))) (propagated-inputs - `(("python-six" ,python-six) + `(("python-importlib-metadata" ,python-importlib-metadata) + ("python-six" ,python-six) ("python-parse" ,python-parse) ("python-parse-type" ,python-parse-type))) (arguments -- cgit 1.4.1 From 78c88baad56ae2843d809a8160631a7bae071315 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jul 2019 12:29:02 +0200 Subject: gnu: guile: Add 2.2.6. * gnu/packages/guile.scm (guile-2.2.5): Rename to... (guile-2.2.6): ... this, and update to 2.2.6. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f0a53e7c39..6e11a13c56 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -286,17 +286,17 @@ without requiring the source code to be rewritten.") (max-silent-time . 36000))))) ;10 hours (needed on ARM ; when heavily loaded) -(define-public guile-2.2.5 +(define-public guile-2.2.6 (package (inherit guile-2.2) - (version "2.2.5") + (version "2.2.6") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "19w5ws1jvs01dpv756qv2cgs37rsnwq1f4f07mj0wra35pqp6c7w")))))) + "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")))))) (define-public guile-next ;; This is the upcoming Guile 3.0, with JIT support. -- cgit 1.4.1 From 2868804de69ed23f396fd8e68d6dd18c40518948 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Jul 2019 00:13:08 +0200 Subject: gnu: python-duniterpy: Update to 0.54.3. * gnu/packages/finance.scm (python-duniterpy): Update to 0.54.3. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index cd5d3b7d9a..573ec0be15 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -935,7 +935,7 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.54.1") + (version "0.54.3") (source (origin (method git-fetch) @@ -946,7 +946,7 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (file-name (git-file-name name version)) (sha256 (base32 - "15z5wc3ahvv8axyiqmf7hd4y91ahh1x4bfmgsqxwygyhswl1yjq8")))) + "1k3rpfc9zxj9z50cr4zjfyzdla9ap5mj1v1rlcriqmflgb5cmiba")))) (build-system python-build-system) (arguments ;; Tests fail with "AttributeError: module 'attr' has no attribute 's'". -- cgit 1.4.1 From 7242d5792b9aee67da30cbe21b1b20265c12248d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Jul 2019 00:38:36 +0200 Subject: gnu: giac: Update to 1.5.0-61. * gnu/packages/algebra.scm (giac): Update to 1.5.0-61. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 95189401f7..7e66e42f0a 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -331,7 +331,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.5.0-57") + (version "1.5.0-61") (source (origin (method url-fetch) ;; "~parisse/giac" is not used because the maintainer regularly @@ -343,7 +343,7 @@ precision.") "source/giac_" version ".tar.gz")) (sha256 (base32 - "08c93knsisbk9dkyyrignw0wvqbr1sa5czlvk5l307ahxbbmqncf")))) + "050vzpqq77fhky32sbisc0ysimgp60xjv39q7y45jkaabdkmclwh")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) -- cgit 1.4.1 From 0f0651295e742b399af4436f350662afb4a6f7af Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Jul 2019 00:45:05 +0200 Subject: gnu: silkaj: Update to 0.7.2. * gnu/packages/finance.scm (silkaj): Update to 0.7.2. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 573ec0be15..03a8285fc1 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -993,7 +993,7 @@ main features are: (define-public silkaj (package (name "silkaj") - (version "0.7.0") + (version "0.7.2") (source (origin (method git-fetch) @@ -1003,7 +1003,7 @@ main features are: (file-name (git-file-name name version)) (sha256 (base32 - "0pnd5v15sgxxm114sbs0z24a4dars5hy1nabc9v9ask7kxzrxs9y")))) + "059k2kil2l8jcm4wp86w1z7y8p26rww7d3l5fzds0qq2dzvkvzgs")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no test -- cgit 1.4.1 From 48eb71aea807262210c38b5fb675d747adfccff3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 1 Jul 2019 15:37:10 +0200 Subject: gnu: emacsy: Update to 0.4.1. * gnu/packages/guile-xyz.scm (emacsy): Update to 0.4.1. --- gnu/packages/guile-xyz.scm | 119 ++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 73 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a8352380f7..f652a94d2e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2326,82 +2326,55 @@ more expressive and flexible than the traditional @code{format} procedure.") (license license:bsd-3)))) (define-public emacsy - (let ((commit "7d49cc1425d5d209bdb82cac0d8ea0694b8b3784") - (revision "4")) - (package - (name "emacsy") - (version (string-append "0.1.2-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/janneke/emacsy.git") - (commit commit))) - (file-name (string-append name "-" version)) - (sha256 - (base32 - "0k9yns1v8zn135w60sx96nqs2bm2p2dvcvlm987hkw4lbff9ii6i")))) - (build-system gnu-build-system) - (native-inputs - `(("emacsy-webkit-gtk" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/janneke/emacsy-webkit-gtk.git") - (commit "35ded1b3e997fd779a17e0c4a2c73741718562d9"))) - (file-name (string-append "emacsy-webkit-gtk" "-" version)) - (sha256 - (base32 - "1gp0li2rbp6in926r3hrww6cnh864pp46v1din2pgmd7vzzl7kg0")))) - ("hello-emacsy" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/janneke/hello-emacsy.git") - (commit "2c117e5286a261be4ff24938f3ae1d348396c538"))) - (file-name (string-append "hello-emacsy" "-" version)) - (sha256 - (base32 - "15ykd7s8axcy8ym4v71fgal4x28fxnim0pv0jmpi3dnhizr63zqn")))) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("bzip2" ,bzip2) - ("guile" ,guile-2.2) - ("gettext" ,gnu-gettext) - ("libtool" ,libtool) - ("noweb" ,noweb) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo) - ("texlive" ,texlive))) - (propagated-inputs - `(("guile-lib" ,guile-lib) - ("guile-readline" ,guile-readline) - ("freeglut" ,freeglut) - ("gssettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk))) - (inputs `(("guile" ,guile-2.2))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-examples - (lambda _ - (copy-recursively (assoc-ref %build-inputs "emacsy-webkit-gtk") - "example/emacsy-webkit-gtk") - (copy-recursively (assoc-ref %build-inputs "hello-emacsy") - "example/hello-emacsy"))) - (add-before 'configure 'setenv - (lambda _ - (setenv "GUILE_AUTO_COMPILE" "0")))))) - (home-page "https://github.com/shanecelis/emacsy/") - (synopsis "Embeddable GNU Emacs-like library using Guile") - (description - "Emacsy is an embeddable GNU Emacs-like library that uses GNU Guile + (package + (name "emacsy") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://download.savannah.nongnu.org/releases/" + name "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "1cpb85dl1nibd34c2x2h7vfmjpkgh353p5b1w20v6cs6gmvgg4np")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("bzip2" ,bzip2) + ("guile" ,guile-2.2) + ("gettext" ,gnu-gettext) + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo) + ("texlive" ,texlive))) + (propagated-inputs + `(("dbus-glib" ,dbus-glib) + ("guile" ,guile-2.2) + ("guile-lib" ,guile-lib) + ("guile-readline" ,guile-readline) + ("glib-networking" ,glib-networking) + ("freeglut" ,freeglut) + ("gssettings-desktop-schemas" ,gsettings-desktop-schemas) + ("webkitgtk" ,webkitgtk))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (setenv "GUILE_AUTO_COMPILE" "0") + #t))))) + (home-page "https://savannah.nongnu.org/projects/emacsy") + (synopsis "Embeddable GNU Emacs-like library using Guile") + (description + "Emacsy is an embeddable Emacs-like library that uses GNU Guile as extension language. Emacsy can give a C program an Emacsy feel with keymaps, minibuffer, recordable macros, history, tab completion, major and minor modes, etc., and can also be used as a pure Guile library. It -comes with a simple counter example using GLUT and browser examples in C -using gtk+-3 and webkitgtk.") - (license license:gpl3+)))) +comes with a simple counter example using FreeGLUT and browser examples +in C using Gtk+-3 and WebKitGtk.") + (license license:gpl3+))) (define-public guile-jpeg (let ((commit "6a1673578b297c2c1b28e44a76bd5c49e76a5046") -- cgit 1.4.1 From 941ae98eae755a92a0e28d04490ee9a237cc585f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 2 Jul 2019 09:35:01 +0200 Subject: gnu: faudio: Update to 19.07. * gnu/packages/audio.scm (faudio): Update to 19.07. --- 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 b8dbc2f00a..eff4edeb59 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3701,7 +3701,7 @@ library.") (define-public faudio (package (name "faudio") - (version "19.06.07") + (version "19.07") (source (origin (method git-fetch) @@ -3710,7 +3710,7 @@ library.") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "1w37qp279lgpyvslwz3wlb4fp0i68ncd411rqdlk5s71b1zz466n")))) + (base32 "1wf6skc5agaikc9qgwk8bx56sad31fafs53lqqn4jmx8i76pl0lw")))) (arguments '(#:tests? #f ; No tests. #:configure-flags '("-DFFMPEG=ON"))) -- cgit 1.4.1 From 71a29277055708b509a477d97c8d5f9815f1b939 Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Sat, 29 Jun 2019 03:09:31 +0530 Subject: gnu: emacs-shroud: Update to 1.83.4. * gnu/packages/emacs-xyz.scm (emacs-shroud): Update to 1.83.4. Signed-off-by: Efraim Flashner --- 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 2a59ae522e..a27de2f778 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -550,7 +550,7 @@ for editing Racket's Scribble documentation syntax in Emacs.") (define-public emacs-shroud (package (name "emacs-shroud") - (version "1.15.1") + (version "1.83.4") (source (origin (method git-fetch) @@ -559,7 +559,7 @@ for editing Racket's Scribble documentation syntax in Emacs.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0wvm4lxqcc1p8v7rpqal3bnqgnpk1gs7v18i83f6cvi5d88jkgdg")))) + (base32 "1yvdjx0kp4y8w5yz2cbqq9n6xl5splvmsyyx8ld1xv0q1c9872nf")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-bui" ,emacs-bui) -- cgit 1.4.1 From 4bac5bba51383f5c01cd5a9a5efe7b9198be86c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Jul 2019 11:42:56 +0300 Subject: gnu: Wrap program with libraries. * gnu/packages/package-management.scm (stow)[arguments]: Add custom 'wrap-stow phase to wrap stow with necessary inputs. [propagated-inputs]: Move perl-clone, perl-clone-choose, perl-hash-merge to... [inputs]: ... here. --- gnu/packages/package-management.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ca360b3884..d0388e5d43 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -475,17 +475,28 @@ sub-directory.") (base32 "0h8qr2rxsrkg6d8jxjk68r23jgn1dxdxyp4bnzzinpa8sjhfl905")))) (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-stow + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/stow") + `("PERL5LIB" ":" prefix + ,(map (lambda (i) (string-append (assoc-ref inputs i) + "/lib/perl5/site_perl")) + '("perl-clone-choose" "perl-clone" "perl-hash-merge")))) + #t)))))) (inputs - `(("perl" ,perl))) + `(("perl" ,perl) + ("perl-clone" ,perl-clone) + ("perl-clone-choose" ,perl-clone-choose) + ("perl-hash-merge" ,perl-hash-merge))) (native-inputs `(("perl-test-simple" ,perl-test-simple) ("perl-test-output" ,perl-test-output) ("perl-capture-tiny" ,perl-capture-tiny) ("perl-io-stringy" ,perl-io-stringy))) - (propagated-inputs - `(("perl-clone-choose" ,perl-clone-choose) - ("perl-clone" ,perl-clone) - ("perl-hash-merge" ,perl-hash-merge))) (home-page "https://www.gnu.org/software/stow/") (synopsis "Managing installed software packages") (description -- cgit 1.4.1 From 697df13f613468f4c572f85d3411dbf60b7bc45a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Jul 2019 15:04:56 +0300 Subject: gnu: octave-cli: Sort inputs alphabetically. * gnu/packages/maths.scm (octave-cli)[inputs]: Sort inputs alphabetically. --- gnu/packages/maths.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5b31596041..7d2c4797f1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1463,30 +1463,30 @@ can solve two kinds of problems: "11wwxpy2q1bhxs2v41bqn05i2sb0905cj1xil6mg8l4k2kka4cq6")))) (build-system gnu-build-system) (inputs - `(("lapack" ,lapack) - ("qhull" ,qhull) - ("readline" ,readline) - ("gl2ps" ,gl2ps) - ("glpk" ,glpk) + `(("alsa-lib" ,alsa-lib) + ("arpack" ,arpack-ng) + ("curl" ,curl) ("fftw" ,fftw) ("fftwf" ,fftwf) - ("arpack" ,arpack-ng) - ("pcre" ,pcre) ("fltk" ,fltk) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("hdf5" ,hdf5) - ("libxft" ,libxft) - ("mesa" ,mesa) + ("gl2ps" ,gl2ps) + ("glpk" ,glpk) ("glu" ,glu) - ("zlib" ,zlib) - ("curl" ,curl) - ("texinfo" ,texinfo) ("graphicsmagick" ,graphicsmagick) - ("suitesparse" ,suitesparse) + ("hdf5" ,hdf5) + ("lapack" ,lapack) ("libsndfile" ,libsndfile) + ("libxft" ,libxft) + ("mesa" ,mesa) + ("pcre" ,pcre) ("portaudio" ,portaudio) - ("alsa-lib" ,alsa-lib))) + ("qhull" ,qhull) + ("readline" ,readline) + ("suitesparse" ,suitesparse) + ("texinfo" ,texinfo) + ("zlib" ,zlib))) (native-inputs `(("lzip" ,lzip) ("gfortran" ,gfortran) -- cgit 1.4.1 From 35a16f5f6d78f15309b8e8282f46887835db83e0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 2 Jul 2019 13:45:16 +0200 Subject: gnu: btrfs-progs: Update to 5.1.1. * gnu/packages/linux.scm (btrfs-progs): Update to 5.1.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 72b62faf42..b4407a5133 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3544,7 +3544,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.1") + (version "5.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -3552,7 +3552,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "0dgh56pamav8wb9nmabjwdlpcazvqc9pgzwablxn77mqh0qrhkaq")))) + "06xybs7rglxjqkbzl2409acb3rgmnc5zc0xhyaxsc2p1x5yipfcw")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" -- cgit 1.4.1 From f62b57ba74ebaee36c554b42933095612d1aee01 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 Jul 2019 12:15:48 +0200 Subject: gnu: re2: Update to 2019-07-01. * gnu/packages/regex.scm (re2): Update to 2019-07-01. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index a64944080b..71dac09737 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -30,7 +30,7 @@ (define-public re2 (package (name "re2") - (version "2019-06-01") + (version "2019-07-01") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,7 +38,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "01613z66wgiffdngbq3031rwd92jf87j93h7y5mn8hlx19gg5k4j")))) + "1ric6gdnf5mqj5iy5f81al49mr3mmjqj3nqi3mw2hjdbbgwkdn71")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit 1.4.1 From 8b5df106fdd52b8851bbdd978077e8ab257eb840 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 14:52:00 +0200 Subject: gnu: WebKitGTK: Update to 2.24.3. * gnu/packages/webkit.scm (webkitgtk-2.24): Update to 2.24.3. [source](patches): Remove. * gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - .../patches/webkitgtk-sans-gstreamer-gl.patch | 24 ---------------------- gnu/packages/webkit.scm | 5 ++--- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0f4cb2a6e4..6e90d88689 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1370,7 +1370,6 @@ dist_patch_DATA = \ %D%/packages/patches/wavpack-CVE-2018-6767.patch \ %D%/packages/patches/wavpack-CVE-2018-7253.patch \ %D%/packages/patches/wavpack-CVE-2018-7254.patch \ - %D%/packages/patches/webkitgtk-sans-gstreamer-gl.patch \ %D%/packages/patches/weechat-python.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ diff --git a/gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch b/gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch deleted file mode 100644 index 4577c81edb..0000000000 --- a/gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build failure when USE_GSTREAMER_GL=off. See -. - -This patch is taken from the upstream source repository: -. - -diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp -index 00a2af6489e..5cb5f7536ac 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp -+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp -@@ -1000,11 +1000,13 @@ void MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags() - break; - } - -+#if USE(GSTREAMER_GL) - // When the imxvpudecoder is used, the texture sampling of the - // directviv-uploaded texture returns an RGB value, so there's no need to - // convert it. - if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU) - m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG; -+#endif - } - #endif - diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index e9b7ab74a7..6b38998772 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -168,15 +168,14 @@ HTML/CSS applications to full-fledged web browsers.") (define-public webkitgtk-2.24 (package/inherit webkitgtk (name "webkitgtk") - (version "2.24.2") + (version "2.24.3") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "071jnjvjq6wsxx1jh4ql3j53h1nhphs5ga67fa5i9xjvs3qb3701")) - (patches (search-patches "webkitgtk-sans-gstreamer-gl.patch")))) + "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl")))) (native-inputs `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) -- cgit 1.4.1 From 52bb05c70274e5f235901cf8f6d190bfce728e87 Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Fri, 24 May 2019 11:33:07 +0200 Subject: gnu: Add chafa. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image-viewers.scm (chaffa): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/image-viewers.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index a5bfb28a88..7d2ff9a677 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019 Guy Fleury Iteriteka ;;; ;;; This file is part of GNU Guix. ;;; @@ -477,3 +478,28 @@ minimalism and usability in mind. Its features include animated GIF controls, file history, rotation/mirroring, and multithreaded preloading.") (license license:gpl3+))) + +(define-public chafa + (package + (name "chafa") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://hpjansson.org/chafa/releases/chafa-" + version ".tar.xz")) + (sha256 + (base32 + "00cf2z52az0z6bzc3hfm4l8infipy5ck410wqmbaybd2csjr3m29")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("imagemagick" ,imagemagick))) + (synopsis "Convert images to ANSI/Unicode characters") + (description + "Chafa is a command-line utility that converts all kinds of images, +including animated GIFs, into ANSI/Unicode character output that can be +displayed in a terminal.") + (home-page "https://hpjansson.org/chafa/") + (license license:lgpl3+))) -- cgit 1.4.1 From c473bd1881d5093789b41cb6927ee3a5ed6d0439 Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Fri, 7 Jun 2019 05:24:12 -0500 Subject: gnu: Add ghc-wl-pprint-annotated. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-wl-pprint-annotated): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cfbd3bfb76..f40d92b9f7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11591,4 +11591,34 @@ Replace some ASCII sequences by their Unicode equivalent (turned off by default) @end itemize") (license license:bsd-3))) + +(define-public ghc-wl-pprint-annotated + (package + (name "ghc-wl-pprint-annotated") + (version "0.1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/wl-pprint-annotated/wl-pprint-annotated-" + version + ".tar.gz")) + (sha256 + (base32 + "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page + "https://github.com/minad/wl-pprint-annotated#readme") + (synopsis + "Wadler/Leijen pretty printer with annotation support") + (description + "Annotations are useful for coloring. This is a limited version of +@code{wl-pprint-extras} without support for point effects and without the free +monad. Like in @code{annotated-wl-pprint}, only annotations are supported. +Compared to @code{annotated-wl-pprint} this library provides a slightly +modernized interface.") + (license license:bsd-3))) ;;; haskell.scm ends here -- cgit 1.4.1 From cbff89d126bf5985cfa4884f543c0908c437ff41 Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Fri, 7 Jun 2019 06:00:26 -0500 Subject: gnu: Add ghc-ansi-terminal-0.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-ansi-terminal-0.8): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f40d92b9f7..a7a8b762c4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4383,6 +4383,21 @@ allows cursor movement, screen clearing, color output showing or hiding the cursor, and changing the title.") (license license:bsd-3))) +(define-public ghc-ansi-terminal-0.8 + (package (inherit ghc-ansi-terminal) + (name "ghc-ansi-terminal") + (version "0.8.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/ansi-terminal/ansi-terminal-" + version + ".tar.gz")) + (sha256 + (base32 + "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b")))))) + (define-public ghc-vault (package (name "ghc-vault") -- cgit 1.4.1 From 5a499d0f7d5b98443ed0b2c41f2651f66a84ab5e Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Fri, 7 Jun 2019 06:09:24 -0500 Subject: gnu: ghc-ansi-wl-pprint: Use ghc-ansi-terminal-0.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-ansi-wl-pprint)[inputs]: Use ghc-ansi-terminal-0.8. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a7a8b762c4..2c4baebcd8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4085,7 +4085,7 @@ instances of the @code{Pretty} class.") "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56")))) (build-system haskell-build-system) (inputs - `(("ghc-ansi-terminal" ,ghc-ansi-terminal))) + `(("ghc-ansi-terminal" ,ghc-ansi-terminal-0.8))) (home-page "https://github.com/ekmett/ansi-wl-pprint") (synopsis "Wadler/Leijen Pretty Printer for colored ANSI terminal output") (description "This is a pretty printing library based on Wadler's paper -- cgit 1.4.1 From 4e3ebbfb1649063bcc0f350523868c667e6699dd Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Fri, 7 Jun 2019 05:28:36 -0500 Subject: gnu: ghc-ansi-terminal: Update to 0.9.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-ansi-terminal): Update to 0.9.1. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2c4baebcd8..c16a291563 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4362,7 +4362,7 @@ interface.") (define-public ghc-ansi-terminal (package (name "ghc-ansi-terminal") - (version "0.8.0.4") + (version "0.9.1") (source (origin (method url-fetch) @@ -4372,7 +4372,7 @@ interface.") ".tar.gz")) (sha256 (base32 - "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b")))) + "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l")))) (build-system haskell-build-system) (inputs `(("ghc-colour" ,ghc-colour))) -- cgit 1.4.1 From 3c69d462ce478b2d4e3939afd6b895a3e0534809 Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Fri, 7 Jun 2019 05:36:25 -0500 Subject: gnu: Add ghc-concurrent-output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-concurrent-output): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c16a291563..63d4360182 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2019 Robert Vollmert +;;; Copyright © 2019 Jacob MacDonald ;;; ;;; This file is part of GNU Guix. ;;; @@ -11607,6 +11608,40 @@ default) @end itemize") (license license:bsd-3))) +(define-public ghc-concurrent-output + (package + (name "ghc-concurrent-output") + (version "1.10.10") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/concurrent-output/concurrent-output-" + version + ".tar.gz")) + (sha256 + (base32 + "1wnjxnwbc3l853kiiijagzjyb6fmhz3lmkwls24plbximl1qrr22")))) + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async) + ("ghc-stm" ,ghc-stm) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-terminal-size" ,ghc-terminal-size))) + (home-page + "https://hackage.haskell.org/package/concurrent-output") + (synopsis + "Ungarble output from several threads or commands") + (description + "Lets multiple threads and external processes concurrently output to the +console, without it getting all garbled up. + +Built on top of that is a way of defining multiple output regions, which are +automatically laid out on the screen and can be individually updated by +concurrent threads. Can be used for progress displays etc.") + (license license:bsd-2))) + (define-public ghc-wl-pprint-annotated (package (name "ghc-wl-pprint-annotated") -- cgit 1.4.1 From 2c4e4bc6583579e0366849d588563d81e9802a0c Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Fri, 7 Jun 2019 05:42:59 -0500 Subject: gnu: Add ghc-hedgehog. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-check.scm (ghc-hedgehog): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell-check.scm | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 550bb13a65..9b010fd5eb 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -822,3 +822,47 @@ minimal dependencies.") cryptographic ciphers, and is used by the test runners of various Haskell implementations of cryptographic ciphers.") (license license:bsd-3))) + +(define-public ghc-hedgehog + (package + (name "ghc-hedgehog") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/hedgehog/hedgehog-" + version + ".tar.gz")) + (sha256 + (base32 + "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-terminal" ,ghc-ansi-terminal-0.8) + ("ghc-async" ,ghc-async) + ("ghc-concurrent-output" ,ghc-concurrent-output) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-lifted-async" ,ghc-lifted-async) + ("ghc-mmorph" ,ghc-mmorph) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-pretty-show" ,ghc-pretty-show) + ("ghc-primitive" ,ghc-primitive) + ("ghc-random" ,ghc-random) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-stm" ,ghc-stm) + ("ghc-th-lift" ,ghc-th-lift) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-wl-pprint-annotated" + ,ghc-wl-pprint-annotated))) + (home-page "https://hedgehog.qa") + (synopsis "Property-based testing in the spirt of QuickCheck") + (description + "Hedgehog is a property-based testing system, in the spirit of +QuickCheck. Hedgehog uses integrated shrinking, so shrinks obey the invariants +of generated values by construction. + +To get started quickly, see the examples: +@uref{https://github.com/hedgehogqa/haskell-hedgehog/tree/master/hedgehog-example}") + (license license:bsd-3))) -- cgit 1.4.1 From 252a4d59368d3fea9c63f12592044b856af20afe Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Fri, 7 Jun 2019 05:48:14 -0500 Subject: gnu: Add ghc-validation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell.scm (ghc-validation): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 63d4360182..d3ff27412f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -11608,6 +11608,60 @@ default) @end itemize") (license license:bsd-3))) +(define-public ghc-validation + (package + (name "ghc-validation") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/validation/validation-" + version + ".tar.gz")) + (sha256 + (base32 + "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'add-setup-script + (lambda _ + ;; The usual "Setup.hs" script is missing from the source. + (with-output-to-file "Setup.hs" + (lambda () + (format #t "import Distribution.Simple~%") + (format #t "main = defaultMain~%")))))))) + (inputs + `(("ghc-semigroups" ,ghc-semigroups) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-lens" ,ghc-lens))) + (native-inputs + `(("ghc-hedgehog" ,ghc-hedgehog) + ("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/qfpl/validation") + (synopsis + "Data-type like Either but with an accumulating Applicative") + (description + "A data-type like Either but with differing properties and type-class +instances. + +Library support is provided for this different representation, including +@code{lens}-related functions for converting between each and abstracting over +their similarities. + +The @code{Validation} data type is isomorphic to @code{Either}, but has an +instance of @code{Applicative} that accumulates on the error side. That is to +say, if two (or more) errors are encountered, they are appended using a +@{Semigroup} operation. + +As a consequence of this @code{Applicative} instance, there is no +corresponding @code{Bind} or @code{Monad} instance. @code{Validation} is an +example of, \"An applicative functor that is not a monad.\"") + (license license:bsd-3))) + (define-public ghc-concurrent-output (package (name "ghc-concurrent-output") -- cgit 1.4.1 From c5ab53204eccf2983bfcdc8e6164d02a81e54d23 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 7 Jun 2019 15:24:58 -0500 Subject: gnu: Add trivial-utf-8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (sbcl-trivial-utf-8, ecl-trivial-utf-8): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 58813c2d84..37e375d356 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -5665,6 +5665,45 @@ basic everyday functions and macros.") (define-public ecl-fare-utils (sbcl-package->ecl-package sbcl-fare-utils)) +(define-public sbcl-trivial-utf-8 + (let ((commit "4d427cfbb1c452436a0efb71c3205c9da67f718f") + (revision "1")) + (package + (name "sbcl-trivial-utf-8") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url (string-append "https://gitlab.common-lisp.net/" + "trivial-utf-8/trivial-utf-8.git")) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1")))) + (arguments + ;; Guix incorrectly assumes the "8" is part of the version + ;; number and lobs it off. + `(#:asd-file "trivial-utf-8.asd" + #:asd-system-name "trivial-utf-8")) + (build-system asdf-build-system/sbcl) + (synopsis "UTF-8 input/output library") + (description + "The Babel library solves a similar problem while understanding more +encodings. Trivial UTF-8 was written before Babel existed, but for new +projects you might be better off going with Babel. The one plus that Trivial +UTF-8 has is that it doesn't depend on any other libraries.") + (home-page "https://common-lisp.net/project/trivial-utf-8/") + (license license:bsd-3)))) + +(define-public cl-trivial-utf-8 + (sbcl-package->cl-source-package sbcl-trivial-utf-8)) + +(define-public ecl-trivial-utf-8 + (sbcl-package->ecl-package sbcl-trivial-utf-8)) + (define-public sbcl-idna (package (name "sbcl-idna") -- cgit 1.4.1 From 2e03bbeb7be35faa1cb5b41c119d378d221266f3 Mon Sep 17 00:00:00 2001 From: Zzull Date: Sat, 15 Jun 2019 22:32:19 +0200 Subject: gnu: Add emacs-multi-term MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-multi-term): New variable Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a27de2f778..d337700914 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16340,3 +16340,35 @@ themselves live in an Org-mode file. As such, this leverages the power of Org-mode (the notes may have outlines, latex fragments, babel, etc...) while acting like notes that are made @emph{in} the document.") (license license:gpl3+))) + +(define-public emacs-multi-term + (let ((commit "0804b11e52b960c80f5cd0712ee1e53ae70d83a4")) + (package + (name "emacs-multi-term") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/manateelazycat/multi-term.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0apvidmvb7rv05qjnjhax42ma8wrimik5vxx620dlbv17svz7iyf")))) + (build-system emacs-build-system) + (inputs `(("zsh" ,zsh))) + (home-page "https://github.com/manateelazycat/multi-term") + (synopsis "Manage multiple terminal buffers in Emacs") + (description + "This package enhances @code{term.el} with the following features: + +@enumerate +@item Functions to switch between multiple terminal buffers +@item List of keys to be intercepted by @code{emacs-multi-term} instead of by +the underlying terminal +@item Kills the unused buffer left after exiting the terminal +@item Kills the running sub-processes along with the terminal when killing the +it forcibly +@item Dedicated window for debugging program. +@end enumerate") + (license license:gpl3+)))) -- cgit 1.4.1