branch master updated (90205b6 -> aa498fc)
thomasd pushed a change to branch master in repository guix. from 90205b6 gnu: Run some tests in the mongodb package check phase. new aa498fc gnu: lollypop: Use meson-build-system, update to 0.9.306. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/gnome.scm | 30 +- 1 file changed, 9 insertions(+), 21 deletions(-)
01/01: gnu: lollypop: Use meson-build-system, update to 0.9.306.
thomasd pushed a commit to branch master in repository guix. commit aa498fc00320d38a37668e2b024bdc7337434c07 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Mon Dec 18 11:10:27 2017 +0100 gnu: lollypop: Use meson-build-system, update to 0.9.306. * gnu/packages/gnome.scm (lollypop) [origin]: Update version to 0.9.306, download tarball from gitlab. [build-system]: Use meson-build-system. [arguments]: Remove phases for "pseudo meson build system". [native-inputs]: Add glib:bin and gtk+:bin, remove ninja. [inputs]: Remove gtk+ and meson. --- gnu/packages/gnome.scm | 30 +- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 23b3f55..d17b582 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6927,35 +6927,24 @@ views can be printed as PDF or PostScript files, or exported to HTML.") (define-public lollypop (package (name "lollypop") -(version "0.9.304") +(version "0.9.306") (source (origin (method url-fetch) - (uri (string-append "https://github.com/gnumdk/lollypop/; - "releases/download/" version "/" + (uri (string-append "https://gitlab.gnome.org/gnumdk/lollypop/uploads/; + "b769805b7063ef9807e4e832e7e87ad2/" name "-" version ".tar.xz")) (sha256 (base32 - "070y6wf1180hbl1ix8al7fmc6y06jb5m14h73g509g4xbwlk62g8" -;; TODO: Use meson-build-system -(build-system glib-or-gtk-build-system) + "0c49v6793bywvh295xbii9yq21hh3qpmxwbgp9i71kj6r9grvhan" +(build-system meson-build-system) (arguments `(#:imported-modules ((guix build python-build-system) - ,@%glib-or-gtk-build-system-modules) + ,@%meson-build-system-modules) + #:glib-or-gtk? #t #:tests? #f ; no test suite #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; remove post-install script, we update the caches later - (substitute* "meson.build" - (("meson.add_install_script\\('meson_post_install.py'\\)") "")) - (zero? - (system* "meson" "builddir" (string-append "--prefix=" out)) - (replace 'install - (lambda _ (zero? (system* "ninja" "-C" "builddir" "install" (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -6968,16 +6957,15 @@ views can be printed as PDF or PostScript files, or exported to HTML.") (native-inputs `(("intltool" ,intltool) ("itstool" ,itstool) - ("ninja" ,ninja) + ("glib:bin" ,glib "bin") ; For glib-compile-resources + ("gtk+:bin" ,gtk+ "bin") ; For gtk-update-icon-cache ("pkg-config" ,pkg-config))) (inputs `(("gobject-introspection" ,gobject-introspection) ("gst-plugins-base" ,gst-plugins-base) - ("gtk+" ,gtk+) ("libnotify" ,libnotify) ("libsecret" ,libsecret) ("libsoup" ,libsoup) - ("meson" ,meson) ("python" ,python) ("python-beautifulsoup4" ,python-beautifulsoup4) ("python-gst" ,python-gst)
02/02: gnu: bluez: Skip non-deterministic test on all architectures.
thomasd pushed a commit to branch core-updates in repository guix. commit fbea821a2ad15bbe8bf70cd86cff42ae8efc90fa Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Mon Oct 16 08:36:28 2017 +0200 gnu: bluez: Skip non-deterministic test on all architectures. * gnu/packages/linux.scm (bluez): [arguments]: Skip unit/test-gatt regardless of architecture. --- gnu/packages/linux.scm | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 27ad92e..cc0a3ce 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3071,16 +3071,14 @@ Bluetooth audio output devices like headphones or loudspeakers.") (string-append "--with-udevdir=" out "/lib/udev"))) #:phases (modify-phases %standard-phases - ,@(if (string=? (%current-system) "armhf-linux") - ;; This test fails unpredictably. - ;; TODO: skip it for all architectures. - `((add-before 'check 'skip-wonky-test - (lambda _ -(substitute* "unit/test-gatt.c" - (("tester_init\\(, \\);") "return 77;")) -#t))) - `()) - + ;; Test unit/test-gatt fails unpredictably. Seems to be a timing + ;; issue (discussion on upstream mailing list: + ;; https://marc.info/?t=14957847632=1=2) + (add-before 'check 'skip-wonky-test +(lambda _ + (substitute* "unit/test-gatt.c" +(("tester_init\\(, \\);") "return 77;")) + #t)) (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out(assoc-ref outputs "out"))
branch core-updates updated (404e3d8 -> fbea821)
thomasd pushed a change to branch core-updates in repository guix. from 404e3d8 gnu: gcc@5: Update to 5.5.0. adds bb3b4b4 gnu: Add python-attrs. adds 9074bac gnu: Add python-constantly. adds fd8ff99 gnu: Add python-m2r. adds 6414410 gnu: Add python-graphviz. adds 96cb5ca gnu: Add python-automat. adds 0cd83b4 gnu: Add python-incremental. adds c1578ad gnu: python-twisted: Update to 17.1.0. adds 3f81ca3 gnu: alot: Update to 0.5.1. adds a6e22d8 ui: Improve reporting of missing closing parentheses. adds b719ddb import: pypi: Remove unneeded import. adds 90eaa94 import: cpan: Load (gnu packages perl) lazily. adds db9c49f gnu: games: Remove unneeded import. adds c3bece4 gnu: dovecot: Update to 2.2.33. adds 7740228 build: Set 'NIX_BUILD_HOOK' only if offloading is configured. adds dac1d8e gnu: linux-libre@4.4: Update to 4.4.91. adds 2f44e7b gnu: linux-libre@4.9: Update to 4.9.54. adds 6de897a gnu: Add r-ggdendro. adds 22d1060 gnu: python-rpy2: Ignore test results. adds b509efb gnu: Add lapack-3.5. adds 1da02b6 gnu: Add xyce-serial. adds 91cabd3 gnu: Add xyce-parallel. adds f26af33 gnu: Add freehdl. adds 1c65cca file-systems: 'mount-file-system' now takes a object. adds 9976c76 file-systems: Preserve UUID types when serializing. adds 8823567 file-systems: Add support for FAT16. adds 03f66ae uuid: Change "fat32" to "fat". adds 50fcf37 doc: Give an example with a FAT UUID. adds 5781c7d gnu: mpg123: Update to 1.25.7. adds 85a2b58 zlib: Fix memory leak due to revealed ports not being GC'd. adds 01d87d3 gnu: rcas-web: Update to 0.0.4. adds de47cfe gnu: bluez: Disable unpredictable test on armhf. adds f51ea1c gnu: orca: Update to 3.26.0. adds f9bd6b3 gnu: evince: Update to 3.26.0. adds 3bf42e2 gnu: gparted: Update to 0.30.0. adds be84a12 gnu: dovecot: Update to 2.2.33.1. adds 22345a8 gnu: mobile-broadband-provider-info: Update to 20170310. adds b27ce41 services: gnome: Register more polkit actions. adds 7ad81b8 gnu: totem: Update to 3.26.0. adds c6643f2 gnu: f-seq: Truncate version string. adds abaee53 substitute: Close the progress port after substitute finished. adds d8e89b1 offload: Reduce the number of calls to 'machine-load'. adds aad8a14 services: cleanup: Remove Shadow lock files from /etc. adds 5acd59e gnu: qt: Update to 5.9.2. adds 2a08788 gnu: mesa: Disable imx driver for armhf-linux. adds d636fd9 gnu: ccid: Update to 1.4.28. adds 0bf6212 gnu: libextractor: Update to 1.5. adds fc0ed8c Revert "gnu: xorg-server: Make the test-variant visible." adds 24384c3 gnu: xorg-server: Update to 1.19.5. [security fixes] adds 453361b gnu: wireshark: Update to 2.4.2. adds db314bf gnu: wireshark: Minor package improvements. adds ee8aab1 gnu: Add python-jupyter-console as input to python-ipython. adds 7658d89 gnu: Add postgresql@9.6. adds 4e169fc gnu: python-psycopg2: Use postgresql@9.6. adds e374159 gnu: python-psycopg2: Update to 2.7.3.1. adds 6ea10db tests: Support multiple HTTP server instances. adds 61f28fe lint: 'home-page' checker reports permanent redirects. adds 9f9c36f gnu: Update home page URLs for Xorg packages. adds e2491f2 gnu: Add trailing slash to 'search.cpan.org' home pages. adds b3936f3 gnu: clustal-omega: Update to 1.2.4. adds 91525b4 build: Add the Go build system. adds 56a3771 gnu: Add go-github-com-audriusbutkevicius-go-nat-pmp. adds 67b4681 gnu: Add go-github-com-bkaradzic-go-lz4. adds add56f3 gnu: Add go-github-com-calmh-du. adds 1e28085 gnu: Add go-github-com-calmh-xdr. adds ab3e158 gnu: Add go-github-com-d4l3k-messagediff. adds a3a5b01 gnu: Add go-github-com-edsrzf-mmap-go. adds 4d93ebb gnu: Add go-github-com-gobwas-glob. adds 07e88fc gnu: Add go-github-com-gogo-protobuf-protoc-gen-gogo. adds 3a4d383 gnu: Add go-github-com-gogo-protobuf. adds ede4f50 gnu: Add go-github-com-golang-groupcache-lru. adds b32eab0 gnu: Add go-github-com-golang-snappy. adds 7b92093 gnu: Add go-github-com-jackpal-gateway. adds 7577a1d gnu: Add go-github-com-kardianos-osext. adds 340e1a9 gnu: Add go-github-com-lib-pq. adds 4a9c4db gnu: Add go-github-com-minio-sha256-simd. adds bde48ed gnu: Add go-golang-org-x-sys-unix. adds a57778f gnu: Add go-github-com-oschwald-maxminddb-golang. adds 0921b23 gnu: Add go-github-com-oschwald-geoip2-golang. adds 6bc1eb1 gnu: Add go-github-com-stathat-go. adds 1a4795f gnu:
01/02: Merge 'master' into core-updates
thomasd pushed a commit to branch core-updates in repository guix. commit 8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb Merge: 404e3d8 484a72a Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Mon Oct 16 19:52:30 2017 +0200 Merge 'master' into core-updates Makefile.am |2 + build-aux/pre-inst-env.in | 11 +- doc/guix.texi | 49 +- gnu/build/file-systems.scm| 121 +- gnu/build/linux-boot.scm | 20 +- gnu/build/linux-container.scm |3 +- gnu/local.mk |3 + gnu/packages/audio.scm| 28 +- gnu/packages/bioinformatics.scm | 104 +- gnu/packages/build-tools.scm |8 +- gnu/packages/cinnamon.scm | 86 + gnu/packages/crypto.scm | 40 +- gnu/packages/cups.scm | 10 +- gnu/packages/databases.scm| 13 + gnu/packages/disk.scm |4 +- gnu/packages/emacs.scm| 205 ++- gnu/packages/embedded.scm | 97 +- gnu/packages/engineering.scm | 195 +++ gnu/packages/games.scm| 52 +- gnu/packages/gl.scm |6 +- gnu/packages/gnome.scm| 91 +- gnu/packages/gnucash.scm | 54 +- gnu/packages/gnunet.scm |4 +- gnu/packages/graphviz.scm | 32 +- gnu/packages/guile.scm| 21 +- gnu/packages/kde-frameworks.scm | 160 +- gnu/packages/libffi.scm | 113 +- gnu/packages/linux.scm| 40 +- gnu/packages/mail.scm | 19 +- gnu/packages/maths.scm| 17 +- gnu/packages/mp3.scm |4 +- gnu/packages/networking.scm |9 +- gnu/packages/password-utils.scm |1 + gnu/packages/patches/totem-meson-easy-codec.patch | 65 + gnu/packages/perl.scm | 734 - gnu/packages/python.scm | 274 +++- gnu/packages/qt.scm | 246 ++- gnu/packages/ruby.scm | 28 - gnu/packages/sdl.scm | 28 +- gnu/packages/security-token.scm |6 +- gnu/packages/serialization.scm| 23 + gnu/packages/statistics.scm | 26 + gnu/packages/syncthing.scm| 1821 + gnu/packages/tmux.scm |4 +- gnu/packages/video.scm|4 +- gnu/packages/web.scm | 19 + gnu/packages/xorg.scm | 45 +- gnu/services.scm |6 + gnu/services/base.scm |6 +- gnu/services/desktop.scm | 16 +- gnu/system/examples/lightweight-desktop.tmpl |8 +- gnu/system/file-systems.scm | 10 +- gnu/system/linux-initrd.scm |6 +- gnu/system/uuid.scm | 30 +- guix/build-system/go.scm | 132 ++ guix/build/emacs-build-system.scm |8 +- guix/build/go-build-system.scm| 217 +++ guix/import/cpan.scm | 14 +- guix/import/pypi.scm |1 - guix/scripts/lint.scm | 78 +- guix/scripts/offload.scm | 61 +- guix/scripts/substitute.scm |1 + guix/tests/http.scm | 133 +- guix/ui.scm |9 + guix/zlib.scm | 39 +- tests/derivations.scm |8 +- tests/guix-system.sh | 15 + tests/lint.scm| 97 +- tests/zlib.scm| 11 +- 69 files changed, 4814 insertions(+), 1037 deletions(-)
branch master updated (01d87d3 -> de47cfe)
thomasd pushed a change to branch master in repository guix. from 01d87d3 gnu: rcas-web: Update to 0.0.4. new de47cfe gnu: bluez: Disable unpredictable test on armhf. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/linux.scm | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-)
01/01: gnu: bluez: Disable unpredictable test on armhf.
thomasd pushed a commit to branch master in repository guix. commit de47cfed13982ad14fc4854cb04a762b4964 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Wed Oct 11 18:05:24 2017 +0200 gnu: bluez: Disable unpredictable test on armhf. * gnu/packages/linux.scm (bluez): [arguments] Add phase to skip a test instead of marking it as XFAIL. --- gnu/packages/linux.scm | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d1420ee..97a294a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3051,6 +3051,16 @@ Bluetooth audio output devices like headphones or loudspeakers.") (string-append "--with-udevdir=" out "/lib/udev"))) #:phases (modify-phases %standard-phases + ,@(if (string=? (%current-system) "armhf-linux") + ;; This test fails unpredictably. + ;; TODO: skip it for all architectures. + `((add-before 'check 'skip-wonky-test + (lambda _ +(substitute* "unit/test-gatt.c" + (("tester_init\\(, \\);") "return 77;")) +#t))) + `()) + (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out(assoc-ref outputs "out")) @@ -3069,12 +3079,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (string-append out "/lib/udev/hid2hci --method")) (("/sbin/udevadm") (string-append (assoc-ref inputs "eudev") "/bin/udevadm"))) - #t - - ;; FIXME: Skip one test that segfaults on ARM. - ,@(if (string=? (%current-system) "armhf-linux") - '(#:make-flags '("XFAIL_TESTS=unit/test-gatt")) - '( + #t)) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal)))
05/05: gnu: Add eid-mw.
thomasd pushed a commit to branch master in repository guix. commit e84eb77a3aa06ef6f3bc952170df54f52e1bfcfc Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Wed Apr 26 20:37:10 2017 +0200 gnu: Add eid-mw. * gnu/packages/security-token.scm (eid-mw): New variable. --- gnu/packages/security-token.scm | 53 - 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 8ae2dda..c6e3d6b 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2016 Mike Gerwitz <m...@gnu.org> ;;; Copyright © 2016 Marius Bakke <mba...@fastmail.com> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,12 +26,20 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) + #:use-module (gnu packages autotools) #:use-module (gnu packages curl) + #:use-module (gnu packages gettext) + #:use-module (gnu packages gtk) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages man) + #:use-module (gnu packages networking) + #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages tls) #:use-module (gnu packages perl) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xml)) (define-public ccid (package @@ -70,6 +79,48 @@ readers and is needed to communicate with such devices through the @command{pcscd} resource manager.") (license license:lgpl2.1+))) +(define-public eid-mw + (package +(name "eid-mw") +(version "4.3.0") +(source (origin + (method url-fetch) + (uri (string-append +"https://github.com/Fedict/eid-mw/archive/v; +version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 +"0s646p19kq27wb160v9b8aaiy30k2shmq4njm471ggd2j7n7a6rs" +(build-system glib-or-gtk-build-system) +(native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gnu-gettext) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("perl" ,perl))) +(inputs + `(("curl" ,curl) + ("openssl" ,openssl) + ("gtk+" ,gtk+) + ("pcsc-lite" ,pcsc-lite) + ("p11-kit" ,p11-kit) + ("libproxy" ,libproxy) + ("libxml2" ,libxml2) + ("cyrus-sasl" ,cyrus-sasl))) +(arguments + `(#:phases + (modify-phases %standard-phases + ;; The github tarball doesn't contain a configure script. + (add-before 'configure 'autoreconf + (lambda _ (zero? (system* "autoreconf" "-i"))) +(synopsis "Belgian eID Middleware") +(description "The Belgian eID Middleware is required to authenticate with +online services using the Belgian electronic identity card.") +(home-page "https://github.com/Fedict/eid-mw;) +(license license:lgpl3))) + (define-public libyubikey (package (name "libyubikey")
02/05: gnu: Add java-slf4-simple.
thomasd pushed a commit to branch master in repository guix. commit 88f256a192710fbd8cc07eb4253df02b63b52c85 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Fri Oct 6 12:38:34 2017 +0200 gnu: Add java-slf4-simple. * gnu/packages/java.scm (java-slf4j-simple): New variable. --- gnu/packages/java.scm | 35 +++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4418b67..60590b1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017 Roel Janssen <r...@gnu.org> ;;; Copyright © 2017 Carlo Zancanaro <ca...@zancanaro.id.au> ;;; Copyright © 2017 Julien Lepiller <jul...@lepiller.eu> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -4207,6 +4208,40 @@ allowing the end user to plug in the desired logging framework at deployment time.") (license license:expat))) +(define-public java-slf4j-simple + (package +(name "java-slf4j-simple") +(version "1.7.25") +(source (package-source java-slf4j-api)) +(build-system ant-build-system) +(arguments + `(#:jar-name "slf4j-simple.jar" + #:source-dir "slf4j-simple/src/main" + #:test-dir "slf4j-simple/src/test" + #:phases + (modify-phases %standard-phases + ;; The tests need some test classes from slf4j-api + (add-before 'check 'build-slf4j-api-test-helpers + (lambda _ + ;; Add current dir to CLASSPATH ... + (setenv "CLASSPATH" + (string-append (getcwd) ":" (getenv "CLASSPATH"))) + ;; ... and build test helper classes here: + (zero? + (apply system* + `("javac" "-d" "." + ,@(find-files "slf4j-api/src/test" ".*\\.java") +(inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core) + ("java-slf4j-api" ,java-slf4j-api))) +(home-page "https://www.slf4j.org/;) +(synopsis "Simple implementation of simple logging facade for Java") +(description "SLF4J binding for the Simple implementation, which outputs +all events to System.err. Only messages of level INFO and higher are +printed.") +(license license:expat))) + (define-public antlr2 (package (name "antlr2")
branch master updated (4792a03 -> e84eb77)
thomasd pushed a change to branch master in repository guix. from 4792a03 gnu: python2-unittest2: Update to 1.1.0. new ce38015 system: operating-system-etc-service: Set XCURSOR_PATH. new 88f256a gnu: Add java-slf4-simple. new 2fd26d0 gnu: Add hdf-java. new 167a541 gnu: Add libproxy. new e84eb77 gnu: Add eid-mw. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/java.scm | 35 gnu/packages/maths.scm | 121 +++- gnu/packages/networking.scm | 35 gnu/packages/security-token.scm | 53 +- gnu/packages/xorg.scm | 9 +++ gnu/system.scm | 3 + 6 files changed, 254 insertions(+), 2 deletions(-)
04/05: gnu: Add libproxy.
thomasd pushed a commit to branch master in repository guix. commit 167a541fd8439eed50294a94890a8ae5c5ec448c Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Wed Apr 26 20:18:56 2017 +0200 gnu: Add libproxy. * gnu/packages/networking.scm (libproxy): New variable. --- gnu/packages/networking.scm | 35 +++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 418d11a..b39f287 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2017 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2017 Rutger Helling <rhell...@mykolab.com> ;;; Copyright © 2017 Gábor Boskovits <boskov...@gmail.com> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) @@ -56,6 +58,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) #:use-module (gnu packages libidn) @@ -922,6 +925,38 @@ information by IP Address.") sockets in Perl.") (license license:perl-license))) +(define-public libproxy + (package +(name "libproxy") +(version "0.4.15") +(source (origin + (method url-fetch) + (uri (string-append "https://github.com/libproxy/libproxy/; + "releases/download/" version "/libproxy-" + version ".tar.xz")) + (sha256 + (base32 +"0kvdrazlzwia876w988cmlypp253gwy6idlh8mjk958c29jb8kb5" +(build-system cmake-build-system) +(native-inputs + `(("pkg-config" ,pkg-config))) +(inputs + `(("dbus" ,dbus) + ("zlib" ,zlib) + ("network-manager" ,network-manager))) +(arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ +(zero? (system* "ctest" "-E" "url-test"))) +(synopsis "Library providing automatic proxy configuration management") +(description "Libproxy handles the details of HTTP/HTTPS proxy +configuration for applications across all scenarios. Applications using +libproxy only have to specify which proxy to use.") +(home-page "https://libproxy.github.io/libproxy;) +(license license:lgpl2.1+))) + (define-public proxychains-ng (package (name "proxychains-ng")
01/05: system: operating-system-etc-service: Set XCURSOR_PATH.
thomasd pushed a commit to branch master in repository guix. commit ce3801506652dcfeec983a66c4cba88c270891e8 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Sun Oct 8 17:21:09 2017 +0200 system: operating-system-etc-service: Set XCURSOR_PATH. * gnu/system.scm (operating-system-etc-service): Set XCURSOR_PATH environment variable so that libxcursor finds cursors in user and system profiles. * gnu/packages/xorg.scm (libxcursor): Add a TODO for better handling of XCURSOR_PATH in other profiles. --- gnu/packages/xorg.scm | 9 + gnu/system.scm| 3 +++ 2 files changed, 12 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f3d415c..c2023de 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5300,6 +5300,15 @@ draggable titlebars and borders.") ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) +;; TODO: add XCURSOR_PATH=.../share/icons to profile search paths, so +;; libXcursor finds cursors installed into a profile. If we solve bugs +;; <http://bugs.gnu.org/20255> and <http://bugs.gnu.org/22138>, we can fix +;; this with a search-path as follows: +;; +;;(native-search-paths +;; (list (search-path-specification +;;(variable "XCURSOR_PATH") +;;(files '("share/icons") (home-page "https://www.x.org/wiki/;) (synopsis "Xorg Cursor management library") (description "Xorg Cursor management library.") diff --git a/gnu/system.scm b/gnu/system.scm index 0e834ba..5f562b4 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -583,6 +583,9 @@ export INFOPATH=$HOME/.guix-profile/share/info:/run/current-system/profile/share export XDG_DATA_DIRS=$HOME/.guix-profile/share:/run/current-system/profile/share export XDG_CONFIG_DIRS=$HOME/.guix-profile/etc/xdg:/run/current-system/profile/etc/xdg +# Make sure libXcursor finds cursors installed into user or system profiles. See <http://bugs.gnu.org/24445> +export XCURSOR_PATH=$HOME/.icons:$HOME/.guix-profile/share/icons:/run/current-system/profile/share/icons + # Ignore the default value of 'PATH'. unset PATH
03/05: gnu: Add hdf-java.
thomasd pushed a commit to branch master in repository guix. commit 2fd26d055ae3ab919debfd0e5deb699b8bf8c07a Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Wed Oct 4 17:17:03 2017 +0200 gnu: Add hdf-java. * gnu/packages/maths.scm (hdf-java): New variable. --- gnu/packages/maths.scm | 121 - 1 file changed, 120 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 088f47f..1fee918 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016 Kei Kebreau <kkebr...@posteo.net> ;;; Copyright © 2016, 2017 Ludovic Courtès <l...@gnu.org> ;;; Copyright © 2016 Leo Famulari <l...@famulari.name> -;;; Copyright © 2016 Thomas Danckaert <p...@thomasdanckaert.be> +;;; Copyright © 2016, 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; Copyright © 2017 Paul Garlick <pgarl...@tourbillion-technology.com> ;;; Copyright © 2017 ng0 <contact@cryptolab.net> ;;; Copyright © 2017 Ben Woodcroft <donttrust...@gmail.com> @@ -70,6 +70,7 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages java) #:use-module (gnu packages less) #:use-module (gnu packages lisp) #:use-module (gnu packages logging) @@ -743,6 +744,124 @@ extremely large and complex data collections.") (license (license:x11-style "http://www.hdfgroup.org/ftp/HDF5/current/src/unpacked/COPYING; +(define-public hdf-java + (package + (name "hdf-java") + (version "3.3.2") + (source +(origin + (method url-fetch) + (uri (string-append +"http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-; +version "/src/CMake-hdfjava-" version ".tar.gz")) + (sha256 + (base32 "0m1gp2aspcblqzmpqbdpfp6giskws85ds6p5gz8sx7asyp7wznpr")) + (modules '((guix build utils))) + (snippet ; Make sure we don't use the bundled sources and binaries. + `(begin + (for-each delete-file +(list "SZip.tar.gz" "ZLib.tar.gz" "JPEG8d.tar.gz" + "HDF4.tar.gz" "HDF5.tar.gz")) + (delete-file-recursively ,(string-append "hdfjava-" version "/lib")) + (build-system gnu-build-system) + (native-inputs +`(("jdk" ,icedtea "jdk") + ("automake" ,automake) ; For up to date 'config.guess' and 'config.sub'. + ;; For tests: + ("hamcrest-core" ,java-hamcrest-core) + ("junit" ,java-junit) + ("slf4j-simple" ,java-slf4j-simple))) + (inputs +`(("hdf4" ,hdf4) + ("hdf5" ,hdf5) + ("zlib" ,zlib) + ("libjpeg" ,libjpeg) + ("slf4j-api" ,java-slf4j-api))) + (arguments +`(#:configure-flags + (list (string-append "--target=" ,(or (%current-target-system) (%current-system))) +(string-append "--with-jdk=" (assoc-ref %build-inputs "jdk") "/include," + (assoc-ref %build-inputs "jdk") "/lib" ) +(string-append "--with-hdf4=" (assoc-ref %build-inputs "hdf4") "/lib") +(string-append "--with-hdf5=" (assoc-ref %build-inputs "hdf5") "/lib")) + + #:make-flags + (list (string-append "HDFLIB=" (assoc-ref %build-inputs "hdf4") "/lib") +(string-append "HDF5LIB=" (assoc-ref %build-inputs "hdf5") "/lib") +(string-append "ZLIB=" (assoc-ref %build-inputs "zlib") "/lib/libz.so") +(string-append "JPEGLIB=" + (assoc-ref %build-inputs "libjpeg") "/lib/libjpeg.so") +"LLEXT=so") + + #:phases + (modify-phases %standard-phases +(add-before 'configure 'chdir-to-source + (lambda _ (chdir ,(string-append "hdfjava-" version +(add-before 'configure 'patch-build + (lambda* (#:key inputs outputs #:allow-other-keys) +(substitute* "configure" + (("COPT=\"") "COPT=\"-O2 ") ; CFLAGS is ignored in Makefiles + (("/bin/cat") (which "cat"))) +;; Set classpath for compilation +(substitute* '("hdf/hdf5lib/Makefile.in" + "hdf/hdf5lib/exceptions/Makefile.in" + "hdf/hdflib/Makefile.in") + (("\\$\\(TOP\\)/lib/slf4j-api-1\\.7\\.5
branch master updated (02bc41c -> 3ceb70e)
thomasd pushed a change to branch master in repository guix. from 02bc41c tests: databases: Add a simple test for MySQL. new 3ceb70e gnu: kdevelop: Do not hardcode user profile locations in wrapper. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/kde.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
01/01: gnu: kdevelop: Do not hardcode user profile locations in wrapper.
thomasd pushed a commit to branch master in repository guix. commit 3ceb70e1e68f8e57fd3e9368cd3e0650ab5e4987 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Sun Oct 8 19:01:59 2017 +0200 gnu: kdevelop: Do not hardcode user profile locations in wrapper. * gnu/packages/kde.scm (kdevelop): [arguments]: Do not add ${HOME}/.guix-profile/{share,lib/plugins} to XDG_DATA_DIRS and QT_PLUGIN_PATH when wrapping the executable. --- gnu/packages/kde.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 91a7b62..57d4492 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -102,17 +102,16 @@ (qtquickcontrols (assoc-ref inputs "qtquickcontrols")) (qtbase (assoc-ref inputs "qtbase")) (qtdeclarative (assoc-ref inputs "qtdeclarative")) -(profile "$HOME/.guix-profile") (qml "/qml")) (wrap-program (string-append out "/bin/kdevelop") `("XDG_DATA_DIRS" ":" prefix ,(map (lambda (s) (string-append s "/share")) - (list profile out kdevplatform kcmutils))) + (list out kdevplatform kcmutils))) `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = (,(string-append qtbase "/plugins/platforms"))) `("QT_PLUGIN_PATH" ":" prefix ,(map (lambda (s) (string-append s "/lib/plugins")) - (list profile out kdevplatform kio))) + (list out kdevplatform kio))) `("QML2_IMPORT_PATH" ":" prefix (,(string-append qtquickcontrols qml) ,(string-append qtdeclarative qml))
01/01: gnu: getmail: Update to 5.4.
thomasd pushed a commit to branch master in repository guix. commit 06ebba151b336000e158549515ca569d7b795b04 Author: ng0Date: Thu Oct 5 19:12:56 2017 + gnu: getmail: Update to 5.4. * gnu/packages/mail.scm (getmail): Update to 5.4. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index cc3977e..e856a85 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -811,7 +811,7 @@ and search library.") (define-public getmail (package (name "getmail") -(version "5.1") +(version "5.4") (source (origin (method url-fetch) @@ -819,7 +819,7 @@ and search library.") name "-" version ".tar.gz")) (sha256 (base32 - "0zh220vx10wi6x61qi0mjayjxgvllk9f6vd4hjrgzha1xbjj0vix" + "1iwss9z94p165gxr2yw7s9q12a0bn71fcdbikzkykr5s7xxnz2ds" (build-system python-build-system) (arguments `(#:tests? #f ; no tests
branch master updated (3202d60 -> 06ebba1)
thomasd pushed a change to branch master in repository guix. from 3202d60 gnu: khal: Update to 0.9.8. new 06ebba1 gnu: getmail: Update to 5.4. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
branch core-updates updated (19d2713 -> b01981a)
thomasd pushed a change to branch core-updates in repository guix. from 19d2713 gnu: gcc: Fix manual pages. new b01981a gnu: bluez: Mark segfaulting test with XFAIL for all architectures. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/linux.scm | 9 + 1 file changed, 5 insertions(+), 4 deletions(-)
01/01: gnu: bluez: Mark segfaulting test with XFAIL for all architectures.
thomasd pushed a commit to branch core-updates in repository guix. commit b01981a9e280b1ea051d332ea5bdeab2f72fbb43 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Wed Sep 27 09:14:02 2017 +0200 gnu: bluez: Mark segfaulting test with XFAIL for all architectures. * gnu/packages/linux.scm (bluez): [arguments] Mark test-gatt with XFAIL. --- gnu/packages/linux.scm | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index abce9b9..04ad0a6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3089,10 +3089,11 @@ Bluetooth audio output devices like headphones or loudspeakers.") (string-append (assoc-ref inputs "eudev") "/bin/udevadm"))) #t - ;; FIXME: Skip one test that segfaults on ARM. - ,@(if (string=? (%current-system) "armhf-linux") - '(#:make-flags '("XFAIL_TESTS=unit/test-gatt")) - '( + ;; FIXME: Skip a test that segfaults on some machines. Seems to be a + ;; timing issue (discussion on upstream mailing list: + ;; https://marc.info/?t=14957847632=1=2) + #:make-flags '("XFAIL_TESTS=unit/test-gatt"))) + (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal)))
branch master updated (48b68c6 -> 1033cdb)
thomasd pushed a change to branch master in repository guix. from 48b68c6 gnu: virtuoso-ose: Limit to 64-bit platforms. new 1033cdb gnu: python-numpy: Give sh store location instead of setting $SHELL. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/python.scm | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)
01/01: gnu: python-numpy: Give sh store location instead of setting $SHELL.
thomasd pushed a commit to branch master in repository guix. commit 1033cdbb0c27a75b77a05a97fbbe776060d5c6e7 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Sun Oct 1 14:32:04 2017 +0200 gnu: python-numpy: Give sh store location instead of setting $SHELL. * gnu/packages/python.scm (python-numpy): [arguments] Don't set $SHELL in the environment, but embed the store location of bash-minimal as a default shell. Otherwise, we have to set $SHELL for every package which uses numpy's distutils. --- gnu/packages/python.scm | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c0173c5..bf451ab 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3742,8 +3742,6 @@ between language specification and implementation aspects.") (modify-phases %standard-phases (add-before 'build 'set-environment-variables (lambda* (#:key inputs #:allow-other-keys) - ;; numpy's distutils uses $SHELL to run external commands. - (setenv "SHELL" "bash") (call-with-output-file "site.cfg" (lambda (port) (format port @@ -3762,6 +3760,11 @@ include_dirs = ~a/include (assoc-ref inputs "openblas") (assoc-ref inputs "lapack") (assoc-ref inputs "lapack" + ;; Make /gnu/store/...-bash-.../bin/sh the default shell, instead of + ;; /bin/sh. + (substitute* "numpy/distutils/exec_command.py" +(("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start match-end) +(string-append match-start (assoc-ref inputs "bash") match-end))) ;; Use "gcc" executable, not "cc". (substitute* "numpy/distutils/system_info.py" (("c = distutils\\.ccompiler\\.new_compiler\\(\\)")
branch master updated (6a5f7af -> 88e6086)
thomasd pushed a change to branch master in repository guix. from 6a5f7af gnu: gnunet: Use 'gnutls/dane' as input. new 88e6086 gnu: emacs-cyberpunk-theme: Update to 1.19. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: emacs-cyberpunk-theme: Update to 1.19.
thomasd pushed a commit to branch master in repository guix. commit 88e6086e60b710605908835a38dd244c0bdc8d67 Author: Feng ShuDate: Sat Sep 23 17:43:20 2017 +0800 gnu: emacs-cyberpunk-theme: Update to 1.19. * gnu/packages/emacs.scm (emacs-cyberpunk-theme): Update to 1.19. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 35ca2b1..7ffe9bf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4005,7 +4005,7 @@ Flx has support for ido (interactively do things) through flx-ido.") (define-public emacs-cyberpunk-theme (package (name "emacs-cyberpunk-theme") -(version "1.18") +(version "1.19") (source (origin (method url-fetch) @@ -4013,7 +4013,7 @@ Flx has support for ido (interactively do things) through flx-ido.") "archive/" version ".tar.gz")) (sha256 (base32 - "0pxzbw0qjxgkhhs3gn3k9qy41kl1a4pfzbw83dk24l4b3nxd24wg")) + "05l5fxw1mn5py6mfhxrzyqjq0d8m5m1akfi46vrgh13r414jffvv")) (file-name (string-append name "-" version ".tar.gz" (build-system emacs-build-system) (home-page "https://github.com/n3mo/cyberpunk-theme.el;)
01/01: gnu: libreoffice: Update to 5.3.6.1.
thomasd pushed a commit to branch master in repository guix. commit 20030905267366ddefd34778367d8447f74ae8d5 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Sun Oct 1 10:48:39 2017 +0200 gnu: libreoffice: Update to 5.3.6.1. * gnu/packages/libreoffice.scm (libreoffice): Update to 5.3.6.1. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 0b1e729..77c9ae1 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -867,7 +867,7 @@ and to return information on pronunciations, meanings and synonyms.") (define-public libreoffice (package (name "libreoffice") -(version "5.3.5.2") +(version "5.3.6.1") (source (origin (method url-fetch) @@ -876,7 +876,7 @@ and to return information on pronunciations, meanings and synonyms.") "http://download.documentfoundation.org/libreoffice/src/; (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1sknmb9bhm8mxyfycqbwng1jqs4avyp1ffcla7dhlpwqs1aqxvx5" + "023a7hr7v5cf0ipga4ijhyl58ncgbjrp500qq5fwf65j8g2c3apz" (build-system gnu-build-system) (native-inputs `(;; autoreconf is run by the LibreOffice build system, since after
branch master updated (7493306 -> 2003090)
thomasd pushed a change to branch master in repository guix. from 7493306 gnu: Add emacs-pyim. new 2003090 gnu: libreoffice: Update to 5.3.6.1. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
branch master updated (58b2835 -> 350cc3a)
thomasd pushed a change to branch master in repository guix. from 58b2835 gnu: pybitmessage: Update to 0.6.2. new 350cc3a doc: Fix rottlog configuration sample code. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
01/01: doc: Fix rottlog configuration sample code.
thomasd pushed a commit to branch master in repository guix. commit 350cc3a270ab43dc01e1036687e9387375a8c17e Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Wed Sep 27 17:36:34 2017 +0200 doc: Fix rottlog configuration sample code. * doc/guix.texi (Log Rotation): Correct code for the default mcron-service. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 1b329d2..c57c0ba 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10014,7 +10014,7 @@ with the default settings, for commonly encountered log files. (operating-system ;; @dots{} - (services (cons* (mcron-service) + (services (cons* (service mcron-service-type) (service rottlog-service-type) %base-services))) @end lisp
branch staging updated (9f1d112 -> c651cba)
thomasd pushed a change to branch staging in repository guix. from 9f1d112 Merge branch 'master' into staging new c651cba gnu: eudev: Update to 3.2.4 and generate manpages. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/linux.scm | 50 +++--- 1 file changed, 35 insertions(+), 15 deletions(-)
01/01: gnu: eudev: Update to 3.2.4 and generate manpages.
thomasd pushed a commit to branch staging in repository guix. commit c651cbad1e38f18f98984463d7d50254b019576b Author: Maxim CournoyerDate: Fri Sep 22 23:24:23 2017 -0400 gnu: eudev: Update to 3.2.4 and generate manpages. * gnu/packages/linux.scm (eudev)[version]: Bump to 3.2.4. [uri]: Download the release from Github, which contains the script to generate the manpages from source. [file-name]: Add a file-name field to the origin record, per linter recommendation. [sha256]: Adjust accordingly. [phases]: Add a bootstrap phase to regenerate the manpages. [configure-flags]: Add the "--enable-manpages" option, required to install the manpages. [native-inputs]: Add autoconf, automake and libtool for the bootstrap phase. Add python-wrapper to run a test script that was previously skipped. Add docbook-xml, docbook-xsl, libxml2 and libxslt for manpage generation. --- gnu/packages/linux.scm | 50 +++--- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 46434b3..dd46b5e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2055,30 +2055,50 @@ from the module-init-tools project.") ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") -(version "3.2.2") +(version "3.2.4") (source (origin (method url-fetch) - (uri (string-append -"http://dev.gentoo.org/~blueness/eudev/eudev-; -version ".tar.gz")) + (uri (string-append "https://github.com/gentoo/eudev/archive/v; + version ".zip")) + (file-name (string-append name "-" version ".zip")) (sha256 (base32 -"0qqgbgpm5wdllk0s04pf80nwc8pr93xazwri1bylm1f15zn5ck1y")) +"1r1ag0snarygrj5qqxi2xdq9w6g3sfjd5jx1b0fl7zmqlsz3vvxx")) (patches (search-patches "eudev-rules-directory.patch" (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'install 'build-hwdb -(lambda* (#:key outputs #:allow-other-keys) - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - (let ((out (assoc-ref outputs "out"))) -(zero? (system* (string-append out "/bin/udevadm") -"hwdb" "--update" + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda* (#:key inputs #:allow-other-keys) +(substitute* "man/make.sh" + (("/usr/bin/xsltproc") +(string-append (assoc-ref inputs "xsltproc") + "/bin/xsltproc"))) +;; Manual pages are regenerated here. +(zero? (system* "./autogen.sh" + (add-after 'install 'build-hwdb + (lambda* (#:key outputs #:allow-other-keys) + ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and + ;; similar tools to display product names. + (let ((out (assoc-ref outputs "out"))) + (zero? (system* (string-append out "/bin/udevadm") + "hwdb" "--update")) + #:configure-flags (list "--enable-manpages"))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gperf" ,gperf) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ;; For tests. ("perl" ,perl) - ("gperf" ,gperf))) + ("python" ,python-wrapper) + ;; For documentation. + ("docbook-xml" ,docbook-xml-4.2) + ("docbook-xsl" ,docbook-xsl) + ("libxml2" ,libxml2) ;for $XML_CATALOG_FILES + ("xsltproc", libxslt))) (inputs ;; When linked against libblkid, eudev can populate /dev/disk/by-label ;; and similar; it also installs the '60-persistent-storage.rules' file,
01/03: gnu: Add footswitch.
thomasd pushed a commit to branch master in repository guix. commit 18a26f1c1300773ec01bc0afb86ca863b22fa285 Author: Stefan ReichörDate: Sat Sep 23 21:33:20 2017 +0200 gnu: Add footswitch. I have tested the built footswitch tool with my foot switch. It works as expected. Is accessibility.scm the correct location for this tool? * gnu/packages/accessibility.scm (footswitch): New variable. --- gnu/packages/accessibility.scm | 45 +- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index 0795808..78cb64a 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages xml) @@ -29,7 +32,8 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages libusb)) (define-public florence (package @@ -76,3 +80,42 @@ available to help to click.") ;; The documentation is under FDL1.2, but we do not install the ;; documentation. (license license:gpl2+))) + +(define-public footswitch + (let ((commit "7cb0a9333a150c27c7e4746ee827765d244e567a")) +(package + (name "footswitch") + (version (git-version "0.1" "1" commit)) + (source (origin +(method git-fetch) +(uri (git-reference + (url "https://github.com/rgerganov/footswitch;) + (commit commit))) +(file-name (git-file-name name version)) +(sha256 + (base32 "0mg1vr4a9vls5y435w7wdnr1vb5059gy60lvrdfjgzhd2wwf47iw" + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("hidapi" ,hidapi))) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list "CC=gcc") + #:phases (modify-phases %standard-phases +(delete 'configure) +;; Install target in the Makefile does not work for Guix +(replace 'install + (lambda* (#:key outputs #:allow-other-keys) +(let ((bin (string-append (assoc-ref outputs "out") + "/bin"))) + (mkdir-p bin) + (install-file "footswitch" bin) + #t)) + (home-page "https://github.com/rgerganov/footswitch;) + (synopsis "Command line utility for PCsensor foot switch") + (description + "Command line utility for programming foot switches sold by PCsensor. +It works for both single pedal devices and three pedal devices. All supported +devices have vendorId:productId = 0c45:7403 or 0c45:7404.") +(license license:expat
branch master updated (1344deb -> 80c3f4d)
thomasd pushed a change to branch master in repository guix. from 1344deb gnu: r-minimal: Update to 3.4.2. new 18a26f1 gnu: Add footswitch. new 025b196 gnu: python-numpy: Update to 1.13.1. new 80c3f4d gnu: python-ipython: Update to 5.3.0. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/accessibility.scm | 45 +- gnu/packages/python.scm| 17 2 files changed, 53 insertions(+), 9 deletions(-)
02/03: gnu: python-numpy: Update to 1.13.1.
thomasd pushed a commit to branch master in repository guix. commit 025b196d9b739418dd9d305864fdb1fb1d0d5af2 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Tue Sep 26 16:26:08 2017 +0200 gnu: python-numpy: Update to 1.13.1. * gnu/packages/python.scm (python-numpy, python2-numpy): Update to 1.13.1. [source]: Download the zip release from pypi instead of a git snapshot. [native-inputs]: Add unzip. [arguments]: Set SHELL environment variable. Co-authored by Leo Famulari <l...@famulari.name> --- gnu/packages/python.scm | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3e266c5..e44462b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3720,22 +3720,21 @@ between language specification and implementation aspects.") (define-public python-numpy (package (name "python-numpy") -(version "1.12.0") +(version "1.13.1") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/numpy/numpy/archive/v; version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "numpy" version ".zip")) (sha256 (base32 - "025d4j4aakcp8w5i5diqh812cbbjgac7jszx1j56ivrbi1i8vv7d" + "1fsgkhh1vdkhmlz8vmdgxnj9n9yaanckxxzz9s0b4p08fqvjic69" (build-system python-build-system) (inputs `(("openblas" ,openblas) ("lapack" ,lapack))) (native-inputs - `(("python-cython" ,python-cython) + `(("unzip" ,unzip) + ("python-cython" ,python-cython) ("python-nose" ,python-nose) ("gfortran" ,gfortran))) (arguments @@ -3743,6 +3742,8 @@ between language specification and implementation aspects.") (modify-phases %standard-phases (add-before 'build 'set-environment-variables (lambda* (#:key inputs #:allow-other-keys) + ;; numpy's distutils uses $SHELL to run external commands. + (setenv "SHELL" "bash") (call-with-output-file "site.cfg" (lambda (port) (format port
03/03: gnu: python-ipython: Update to 5.3.0.
thomasd pushed a commit to branch master in repository guix. commit 80c3f4d6c04f7112afab5ce309c8b73d9789c79a Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Sep 28 12:05:13 2017 +0200 gnu: python-ipython: Update to 5.3.0. * gnu/packages/python.scm (python-ipython, python2-ipython): Update to 5.3.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e44462b..77c4a83 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5784,13 +5784,13 @@ tools for mocking system commands and recording calls to those.") (define-public python-ipython (package (name "python-ipython") -(version "5.2.2") +(version "5.3.0") (source (origin (method url-fetch) (uri (pypi-uri "ipython" version ".tar.gz")) (sha256 -(base32 "1qhjwa9cyz1np7rhv3p4ip13lkgbqsad62l24xkwiq1ic2gwiqbf" +(base32 "079wyjir4a9qx6kvx096b1asm63djbidk65z3ykcbnlngmg62pmz" (build-system python-build-system) (outputs '("out" "doc")) (propagated-inputs
branch master updated (3daea4f -> c694520)
thomasd pushed a change to branch master in repository guix. from 3daea4f gnu: cuirass: Update development snapshot. new c694520 system: Create "/etc/hostname". The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/system.scm | 5 + 1 file changed, 5 insertions(+)
01/01: system: Create "/etc/hostname".
thomasd pushed a commit to branch master in repository guix. commit c694520bb13ef11c11c06cbc52e1dc27c24dc788 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Sat Sep 16 13:54:40 2017 +0200 system: Create "/etc/hostname". * gnu/system.scm (operating-system-etc-service): Add a plain-file with the operating-system-host-name. --- gnu/system.scm | 5 + 1 file changed, 5 insertions(+) diff --git a/gnu/system.scm b/gnu/system.scm index d337e52..88b5346 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -646,6 +646,11 @@ fi\n"))) ("bashrc" ,#~#$bashrc) ("hosts" ,#~#$(or (operating-system-hosts-file os) (default-/etc/hosts (operating-system-host-name os + ;; Write the operating-system-host-name to /etc/hostname to prevent + ;; NetworkManager from changing the system's hostname when connecting + ;; to certain networks. Some discussion at + ;; https://lists.gnu.org/archive/html/help-guix/2017-09/msg00037.html + ("hostname" ,(plain-file "hostname" (operating-system-host-name os))) ("localtime" ,(file-append tzdata "/share/zoneinfo/" (operating-system-timezone os))) ("sudoers" ,(operating-system-sudoers-file os))
branch master updated (a0596a2 -> 43d0167)
thomasd pushed a change to branch master in repository guix. from a0596a2 gnu: python2-larch: Enable tests. new e3a1a1d gnu: hdf5: Add output for fortran interface. new fd0378a gnu: hdf5: Avoid unneeded store references to compilers. new e464b45 gnu: hdf4: Avoid unneeded store references to compilers. new 43d0167 gnu: netcdf: Fix reproducibility issue; remove unneeded references. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/maths.scm | 99 -- 1 file changed, 95 insertions(+), 4 deletions(-)
01/04: gnu: hdf5: Add output for fortran interface.
thomasd pushed a commit to branch master in repository guix. commit e3a1a1deda03e52fbdb38e9c7a92ce69f78c8eb3 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Aug 24 11:00:59 2017 +0200 gnu: hdf5: Add output for fortran interface. * gnu/packages/maths.scm (hdf5) [native-inputs]: Add gfortran. [outputs]: Add "fortran". [arguments]: Enable Fortran compilation; add "/lib" directory of the fortran output to the runpath of the Fortran libs; add a 'split phase to move all Fortran-related files to the the Fortran output store location. --- gnu/packages/maths.scm | 53 +++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7481636..b561531 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -648,16 +648,30 @@ incompatible with HDF5.") (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) +(native-inputs + `(("gfortran" ,gfortran))) +(outputs '("out" ; core library + "fortran")) ; fortran interface (arguments `(;; Some of the users, notably Flann, need the C++ interface. - #:configure-flags '("--enable-cxx") + #:configure-flags '("--enable-cxx" + "--enable-fortran" + "--enable-fortran2003") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-configure - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) (substitute* "configure" (("/bin/mv") "mv")) + (substitute* "fortran/src/Makefile.in" + (("libhdf5_fortran_la_LDFLAGS =") +(string-append "libhdf5_fortran_la_LDFLAGS = -Wl-rpath=" + (assoc-ref outputs "fortran") "/lib"))) + (substitute* "hl/fortran/src/Makefile.in" + (("libhdf5hl_fortran_la_LDFLAGS =") +(string-append "libhdf5hl_fortran_la_LDFLAGS = -Wl,-rpath=" + (assoc-ref outputs "fortran") "/lib"))) #t)) (add-after 'install 'patch-references (lambda* (#:key inputs outputs #:allow-other-keys) @@ -666,7 +680,40 @@ incompatible with HDF5.") (substitute* (find-files bin "h5p?cc") (("-lz" lib) (string-append "-L" zlib "/lib " lib))) - #t)) + #t))) + (add-after 'install 'split +(lambda* (#:key inputs outputs #:allow-other-keys) + ;; Move all fortran-related files + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib")) + (inc (string-append out "/include")) + (ex (string-append out "/share/hdf5_examples/fortran")) + (fort (assoc-ref outputs "fortran")) + (fbin (string-append fort "/bin")) + (flib (string-append fort "/lib")) + (finc (string-append fort "/include")) + (fex (string-append fort "/share/hdf5_examples/fortran"))) +(mkdir-p fbin) +(mkdir-p flib) +(mkdir-p finc) +(mkdir-p fex) +(rename-file (string-append bin "/h5fc") + (string-append fbin "/h5fc")) +(for-each (lambda (file) +(rename-file file + (string-append flib "/" (basename file + (find-files lib ".*fortran.*")) +(for-each (lambda (file) +(rename-file file + (string-append finc "/" (basename file + (find-files inc ".*mod")) +(for-each (lambda (file) +(rename-file file + (string-append fex "/" (basename file + (find-files ex ".*")) +(delete-file-recursively ex)) + #t) (home-page "http://www.hdfgroup.org;) (synopsis "Management suite for extremely large and complex data") (description "HDF5 is a suite that makes possible the management of
04/04: gnu: netcdf: Fix reproducibility issue; remove unneeded references.
thomasd pushed a commit to branch master in repository guix. commit 43d01672a11814ca4cdcc592544064d75d1653f0 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Aug 24 15:13:02 2017 +0200 gnu: netcdf: Fix reproducibility issue; remove unneeded references. * gnu/packages/maths.scm (netcdf) [arguments]: Add phase to fix the embedded 'Configured On' date; truncate reference to compiler store item. --- gnu/packages/maths.scm | 23 +++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a8c81a7..bebed14 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -918,6 +918,29 @@ similar to MATLAB, GNU Octave or SciPy.") ("libjpeg" ,libjpeg))) (arguments `(#:configure-flags '("--enable-doxygen" "--enable-dot" "--enable-hdf4") + + #:phases (modify-phases %standard-phases + (add-before 'configure 'fix-source-date + (lambda _ + ;; As we ${SOURCE_DATE_EPOCH} evaluates to "1" in the build + ;; environment, `date -u -d ${SOURCE_DATE_EPOCH}` will evaluate + ;; to '1st hour of the current day', and therefore makes the + ;; package not reproducible. + (substitute* "./configure" + (("date -u -d \"\\$\\{SOURCE_DATE_EPOCH\\}\"") +"date --date='@0'")) + #t)) + (add-after 'configure 'patch-settings + (lambda _ + ;; libnetcdf.settings contains the full filename of the compilers + ;; used to build the library. We truncate the hashes of those + ;; filenames to avoid unnecessary references to the corresponding + ;; store items. + (substitute* "libnetcdf.settings" + (("(/gnu/store/)([a-Z0-9]*)" all prefix hash) +(string-append prefix (string-take hash 10) "..."))) + #t))) + #:parallel-tests? #f)) ;various race conditions (home-page "http://www.unidata.ucar.edu/software/netcdf/;) (synopsis "Library for scientific data")
02/04: gnu: hdf5: Avoid unneeded store references to compilers.
thomasd pushed a commit to branch master in repository guix. commit fd0378a1475900bdbd1da43066811677ba41f3ea Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Aug 31 17:29:36 2017 +0200 gnu: hdf5: Avoid unneeded store references to compilers. * gnu/packages/maths.scm (hdf5) [arguments]: Add phase to patch "libhdf5.settings", removing references to the C/C++/Fortran compilers. --- gnu/packages/maths.scm | 10 ++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b561531..47e7ba3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -673,6 +673,16 @@ incompatible with HDF5.") (string-append "libhdf5hl_fortran_la_LDFLAGS = -Wl,-rpath=" (assoc-ref outputs "fortran") "/lib"))) #t)) + (add-after 'configure 'patch-settings + (lambda _ + ;; libhdf5.settings contains the full path of the + ;; compilers used, and its contents are included in + ;; libhdf5.so. We truncate the hashes to avoid + ;; unnecessary store references to those compilers: + (substitute* "src/libhdf5.settings" + (("(/gnu/store/)([a-Z0-9]*)" all prefix hash) + (string-append prefix (string-take hash 10) "..."))) + #t)) (add-after 'install 'patch-references (lambda* (#:key inputs outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
05/07: gnu: Add fzy.
thomasd pushed a commit to branch master in repository guix. commit f3f82d1d1f3d6a320ae12c13176c49797fc64dc8 Author: Stefan ReichörDate: Thu Aug 24 22:14:51 2017 +0200 gnu: Add fzy. * gnu/packages/shellutils.scm (fzy): New variable. --- gnu/packages/shellutils.scm | 35 +++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 3ecc1ee..2d515ec 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 Christopher Baines +;;; Copyright © 2017 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -122,3 +123,37 @@ Before each prompt, direnv checks for the existence of a .envrc file in the current and parent directories. This file is then used to alter the environmental variables of the current shell.") (license expat))) + +(define-public fzy + (package +(name "fzy") +(version "0.9") +(source + (origin + (method url-fetch) + (uri (string-append "https://github.com/jhawthorn/fzy/archive/; + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 +(base32 + "1xfgxqbkcpi2n4381kj3fq4026qs6by7xhl5gn0fgp3dh232c63j" +(build-system gnu-build-system) +(arguments + '(#:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure +(home-page "https://github.com/jhawthorn/fzy;) +(synopsis "Fast fuzzy text selector for the terminal with an advanced +scoring algorithm") +(description + "Most other fuzzy matchers sort based on the length of a match. fzy tries +to find the result the user intended. It does this by favouring matches on +consecutive letters and starts of words. This allows matching using acronyms +or different parts of the path. + +fzy is designed to be used both as an editor plugin and on the command +line. Rather than clearing the screen, fzy displays its interface directly +below the current cursor position, scrolling the screen if necessary.") +(license expat)))
04/07: gnu: wine: Update to 2.0.2.
thomasd pushed a commit to branch master in repository guix. commit 9dd14f1e08b0a4cd73590495d8a853e8ddc027d5 Author: Rutger HellingDate: Wed Aug 23 13:43:14 2017 +0200 gnu: wine: Update to 2.0.2. * gnu/packages/wine.scm (wine): Update to 2.0.2. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 513b0eb..a1637b9 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -55,14 +55,14 @@ (define-public wine (package (name "wine") -(version "2.0.1") +(version "2.0.2") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/2.0; "/wine-" version ".tar.xz")) (sha256 (base32 -"10qm0xxqzvl4y3mhvaxcaacrcs8d5kdz5wf0gbxpmp36wnm4xyvc" +"16iwf48cfi39aqyy8131jz4x7lr551c9yc0mnks7g24j77sq867p" (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal)
branch master updated (b85a66b -> c93ffc1)
thomasd pushed a change to branch master in repository guix. from b85a66b gnu: dtach: Install man page. new 07e62ae gnu: Add python-pysocks. new 7a276cd gnu: Add python-pyaes. new 13035eb gnu: electrum: Update to 2.9.3. new 9dd14f1 gnu: wine: Update to 2.0.2. new f3f82d1 gnu: Add fzy. new e0fbf37 gnu: coda: Update to 2.18.2. new c93ffc1 gnu: kdevelop: Update to 5.1.2. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/finance.scm| 7 --- gnu/packages/kde.scm| 8 gnu/packages/maths.scm | 4 ++-- gnu/packages/python.scm | 44 gnu/packages/shellutils.scm | 35 +++ gnu/packages/wine.scm | 4 ++-- 6 files changed, 91 insertions(+), 11 deletions(-)
02/07: gnu: Add python-pyaes.
thomasd pushed a commit to branch master in repository guix. commit 7a276cd94501c7159a63625e7e9188a05b0709da Author: Carlo ZancanaroDate: Sun Aug 20 15:40:56 2017 +1000 gnu: Add python-pyaes. * gnu/packages/python.scm (python-pyaes, python2-pyaes): New variables. --- gnu/packages/python.scm | 22 ++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dfc1b00..e8018b4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -15987,3 +15987,25 @@ version of @code{SocksiPy} with bug fixes and extra features.") (define-public python2-pysocks (package-with-python2 python-pysocks)) + +(define-public python-pyaes + (package +(name "python-pyaes") +(version "1.6.0") +(source + (origin + (method url-fetch) + (uri (pypi-uri "pyaes" version)) + (sha256 +(base32 + "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw" +(build-system python-build-system) +(home-page "https://github.com/ricmoo/pyaes;) +(synopsis "Implementation of AES in Python") +(description "This package contains a pure-Python implementation of the +AES block cipher algorithm and the common modes of operation (CBC, CFB, CTR, +ECB and OFB).") +(license license:expat))) + +(define-public python2-pyaes + (package-with-python2 python-pyaes))
01/07: gnu: Add python-pysocks.
thomasd pushed a commit to branch master in repository guix. commit 07e62ae1c20977a622a6b623a8416ed1213d3113 Author: Carlo ZancanaroDate: Sun Aug 20 15:40:55 2017 +1000 gnu: Add python-pysocks. * gnu/packages/python.scm (python-pysocks, python2-pysocks): New variables. --- gnu/packages/python.scm | 22 ++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1ea2c42..dfc1b00 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -15965,3 +15965,25 @@ authentication for Flask routes.") (define-public python2-flask-httpauth (package-with-python2 python-flask-httpauth)) + +(define-public python-pysocks + (package +(name "python-pysocks") +(version "1.6.7") +(source + (origin + (method url-fetch) + (uri (pypi-uri "PySocks" version)) + (sha256 +(base32 + "1krkiss578zqwcg4c8iqz1hwscwhsvy2djp3xyvps5gsgvr2j0yh" +(build-system python-build-system) +(arguments `(#:tests? #f)) +(home-page "https://github.com/Anorov/PySocks;) +(synopsis "SOCKS client module") +(description "@code{pysocks} is an updated and semi-actively maintained +version of @code{SocksiPy} with bug fixes and extra features.") +(license license:bsd-3))) + +(define-public python2-pysocks + (package-with-python2 python-pysocks))
03/07: gnu: electrum: Update to 2.9.3.
thomasd pushed a commit to branch master in repository guix. commit 13035eb2de81d5a16b8146cac75b8ce8b93474ed Author: Carlo ZancanaroDate: Sun Aug 20 15:40:57 2017 +1000 gnu: electrum: Update to 2.9.3. * gnu/packages/finance.scm (electrum): Update to 2.9.3. [inputs]: Add python2-pyaes, python2-pysocks. Remove python2-slowaes. --- gnu/packages/finance.scm | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 748b59c..6d6844f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -246,7 +246,7 @@ do so.") (define-public electrum (package (name "electrum") -(version "2.7.12") +(version "2.9.3") (source (origin (method url-fetch) @@ -255,7 +255,7 @@ do so.") version ".tar.gz")) (sha256 (base32 - "0vxdfl208if7mdsnva1jg37bnay2dsz3ww157aqwcv1j6512fi1n")) + "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2")) (modules '((guix build utils))) (snippet '(begin @@ -264,7 +264,8 @@ do so.") #t (build-system python-build-system) (inputs - `(("python-slowaes" ,python2-slowaes) + `(("python-pyaes" ,python2-pyaes) + ("python-pysocks" ,python2-pysocks) ("python-sip" ,python2-sip) ("python-pyqt" ,python2-pyqt-4) ("python-ecdsa" ,python2-ecdsa)
06/07: gnu: coda: Update to 2.18.2.
thomasd pushed a commit to branch master in repository guix. commit e0fbf37350e5e993a47e93ddb8631d2fdf769849 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Aug 24 16:40:56 2017 +0200 gnu: coda: Update to 2.18.2. * gnu/packages/maths.scm (coda): Update to 2.18.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1c396a0..70c5a77 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -149,14 +149,14 @@ interactive dialogs to guide them.") (define-public coda (package (name "coda") -(version "2.18") +(version "2.18.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/stcorp/coda/releases/download/; version "/coda-" version ".tar.gz")) (sha256 -(base32 "11asla1ap8vd73farqjlpb179sfiy0biydcwxjfcakrp9sf8v9bs")) +(base32 "01fnqcby9jijvf3jxr1fk4bny059lvvq5wbqm7ns60ilykfdnm6a")) (patches (search-patches "coda-use-system-libs.patch")) (modules '((guix build utils))) (snippet
07/07: gnu: kdevelop: Update to 5.1.2.
thomasd pushed a commit to branch master in repository guix. commit c93ffc11d05cbffe77e5b6abc82b4a9e0e73847f Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Tue Aug 29 17:30:53 2017 +0200 gnu: kdevelop: Update to 5.1.2. * gnu/packages/kde.scm (kdevelop, kdevplatform): Update to 5.1.2. --- gnu/packages/kde.scm | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 2e46a3c..91a7b62 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -39,7 +39,7 @@ (define-public kdevelop (package (name "kdevelop") -(version "5.1.1") +(version "5.1.2") (source (origin (method url-fetch) @@ -48,7 +48,7 @@ version ".tar.xz")) (sha256 (base32 - "0m6pnmylp1gij5cr75waz8hjry5894qillj5977h467hnbzs808a" + "1iqaq0ilijjigqb34v5wq9in6bnjs0p9cmgbygjmy53xhh3yhm5g" (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -151,7 +151,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (define-public kdevplatform (package (name "kdevplatform") -(version "5.1.1") +(version "5.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kdevelop" @@ -159,7 +159,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") version ".tar.xz")) (sha256 (base32 -"09p7lvniw55g6x8v8wl3azlps8c13yx03x1m9cd3qdxi282l8n9i" +"0jk6g1kiqpyjy8pca0236b9944gxqnymqv8ny6m8nrraannxs8p6" (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)
01/01: gnu: libreoffice: Fix icons, enable liblangtag.
thomasd pushed a commit to branch master in repository guix. commit 17e56dac127013a3bacefcf9bcbe13d27ce08055 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Tue Aug 22 19:25:11 2017 +0200 gnu: libreoffice: Fix icons, enable liblangtag. * gnu/packages/libreoffice.scm (libreoffice) [inputs]: Add liblangtag. [arguments]: Correct icon names in .desktop files; copy desktop files & icons for libreoffice-math and libreoffice-startcenter; enable parallel build; enable liblangtag. --- gnu/packages/libreoffice.scm | 23 +-- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 16a8d25..cca222b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -837,6 +837,7 @@ and to return information on pronunciations, meanings and synonyms.") ("libetonyek" ,libetonyek) ("libexttextcat" ,libexttextcat) ("libfreehand" ,libfreehand) + ("liblangtag" ,liblangtag) ("libmspub" ,libmspub) ("libmwaw" ,libmwaw) ("libodfgen" ,libodfgen) @@ -919,15 +920,16 @@ and to return information on pronunciations, meanings and synonyms.") (substitute* (string-append out src) (("Exec=libreoffice[0-9]+\\.[0-9]+ ") (string-append "Exec=" out "/bin/libreoffice ")) - (("Icon=libreoffice[0-9]+\\.[0-9]+") -"Icon=libreoffice") + (("Icon=libreoffice.*") +(string-append "Icon=" app "\n")) (("LibreOffice [0-9]+\\.[0-9]+") "LibreOffice")) - (symlink-output src dst) - (install-file (string-append + (symlink-output src dst))) + (define (install-appdata app) + (install-file (string-append "sysui/desktop/appstream-appdata/" "libreoffice-" app ".appdata.xml") - (string-append out "/share/appdata" + (string-append out "/share/appdata"))) (symlink-output "/lib/libreoffice/program/soffice" "/bin/soffice") (symlink-output "/lib/libreoffice/program/soffice" @@ -940,16 +942,18 @@ and to return information on pronunciations, meanings and synonyms.") "workdir/CustomTarget/sysui/share/libreoffice/openoffice.org.xml" "/share/mime/packages/libreoffice.xml") (for-each install-desktop-file + '("base" "calc" "draw" "impress" "writer" + "math" "startcenter")) + (for-each install-appdata '("base" "calc" "draw" "impress" "writer")) - (mkdir-p (string-append out "/share/icons")) + (mkdir-p (string-append out "/share/icons/hicolor")) (copy-recursively "sysui/desktop/icons/hicolor" - (string-append out "/share/icons/"))) + (string-append out "/share/icons/hicolor"))) #t))) #:configure-flags (list "--enable-release-build" "--enable-verbose" - "--without-parallelism" ; otherwise the build fails "--disable-fetch-external" ; disable downloads "--with-system-libs" ; enable all --with-system-* flags (string-append "--with-boost-libdir=" @@ -969,8 +973,7 @@ and to return information on pronunciations, meanings and synonyms.") "--disable-firebird-sdbc" ; embedded firebird "--disable-gltf" "--without-doxygen" - "--disable-gtk3" - "--disable-liblangtag"))) + "--disable-gtk3"))) (home-page "https://www.libreoffice.org/;) (synopsis "Office suite") (description "LibreOffice is a comprehensive office suite. It contains
branch master updated (5cdb0cd -> 17e56da)
thomasd pushed a change to branch master in repository guix. from 5cdb0cd gnu: dovecot: Update to 2.2.32. new 17e56da gnu: libreoffice: Fix icons, enable liblangtag. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/libreoffice.scm | 23 +-- 1 file changed, 13 insertions(+), 10 deletions(-)
branch master updated (285e18e -> 1206c95)
thomasd pushed a change to branch master in repository guix. from 285e18e gnu: terminology: Update to 1.1.0. new 5c78db6 gnu: python-h5py: Update to 2.7.0. new 1206c95 gnu: python-netcdf4: Update to 1.2.9. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/python.scm | 8 1 file changed, 4 insertions(+), 4 deletions(-)
01/02: gnu: python-h5py: Update to 2.7.0.
thomasd pushed a commit to branch master in repository guix. commit 5c78db622238bc564ba343c18afd59afedeb2bd2 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Mon Aug 21 12:26:40 2017 +0200 gnu: python-h5py: Update to 2.7.0. * gnu/packages/python.scm (python-h5py): Update to 2.7.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bd490cf..b74e62b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -803,14 +803,14 @@ NetCDF files can also be read and modified. Python-HDF4 is a fork of (define-public python-h5py (package (name "python-h5py") -(version "2.6.0") +(version "2.7.0") (source (origin (method url-fetch) (uri (pypi-uri "h5py" version)) (sha256 (base32 -"0df46dg7i7xfking9lp221bfm8dbl974yvlrbi1w7r6m61ac7bxj" +"0433sdv6xc9p7v1xs1gvbxp7p152ywi3nplgjb258q9fvw9469br" (build-system python-build-system) (arguments `(#:tests? #f ; no test target
02/02: gnu: python-netcdf4: Update to 1.2.9.
thomasd pushed a commit to branch master in repository guix. commit 1206c95a4992d47c4309416906112c0d5293fb4c Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Mon Aug 21 13:26:47 2017 +0200 gnu: python-netcdf4: Update to 1.2.9. * gnu/packages/python.scm (python-netcdf4): Update to 1.2.9. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b74e62b..1b4d90b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -852,14 +852,14 @@ concepts.") (define-public python-netcdf4 (package (name "python-netcdf4") -(version "1.2.7") +(version "1.2.9") (source (origin (method url-fetch) (uri (pypi-uri "netCDF4" version)) (sha256 (base32 - "1fllizmnpw0zkzzm4j9pgamarlzfn3kmv9zrm0w65q1y31h9ni0c" + "1h6jq338amlbk0ilzvjyl7cck80i0bah9a5spn9in71vy2qxm7i5" (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython)))
01/01: gnu: libreoffice: Update to 5.3.5.2.
thomasd pushed a commit to branch master in repository guix. commit 7b87132f6e6f1ba03c820519b172a7174fdde964 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Sat Aug 19 22:43:51 2017 +0200 gnu: libreoffice: Update to 5.3.5.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 5.3.5.2. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index c27ddf0..16a8d25 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -789,7 +789,7 @@ and to return information on pronunciations, meanings and synonyms.") (define-public libreoffice (package (name "libreoffice") -(version "5.3.2.2") +(version "5.3.5.2") (source (origin (method url-fetch) @@ -798,7 +798,7 @@ and to return information on pronunciations, meanings and synonyms.") "http://download.documentfoundation.org/libreoffice/src/; (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1bcy1wx2cixawpd6cpivakwcwv8ryyy25kdw0fbci319p5gaj4c8" + "1sknmb9bhm8mxyfycqbwng1jqs4avyp1ffcla7dhlpwqs1aqxvx5" (build-system gnu-build-system) (native-inputs `(;; autoreconf is run by the LibreOffice build system, since after
branch master updated (af73566 -> 7b87132)
thomasd pushed a change to branch master in repository guix. from af73566 pack: Add "none" compressor. new 7b87132 gnu: libreoffice: Update to 5.3.5.2. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/02: gnu: freerdp: Revert to version 1.1.
thomasd pushed a commit to branch master in repository guix. commit cc81f1c3495e81cc738b486e1ef2b4a1dbe99e28 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Wed Aug 16 21:49:17 2017 +0200 gnu: freerdp: Revert to version 1.1. * gnu/packages/rdesktop.scm (freerdp) [version, source]: Revert to upstream branch 1.1. [inputs]: Use ffmpeg-2.8. * gnu/packages/gnome.scm (vinagre): Add patches required to build against freerdp branch 1.1. * gnu/packages/patches/vinagre-revert-1.patch, gnu/packages/patches/vinagre-revert-2.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk| 2 + gnu/packages/gnome.scm | 3 + gnu/packages/patches/vinagre-revert-1.patch | 56 gnu/packages/patches/vinagre-revert-2.patch | 448 gnu/packages/rdesktop.scm | 95 +++--- 5 files changed, 558 insertions(+), 46 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 5e4ef72..c37d4b2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1081,6 +1081,8 @@ dist_patch_DATA = \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ %D%/packages/patches/valgrind-enable-arm.patch \ + %D%/packages/patches/vinagre-revert-1.patch \ + %D%/packages/patches/vinagre-revert-2.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch\ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b362ba5..dab450a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2123,6 +2123,9 @@ selection and URL hints."))) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches ; We have to revert 2 commits to build against freerdp 1.1. + (search-patches "vinagre-revert-1.patch" + "vinagre-revert-2.patch")) (sha256 (base32 "10jya3jyrm18nbw3v410gbkc7677bqamax44pzgd3j15randn76d" diff --git a/gnu/packages/patches/vinagre-revert-1.patch b/gnu/packages/patches/vinagre-revert-1.patch new file mode 100644 index 000..5a98377 --- /dev/null +++ b/gnu/packages/patches/vinagre-revert-1.patch @@ -0,0 +1,56 @@ +Patch taken from Debian: revert changes that prevent building against freerdp +version 1.1 branch. + +From 8ebc0685b85e0d1f70eb00171f2e7712de3d44bd Mon Sep 17 00:00:00 2001 +From: Michael Biebl <bi...@debian.org> +Date: Thu, 22 Sep 2016 01:15:55 +0200 +Subject: [PATCH 1/2] Revert "Improve FreeRDP authentication failure handling" + +This reverts commit d7b4f88943e8615d252d27e1efc58cb64a9e1821. +--- + plugins/rdp/vinagre-rdp-tab.c | 10 ++ + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c +index b731f9b..8572bc3 100644 +--- a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c +@@ -1195,8 +1195,8 @@ open_freerdp (VinagreRdpTab *rdp_tab) + VinagreTab *tab = VINAGRE_TAB (rdp_tab); + GtkWindow*window = GTK_WINDOW (vinagre_tab_get_window (tab)); + gboolean success = TRUE; ++ gboolean authentication_error = FALSE; + gboolean cancelled = FALSE; +- guint authentication_errors = 0; + + priv->events = g_queue_new (); + +@@ -1205,12 +1205,14 @@ open_freerdp (VinagreRdpTab *rdp_tab) + + do + { ++ authentication_error = FALSE; ++ + /* Run FreeRDP session */ + success = freerdp_connect (priv->freerdp_session); + if (!success) + { +- authentication_errors += freerdp_get_last_error (priv->freerdp_session->context) == 0x20009 || +- freerdp_get_last_error (priv->freerdp_session->context) == 0x2000c; ++ authentication_error = freerdp_get_last_error (priv->freerdp_session->context) == 0x20009 || ++ freerdp_get_last_error (priv->freerdp_session->context) == 0x2000c; + + cancelled = freerdp_get_last_error (priv->freerdp_session->context) == 0x2000b; + +@@ -1218,7 +1220,7 @@ open_freerdp (VinagreRdpTab *rdp_tab) + init_freerdp (rdp_tab); + } + } +- while (!success && authentication_errors < 3); ++ while (!success && authentication_error); + + if (!success) + {
branch master updated (c5a856d -> 598b548)
thomasd pushed a change to branch master in repository guix. from c5a856d gnu: xf86-video-siliconmotion: Fix building on aarch64. new cc81f1c gnu: freerdp: Revert to version 1.1. new 598b548 gnu: freerdp: Update inputs. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk| 2 + gnu/packages/gnome.scm | 3 + gnu/packages/patches/vinagre-revert-1.patch | 56 gnu/packages/patches/vinagre-revert-2.patch | 448 gnu/packages/rdesktop.scm | 108 --- 5 files changed, 571 insertions(+), 46 deletions(-) create mode 100644 gnu/packages/patches/vinagre-revert-1.patch create mode 100644 gnu/packages/patches/vinagre-revert-2.patch
02/02: gnu: freerdp: Update inputs.
thomasd pushed a commit to branch master in repository guix. commit 598b5481a462509638004728122a42cc9e3ac502 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Fri Aug 18 12:36:19 2017 +0200 gnu: freerdp: Update inputs. * gnu/packages/rdesktop.scm (freerdp) [native-inputs]: Add libxslt, libxml2 and docbook-xsl. [inputs]: Add libjpeg, remove gstreamer, gst-plugins-base, libxml2 and libxslt. [arguments]: Enable features JPEG and SSE2 (on x86_64), and set up docbook-xsl. --- gnu/packages/rdesktop.scm | 27 --- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 7c2b891..65d17de 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -26,7 +26,9 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages compression) #:use-module (gnu packages cups) + #:use-module (gnu packages docbook) #:use-module (gnu packages gstreamer) + #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) @@ -86,6 +88,9 @@ to remotely control a user's Windows desktop.") (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) + ("libxslt" ,libxslt) + ("libxml2" ,libxml2) + ("docbook-xsl" ,docbook-xsl) ("xmlto" ,xmlto))) (inputs `(("libx11" ,libx11) @@ -98,21 +103,29 @@ to remotely control a user's Windows desktop.") ("libxrender" ,libxrender) ("libxinerama" ,libxinerama) ("libxshmfence" ,libxshmfence) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) ("cups" ,cups) ("ffmpeg" ,ffmpeg-2.8) + ("libjpeg" ,libjpeg) ("pulseaudio" ,pulseaudio) ("alsa-lib" ,alsa-lib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) ("zlib" ,zlib) ("openssl" ,openssl))) (arguments `(#:configure-flags - '("-DCMAKE_INSTALL_LIBDIR=lib" - "-DWITH_PULSE=ON" - "-DWITH_CUPS=ON") + (list "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_BUILD_TYPE=RELEASE" + "-DWITH_JPEG=ON" + ,@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + '("-DWITH_SSE2=ON") + '()) + (string-append "-DDOCBOOKXSL_DIR=" + (assoc-ref %build-inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl)) + "-DWITH_PULSE=ON" + "-DWITH_CUPS=ON") #:tests? #f)) ; no 'test' target (home-page "https://www.freerdp.com;) (synopsis "Remote Desktop Protocol implementation")
branch master updated (ced2d2b -> 33485fa)
thomasd pushed a change to branch master in repository guix. from ced2d2b gnu: libvirt: Update to 3.6.0. new 0abf526 gnu: hdf4: Update to 4.12.13. new a70b03d gnu: Add python-grako new 33485fa gnu: eyed3: Update to 0.8, build with python3. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/maths.scm | 5 ++--- gnu/packages/mp3.scm| 13 ++--- gnu/packages/python.scm | 28 3 files changed, 36 insertions(+), 10 deletions(-)
03/03: gnu: eyed3: Update to 0.8, build with python3.
thomasd pushed a commit to branch master in repository guix. commit 33485fa91316556ccc91314fab0477d3337c9d07 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Thu Jul 27 16:47:53 2017 +0200 gnu: eyed3: Update to 0.8, build with python3. * gnu/packages/mp3.scm (eyed3): [source] Update to 0.8. [arguments]: Disable tests; don't use python-2. [propagated-inputs]: Add python-six and python-grako. [native-inputs]: Remove. --- gnu/packages/mp3.scm | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 789e596..37885c9 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -462,7 +462,7 @@ compression format (.mpc files).") (define-public eyed3 (package (name "eyed3") -(version "0.7.10") +(version "0.8") (source (origin (method url-fetch) (uri (string-append @@ -470,14 +470,13 @@ compression format (.mpc files).") version ".tar.gz")) (sha256 (base32 - "0wjicszs64ksj2y5jbk09yjd08znc1qnarlq8ssmx13f2d4x59wq" + "1dcswb0f6w3b05s1v43pq8fmavkd5g88ysndn9160wlaa1v9n40h" (build-system python-build-system) (arguments - `(#:python ,python-2)) -(native-inputs - `(("python2-nose" ,python2-nose) - ("python2-sphinx" ,python2-sphinx) - ("python2-coverage" ,python2-coverage))) + `(#:tests? #f)) ; the required test data contains copyrighted material. +(propagated-inputs + `(("python-six" ,python-six) + ("python-grako" ,python-grako))) (synopsis "MP3 tag ID3 metadata editor") (description "eyeD3 is a Python tool for working with audio files, specifically mp3 files containing ID3 metadata (i.e. song info). It provides a
01/03: gnu: hdf4: Update to 4.12.13.
thomasd pushed a commit to branch master in repository guix. commit 0abf52642043f5ed4b1a9ce51026f7e9bad2f428 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Tue Aug 1 10:26:39 2017 +0200 gnu: hdf4: Update to 4.12.13. * gnu/packages/maths.scm (hdf4): Update to 4.12.13. --- gnu/packages/maths.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6566d75..1761f02 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -561,18 +561,17 @@ computations.") (define-public hdf4 (package (name "hdf4") -(version "4.2.12") +(version "4.2.13") (source (origin (method url-fetch) (uri (string-append "https://support.hdfgroup.org/ftp/HDF/releases/HDF; version "/src/hdf-" version ".tar.bz2")) (sha256 -(base32 "020jh563sjyxsgml8l809d2i1d4ms9shivwj3gbm7n0ilxbll8id")) +(base32 "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm")) (patches (search-patches "hdf4-architectures.patch" "hdf4-reproducibility.patch" "hdf4-shared-fortran.patch" - (build-system gnu-build-system) (native-inputs `(("gfortran" ,gfortran)
02/03: gnu: Add python-grako
thomasd pushed a commit to branch master in repository guix. commit a70b03d413b196dbce4747f9f039ebf28d1c568a Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Thu Jul 27 16:45:19 2017 +0200 gnu: Add python-grako * gnu/packages/python.scm (python-grako): New variable. --- gnu/packages/python.scm | 28 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 21e32c3..cf77abd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5168,6 +5168,34 @@ Python language binding specification.") (define-public python2-drmaa (package-with-python2 python-drmaa)) +(define-public python-grako + (package +(name "python-grako") +(version "3.99.9") +(source + (origin + (method url-fetch) + (uri +(pypi-uri "grako" version ".zip")) + (sha256 +(base32 + "0r63i68wcnv63rfjkasq1ah81frz61a6mzbcnaxhrkdpx84p7hzw" +(build-system python-build-system) +(arguments '(#:tests? #f)) ; Test file 'grako.ebnf' is missing from archive. +(native-inputs + `(("unzip" ,unzip) + ("python-pytest" ,python-pytest-3.0) + ("python-pytest-runner" ,python-pytest-runner))) +(home-page "https://bitbucket.org/neogeny/grako;) +(synopsis "EBNF parser generator") +(description + "Grako takes a grammar in a variation of EBNF as input, and outputs a +memoizing PEG/Packrat parser in Python.") +(license license:bsd-3))) + +(define-public python2-grako + (package-with-python2 python-grako)) + (define-public python-gridmap (package (name "python-gridmap")
branch master updated (a1714ff -> 2da6306)
thomasd pushed a change to branch master in repository guix. from a1714ff gnu: Add pass-git-helper. new 2da6306 gnu: hdf5: Update to 1.8.19. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/maths.scm | 9 + 1 file changed, 5 insertions(+), 4 deletions(-)
01/01: gnu: hdf5: Update to 1.8.19.
thomasd pushed a commit to branch master in repository guix. commit 2da63064271b5b7af24d619ba147c7dabaea15ef Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Mon Jun 19 09:57:32 2017 +0200 gnu: hdf5: Update to 1.8.19. * gnu/packages/maths.scm (hdf5): Update to 1.8.19. [source]: Update uri. --- gnu/packages/maths.scm | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1115cef..9bdb068 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -608,12 +608,13 @@ incompatible with HDF5.") (define-public hdf5 (package (name "hdf5") -(version "1.8.18") +(version "1.8.19") (source (origin (method url-fetch) - (uri (list (string-append "http://www.hdfgroup.org/ftp/HDF5/releases/; -"hdf5-" version "/src/hdf5-" + (uri (list (string-append "https://support.hdfgroup.org/ftp/HDF5/releases/; +"hdf5-" (version-major+minor version) +"/hdf5-" version "/src/hdf5-" version ".tar.bz2") (string-append "https://support.hdfgroup.org/ftp/HDF5/; "current" @@ -621,7 +622,7 @@ incompatible with HDF5.") (take (string-split version #\.) 2)) "/src/hdf5-" version ".tar.bz2"))) (sha256 - (base32 "13542vrnl1p35n8vbq0wzk40vddmm33q5nh04j98c7r1yjnxxih1")) + (base32 "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r")) (patches (list (search-patch "hdf5-config-date.patch") (build-system gnu-build-system) (inputs
01/01: gnu: Add tmuxifier.
thomasd pushed a commit to branch master in repository guix. commit 6c8b802f9c8ef3beb41d468eec8d2a2948efdb9c Author: Stefan Reichoer <ste...@xsteve.at> Date: Fri Jun 16 21:30:24 2017 +0200 gnu: Add tmuxifier. * gnu/packages/tmux.scm (tmuxifier): New variable. Signed-off-by: Thomas Danckaert <p...@thomasdanckaert.be> --- gnu/packages/tmux.scm | 46 ++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 5b92df8..0ffc3b9 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2016 Matthew Jordan <matthewjordandev...@yandex.com> ;;; Copyright © 2017 Vasile Dumitrascu <va5...@yahoo.com> +;;; Copyright © 2017 Stefan Reichör <ste...@xsteve.at> ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,3 +90,48 @@ continue running in the background, then later reattached.") (description "A collection of various themes for Tmux.") (license (non-copyleft "http://www.wtfpl.net/txt/copying/;) + +(define-public tmuxifier + (package +(name "tmuxifier") +(version "0.13.0") +(source (origin + (method url-fetch) + (uri (string-append +"https://github.com/jimeh/tmuxifier/archive/v; +version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1j9fj6zg0j3sdn7svpybzsqh7876rv81zi437976kj7hxnyjkcz7" +(build-system gnu-build-system) +(arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install +(lambda* (#:key outputs #:allow-other-keys) + (let* ((out(assoc-ref %outputs "out")) + (bindir (string-append out "/bin")) + (share (string-append out "/share/" ,name))) +(install-file "bin/tmuxifier" bindir) +(substitute* (string-append bindir "/tmuxifier") + (("set -e") + (string-append "TMUXIFIER=" share "\nset -e"))) +(for-each (lambda (init-script) +(install-file init-script (string-append + share "/init"))) + '("init.sh" "init.tcsh" "init.fish")) +(for-each (lambda (dir) +(copy-recursively dir (string-append + share "/" dir))) + '("completion" "lib" "libexec" +"templates" +(home-page "https://github.com/jimeh/tmuxifier;) +(synopsis "Powerful session, window & pane management for Tmux") +(description "Tmuxifier allows you to easily create, edit, and load +@code{layout} files, which are simple shell scripts where you use the tmux +command and helper commands provided by tmuxifier to manage Tmux sessions and +windows.") +(license expat)))
branch master updated (26bbdab -> 6c8b802)
thomasd pushed a change to branch master in repository guix. from 26bbdab gnu: r-devtools: Update to 1.13.2. new 6c8b802 gnu: Add tmuxifier. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/tmux.scm | 46 ++ 1 file changed, 46 insertions(+)
branch master updated (07bf692 -> c84384c)
thomasd pushed a change to branch master in repository guix. from 07bf692 gnu: gemma: Fix indentation. new c84384c gnu: kdevelop: Update to 5.1.1. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/kde.scm | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-)
01/01: gnu: kdevelop: Update to 5.1.1.
thomasd pushed a commit to branch master in repository guix. commit c84384cb7cef061f19d0e5aa1b2c543d048b95da Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Wed Jun 14 17:46:36 2017 +0200 gnu: kdevelop: Update to 5.1.1. * gnu/packages/kde.scm (kdevelop): Update to 5.1.1. [arguments]: Set QT_QPA_PLATFORM_PLUGIN_PATH during the wrap-executable phase. (kdevplatform): Update to 5.1.1. --- gnu/packages/kde.scm | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a5ad8da..0a41614 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -39,7 +39,7 @@ (define-public kdevelop (package (name "kdevelop") -(version "5.1.0") +(version "5.1.1") (source (origin (method url-fetch) @@ -48,7 +48,7 @@ version ".tar.xz")) (sha256 (base32 - "1s4cbkx2a0p73b52yxmf5dhv08xk9pxgrkjsnbzy76ssfr545g60" + "0m6pnmylp1gij5cr75waz8hjry5894qillj5977h467hnbzs808a" (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -100,6 +100,7 @@ (kio (assoc-ref inputs "kio")) (kcmutils (assoc-ref inputs "kcmutils")) (qtquickcontrols (assoc-ref inputs "qtquickcontrols")) +(qtbase (assoc-ref inputs "qtbase")) (qtdeclarative (assoc-ref inputs "qtdeclarative")) (profile "$HOME/.guix-profile") (qml "/qml")) @@ -107,6 +108,8 @@ `("XDG_DATA_DIRS" ":" prefix ,(map (lambda (s) (string-append s "/share")) (list profile out kdevplatform kcmutils))) + `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = + (,(string-append qtbase "/plugins/platforms"))) `("QT_PLUGIN_PATH" ":" prefix ,(map (lambda (s) (string-append s "/lib/plugins")) (list profile out kdevplatform kio))) @@ -148,7 +151,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (define-public kdevplatform (package (name "kdevplatform") -(version "5.1.0") +(version "5.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kdevelop" @@ -156,7 +159,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") version ".tar.xz")) (sha256 (base32 -"1nxf66vk6p7lmckdsha9fpq3zchwbg79qhy49f4hndlxgj03p7zh" +"09p7lvniw55g6x8v8wl3azlps8c13yx03x1m9cd3qdxi282l8n9i" (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)
02/07: gnu: Add dvd+rw-tools.
thomasd pushed a commit to branch master in repository guix. commit 76e98457347207459417f46c2f542b6a9f03fb7f Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Apr 20 17:58:24 2017 +0200 gnu: Add dvd+rw-tools. * gnu/packages/cdrom.scm (dvd+rw-tools): New variable. * gnu/packages/patches/dvd+rw-tools-add-include.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/cdrom.scm | 43 ++ .../patches/dvd+rw-tools-add-include.patch | 14 +++ 3 files changed, 58 insertions(+) diff --git a/gnu/local.mk b/gnu/local.mk index 33e1c77..e7c6707 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -552,6 +552,7 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch\ %D%/packages/patches/doxygen-test.patch \ + %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-disable-failing-tests.patch \ %D%/packages/patches/einstein-build.patch\ diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index c0ba337..759375e 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Alex Kost <alez...@gmail.com> ;;; Copyright © 2016 Marius Bakke <mba...@fastmail.com> ;;; Copyright © 2017 John Darrington <j...@gnu.org> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages glib) #:use-module (gnu packages man) + #:use-module (gnu packages m4) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages elf) @@ -254,6 +256,47 @@ images.") ;; mkisofs is GPL, the other programs are CDDL. (license (list cddl1.0 gpl2 +(define-public dvd+rw-tools + (package +(name "dvd+rw-tools") +(version "7.1") +(source (origin + (method url-fetch) + (uri (string-append + "http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-; +version ".tar.gz")) + (sha256 + (base32 +"1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq")) + (patches (search-patches "dvd+rw-tools-add-include.patch" +(build-system gnu-build-system) +(inputs + `(("cdrtools" ,cdrtools))) +(native-inputs + `(("m4" ,m4))) +(arguments + `(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ (setenv "prefix" (assoc-ref %outputs "out")) #t)) + (add-before 'build 'embed-mkisofs + (lambda* (#:key inputs #:allow-other-keys) + ;; We use sed --in-place because substitute* cannot handle the + ;; character encoding used by growisofs.c. + (zero? (system* "sed" "-i" "-e" + (string-append + "s,\"mkisofs\"," + "\"" (which "mkisofs") "\",") + "growisofs.c"))) +(home-page "http://fy.chalmers.se/~appro/linux/DVD+RW/;) +(synopsis "DVD and Blu-ray Disc burning tools") +(description "dvd+rw-tools, mostly known for its command +@command{growisofs}, is a collection of DVD and Blu-ray Disc burning tools. +It requires another program, such as @command{mkisofs}, @command{genisoimage}, +or @command{xorrisofs} to create ISO 9660 images.") +(license gpl2))) + (define-public dvdisaster (package (name "dvdisaster") diff --git a/gnu/packages/patches/dvd+rw-tools-add-include.patch b/gnu/packages/patches/dvd+rw-tools-add-include.patch new file mode 100644 index 000..800f8f3 --- /dev/null +++ b/gnu/packages/patches/dvd+rw-tools-add-include.patch @@ -0,0 +1,14 @@ +Without , INT_MAX is not defined. + +diff --git a/transport.hxx b/transport.hxx +index 35a57a7..838add6 100644 +--- a/transport.hxx b/transport.hxx +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include
04/07: gnu: Add dvdauthor.
thomasd pushed a commit to branch master in repository guix. commit b5b20bda17acfce8802e067f1ca015c65f4d3cf8 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Apr 20 18:15:03 2017 +0200 gnu: Add dvdauthor. * gnu/packages/video.scm (dvdauthor): New variable. --- gnu/packages/video.scm | 29 + 1 file changed, 29 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e7af81e..dde4041 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2017 Feng Shu <tuma...@163.com> ;;; Copyright © 2017 Tobias Geerinckx-Rice <m...@tobias.gr> ;;; Copyright © 2017 Chris Marusich <cmmarus...@gmail.com> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,6 +76,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages m4) @@ -1193,6 +1195,33 @@ authentication and descrambling (if an external libdvdcss library is installed).") (license license:gpl2+))) +(define-public dvdauthor + (package +(name "dvdauthor") +(version "0.7.2") +(source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/dvdauthor/dvdauthor-" + version ".tar.gz")) + (sha256 +(base32 + "1drfc47hikfzc9d7hjk34rw10iqw01d2vwmn91pv73ppx4nsj81h" +(build-system gnu-build-system) +(inputs + `(("libdvdread" ,libdvdread) + ("libpng" ,libpng) + ("imagemagick" ,imagemagick) + ("libxml2" ,libxml2) + ("freetype" ,freetype))) +(native-inputs + `(("pkg-config" ,pkg-config))) +(synopsis "Generates a DVD-Video movie from a MPEG-2 stream") +(description "@command{dvdauthor} will generate a DVD-Video movie from a +MPEG-2 stream containing VOB packets.") +(home-page "http://dvdauthor.sourceforge.net;) +(license license:gpl3+))) + (define-public libdvdnav (package (name "libdvdnav")
branch master updated (28a1041 -> 52cb22c)
thomasd pushed a change to branch master in repository guix. from 28a1041 gnu: Add guile-miniadapton. new ded5966 gnu: Add cdrtools. new 76e9845 gnu: Add dvd+rw-tools. new ce426de gnu: brasero: Embed growisofs store item. new b5b20bd gnu: Add dvdauthor. new 1d5b3f4 gnu: Add wxwidgets-3.1. new a689185 gnu: Add wxsvg. new 52cb22c gnu: Add dvdstyler. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 2 + gnu/packages/cdrom.scm | 175 ++- gnu/packages/gnome.scm | 12 +- .../patches/cdrtools-3.01-mkisofs-isoinfo.patch| 514 + .../patches/dvd+rw-tools-add-include.patch | 14 + gnu/packages/video.scm | 29 ++ gnu/packages/wxwidgets.scm | 55 +++ 7 files changed, 798 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch create mode 100644 gnu/packages/patches/dvd+rw-tools-add-include.patch
01/07: gnu: Add cdrtools.
thomasd pushed a commit to branch master in repository guix. commit ded5966585cc75da53ad7bfb266f9b861aa71ed3 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Fri Apr 21 15:54:20 2017 +0200 gnu: Add cdrtools. * gnu/packages/cdrom.scm (cdrtools): New variable. * gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/cdrom.scm | 59 ++- .../patches/cdrtools-3.01-mkisofs-isoinfo.patch| 514 + 3 files changed, 573 insertions(+), 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index 0d8daf7..33e1c77 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -517,6 +517,7 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-drop-unrar.patch\ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ + %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch\ %D%/packages/patches/ceph-disable-unittest-throttle.patch\ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 7e86753..c0ba337 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -26,7 +26,7 @@ (define-module (gnu packages cdrom) #:use-module (guix download) #:use-module (guix packages) - #:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+)) + #:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+ cddl1.0)) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) @@ -197,6 +197,63 @@ extra-robust data verification, synchronization, error handling and scratch reconstruction capability.") (license gpl2))) ; libraries under lgpl2.1 +(define-public cdrtools + (package +(name "cdrtools") +(version "3.01") +(source (origin + (method url-fetch) + (uri (string-append +"mirror://sourceforge/cdrtools/cdrtools-" version ".tar.bz2")) + (sha256 + (base32 +"03w6ypsmwwy4d7vh6zgwpc60v541vc5ywp8bdb758hbc4yv2wa7d")) + (patches (search-patches "cdrtools-3.01-mkisofs-isoinfo.patch" +(build-system gnu-build-system) +;; XXX cdrtools bundles a modified, relicensed early version of cdparanoia. +(inputs + `(("linux-headers" ,linux-libre-headers))) +(arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-linux-headers + (lambda _ + (substitute* "autoconf/configure" + (("/usr/src/linux") +(assoc-ref %build-inputs "linux-headers"))) + #t)) + (add-before 'build 'substitute-dirs + (lambda _ + (substitute* (append (find-files "DEFAULTS" "^Defaults\\.") + (find-files "DEFAULTS_ENG" "^Defaults\\.") + (find-files "TEMPLATES" "^Defaults\\.")) + (("/opt/schily") (assoc-ref %outputs "out"))) + #t)) + (replace 'build + (lambda _ + (zero? + (system* "make" "CONFIG_SHELL=sh" "CCOM=gcc" "RM=rm" + (replace 'install + (lambda _ + (zero? + (system* "make" + "RM=rm" "LN=ln" "SYMLINK=ln -s" + (string-append "INS_BASE=" (assoc-ref %outputs "out")) + (string-append "INS_RBASE=" (assoc-ref %outputs "out")) + "install" ) + #:tests? #f)) ; no tests + (synopsis "Command line utilities to manipulate and burn CD/DVD/BD images") + (description "cdrtools is a collection of command line utilities to create +CD's, DVD's or Blue Ray discs. The most important components are +@command{cdrecord}, a burning program, @command{cdda2wav}, a CD audio ripper +which uses libparanoia, and @command{mkisofs}, which can create various disc +images.") + (home-page "http://cdrtools.sourceforge.net/private/cdrecord.html;) + + ;; mkisofs is GPL, the other programs are CDDL. + (license (list cddl1.0 gpl2 + (define-public dvdisaster (package (name "dvdisaster") diff --git a/gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch b/gnu/pa
06/07: gnu: Add wxsvg.
thomasd pushed a commit to branch master in repository guix. commit a689185df3f6dea13d603874c070c944f4ad862d Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Apr 20 18:40:25 2017 +0200 gnu: Add wxsvg. * gnu/packages/wxwidgets.scm (wxsvg): New variable. --- gnu/packages/wxwidgets.scm | 32 1 file changed, 32 insertions(+) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index cf4329a..5610a0f 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -37,6 +37,8 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages photo) + #:use-module (gnu packages video) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages sdl) @@ -195,3 +197,33 @@ and many other languages.") (description "@code{wxpython} provides Python 2 bindings for wxWidgets.") (home-page "http://wxpython.org/;) (license (package-license wxwidgets + +(define-public wxsvg + (package +(name "wxsvg") +(version "1.5.11") +(source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/wxsvg/wxsvg/" +version "/wxsvg-" version ".tar.bz2")) + (sha256 +(base32 + "0m3ff8mjiq4hvy8rmxyc9fkpf24xwxhvr3a6jmvr2q5zc41xhz7x" +(build-system glib-or-gtk-build-system) +(inputs + `(("wxwidgets" ,wxwidgets-3.1) + ("cairo" ,cairo) + ("pango" ,pango) + ("libexif" ,libexif) + ("ffmpeg" ,ffmpeg))) +(native-inputs + `(("pkg-config" ,pkg-config))) +(synopsis "C++ library to create, manipulate and render SVG files") +(description "wxSVG is a C++ library to create, manipulate and render +@dfn{Scalable Vector Graphics} (SVG) files with the wxWidgets toolkit.") +(home-page "http://wxsvg.sourceforge.net;) + +;; wxSVG is licenced under the "wxWindows library licence", which is +;; the LGPL2.0+, with a few extra permissions. +(license (list l:lgpl2.0+ (l:fsf-free "file://COPYING")
05/07: gnu: Add wxwidgets-3.1.
thomasd pushed a commit to branch master in repository guix. commit 1d5b3f432efa59ea7604380ca3fd0f8771ae3ecf Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Apr 20 18:33:07 2017 +0200 gnu: Add wxwidgets-3.1. * gnu/packages/wxwidgets.scm (wxwidgets-3.1): New variable. --- gnu/packages/wxwidgets.scm | 23 +++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 329920d..cf4329a 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Danny Milosavljevic <dan...@scratchpost.org> ;;; Copyright © 2017 Rene Saavedra <ren...@openmailbox.org> ;;; Copyright © 2017 Efraim Flashner <efr...@flashner.co.il> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) #:use-module (guix build utils) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages databases) @@ -102,6 +104,27 @@ and many other languages.") (package-inputs wxwidgets (name "wxwidgets-gtk2"))) +;; Development version of wxWidgets, required to build against gstreamer-1.x. +;; This can be removed when wxWidgets is updated to the next stable version. +(define-public wxwidgets-3.1 + (package (inherit wxwidgets) + (version "3.1.0") + (source +(origin + (method url-fetch) + (uri (string-append "https://github.com/wxWidgets/wxWidgets/archive/v; + version ".tar.gz")) + (file-name (string-append "wxwidgets-" version ".tar.gz")) + (sha256 + (base32 "1yan5ysjwh6a7xw82sfjd1xn0nsy1dn2s0cx9ac7cw19191blc3y" + (inputs `(("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ,@(package-inputs wxwidgets))) + (arguments +(substitute-keyword-arguments (package-arguments wxwidgets) + ((#:configure-flags flags) + `(cons "--enable-mediactrl" ,flags)) + (define-public python2-wxpython (package (name "python2-wxpython")
03/07: gnu: brasero: Embed growisofs store item.
thomasd pushed a commit to branch master in repository guix. commit ce426deb8a4b6132919200ea956f10c4269c9550 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Tue Apr 25 18:01:40 2017 +0200 gnu: brasero: Embed growisofs store item. * gnu/packages/gnome.scm (brasero)[arguments]: Add phase 'embed-growisofs. [inputs]: Add dvd+rw-tools. --- gnu/packages/gnome.scm | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ef67961..cec8bae 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -150,7 +150,14 @@ "/share/gir-1.0") (string-append "--with-typelibdir=" (assoc-ref %outputs "out") - "/lib/girepository-1.0" + "/lib/girepository-1.0")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'embed-growisofs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "plugins/growisofs/burn-growisofs.c" + (("\"growisofs") (string-append "\"" (which "growisofs" + #t ) (propagated-inputs `(("hicolor-icon-theme" ,hicolor-icon-theme))) (native-inputs @@ -159,7 +166,8 @@ ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (inputs - `(("glib" ,glib) + `(("dvd+rw-tools" ,dvd+rw-tools) + ("glib" ,glib) ("gnome-doc-utils" ,gnome-doc-utils) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base)
07/07: gnu: Add dvdstyler.
thomasd pushed a commit to branch master in repository guix. commit 52cb22cd5a352c2193189401f3bed5ef1d5de026 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Apr 20 18:53:22 2017 +0200 gnu: Add dvdstyler. * gnu/packages/cdrom.scm (dvdstyler): New variable. --- gnu/packages/cdrom.scm | 73 ++ 1 file changed, 73 insertions(+) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 759375e..15329b3 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -37,8 +37,12 @@ #:use-module (gnu packages audio) #:use-module (gnu packages bison) #:use-module (gnu packages compression) + #:use-module (gnu packages zip) #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) + #:use-module (gnu packages docbook) + #:use-module (gnu packages xml) #:use-module (gnu packages gtk) #:use-module (gnu packages glib) #:use-module (gnu packages man) @@ -46,11 +50,16 @@ #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages elf) + #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) #:use-module (gnu packages base) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages image) + #:use-module (gnu packages photo) + #:use-module (gnu packages video) #:use-module (gnu packages wget) #:use-module (gnu packages xiph)) @@ -338,6 +347,70 @@ depend on the file system of the medium. The maximum error correction capacity is user-selectable.") (license gpl2+))) +(define-public dvdstyler + (package +(name "dvdstyler") +(version "3.0.3") +(source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/dvdstyler/dvdstyler/" +version "/DVDStyler-" version ".tar.bz2")) + (sha256 +(base32 + "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q" +(build-system gnu-build-system) +(arguments + `(#:configure-flags (list (string-append "XMLTO=" + (assoc-ref %build-inputs "xmlto") + "/bin/xmlto" + " --searchpath " + (assoc-ref %build-inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.1/htmlhelp:" + (assoc-ref %build-inputs "docbook-xml") + "/xml/dtd/docbook")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") "/bin/dvdstyler") + `("PATH" ":" prefix + (,(string-join +(map (lambda (in) (string-append (assoc-ref inputs in) "/bin")) + '("cdrtools" "dvdauthor" "dvd+rw-tools" "ffmpeg")) +":" + #t))) + #:tests? #f)) ; No tests. +(inputs ; TODO package bundled wxvillalib + `(("wxwidgets" ,wxwidgets-3.1) + ("wssvg" ,wxsvg) + ("dbus" ,dbus) + ("cdrtools" ,cdrtools) + ("dvd+rw-tools" ,dvd+rw-tools) + ("dvdauthor" ,dvdauthor) + ("eudev" ,eudev) + ("fontconfig" ,fontconfig) + ("libexif" ,libexif) + ("libjpeg" ,libjpeg) + ("ffmpeg" ,ffmpeg))) +(native-inputs + `(("pkg-config" ,pkg-config) + ("flex" ,flex) + ("python" ,python-2) + ("xmlto" ,xmlto) + ("gettext" ,gnu-gettext) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("zip" ,zip))) +(synopsis "DVD authoring application") +(description "DVDStyler is a DVD authoring application which allows users +to burn video files in many formats to DVD discs, complete with individually +designed menus. It can be used to create professional-looking DVD's with +custom buttons, backgrounds and animations, from within a user-friendly +graphical interface.") +(home-page "https://www.dvdstyler.org;) +(license gpl2))) + (define-public libcue (package (name "libcue")
branch master updated (06be316 -> 300200b)
thomasd pushed a change to branch master in repository guix. from 06be316 gnu: jemalloc: Disable transparent huge pages on non-Intel systems. new 300200b gnu: Add netcdf-fortran. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/maths.scm | 24 1 file changed, 24 insertions(+)
01/01: gnu: Add netcdf-fortran.
thomasd pushed a commit to branch master in repository guix. commit 300200b6370c3ab506df202853602dccb7368b6c Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Apr 27 17:06:53 2017 +0200 gnu: Add netcdf-fortran. * gnu/packages/maths.scm (netcdf-fortran): New variable. --- gnu/packages/maths.scm | 24 1 file changed, 24 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0a11da9..4e70bd8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -850,6 +850,30 @@ sharing of scientific data.") "--disable-shared" "--with-pic" ,flags)) +(define-public netcdf-fortran + (package +(name "netcdf-fortran") +(version "4.4.4") +(source (origin + (method url-fetch) + (uri (string-append +"ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-fortran-; +version ".tar.gz")) + (sha256 + (base32 +"0xaxdcg1p83zmypwml3swsnr3ccn38inwldyr1l3wa4dbwbrblxj" +(build-system gnu-build-system) +(arguments + `(#:parallel-tests? #f)) +(inputs + `(("netcdf" ,netcdf))) +(native-inputs + `(("gfortran" ,gfortran))) +(synopsis "Fortran interface for the netCDF library") +(description (package-description netcdf)) +(home-page (package-home-page netcdf)) +(license (package-license netcdf + (define-public nlopt (package (name "nlopt")
01/01: gnu: duplicity: Update to 0.7.12.
thomasd pushed a commit to branch master in repository guix. commit b8ebbefee2e2e2a8312f66cc2c5602510565e939 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Tue Apr 25 12:14:41 2017 +0200 gnu: duplicity: Update to 0.7.12. * gnu/packages/backup.scm (duplicity): Update to 0.7.12. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 74245e5..f9c0a22 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -55,7 +55,7 @@ (define-public duplicity (package (name "duplicity") -(version "0.7.11") +(version "0.7.12") (source (origin (method url-fetch) @@ -65,7 +65,7 @@ version ".tar.gz")) (sha256 (base32 -"01zcq9cwn4pvj68rihgjvcdgccnxvz4jrba38sbv6nqz19cs2ixh" +"1rhgrz2lm9vbfdp2raykrih1c6n2lw5jd572z4dsz488m52avjqi" (build-system python-build-system) (native-inputs `(("util-linux" ,util-linux) ;setsid command, for the tests
branch master updated (b5f57f6 -> b8ebbef)
thomasd pushed a change to branch master in repository guix. from b5f57f6 Update name on email address for Mathieu Othacehe. new b8ebbef gnu: duplicity: Update to 0.7.12. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: kdevelop: Update to 5.1.0.
thomasd pushed a commit to branch master in repository guix. commit 52b2d666ca853f36068d5924b4a516af9f9c6d14 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Mon Apr 3 15:18:31 2017 +0200 gnu: kdevelop: Update to 5.1.0. * gnu/packages/kde.scm (kdevelop, kdevplatform): Update to 5.1.0. --- gnu/packages/kde.scm | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 03cfd0e..9d85070 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -39,7 +39,7 @@ (define-public kdevelop (package (name "kdevelop") -(version "5.0.4") +(version "5.1.0") (source (origin (method url-fetch) @@ -48,7 +48,7 @@ version ".tar.xz")) (sha256 (base32 - "0max4g1i8xf5g7a8zm60qkr2j8w5bsqzxz914z43fj5ipnr4448r" + "1s4cbkx2a0p73b52yxmf5dhv08xk9pxgrkjsnbzy76ssfr545g60" (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -148,7 +148,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (define-public kdevplatform (package (name "kdevplatform") -(version "5.0.4") +(version "5.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kdevelop" @@ -156,7 +156,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") version ".tar.xz")) (sha256 (base32 -"0wfl5azblnpmc7hydfvm7450343m1v7cr2g9gw0qs1432gbzraq1" +"1nxf66vk6p7lmckdsha9fpq3zchwbg79qhy49f4hndlxgj03p7zh" (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules)
branch master updated (dfee7da -> 52b2d66)
thomasd pushed a change to branch master in repository guix. from dfee7da gnu: bc: Update to 1.07. new 52b2d66 gnu: kdevelop: Update to 5.1.0. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/kde.scm | 8 1 file changed, 4 insertions(+), 4 deletions(-)
01/01: gnu: libsndfile: Update to 1.0.28.
thomasd pushed a commit to branch staging in repository guix. commit 3cd959a4293b991bf74e5c5aa45a5dd6b3e0d378 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Mon Apr 3 10:59:16 2017 +0200 gnu: libsndfile: Update to 1.0.28. * gnu/packages/pulseaudio.scm (libsndfile): Update to 1.0.28. --- gnu/packages/pulseaudio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index a12f8d8..16c77f1 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <m...@netris.org> ;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2016 Ricardo Wurmus <rek...@elephly.net> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,14 +43,14 @@ (define-public libsndfile (package (name "libsndfile") -(version "1.0.27") +(version "1.0.28") (source (origin (method url-fetch) (uri (string-append "http://www.mega-nerd.com/libsndfile/files/libsndfile-; version ".tar.gz")) (sha256 (base32 - "1h7s61nhf7vklh9sdsbbqzb6x287q4x4j1jc5gmjragl4wprb4d3" + "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz" (build-system gnu-build-system) (inputs `(("libvorbis" ,libvorbis)
branch staging updated (52196ae -> 3cd959a)
thomasd pushed a change to branch staging in repository guix. from 52196ae gnu: tzdata: Update to 2017b. new 3cd959a gnu: libsndfile: Update to 1.0.28. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/pulseaudio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
01/01: gnu: Add cifs-utils.
thomasd pushed a commit to branch master in repository guix. commit b4dcfce51bb3e06710e06881e23493fde3c4763c Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Thu Mar 30 17:47:00 2017 +0200 gnu: Add cifs-utils. * gnu/packages/samba.scm (cifs-utils): New variable. --- gnu/packages/samba.scm | 47 +++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 3b2a686..8c13222 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver <m...@netris.org> ;;; Copyright © 2016, 2017 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adf...@openmailbox.org> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,8 @@ #:use-module (guix licenses) #:use-module (gnu packages acl) #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) + #:use-module (gnu packages crypto) #:use-module (gnu packages cups) #:use-module (gnu packages databases) #:use-module (gnu packages tls) @@ -33,10 +36,54 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages openldap) #:use-module (gnu packages readline) + #:use-module (gnu packages kerberos) #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages python)) +(define-public cifs-utils + (package +(name "cifs-utils") +(version "6.7") +(source + (origin + (method url-fetch) + (uri (string-append "https://download.samba.org/pub/linux-cifs/; + name "/" name "-" version ".tar.bz2")) + (sha256 (base32 +"1ayghnkryy1n1zm5dyvyyr7n3807nsm6glfcbbki5c2a8w91dwmj" +(build-system gnu-build-system) +(native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) +(inputs + `(("keytuils" ,keyutils) + ("linux-pam" ,linux-pam) + ("libcap-ng" ,libcap-ng) + ("mit-krb5" ,mit-krb5) + ("samba" ,samba) + ("talloc" ,talloc))) +(arguments + `(#:phases + (modify-phases %standard-phases + ;; The 6.7 tarball is missing ‘install.sh’. Create it. + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-i" + (add-before 'configure 'set-root-sbin + (lambda _ ; Don't try to install in "/sbin". + (setenv "ROOTSBINDIR" + (string-append (assoc-ref %outputs "out") "/sbin")) + #t) +(synopsis "User-space utilities for Linux CIFS (Samba) mounts") +(description "@code{cifs-utils} is a set of user-space utilities for +mounting and managing @dfn{Common Internet File System} (CIFS) shares using +the Linux kernel CIFS client.") +(home-page "https://wiki.samba.org/index.php/LinuxCIFS_utils;) +;; cifs-utils is licensed as GPL3 or later, but 3 files contain LGPL code. +(license gpl3+))) + (define-public iniparser (package (name "iniparser")
06/07: gnu: orcus: Update to 0.12.1.
thomasd pushed a commit to branch core-updates in repository guix. commit 90ac806d3ad859cca2c3b6e5ac219e930b848eb9 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Mon Mar 27 20:16:47 2017 +0200 gnu: orcus: Update to 0.12.1. * gnu/packages/libreoffice.scm (orcus): Update to 0.12.1. [inputs]: Add python. --- gnu/packages/libreoffice.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3d05603..b21e41b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -96,20 +96,21 @@ their dependencies automatically upon calculation.") (define-public orcus (package (name "orcus") -(version "0.9.2") +(version "0.12.1") (source (origin (method url-fetch) (uri (string-append "http://kohei.us/files/; name "/src/lib" name "-" version ".tar.xz")) (sha256 (base32 - "170racjz7s7yxza722hxsqc12788w57qnp6x6j2692pzp3qzjjfx" + "171bmqa9hkk4xygz20qda5900rs4kq9fgl424ldkxlj4d733dffi" (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("ixion" ,ixion) ("mdds" ,mdds) +("python" ,python) ("zlib" ,zlib))) (home-page "https://gitlab.com/orcus/orcus;) (synopsis "File import filter library for spreadsheet documents")
03/07: gnu: ixion: Update to 0.12.2.
thomasd pushed a commit to branch core-updates in repository guix. commit cb386439245d09e52893a4b11f625cb17539e2eb Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Mon Mar 27 20:15:51 2017 +0200 gnu: ixion: Update to 0.12.2. * gnu/packages/libreoffice.scm (ixion): Update to 0.12.2. [inputs]: Replace python-2 by python. --- gnu/packages/libreoffice.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 760f654..a8565af 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -71,20 +71,20 @@ (define-public ixion (package (name "ixion") -(version "0.9.1") +(version "0.12.2") (source (origin (method url-fetch) (uri (string-append "http://kohei.us/files/ixion/src/libixion-; version ".tar.xz")) (sha256 (base32 - "18g3nk29ljiqbyi0ml49j2x3f3xrqckdm9i66sw5fxnj7hb5rqvp" + "1bnsqbxpbijwbg42rrqq6mz06wvcxjpl0gjdzwyilkmv6s400i4b" (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("mdds" ,mdds) -("python" ,python-2))) ; looks for python.pc, not python3.pc +("python" ,python))) (home-page "https://gitlab.com/ixion/ixion;) (synopsis "General purpose formula parser and interpreter") (description "Ixion is a library for calculating the results of formula
05/07: gnu: libetonyek: Update to 0.1.6.
thomasd pushed a commit to branch core-updates in repository guix. commit b85b56dd7bb0185059e81f2aeeb0749e180d2084 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Mon Mar 27 20:16:32 2017 +0200 gnu: libetonyek: Update to 0.1.6. * gnu/packages/libreoffice.scm (libetonyek): Update to 0.1.6. [arguments]: Add phase 'autoreconf, because configure.ac is patched. Add configure flag "--with-mdds=1.2". [inputs]: Add liblangtag. [native-inputs]: Add autoconf and automake. * gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/libreoffice.scm | 15 - .../patches/libetonyek-build-with-mdds-1.2.patch | 74 ++ 3 files changed, 87 insertions(+), 3 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 782bf74..02758dd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -676,6 +676,7 @@ dist_patch_DATA = \ %D%/packages/patches/libbonobo-activation-test-race.patch\ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ %D%/packages/patches/libdrm-symbol-check.patch \ + %D%/packages/patches/libetonyek-build-with-mdds-1.2.patch \ %D%/packages/patches/libevent-dns-tests.patch\ %D%/packages/patches/libevent-2.0-CVE-2016-10195.patch \ %D%/packages/patches/libevent-2.0-CVE-2016-10196.patch \ diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a558d8e..3d05603 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -349,22 +349,31 @@ CorelDRAW documents of all versions.") (define-public libetonyek (package (name "libetonyek") -(version "0.1.3") +(version "0.1.6") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/; name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0mghaqzj0qqza8z1gzprw62702adlww4kgdzynj5qpxxc9m2f4py" + "0y60vi1plyq69fqbcjnc0v8mvcjqjsl1ry6rmb3bq3q7j8a2fm6z")) + (patches (search-patches "libetonyek-build-with-mdds-1.2.patch" (build-system gnu-build-system) +(arguments + `(#:configure-flags '("--with-mdds=1.2") + #:phases (modify-phases %standard-phases + (add-before 'configure 'autoreconf + (lambda _ (system* "autoreconf")) (native-inputs `(("cppunit" ,cppunit) ("doxygen" ,doxygen) ("glm" ,glm) ("gperf" ,gperf) + ("liblangtag" ,liblangtag) ("mdds" ,mdds) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) ; due to patch + ("automake" ,automake))) (propagated-inputs ; in Requires or Requires.private field of .pkg `(("librevenge" ,librevenge) ("libxml2" ,libxml2))) diff --git a/gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch b/gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch new file mode 100644 index 000..1ede82a --- /dev/null +++ b/gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch @@ -0,0 +1,74 @@ +Allow building with mdds 1.2. + +Patch taken from upstream commit f6d14b3b510de5c50e45c98fe812a73ba00f3def +see https://gerrit.libreoffice.org/gitweb?p=libetonyek.git;a=commitdiff;h=f6d14b3b510de5c50e45c98fe812a73ba00f3def + +diff --git a/configure.ac b/configure.ac +index ca4bb07..bb946eb 100644 (file) +--- a/configure.ac b/configure.ac +@@ -24,7 +24,7 @@ AC_LANG([C++]) + # Configure options + # = + AC_ARG_WITH([mdds], +-AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]), ++AS_HELP_STRING([--with-mdds=1.2|1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]), + [], [with_mdds="1.0"]) + + # === +@@ -47,7 +47,7 @@ AC_PROG_SED + + AM_MISSING_PROG([GPERF], [gperf]) + +-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])]) ++AS_IF([test "$with_mdds" = "1.0" -o "$with_mdds" = "1.2" ], [AX_CXX_COMPILE_STDCXX_11([noext])]) + + # === + # Find librevenge +@@ -138,25 +138,27 @@ AC_SUBST([GLM_CFLAGS]) + # = + # Find mdds + # = +-AS_IF([test "$with_mdds" = "1.0"], [ +-PKG_CHECK_MODULES([MDDS], [mdds-1.0]) +-], [ +-PKG_CHECK_MODULES([MDDS], [mdds]) +-AC_MSG_CHECKING([checking if mdd
02/07: gnu: mdds: Upgrade to 1.2.2.
thomasd pushed a commit to branch core-updates in repository guix. commit 57144094b8c6db390c2b465ae90c095cd019e6a7 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Mon Mar 27 20:15:36 2017 +0200 gnu: mdds: Upgrade to 1.2.2. * gnu/packages/boost.scm (mdds): Upgrade to 1.2.2. --- gnu/packages/boost.scm | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index b3fccdf..dfaa853 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Andreas Enge <andr...@enge.fr> ;;; Copyright © 2016 Eric Bavier <bav...@member.fsf.org> ;;; Copyright © 2015 Ludovic Courtès <l...@gnu.org> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -109,14 +110,14 @@ across a broad spectrum of applications.") (define-public mdds (package (name "mdds") -(version "0.12.1") +(version "1.2.2") (source (origin (method url-fetch) (uri (string-append - "http://kohei.us/files/mdds/src/mdds_; version ".tar.bz2")) + "http://kohei.us/files/mdds/src/mdds-; version ".tar.bz2")) (sha256 (base32 - "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3" + "17fcjhsq3bzqm7ba9sgp6my3y4226jnwai6q5jq3810i745p67hl" (build-system gnu-build-system) (propagated-inputs `(("boost" ,boost))) ; inclusion of header files
01/07: gnu: Add libzmf.
thomasd pushed a commit to branch core-updates in repository guix. commit 741916f11457129442c8155d8c55de22112b04c9 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Mon Mar 27 20:15:04 2017 +0200 gnu: Add libzmf. * gnu/packages/libreoffice.scm (libzmf): New Variable. --- gnu/packages/libreoffice.scm | 30 ++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 52f4266..760f654 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Andreas Enge <andr...@enge.fr> ;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2017 Alex Griffin <a...@ajgrf.com> +;;; Copyright © 2017 Thomas Danckaert <p...@thomasdanckaert.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -629,6 +630,35 @@ spreadsheet documents.") Works word processor file format.") (license (list mpl2.0 lgpl2.1+ ; dual license +(define-public libzmf + (package + (name "libzmf") + (version "0.0.1") + (source +(origin + (method url-fetch) + (uri (string-append "http://dev-www.libreoffice.org/src/libzmf/libzmf-; + version ".tar.xz")) + (sha256 (base32 + "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga" + (build-system gnu-build-system) + (inputs +`(("boost" ,boost) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("librevenge" ,librevenge) + ("zlib" ,zlib))) +(native-inputs + `(("cppunit" ,cppunit) + ("doxygen" ,doxygen) + ("pkg-config" ,pkg-config))) +(home-page "https://wiki.documentfoundation.org/DLP/Libraries/libzmf;) +(synopsis "Parses file format of Zoner Callisto/Draw documents") +(description "Libzmf is a library that parses the file format of Zoner +Callisto/Draw documents. Currently it only understands documents created by +Zoner Draw version 4 and 5.") +(license mpl2.0))) + (define-public hunspell (package (name "hunspell")
07/07: gnu: libreoffice: Update to 5.3.1.2.
thomasd pushed a commit to branch core-updates in repository guix. commit b1a8fd2d2cf6bf1b20ba8d26ca6f9a7caef60cbc Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Mon Mar 27 20:17:02 2017 +0200 gnu: libreoffice: Update to 5.3.1.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 5.3.1.2. [inputs]: Add libstaroffice and libzmf. [arguments]: Remove reference to removed patch; unpack xmlsec 1.2.23 tarball. (xmlsec-src-libreoffice): Update to version 1.2.23 tarball. --- gnu/packages/libreoffice.scm | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b21e41b..42e47a5 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -769,15 +769,15 @@ and to return information on pronunciations, meanings and synonyms.") (method url-fetch) (uri (string-append -"http://dev-www.libreoffice.org/src/; -"1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz")) + "http://dev-www.libreoffice.org/src/; + "86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz")) (sha256 (base32 - "0jnxxygg6z5zi6za94dvxmg1bfar1wh8p5xa2bzbha0qcn2m02ir" + "17qfw5crkqn4v6xbkjxrjvcccfc00dy053892wrwv54qdk8n7m21" (define-public libreoffice (package (name "libreoffice") -(version "5.1.6.2") +(version "5.3.1.2") (source (origin (method url-fetch) @@ -786,7 +786,7 @@ and to return information on pronunciations, meanings and synonyms.") "http://download.documentfoundation.org/libreoffice/src/; (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "150xb76pc3889gfy4jrnq8sidymm1aihkm5pzy8b1fdy51zip804" + "1zsl0z0i8pw532x2lmwd64ms6igibkkjhwf01zmm2kpnr9ycsijp" (build-system gnu-build-system) (native-inputs `(;; autoreconf is run by the LibreOffice build system, since after @@ -829,6 +829,7 @@ and to return information on pronunciations, meanings and synonyms.") ("libmwaw" ,libmwaw) ("libodfgen" ,libodfgen) ("libpagemaker" ,libpagemaker) + ("libstaroffice" ,libstaroffice) ("libvisio" ,libvisio) ("libwpg" ,libwpg) ("libwps" ,libwps) @@ -836,6 +837,7 @@ and to return information on pronunciations, meanings and synonyms.") ("libxrender" ,libxrender) ("libxslt" ,libxslt) ("libxt" ,libxt) + ("libzmf" ,libzmf) ("lpsolve" ,lpsolve) ("mdds" ,mdds) ("mythes" ,mythes) @@ -868,15 +870,14 @@ and to return information on pronunciations, meanings and synonyms.") (substitute* (list "sysui/CustomTarget_share.mk" "solenv/gbuild/gbuild.mk" - "solenv/gbuild/platform/unxgcc.mk" - "external/libxmlsec/xmlsec1-oldlibtool.patch") + "solenv/gbuild/platform/unxgcc.mk") (("/bin/sh") (which "bash"))) (mkdir "external/tarballs") (symlink xmlsec (string-append "external/tarballs/" - "1f24ab1d39f4a51faf22244c94a6203f-" - "xmlsec1-1.2.14.tar.gz")) + "86b1daaa438f5a7bea9a52d7b9799ac0-" + "xmlsec1-1.2.23.tar.gz")) ;; The following is required for building xmlsec from the ;; unpatched external tarball; since "configure" starts with ;; "/bin/sh", it needs to be executed by a command invoking
04/07: gnu: Add libstaroffice.
thomasd pushed a commit to branch core-updates in repository guix. commit 22e52dbd06726261e370e9b761e7f3a3f6b47630 Author: Thomas Danckaert <thomas.dancka...@gmail.com> Date: Mon Mar 27 20:16:19 2017 +0200 gnu: Add libstaroffice. * gnu/packages/libreoffice.scm (libstaroffice): New variable. --- gnu/packages/libreoffice.scm | 23 +++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a8565af..a558d8e 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -601,6 +601,29 @@ text documents (MacWrite, ClarisWorks, ... ) and for some graphics and spreadsheet documents.") (license (list mpl2.0 lgpl2.1+ ; dual license +(define-public libstaroffice + (package +(name "libstaroffice") +(version "0.0.3") +(source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fosnola/libstaroffice/releases/download/; + version "/libstaroffice-" version ".tar.xz")) + (sha256 (base32 +"1ii2wi3wr5npyz9gby1bjk8r4wyflpfpc6gx7mmqkhsc9c8frpmy" +(build-system gnu-build-system) +(inputs + `(("librevenge" ,librevenge) + ("zlib" ,zlib))) +(native-inputs + `(("pkg-config" ,pkg-config))) +(home-page "https://github.com/fosnola/libstaroffice;) +(synopsis "Provides LibreOffice support for old StarOffice documents") +(description "@code{libstaroffice} is an import filter for the document formats +from the old StarOffice (.sdc, .sdw, ...).") +(license (list mpl2.0 lgpl2.1+ ; dual license + (define-public libwps (package (name "libwps")
branch core-updates updated (b5a1359 -> b1a8fd2)
thomasd pushed a change to branch core-updates in repository guix. from b5a1359 gnu: mumble: Fix build after speex update. new 741916f gnu: Add libzmf. new 5714409 gnu: mdds: Upgrade to 1.2.2. new cb38643 gnu: ixion: Update to 0.12.2. new 22e52db gnu: Add libstaroffice. new b85b56d gnu: libetonyek: Update to 0.1.6. new 90ac806 gnu: orcus: Update to 0.12.1. new b1a8fd2 gnu: libreoffice: Update to 5.3.1.2. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 1 + gnu/packages/boost.scm | 7 +- gnu/packages/libreoffice.scm | 98 ++ .../patches/libetonyek-build-with-mdds-1.2.patch | 74 4 files changed, 160 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch
01/01: services: Add inetd-service-type.
thomasd pushed a commit to branch master in repository guix. commit 9260b9d1005559f526569bcf694e9c9b40d85800 Author: Thomas Danckaert <p...@thomasdanckaert.be> Date: Tue Mar 14 18:12:34 2017 +0100 services: Add inetd-service-type. * gnu/services/networking.scm (, ): New record types. (inetd-config-file, inetd-shepherd-service): New procedures. (inetd-service-type): New variable. * doc/guix.texi (Networking Services): Document it. * gnu/tests/networking.scm: New file. * gnu/local.mk: Add it. --- doc/guix.texi | 96 +++- gnu/local.mk| 1 + gnu/services/networking.scm | 89 ++ gnu/tests/networking.scm| 149 4 files changed, 334 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6aa279e..57595b9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -33,7 +33,8 @@ Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2017 Clément Lassieur@* Copyright @copyright{} 2017 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* -Copyright @copyright{} 2017 Carlo Zancanaro +Copyright @copyright{} 2017 Carlo Zancanaro@* +Copyright @copyright{} 2017 Thomas Danckaert Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -9400,6 +9401,99 @@ make an initial adjustment of more than 1,000 seconds. List of host names used as the default NTP servers. @end defvr +@cindex inetd +@deffn {Scheme variable} inetd-service-type +This service runs the @command{inetd} (@pxref{inetd invocation,,, +inetutils, GNU Inetutils}) daemon. @command{inetd} listens for +connections on internet sockets, and lazily starts the specified server +program when a connection is made on one of these sockets. + +The value of this service is an @code{inetd-configuration} object. The +following example configures the @command{inetd} daemon to provide the +built-in @command{echo} service, as well as an smtp service which +forwards smtp traffic over ssh to a server @code{smtp-server} behind a +gateway @code{hostname}: + +@example +(service + inetd-service-type + (inetd-configuration + (entries (list +(inetd-entry + (name "echo") + (socket-type 'stream) + (protocol "tcp") + (wait? #f) + (user "root")) +(inetd-entry + (node "127.0.0.1") + (name "smtp") + (socket-type 'stream) + (protocol "tcp") + (wait? #f) + (user "root") + (program (file-append openssh "/bin/ssh")) + (arguments + '("ssh" "-qT" "-i" "/path/to/ssh_key" +"-W" "smtp-server:25" "user@@hostname") +@end example + +See below for more details about @code{inetd-configuration}. +@end deffn + +@deftp {Data Type} inetd-configuration +Data type representing the configuration of @command{inetd}. + +@table @asis +@item @code{program} (default: @code{(file-append inetutils "/libexec/inetd")}) +The @command{inetd} executable to use. + +@item @code{entries} (default: @code{'()}) +A list of @command{inetd} service entries. Each entry should be created +by the @code{inetd-entry} constructor. +@end table +@end deftp + +@deftp {Data Type} inetd-entry +Data type representing an entry in the @command{inetd} configuration. +Each entry corresponds to a socket where @command{inetd} will listen for +requests. + +@table @asis +@item @code{node} (default: @code{#f}) +Optional string, a comma-separated list of local addresses +@command{inetd} should use when listening for this service. +@xref{Configuration file,,, inetutils, GNU Inetutils} for a complete +description of all options. +@item @code{name} +A string, the name must correspond to an entry in @code{/etc/services}. +@item @code{socket-type} +One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or +@code{'seqpacket}. +@item @code{protocol} +A string, must correspond to an entry in @code{/etc/protocols}. +@item @code{wait?} (default: @code{#t}) +Whether @command{inetd} should wait for the server to exit before +listening to new service requests. +@item @code{user} +A string containing the user (and, optionally, group) name of the user +as whom the server should run. The group name can be specified in a +suffix, separated by a colon or period, i.e. @code{"user"}, +@code{"user:group"} or @code{"user.group"}. +@item @code{program} (default: @code{"internal"}) +The server program which will serve the requests, or @code{"internal"} +if @command{inetd} should use a built-in service. +@item @code{arguments} (default: @code{'(
branch master updated (1c17a86 -> 9260b9d)
thomasd pushed a change to branch master in repository guix. from 1c17a86 doc: Re-generate openvpn service documentation. new 9260b9d services: Add inetd-service-type. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi | 96 +++- gnu/local.mk| 1 + gnu/services/networking.scm | 89 ++ gnu/tests/networking.scm| 149 4 files changed, 334 insertions(+), 1 deletion(-) create mode 100644 gnu/tests/networking.scm