From a71019960603ef50335a6579bc94b6d607ae5798 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Feb 2018 12:55:57 +0100 Subject: gnu: Add ghc-iwlib. * gnu/packages/haskell.scm (ghc-iwlib): New public variable. --- gnu/packages/haskell.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 21858e481c..0840ef42b2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -42,6 +42,7 @@ (define-module (gnu packages haskell) #:use-module (gnu packages haskell-crypto) #:use-module (gnu packages haskell-web) #:use-module (gnu packages libffi) + #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages lua) #:use-module (gnu packages maths) @@ -2068,6 +2069,28 @@ (define-public ghc-iproute removed. Both IPv4 and IPv6 are supported.") (license license:bsd-3))) +(define-public ghc-iwlib + (package + (name "ghc-iwlib") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/iwlib/iwlib-" + version ".tar.gz")) + (sha256 + (base32 "0khmfwql4vwj55idsxmhjhrbqzfir3g9wm5lmpvnf77mm95cfpdz")))) + (build-system haskell-build-system) + (inputs + `(("wireless-tools" ,wireless-tools))) + (home-page "https://github.com/jaor/iwlib") + (synopsis "Haskell binding to the iw wireless networking library") + (description + "IWlib is a thin Haskell binding to the iw C library. It provides +information about the current wireless network connections, and adapters on +supported systems.") + (license license:bsd-3))) + (define-public ghc-regex-base (package (name "ghc-regex-base") -- cgit v1.2.3 From d2ea806436e25773221f8c9d6631db095b5f8969 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Feb 2018 12:58:29 +0100 Subject: gnu: xmobar: Update to 0.25. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (xmobar): Update to 0.25. [inputs]: Replace wireless-tools with (upstream-)unbundled ghc-iwlib. [arguments]: Add ‘with_weather’ to listified #:configure-flags. --- gnu/packages/wm.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 75e4bb63fd..0cf6c1a2de 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -503,27 +504,34 @@ (define-public xmonad (define-public xmobar (package (name "xmobar") - (version "0.24.5") + (version "0.25") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmobar/" name "-" version ".tar.gz")) (sha256 (base32 - "0sdzfj2wa4wpig1i2i5n9qpwm90jp88qifsmaa7j37yhhs6snfir")))) + "0382r4vzqkz76jlp2069rdbwf4gh1a22r9w4rkphcn5qflw0dlb6")))) (build-system haskell-build-system) (inputs - `(("ghc-http" ,ghc-http) + `(("ghc-hinotify" ,ghc-hinotify) + ("ghc-http" ,ghc-http) + ("ghc-iwlib" ,ghc-iwlib) ("ghc-parsec" ,ghc-parsec) ("ghc-regex-compat" ,ghc-regex-compat) ("ghc-stm" ,ghc-stm) ("ghc-x11-xft" ,ghc-x11-xft) - ("ghc-hinotify" ,ghc-hinotify) - ("libxpm" ,libxpm) - ("wireless-tools" ,wireless-tools))) + ("libxpm" ,libxpm))) (arguments `(#:configure-flags - '("--flags=with_utf8 with_xft with_xpm with_inotify with_iwlib"))) + (list (string-append "--flags=" + (string-join (list "with_inotify" + "with_iwlib" + "with_utf8" + "with_weather" + "with_xft" + "with_xpm") + " "))))) (home-page "http://xmobar.org") (synopsis "Minimalistic text based status bar") (description -- cgit v1.2.3 From 7eaa37a19d3c0776fac415387ed5c1ed7d372b1d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Feb 2018 13:19:06 +0100 Subject: gnu: sslh: Update to 1.19b. * gnu/packages/networking.scm (sslh): Update to 1.19b. [inputs]: Add pcre. [home-page]: Update and use HTTPS. --- gnu/packages/networking.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 84428c3da9..ffdaf919fe 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1025,7 +1025,7 @@ (define-public enet (define-public sslh (package (name "sslh") - (version "1.18") + (version "1.19b") (source (origin (method url-fetch) (uri (string-append "https://github.com/yrutschle/sslh/archive/v" @@ -1033,10 +1033,10 @@ (define-public sslh (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vzw7a7s9lhspbn5zn3hw8hir4pkjgbd68yys4hfsnjp1h7bzjpn")))) + "0p0zfy5ifzj7508zqidgkf8g43frm7l5xcs5s6v7132lypcsbd4k")))) (build-system gnu-build-system) (native-inputs - `(;; Tests dependencies. + `(;; Test dependencies. ("lcov" ,lcov) ("perl" ,perl) ("perl-io-socket-inet6" ,perl-io-socket-inet6) @@ -1046,6 +1046,7 @@ (define-public sslh (inputs `(("libcap" ,libcap) ("libconfig" ,libconfig) + ("pcre" ,pcre) ("tcp-wrappers" ,tcp-wrappers))) (arguments '(#:phases @@ -1075,7 +1076,7 @@ (define-public sslh "USELIBWRAP=1" (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:test-target "test")) - (home-page "http://www.rutschle.net/tech/sslh.shtml") + (home-page "https://www.rutschle.net/tech/sslh/README.html") (synopsis "Applicative network protocol demultiplexer") (description "sslh is a network protocol demultiplexer. It acts like a switchboard, -- cgit v1.2.3 From beacd8a07ce4141762a40d46bc5f05a2d9685928 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 1 Feb 2018 14:08:48 -0500 Subject: gnu: python-botocore: Update to 1.8.36. * gnu/packages/python.scm (python-botocore): Update to 1.8.36. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 94551da331..9483ad6b1b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7375,14 +7375,14 @@ (define-public python2-jmespath (define-public python-botocore (package (name "python-botocore") - (version "1.7.9") + (version "1.8.36") (source (origin (method url-fetch) (uri (pypi-uri "botocore" version)) (sha256 (base32 - "02b1bw25r1wdjs5yppb1h9igf11wj092biriv2yg8hzp5r0wrkmg")))) + "0xd607qd9vkwpsvp552nqnrxppnx2n1rzh9kk9shz48ldpyy1jdj")))) (build-system python-build-system) (arguments ;; FIXME: Many tests are failing. -- cgit v1.2.3 From e543e8c0e79799dda4970af4a24260de259e222a Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 1 Feb 2018 14:09:14 -0500 Subject: gnu: awscli: Update to 1.14.32. * gnu/packages/python-web.scm (awscli): Update to 1.14.32. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4e280b4590..b119fbd6b8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1216,14 +1216,14 @@ (define-public python2-urllib3 (define-public awscli (package (name "awscli") - (version "1.11.185") + (version "1.14.32") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "18rskl6sla456z4hkq2gmmm03fqc4rqw5pfiqdyc7a2v9kljv4ah")))) + "09i82nf43pv5v598wvbj4nk1bfc64wp7xzlx5ykaca5m40lkarz0")))) (build-system python-build-system) (propagated-inputs `(("python-colorama" ,python-colorama) -- cgit v1.2.3 From bee301254996a84e29923e1af3fe652151e9d513 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 31 Jan 2018 13:42:01 +0000 Subject: gnu: Add go-github.com-smartystreets-gunit. * gnu/packages/check.scm (go-github.com-smartystreets-gunit): New variable. --- gnu/packages/check.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 564b75f8d1..69d5b7a382 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -308,6 +308,36 @@ (define-public go-gopkg.in-check.v1 (home-page "https://github.com/go-check/check") (license license:bsd-2)))) +(define-public go-github.com-smartystreets-gunit + (package + (name "go-github.com-smartystreets-gunit") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/smartystreets/gunit") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00m4zg0kdj49mnpmf9klb44ba71p966xsk6zknrzqgfc8119f35z")))) + (build-system go-build-system) + (arguments + '(;; TODO: This package depends on go-github.com-smartystreets-assertions + ;; for running the tests, but go-github.com-smartystreets-assertions + ;; depends on this package, so break this loop by not running the tests + ;; for this package. + #:tests? #f + #:import-path "github.com/smartystreets/gunit")) + (synopsis "Testing tool for Go, in the style of xUnit") + (description + "@code{gunit} allows the test author to use a struct as the scope for a +group of related test cases, in the style of xUnit fixtures. This makes +extraction of setup/teardown behavior (as well as invoking the system under +test) much simpler.") + (home-page "https://github.com/smartystreets/gunit") + (license license:expat))) + (define-public googletest (package (name "googletest") -- cgit v1.2.3 From 7952804cecf670b4b0d6f75df6f86d64c5b65e71 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 31 Jan 2018 13:43:32 +0000 Subject: gnu: Add go-github.com-smartystreets-assertions. * gnu/packages/check.scm (go-github.com-smartystreets-assertions): New variable. --- gnu/packages/check.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 69d5b7a382..b26deda8a3 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -338,6 +338,31 @@ (define-public go-github.com-smartystreets-gunit (home-page "https://github.com/smartystreets/gunit") (license license:expat))) +(define-public go-github.com-smartystreets-assertions + (package + (name "go-github.com-smartystreets-assertions") + (version "1.8.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/smartystreets/assertions") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1j0adgbykl55rf2945g0n5bmqdsnjcqlx5dcmpfh4chki43hiwg9")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/smartystreets/assertions")) + (native-inputs + `(("go-github.com-smartystreets-gunit" ,go-github.com-smartystreets-gunit))) + (synopsis "Assertions for testing with Go") + (description + "The @code{assertions} package provides convinient assertion functions +for writing tests in Go.") + (home-page "https://github.com/smartystreets/assertions") + (license license:expat))) + (define-public googletest (package (name "googletest") -- cgit v1.2.3 From da6f9d41c15f6d9f265d60ef01293f3431651c85 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 31 Jan 2018 13:44:10 +0000 Subject: gnu: Add go-github.com-jtolds-gls. * gnu/packages/golang.scm (go-github.com-jtolds-gls): New variable. --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b8eb90ed9e..3149d36bae 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -496,3 +496,26 @@ (define-public go-gopkg.in-tomb.v2 termination.") (home-page "https://gopkg.in/tomb.v2") (license license:bsd-3)))) + +(define-public go-github.com-jtolds-gls + (package + (name "go-github.com-jtolds-gls") + (version "4.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jtolds/gls") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jtolds/gls")) + (synopsis "@code{gls} provides Goroutine local storage") + (description + "The @code{gls} package provides a way to store a retrieve values +per-goroutine.") + (home-page "https://github.com/jtolds/gls") + (license license:expat))) -- cgit v1.2.3 From 8d54ace78e4bb51f0c460fff11c0b3bbc97c7e1b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 31 Jan 2018 13:44:55 +0000 Subject: gnu: Add go-github.com-smartystreets-goconvey. * gnu/packages/check.scm (go-github.com-smartystreets-goconvey): New variable. --- gnu/packages/check.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b26deda8a3..1276c0fda4 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -49,6 +49,7 @@ (define-module (gnu packages check) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages golang) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages time) @@ -363,6 +364,32 @@ (define-public go-github.com-smartystreets-assertions (home-page "https://github.com/smartystreets/assertions") (license license:expat))) +(define-public go-github.com-smartystreets-goconvey + (package + (name "go-github.com-smartystreets-goconvey") + (version "1.6.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/smartystreets/goconvey") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/smartystreets/goconvey")) + (propagated-inputs + `(("go-github.com-jtolds-gls" ,go-github.com-jtolds-gls) + ("go-github.com-smartystreets-assertions" ,go-github.com-smartystreets-assertions))) + (synopsis "Go testing tool with both a web and terminal user interface") + (description + "GoConvey is a testing tool for Go. It integrates with go test, can show +test coverage and has a web user interface that will refresh automatically.") + (home-page "https://github.com/smartystreets/goconvey") + (license license:expat))) + (define-public googletest (package (name "googletest") -- cgit v1.2.3 From 9b32bf6e6c351a1b395512bd14a94dde23c06044 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 31 Jan 2018 13:45:34 +0000 Subject: gnu: Fix and improve the mongo-tools package. The hash of the source for this package is wrong. Most probably because the source was changed from a tarball to a git repository without updating the hash. Fixing this seems to break the check phase, so I rewrote that as well, making changes to the build and install phases as needed. * gnu/packages/databases.scm (mongo-tools)[source]: Update the hash value. [arguments]: Remove the different unpack path, as this isn't necessary when using the git repository as a source. Move the list of tools to make it accessible from multiple phases. Rewrite the build phase, getting it to install the tools in to the location the tests seem to expect to find them. Replace the check phase to run the tests for each tool individually. Add an install phase to install the tools, now that go install is not being run in the build phase. [native-inputs]: Add go-github.com-smartystreets-goconvey as a native-input as this is required for running the tests. --- gnu/packages/databases.scm | 80 +++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 30 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 79dac20132..31ed2cd203 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2617,51 +2617,71 @@ (define-public mongo-tools (file-name (git-file-name name version)) (sha256 (base32 - "095nc57k4m4iyim0x3fgpw681qba123iyl4qz7xysbv5ngbr19mc")))) + "1bcsz5cvj39a7nsxsfqmz9igrw33j6yli9kffigqyscs52amw7x1")))) (build-system go-build-system) (arguments - `(#:unpack-path "github.com/mongodb" - #:import-path "github.com/mongodb/mongo-tools" + `(#:import-path "github.com/mongodb/mongo-tools" + #:modules ((srfi srfi-1) + (guix build go-build-system) + (guix build utils)) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-bundled-source-code - (lambda _ - (delete-file-recursively - "src/github.com/mongodb/mongo-tools/vendor") - #t)) - - ;; We don't need to install the source code for end-user application - (delete 'install-source) - - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let build ((tools - '("bsondump" "mongodump" "mongoexport" "mongofiles" - "mongoimport" "mongooplog" "mongorestore" - "mongostat" "mongotop"))) - (if (null? tools) - #t - (if (let* ((tool (car tools)) - (command - `("go" "install" "-v" + (let ((all-tools + '("bsondump" "mongodump" "mongoexport" "mongofiles" + "mongoimport" "mongooplog" "mongorestore" + "mongostat" "mongotop"))) + (modify-phases %standard-phases + (add-after 'unpack 'delete-bundled-source-code + (lambda _ + (delete-file-recursively + "src/github.com/mongodb/mongo-tools/vendor") + #t)) + ;; We don't need to install the source code for end-user applications + (delete 'install-source) + (replace 'build + (lambda _ + (every (lambda (tool) + (let ((command + `("go" "build" + ;; This is where the tests expect to find the + ;; executables + "-o" ,(string-append + "src/github.com/mongodb/mongo-tools/bin/" + tool) + "-v" "-tags=\"ssl sasl\"" "-ldflags" "-extldflags=-Wl,-z,now,-z,relro" ,(string-append "src/github.com/mongodb/mongo-tools/" tool "/main/" tool ".go")))) - (simple-format #t "build: running ~A\n" - (string-join command)) - (zero? (apply system* command))) - (build (cdr tools)) - #f)))))))) + (simple-format #t "build: running ~A\n" + (string-join command)) + (apply invoke command))) + all-tools))) + (replace 'check + (lambda _ + (with-directory-excursion "src" + (every (lambda (tool) + (invoke + "go" "test" "-v" + (string-append "github.com/mongodb/mongo-tools/" tool))) + all-tools)))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (for-each (lambda (tool) + (install-file + (string-append "src/github.com/mongodb/mongo-tools/bin/" tool) + (string-append (assoc-ref outputs "out") + "/bin"))) + all-tools))))))) (native-inputs `(("go-github.com-howeyc-gopass" ,go-github.com-howeyc-gopass) ("go-github.com-jessevdk-go-flags" ,go-github.com-jessevdk-go-flags) ("go-golang.org-x-crypto-ssh-terminal" ,go-golang.org-x-crypto-ssh-terminal) ("go-gopkg.in-mgo.v2" ,go-gopkg.in-mgo.v2) ("go-gopkg.in-tomb.v2" ,go-gopkg.in-tomb.v2) - ("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go))) + ("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go) + ("go-github.com-smartystreets-goconvey" ,go-github.com-smartystreets-goconvey))) (home-page "https://github.com/mongodb/mongo-tools") (synopsis "Various tools for interacting with MongoDB and BSON") (description -- cgit v1.2.3 From 537a17fbe89c3102b7b6d95616a7ce0b5e3ce209 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 1 Feb 2018 16:14:07 -0500 Subject: gnu: Add copyright statement for Alex Vong. This is a followup to commit 20be64dcf7d4d08e75eb56c34890420bea7882ec. * gnu/packages/base.scm: Add copyright statement. --- gnu/packages/base.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5fcfc90e56..a7ced142e2 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016 Alex Vong ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Marius Bakke -- cgit v1.2.3 From 95e545a4dafe82499c68625e0c145df45ac38484 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 1 Feb 2018 22:38:42 +0100 Subject: gnu: solfege: Make configuration more robust to GC * gnu/packages/music.scm (solfege): Do not introduce store filenames in the configuration skeleton. [inputs]: Remove optional players. --- gnu/packages/music.scm | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2fb62d0ecf..2e8bc17192 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Rodger Fox -;;; Copyright © 2017 Nicolas Goaziou +;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2017 Pierre Langlois ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -1050,22 +1050,10 @@ (define-public solfege (add-after 'unpack 'fix-configuration (lambda* (#:key inputs #:allow-other-keys) (substitute* "default.config" - (("csound=csound") - (string-append "csound=" - (assoc-ref inputs "csound") - "/bin/csound")) - (("/usr/bin/aplay") - (string-append (assoc-ref inputs "aplay") - "/bin/aplay")) - (("/usr/bin/timidity") - (string-append (assoc-ref inputs "timidity") - "/bin/timidity")) - (("/usr/bin/mpg123") - (string-append (assoc-ref inputs "mpg123") - "/bin/mpg123")) - (("/usr/bin/ogg123") - (string-append (assoc-ref inputs "ogg123") - "/bin/ogg123"))) + (("/usr/bin/aplay" "aplay")) + (("/usr/bin/timidity") "timidity") + (("/usr/bin/mpg123") "mpg123") + (("/usr/bin/ogg123") "ogg123")) #t)) (add-before 'build 'patch-python-shebangs (lambda _ @@ -1105,13 +1093,7 @@ (define-public solfege ("pygtk" ,python2-pygtk) ("gettext" ,gettext-minimal) ("gtk" ,gtk+) - ("lilypond" ,lilypond) - ;; players needed at runtime - ("aplay" ,alsa-utils) - ("csound" ,csound) ; optional, needed for some exercises - ("mpg123" ,mpg123) - ("ogg123" ,vorbis-tools) - ("timidity" ,timidity++))) + ("lilypond" ,lilypond))) (native-inputs `(("pkg-config" ,pkg-config) ("txt2man" ,txt2man) -- cgit v1.2.3 From 2b4d2a4d0a100b67397eeb76f55e1cc20be4ae75 Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:14:18 -0600 Subject: gnu: ocaml-findlib-1.7.3: Fix install. * gnu/packages/ocaml.scm (ocaml-findlib-1.7.3): install topfind to lib/ocaml/site-lib Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index eab84c6981..6648f5ba40 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016, 2017 Julien Lepiller ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Peter Kreye ;;; ;;; This file is part of GNU Guix. ;;; @@ -918,7 +919,7 @@ (define-public ocaml-findlib-1.7.3 (let ((out (assoc-ref outputs "out"))) (zero? (system* "make" "install" (string-append "OCAML_CORE_STDLIB=" - out)))))))))))) + out "/lib/ocaml/site-lib")))))))))))) (define-public ocaml4.01-findlib (package -- cgit v1.2.3 From edac535493e42ca836fb5c432297cb4882f0e07b Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:14:55 -0600 Subject: gnu: Add ocaml-integers. * gnu/packages/ocaml.scm (ocaml-integes): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6648f5ba40..1d5144e875 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3740,6 +3740,37 @@ (define-public ocaml-utop sensitive completion, colors, and more.") (license license:bsd-3))) +(define-public ocaml-integers + (package + (name "ocaml-integers") + (version "0.2.2") + (home-page "https://github.com/ocamllabs/ocaml-integers") + (source (origin + (method url-fetch) + (uri (string-append home-page + "/releases/download/v0.2.2/integers-" + version ".tbz")) + (file-name (string-append name "-" version ".tbz")) + (sha256 + (base32 + "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f; no tests + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("findlib" ,ocaml-findlib-1.7.3) + ("topkg" ,ocaml-topkg) + ("opam", opam))) + (synopsis "Various signed and unsigned integer types for OCaml") + (description "The ocaml-integers library provides a number of 8-, 16-, 32- +and 64-bit signed and unsigned integer types, together with aliases such as +long and size_t whose sizes depend on the host platform.") + (license license:expat))) + (define-public coq-flocq (package (name "coq-flocq") -- cgit v1.2.3 From 69d08bb131c507550643d33e63526c00ed8c0e43 Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:24:18 -0600 Subject: gnu: Add ocaml-ctypes. * gnu/packages/ocaml.scm (ocaml-ctypes): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1d5144e875..021dabf835 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -43,6 +43,7 @@ (define-module (gnu packages ocaml) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) + #:use-module (gnu packages libffi) #:use-module (gnu packages llvm) #:use-module (gnu packages m4) #:use-module (gnu packages multiprecision) @@ -3771,6 +3772,45 @@ (define-public ocaml-integers long and size_t whose sizes depend on the host platform.") (license license:expat))) +(define-public ocaml-ctypes + (package + (name "ocaml-ctypes") + (version "0.13.1") + (home-page "https://github.com/ocamllabs/ocaml-ctypes") + (source (origin + (method url-fetch) + (uri (string-append home-page "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17w0pr5k0zjcjns4y9n36rjpfl35zhvp3h8ggqs9lz12qhshdk2m")))) + (build-system ocaml-build-system) + (arguments + `(#:findlib ,ocaml-findlib-1.7.3 + #:make-flags + (list (string-append "INSTALL_HEADERS = $(wildcard $($(PROJECT).dir)/*.h)")) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libffi" ,libffi) + ("ounit" ,ocaml-ounit) + ("integers" ,ocaml-integers) + ("lwt" ,ocaml-lwt) + ("topkg" ,ocaml-topkg) + ("opam", opam))) + (synopsis "Library for binding to C libraries using pure OCaml") + (description "Ctypes is a library for binding to C libraries using pure +OCaml. The primary aim is to make writing C extensions as straightforward as +possible. The core of ctypes is a set of combinators for describing the +structure of C types -- numeric types, arrays, pointers, structs, unions and +functions. You can use these combinators to describe the types of the +functions that you want to call, then bind directly to those functions -- all +without writing or generating any C!") + (license license:expat))) + (define-public coq-flocq (package (name "coq-flocq") -- cgit v1.2.3 From c98c82370462f8c06c420175dcc47fc1a64cf68d Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:25:52 -0600 Subject: gnu: Add ocaml-ocb-stubblr. * gnu/packages/ocaml.scm (ocaml-ocb-stubblr): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 021dabf835..1ecd9ab540 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3811,6 +3811,38 @@ (define-public ocaml-ctypes without writing or generating any C!") (license license:expat))) +(define-public ocaml-ocb-stubblr + (package + (name "ocaml-ocb-stubblr") + (version "0.1.1") + (home-page "https://github.com/pqwy/ocb-stubblr") + (source (origin + (method url-fetch) + (uri (string-append + home-page "/releases/download/v0.1.1/ocb-stubblr-" + version ".tbz")) + (file-name (string-append name "-" version ".tbz")) + (sha256 + (base32 + "167b7x1j21mkviq8dbaa0nmk4rps2ilvzwx02igsc2706784z72f")))) + (build-system ocaml-build-system) + (arguments + `(#:findlib ,ocaml-findlib-1.7.3 + #:build-flags (list "build" "--tests" "true") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("topkg" ,ocaml-topkg) + ("opam", opam))) + (native-inputs + `(("astring" ,ocaml-astring))) + (synopsis "OCamlbuild plugin for C stubs") + (description "Ocb-stubblr is about ten lines of code that you need to +repeat over, over, over and over again if you are using ocamlbuild to build +OCaml projects that contain C stubs.") + (license license:isc))) + (define-public coq-flocq (package (name "coq-flocq") -- cgit v1.2.3 From a9e9fd15068ee7901c905a1a9bff14ecf50f2ad0 Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:26:37 -0600 Subject: gnu: Add ocaml-tsdl. * gnu/packages/ocaml.scm (ocaml-tsdl): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1ecd9ab540..64031dfbbb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -53,6 +53,7 @@ (define-module (gnu packages ocaml) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages sdl) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) @@ -3843,6 +3844,41 @@ (define-public ocaml-ocb-stubblr OCaml projects that contain C stubs.") (license license:isc))) +(define-public ocaml-tsdl + (package + (name "ocaml-tsdl") + (version "0.9.1") + (home-page "http://erratique.ch/software/tsdl") + (source (origin + (method url-fetch) + (uri (string-append home-page "/releases/tsdl-" + version ".tbz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08bb97fhvz829fb0sgjn2p20mp7b04v98zy2qxpk2w390a6c4b34")))) + (build-system ocaml-build-system) + (arguments + `(#:build-flags '("build") + #:tests? #f; tests require a display device + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("opam" ,opam) + ("pkg-config" ,pkg-config))) + (inputs + `(("findlib" ,ocaml-findlib-1.7.3) + ("topkg" ,ocaml-topkg) + ("result" ,ocaml-result) + ("sdl2" ,sdl2) + ("integers" ,ocaml-integers) + ("ctypes" ,ocaml-ctypes))) + (synopsis "Thin bindings to SDL for OCaml") + (description "Tsdl is an OCaml library providing thin bindings to the +cross-platform SDL C library.") + (license license:isc))) + (define-public coq-flocq (package (name "coq-flocq") -- cgit v1.2.3 From bff6739d5ea513417bb491a61aa276c4fb7ddd43 Mon Sep 17 00:00:00 2001 From: Peter Kreye Date: Sat, 13 Jan 2018 05:27:36 -0600 Subject: gnu: ocaml-findlib: Update to 1.7.3. * gnu/packages/ocaml.scm (ocaml-findlib): Update to 1.7.3. * gnu/packages/ocaml.scm (ocaml-findlib-1.7.3): Removed. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 47 +++++++++++++---------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 64031dfbbb..2b62c1cdf4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -851,15 +851,14 @@ (define-public unison (define-public ocaml-findlib (package (name "ocaml-findlib") - (version "1.6.1") + (version "1.7.3") (source (origin (method url-fetch) (uri (string-append "http://download.camlcity.org/download/" "findlib" "-" version ".tar.gz")) (sha256 (base32 - "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721")) - (patches (search-patches "ocaml-findlib-make-install.patch")))) + "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni")))) (build-system gnu-build-system) (native-inputs `(("camlp4" ,camlp4) @@ -881,6 +880,12 @@ (define-public ocaml-findlib "-mandir" (string-append out "/share/man") "-sitelib" (string-append out "/lib/ocaml/site-lib") "-with-toolbox")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (zero? (system* "make" "install" + (string-append "OCAML_CORE_STDLIB=" + out "/lib/ocaml/site-lib")))))) (add-after 'install 'remove-camlp4 (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -901,28 +906,6 @@ (define-public ocaml-findlib compilers that can directly deal with packages.") (license license:x11))) -(define-public ocaml-findlib-1.7.3 - (package - (inherit ocaml-findlib) - (version "1.7.3") - (source (origin - (method url-fetch) - (uri (string-append "http://download.camlcity.org/download/" - "findlib" "-" version ".tar.gz")) - (sha256 - (base32 - "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni")))) - (arguments - (substitute-keyword-arguments (package-arguments ocaml-findlib) - ((#:phases phases) - `(modify-phases ,phases - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (zero? (system* "make" "install" - (string-append "OCAML_CORE_STDLIB=" - out "/lib/ocaml/site-lib")))))))))))) - (define-public ocaml4.01-findlib (package (inherit ocaml-findlib) @@ -3729,7 +3712,7 @@ (define-public ocaml-utop ("cppo" ,ocaml-cppo) ("jbuilder" ,ocaml-jbuilder))) (propagated-inputs - `(("findlib" ,ocaml-findlib-1.7.3) + `(("ocaml-findlib" ,ocaml-findlib) ("lambda-term" ,ocaml-lambda-term) ("lwt" ,ocaml-lwt) ("react" ,ocaml-react) @@ -3764,8 +3747,7 @@ (define-public ocaml-integers (modify-phases %standard-phases (delete 'configure)))) (inputs - `(("findlib" ,ocaml-findlib-1.7.3) - ("topkg" ,ocaml-topkg) + `(("topkg" ,ocaml-topkg) ("opam", opam))) (synopsis "Various signed and unsigned integer types for OCaml") (description "The ocaml-integers library provides a number of 8-, 16-, 32- @@ -3787,8 +3769,7 @@ (define-public ocaml-ctypes "17w0pr5k0zjcjns4y9n36rjpfl35zhvp3h8ggqs9lz12qhshdk2m")))) (build-system ocaml-build-system) (arguments - `(#:findlib ,ocaml-findlib-1.7.3 - #:make-flags + `(#:make-flags (list (string-append "INSTALL_HEADERS = $(wildcard $($(PROJECT).dir)/*.h)")) #:phases (modify-phases %standard-phases @@ -3828,8 +3809,7 @@ (define-public ocaml-ocb-stubblr "167b7x1j21mkviq8dbaa0nmk4rps2ilvzwx02igsc2706784z72f")))) (build-system ocaml-build-system) (arguments - `(#:findlib ,ocaml-findlib-1.7.3 - #:build-flags (list "build" "--tests" "true") + `(#:build-flags (list "build" "--tests" "true") #:phases (modify-phases %standard-phases (delete 'configure)))) @@ -3868,8 +3848,7 @@ (define-public ocaml-tsdl `(("opam" ,opam) ("pkg-config" ,pkg-config))) (inputs - `(("findlib" ,ocaml-findlib-1.7.3) - ("topkg" ,ocaml-topkg) + `(("topkg" ,ocaml-topkg) ("result" ,ocaml-result) ("sdl2" ,sdl2) ("integers" ,ocaml-integers) -- cgit v1.2.3 From 1d8e04e64bbc00af9e53036ea31fa5b81eda0ae4 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 9 Sep 2017 13:47:31 +0000 Subject: gnu: Add libburn. * gnu/packages/cdrom.scm (libburn): New variable. Signed-off-by: Christopher Baines --- gnu/packages/cdrom.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 38190340f1..8e0717e189 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -694,3 +695,25 @@ (define-public ccd2cue laid out on the image.") (home-page "https://www.gnu.org/software/ccd2cue/") (license gpl3+))) + +(define-public libburn + (package + (name "libburn") + (version "1.4.6") + (source (origin + (method url-fetch) + (uri (string-append "http://files.libburnia-project.org/releases/" + "libburn-" version ".tar.gz")) + (sha256 + (base32 + "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://dev.lovelyhq.com/libburnia/libburn") + (synopsis "Library for reading and writing optical discs") + (description + "Libburn is a library for reading and writing optical discs. +Supported media are: CD-R, CD-RW, DVD-RAM, DVD+RW, DVD+R, DVD+R/DL, +DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.") + (license gpl2))) -- cgit v1.2.3 From dbfab26dac1f9cc5eaf66f144d06c09f8e5afa94 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 9 Sep 2017 13:59:39 +0000 Subject: gnu: Add libisofs. * gnu/packages/cdrom.scm (libisofs): New variable. Signed-off-by: Christopher Baines --- gnu/packages/cdrom.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 8e0717e189..0790444c81 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -717,3 +717,32 @@ (define-public libburn Supported media are: CD-R, CD-RW, DVD-RAM, DVD+RW, DVD+R, DVD+R/DL, DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.") (license gpl2))) + +(define-public libisofs + (package + (name "libisofs") + (version "1.4.6") + (source (origin + (method url-fetch) + (uri (string-append "http://files.libburnia-project.org/releases/" + "libisofs-" version ".tar.gz")) + (sha256 + (base32 + "02m5g6lbmmkh2xc5xzq5zaf3ma6v31gls66aj886b3cq9qw0paql")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("acl" ,acl))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://dev.lovelyhq.com/libburnia/libisofs") + (synopsis "Library to create ISO 9660 images") + (description + "Libisofs creates ISO 9660 (also known as ECMA-119) filesystem images +which can either be written to POSIX file objects or handed over to +libburn for being written directly to optical media. +It can read metadata of ISO 9660 filesystems, manipulate them, and use them +to produce new complete filesystem images or add-on images to be appended +to the read filesystem image. +Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.") + (license gpl2+))) -- cgit v1.2.3 From 53e1b30e0c569551260b79b344ba38b2f5c69146 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 9 Sep 2017 14:11:36 +0000 Subject: gnu: Add xfburn. * gnu/packages/xfce.scm (xfburn): New variable. Signed-off-by: Christopher Baines --- gnu/packages/xfce.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index f132999bcf..630851ba39 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Petter +;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -33,6 +34,7 @@ (define-module (gnu packages xfce) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages calendar) + #:use-module (gnu packages cdrom) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -906,3 +908,39 @@ (define-public xfce4-notifyd sending standard messages over D-Bus using the @code{org.freedesktop.Notifications} interface.") (license gpl2))) + +(define-public xfburn + (package + (name "xfburn") + (version "0.5.4") + (source (origin + (method url-fetch) + (uri (string-append "http://archive.xfce.org/src/apps/xfburn/" + (version-major+minor version) "/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "1xn1kwxa3dl5r9bfj90a5322ynkwbn6k5v9b3a3pbr3a23zm604s")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("exo" ,exo) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gst-plugins-ugly" ,gst-plugins-ugly) + ("glib" ,glib) + ("gtk+" ,gtk+-2) + ("libburn" ,libburn) + ("libisofs" ,libisofs) + ("libxfce4ui" ,libxfce4ui))) + (home-page "https://goodies.xfce.org/projects/applications/xfburn") + (synopsis "GTK+ based CD, DVD and Blu-ray burning application") + (description + "Xfburn is a simple CD, DVD, and Blu-ray burning tool based on +the libburnia libraries. It can blank CD/DVD/BD(-RW)s, burn and +create iso images, audio CDs, as well as burn personal compositions +of data to either CD/DVD/BD.") + (license gpl2+))) -- cgit v1.2.3 From a3a932c008d0d9051eb8cdfdcea07ebd7b68b1b3 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 11 Dec 2017 09:29:40 +0000 Subject: gnu: xorriso: Remove 'bzip2' and 'libcdio' from inputs. Thomas Schmitt suggested in bug#28398 to apply these changes. Neither of these inputs are referenced by the output store item. * gnu/packages/cdrom.scm (xorriso)[inputs]: Remove 'bzip2' and 'libcdio'. Signed-off-by: Christopher Baines --- gnu/packages/cdrom.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 0790444c81..4f9e2be686 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -161,9 +161,7 @@ (define-public xorriso (inputs `(("acl" ,acl) ("readline" ,readline) - ("bzip2" ,bzip2) - ("zlib" ,zlib) - ("libcdio" ,libcdio))) + ("zlib" ,zlib))) (home-page "https://www.gnu.org/software/xorriso/") (synopsis "Create, manipulate, burn ISO-9660 file systems") (description -- cgit v1.2.3 From f8aa265e08eee1ed80d4f77f7a730520662213d4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Jan 2018 19:55:21 +0200 Subject: gnu: linux-libre: Fix home-page url. * gnu/packages/linux.scm (linux-libre)[home-page]: Remove duplicate forward slash. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 346b481c50..46dd61a77c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,7 +368,7 @@ (define* (make-linux-libre version hash supported-systems "INSTALL_MOD_STRIP=1" "modules_install")))))) #:tests? #f)) - (home-page "https://www.gnu.org/software/linux-libre//") + (home-page "https://www.gnu.org/software/linux-libre/") (synopsis "100% free redistribution of a cleaned Linux kernel") (description "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. -- cgit v1.2.3 From 9b94ced45c37ec1ccd25dd1f232989d2bd90e95b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Jan 2018 20:07:45 +0200 Subject: gnu: u-boot: Remove surplus flag in 'install phase. * gnu/packages/bootloaders.scm (u-boot)[arguments]: Remove 'make-flags key from custom 'install phase. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index f2e45edb9d..498b807ce7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -401,7 +401,7 @@ (define (make-u-boot-package board triplet) suffix-len)))))) #f))))) (replace 'install - (lambda* (#:key outputs make-flags #:allow-other-keys) + (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (libexec (string-append out "/libexec")) (uboot-files (append -- cgit v1.2.3 From a9b34762391e6f3b066aef6fc1ebc614ec88db86 Mon Sep 17 00:00:00 2001 From: Mark Meyer Date: Thu, 1 Feb 2018 15:07:58 +0100 Subject: gnu: Add fann. * gnu/packages/machine-learning.scm (fann): New variable. Co-authored-by: Ben Woodcroft --- gnu/packages/machine-learning.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index bd13cedcb3..93d6027250 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4,6 +4,8 @@ ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Mark Meyer +;;; Copyright © 2018 Ben Woodcroft ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +33,7 @@ (define-module (gnu packages machine-learning) #:use-module (guix build-system ocaml) #:use-module (guix build-system python) #:use-module (guix build-system r) + #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) @@ -50,6 +53,38 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) +(define-public fann + ;; The last release is >100 commits behind, so we package from git. + (let ((commit "d71d54788bee56ba4cf7522801270152da5209d7")) + (package + (name "fann") + (version (string-append "2.2.0-1." (string-take commit 8))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libfann/fann.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0ibwpfrjs6q2lijs8slxjgzb2llcl6rk3v2ski4r6215g5jjhg3x")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (with-directory-excursion (string-append (getcwd) "/tests") + (invoke "./fann_tests")))))))) + (home-page "http://leenissen.dk/fann/wp/") + (synopsis "Fast Artificial Neural Network") + (description + "FANN is a free open source neural network library, which implements +multilayer artificial neural networks in C with support for both fully +connected and sparsely connected networks.") + (license license:lgpl2.1)))) + (define-public libsvm (package (name "libsvm") -- cgit v1.2.3 From 7502badb81311df8ded0202c99b7cada31511678 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Feb 2018 22:12:18 +1000 Subject: gnu: diamond: Update to 0.9.17. * gnu/packages/bioinformatics.scm (diamond): Update to 0.9.17. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a240434e0d..b8c6e6ad79 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ricardo Wurmus -;;; Copyright © 2015, 2016, 2017 Ben Woodcroft +;;; Copyright © 2015, 2016, 2017, 2018 Ben Woodcroft ;;; Copyright © 2015, 2016 Pjotr Prins ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Roel Janssen @@ -2074,7 +2074,7 @@ (define-public deeptools (define-public diamond (package (name "diamond") - (version "0.9.16") + (version "0.9.17") (source (origin (method url-fetch) (uri (string-append @@ -2083,7 +2083,7 @@ (define-public diamond (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1sydm3jldl4pypy74g82dj9j8vx3j3ikf3i9srxqjp7r64039hiy")))) + "1p3fd1ad7hg2w09w3sjk4pxqx0p0gaqys8ipg3f4adg77mn9m9yd")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no "check" target -- cgit v1.2.3 From 02267798de00870a3bcfa8d6c528bb06380b4b5e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 2 Feb 2018 14:47:26 +0100 Subject: gnu: Add emacs-org-tree-slide. Thanks, Pjotr & Ricardo! :-) * gnu/packages/emacs.scm (org-tree-slide): New variable. --- gnu/packages/emacs.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9be92edc10..d2c81736bd 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost ;;; Copyright © 2015 Federico Beffa @@ -6918,3 +6918,25 @@ (define-public groovy-emacs-modes Groovy source files, REPL integration with run-groovy and Grails project navigation with the grails mode.") (license license:gpl3+))) + +(define-public org-tree-slide + (let ((commit "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134") + (revision "0")) + (package + (name "emacs-org-tree-slide") + (version (git-version "0.1" revision commit)) + (home-page "https://github.com/takaxp/org-tree-slide") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "153bg0x7ypla11pq51jmsgzfjklwwnrq56xgpbfhk1j16xwz9hyf")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (synopsis "Presentation tool for org-mode") + (description + "Org-tree-slide provides a slideshow mode to view org-mode files. Use +@code{org-tree-slide-mode} to enter the slideshow mode, and then @kbd{C->} and +@kbd{C-<} to jump to the next and previous slide.") + (license license:gpl3+)))) -- cgit v1.2.3 From cbc084e1a7c25d1c8944bcb20a989f795acdb096 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 31 Jan 2018 13:55:37 -0600 Subject: gnu: Add QD. * gnu/packages/multiprecision.scm (qd): New variable. --- gnu/packages/multiprecision.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 3107bbb979..6fc58ccff1 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ (define-module (gnu packages multiprecision) #:use-module (guix licenses) #:use-module (gnu packages) #:use-module (gnu packages m4) + #:use-module (gnu packages gcc) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -157,3 +159,41 @@ (define-public mpfi multiple-precision arithmetic.") (license lgpl2.1+) (home-page "https://perso.ens-lyon.fr/nathalie.revol/software.html"))) + +(define-public qd + (package + (name "qd") + (version "2.3.18") + (source (origin + (method url-fetch) + (uri (string-append "http://crd.lbl.gov/~dhbailey/mpdist/qd-" + version ".tar.gz")) + (sha256 + (base32 + "0vkihcj9fyv2cycq8515713gbs3yskhmivy8bznvx72i6ddnn2c1")))) + (build-system gnu-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (arguments + `(#:configure-flags `("--disable-enable_fma" ;weird :/ + "--enable-shared" + ,,@(if (string-prefix? "aarch64" + (or (%current-target-system) + (%current-system))) + ;; XXX: The qd_test test fails numerical + ;; accuracy checks for 'dd_real::exp()' on + ;; aarch64 with GCC 5.4 at -O2. Disabling + ;; expensive optimizations lets it pass. + '("CXXFLAGS=-O3 -fno-expensive-optimizations") + '("CXXFLAGS=-O3"))))) + (home-page "http://crd-legacy.lbl.gov/~dhbailey/mpdist/") + (synopsis "Double-double and quad-double library") + (description "This package supports both a double-double +datatype (approx. 32 decimal digits) and a quad-double datatype (approx. 64 +decimal digits). The computational library is written in C++. Both C++ and +Fortran-90 high-level language interfaces are provided to permit one to +convert an existing C++ or Fortran-90 program to use the library with only +minor changes to the source code. In most cases only a few type statements +and (for Fortran-90 programs) read/write statements need to be changed. PSLQ +and numerical quadrature programs are included.") + (license bsd-3))) -- cgit v1.2.3 From e01397b489dc1ec76fcbe33a26333ddcb92e20f8 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 31 Jan 2018 16:56:10 -0600 Subject: gnu: Add Elemental. * gnu/packages/maths.scm (elemental): New variable. --- gnu/packages/maths.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index eaf385db70..30a03a0fb6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016, 2017 John Darrington -;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2014 Mathieu Lirzin ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus @@ -3652,3 +3652,56 @@ (define-public cubicle an arbitrary number of processes. Cache coherence protocols and mutual exclusion algorithms are typical examples of such systems.") (license license:asl2.0))) + +(define-public elemental + (package + (name "elemental") + (version "0.87.7") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/elemental/Elemental/" + "archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nfp82w22pi8x8fg9sc37z8kf84dqi1dhxp8bbk7571y4aygvv3v")))) + (build-system cmake-build-system) + (home-page "http://libelemental.org") + (native-inputs + `(("gfortran" ,gfortran))) + (inputs + `(("blas" ,openblas) + ("gfortran:lib" ,gfortran "lib") + ("gmp" ,gmp) + ("lapack" ,lapack) + ("metis" ,metis) + ("mpc" ,mpc) + ("mpfr" ,mpfr) + ("mpi" ,openmpi) + ("qd" ,qd))) + (arguments + `(#:build-type "Release" ;default RelWithDebInfo not supported + #:configure-flags `("-DEL_DISABLE_PARMETIS:BOOL=YES" + "-DEL_AVOID_COMPLEX_MPI:BOOL=NO" + "-DEL_CACHE_WARNINGS:BOOL=YES" + "-DEL_TESTS:BOOL=YES" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DGFORTRAN_LIB=gfortran") + #:phases (modify-phases %standard-phases + (add-before 'check 'setup-tests + (lambda _ + ;; Parallelism is done at the MPI layer. + (setenv "OMP_NUM_THREADS" "1") + #t)) + (add-after 'install 'remove-tests + (lambda* (#:key outputs #:allow-other-keys) + ;; Tests are installed, with no easy configuration + ;; switch to prevent this, so delete them. + (delete-file-recursively + (string-append (assoc-ref outputs "out") "/bin")) + #t))))) + (synopsis "Dense and sparse-direct linear algebra and optimization") + (description "Elemental is a modern C++ library for distributed-memory +dense and sparse-direct linear algebra, conic optimization, and lattice +reduction.") + (license license:bsd-2))) -- cgit v1.2.3 From c684008992b0a0d2d8099dab48297fcf13b4a625 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 2 Feb 2018 08:20:02 -0600 Subject: gnu: slepc: Apply invoke to configure flags. Follow-up to 94a1eb96d32fcce97ee5d9440ecffe22f7555cd5 * gnu/packages/maths.scm (slepc)[arguments]: Use 'apply' since 'flags' is a list of configure arguments. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 30a03a0fb6..dcb12199cb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1647,7 +1647,7 @@ (define-public slepc (format #t "configure flags: ~s~%" flags) (setenv "SLEPC_DIR" (getcwd)) (setenv "PETSC_DIR" (assoc-ref inputs "petsc")) - (invoke "./configure" flags)))) + (apply invoke "./configure" flags)))) (add-after 'install 'delete-doc ;; TODO: SLEPc installs HTML documentation alongside headers in ;; $out/include. We'd like to move them to share/doc, but delete -- cgit v1.2.3 From 0c8c97f45d9fc83f32f33c9059a7000cccff6b45 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 2 Feb 2018 18:08:47 +0200 Subject: gnu: ethtool: Update to 4.15. * gnu/packages/networking.scm (ethtool): Update to 4.15. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ffdaf919fe..738275a6b8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017 Pjotr Prins ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2017 Thomas Danckaert @@ -326,14 +326,14 @@ (define-public libndp (define-public ethtool (package (name "ethtool") - (version "4.13") + (version "4.15") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1flwz4x76ajxigadq9knxgwr778g03y3qfx6c7rflc3x020a7hdp")))) + "06pr3s7wg2pbvfbf7js61bgh3caff4qf50nqqk3cgz9z90rgvxvi")))) (build-system gnu-build-system) (home-page "https://www.kernel.org/pub/software/network/ethtool/") (synopsis "Display or change Ethernet device settings") -- cgit v1.2.3 From b8181163a5eb159144f06f0630403618b3315f07 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Jan 2018 04:09:29 +0100 Subject: gnu: cfitsio: Use HTTPS home page. * gnu/packages/astronomy.scm (cfitsio)[home-page]: Use HTTPS. --- gnu/packages/astronomy.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 2bbdfb58d7..8cf9d9e4a5 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -55,7 +55,7 @@ (define-public cfitsio (lambda _ (substitute* "Makefile.in" (("/bin/") "")) #t))))) - (home-page "http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html") + (home-page "https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html") (synopsis "Library for reading and writing FITS files") (description "CFITSIO provides simple high-level routines for reading and writing @dfn{FITS} (Flexible Image Transport System) files that insulate the -- cgit v1.2.3 From 4b179fb2e617013478a01b86e2838b6aea359db5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Feb 2018 17:42:55 +0100 Subject: gnu: man-pages: Update to 4.15. * gnu/packages/man.scm (man-pages): Update to 4.15. --- gnu/packages/man.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 2c91f012ae..b677117c3e 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2015, 2016 Efraim Flashner -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -147,7 +147,7 @@ (define-public man-db (define-public man-pages (package (name "man-pages") - (version "4.14") + (version "4.15") (source (origin (method url-fetch) (uri @@ -160,7 +160,7 @@ (define-public man-pages "man-pages-" version ".tar.xz"))) (sha256 (base32 - "0wf9ymqxk1k5xwcl3n919p66a1aayif3x4cahj4w04y3k1wbhlih")))) + "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 66ab28bb737b95430b4ae7e000bd6090efbd29a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Feb 2018 17:48:29 +0100 Subject: gnu: ncdu: Update to 1.13. * gnu/packages/ncdu.scm (ncdu): Update to 1.13. --- gnu/packages/ncdu.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index b2e2ae2d83..5008a6a521 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 John Darrington +;;; Copyright © 2014 John Darrington +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +28,14 @@ (define-module (gnu packages ncdu) (define-public ncdu (package (name "ncdu") - (version "1.12") + (version "1.13") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "16j9fyw73y1lk05a35i4q9i66laklgsx41lz5rxfr8m28x3lw3l2")))) + "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (synopsis "Ncurses based disk usage analyzer") -- cgit v1.2.3 From 0698633dd852075d9533eb6b29e0d323d2c13bfb Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 3 Feb 2018 00:11:41 +0300 Subject: gnu: emacs-browse-at-remote: Update to 0.9.0-1.31dcf77. * gnu/packages/emacs.scm (emacs-browse-at-remote): Update to 0.9.0-1.31dcf77. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d2c81736bd..9523f14da3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6435,7 +6435,7 @@ (define-public emacs-idris-mode (license license:gpl3+))) (define-public emacs-browse-at-remote - (let ((commit "b5cff7971ca8bbb966e3acd9b7e5c4c007f94215") + (let ((commit "31dcf77d7c89a12f230e2b2332585db2c44530ef") (revision "1")) (package (name "emacs-browse-at-remote") @@ -6449,7 +6449,7 @@ (define-public emacs-browse-at-remote (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "16ms9703m15dfxg6ap4mdw7msf8z5rzsdhba51dwivfpjxg7n52c")))) + "017cb8lf7zbg0jmr7zxzd7d5kz2jy35cvw5vcpdmq1fdr3wqwkgj")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-f" ,emacs-f) -- cgit v1.2.3 From f860204637d1f8adfe109ffff6a7a84652a14353 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Jan 2018 20:57:30 +0200 Subject: gnu: Add culmus. * gnu/packages/fonts.scm (culmus): New variable. --- gnu/packages/fonts.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index ccf05fec2d..cb46fee77a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1199,3 +1199,71 @@ (define-public font-dosis It comes in 7 incremental weights: ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold") (license license:silofl1.1))) + +(define-public culmus + (package + (name "culmus") + (version "0.132") + (source + (origin + (method url-fetch) + (uri (string-append "https://sourceforge.net/projects/" + "culmus/files/culmus/" version "/culmus-src-" + version ".tar.gz")) + (sha256 + (base32 + "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:modules ((guix build utils) + (guix build gnu-build-system) + (srfi srfi-1) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (let ((compile + (lambda (name ext) + (zero? (system* + "fontforge" "-lang=ff" + "-c" (string-append "Open('" name "');" + "Generate('" + (basename name "sfd") ext + "')")))))) + ;; This part based on the fonts shipped in the non-source package. + (every (lambda (name) + (compile name "ttf")) + (find-files "." "^[^Nachlieli].*\\.sfd$")) + (every (lambda (name) + (compile name "otf")) + (find-files "." "^Nachlieli.*\\.sfd$")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (ttf (string-append out "/share/fonts/truetype")) + (otf (string-append out "/share/fonts/opentype")) + (license (string-append out "/share/doc/" ,name))) + (for-each (lambda (file) + (install-file file ttf)) + (find-files "." "\\.ttf$")) + (for-each (lambda (file) + (install-file file otf)) + (find-files "." "\\.otf$")) + (for-each (lambda (file) + (install-file file license)) + '("GNU-GPL" "LICENSE" "LICENSE-BITSTREAM")) + #t)))))) + (native-inputs + `(("fontforge" ,fontforge))) + (home-page "http://culmus.sourceforge.net/") + (synopsis "TrueType Hebrew Fonts for X11") + (description "14 Hebrew trivial families. Contain ASCII glyphs from various +sources. Those families provide a basic set of a serif (Frank Ruehl), sans +serif (Nachlieli) and monospaced (Miriam Mono) trivials. Also included Miriam, +Drugulin, Aharoni, David, Hadasim etc. Cantillation marks support is +available in Keter YG.") + (license license:gpl2))) ; consult the LICENSE file included -- cgit v1.2.3 From 03392caace9a56878acc0994571c9011d087588d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 3 Feb 2018 21:30:14 +0100 Subject: gnu: gpsbabel: Add missing module. * gnu/packages/gps.scm (gpsbabel)[source]: Add (guix build utils) module for "with-directory-excursion" macro. --- gnu/packages/gps.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 760d9852d7..732c073b56 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -48,6 +48,7 @@ (define-public gpsbabel (sha256 (base32 "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w")) + (modules '((guix build utils))) (snippet '(begin ;; Delete files under GPL-compatible licences but never used -- cgit v1.2.3 From 0903a51769427b0dac0ea515db4c5b678ce9a02c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 4 Feb 2018 00:42:36 +0100 Subject: gnu: giac-xcas: Update to 1.4.9-45. * gnu/packages/algebra.scm (giac-xcas): Update to 1.4.9-45. --- 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 e86f8367aa..2bc8431033 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -208,7 +208,7 @@ (define-public gp2c (define-public giac-xcas (package (name "giac-xcas") - (version "1.4.9-43") + (version "1.4.9-45") (source (origin (method url-fetch) ;; "~parisse/giac" is not used because the maintainer regularly @@ -220,7 +220,7 @@ (define-public giac-xcas "source/giac_" version ".tar.gz")) (sha256 (base32 - "1zhbyw4mrgf78fz55cf65650zqld156qa40s4ps69bas8jh61hci")))) + "11za5rznr2dgy6598y4iwrcyi86w7f601ci9i794kl8k22pqhcd8")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3