Browse Source

Merge branch 'master' into core-updates

version-0.12.0
Mark H Weaver 6 years ago
parent
commit
dcaf70897a
No known key found for this signature in database GPG Key ID: 7CEF29847562C516
  1. 14
      doc/guix.texi
  2. 8
      gnu/local.mk
  3. 4
      gnu/packages/audio.scm
  4. 92
      gnu/packages/bioinformatics.scm
  5. 13
      gnu/packages/cdrom.scm
  6. 71
      gnu/packages/emacs.scm
  7. 60
      gnu/packages/embedded.scm
  8. 54
      gnu/packages/finance.scm
  9. 4
      gnu/packages/game-development.scm
  10. 50
      gnu/packages/games.scm
  11. 1
      gnu/packages/gd.scm
  12. 1
      gnu/packages/glib.scm
  13. 28
      gnu/packages/gnome.scm
  14. 10
      gnu/packages/graphics.scm
  15. 7
      gnu/packages/guile.scm
  16. 21
      gnu/packages/image.scm
  17. 16
      gnu/packages/linux.scm
  18. 48
      gnu/packages/mail.scm
  19. 388
      gnu/packages/music.scm
  20. 76
      gnu/packages/networking.scm
  21. 34
      gnu/packages/node.scm
  22. 70
      gnu/packages/patches/artanis-fix-Makefile.in.patch
  23. 34
      gnu/packages/patches/freeimage-CVE-2016-5684.patch
  24. 206
      gnu/packages/patches/gcc-6-arm-none-eabi-multilib.patch
  25. 65
      gnu/packages/patches/gcc-6-cross-environment-variables.patch
  26. 38
      gnu/packages/patches/gd-CVE-2016-8670.patch
  27. 579
      gnu/packages/patches/hdf4-architectures.patch
  28. 46
      gnu/packages/patches/irrlicht-mesa-10.patch
  29. 30
      gnu/packages/patches/node-9077.patch
  30. 54
      gnu/packages/pdf.scm
  31. 4
      gnu/packages/photo.scm
  32. 87
      gnu/packages/python.scm
  33. 6
      gnu/packages/qt.scm
  34. 6
      gnu/packages/ruby.scm
  35. 9
      gnu/packages/serialization.scm
  36. 11
      gnu/packages/ssh.scm
  37. 14
      gnu/packages/terminals.scm
  38. 18
      gnu/packages/tls.scm
  39. 6
      gnu/packages/version-control.scm
  40. 4
      gnu/packages/webkit.scm
  41. 2
      gnu/services/sddm.scm
  42. 32
      guix/grafts.scm
  43. 1
      guix/import/utils.scm
  44. 6
      guix/packages.scm
  45. 53
      guix/scripts/graph.scm
  46. 62
      tests/grafts.scm
  47. 22
      tests/graph.scm
  48. 106
      tests/packages.scm

14
doc/guix.texi

@ -5546,6 +5546,20 @@ example, the command below produces the reference graph of your profile
@example
guix graph -t references `readlink -f ~/.guix-profile`
@end example
@item referrers
This is the graph of the @dfn{referrers} of a store item, as returned by
@command{guix gc --referrers} (@pxref{Invoking guix gc}).
This relies exclusively on local information from your store. For
instance, let us suppose that the current Inkscape is available in 10
profiles on your machine; @command{guix graph -t referrers inkscape}
will show a graph rooted at Inkscape and with those 10 profiles linked
to it.
It can help determine what is preventing a store item from being garbage
collected.
@end table
The available options are the following:

8
gnu/local.mk

@ -6,6 +6,7 @@
# Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
# Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
# Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
#
# This file is part of GNU Guix.
#
@ -456,6 +457,7 @@ dist_patch_DATA = \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/arb-ldconfig.patch \
%D%/packages/patches/artanis-fix-Makefile.in.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
@ -527,13 +529,17 @@ dist_patch_DATA = \
%D%/packages/patches/fltk-xfont-on-demand.patch \
%D%/packages/patches/fontforge-svg-modtime.patch \
%D%/packages/patches/freeimage-CVE-2015-0852.patch \
%D%/packages/patches/freeimage-CVE-2016-5684.patch \
%D%/packages/patches/gawk-shell.patch \
%D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-libvtv-runpath.patch \
%D%/packages/patches/gcc-5.0-libvtv-runpath.patch \
%D%/packages/patches/gcc-6-arm-none-eabi-multilib.patch \
%D%/packages/patches/gcc-6-cross-environment-variables.patch \
%D%/packages/patches/gd-CVE-2016-7568.patch \
%D%/packages/patches/gd-CVE-2016-8670.patch \
%D%/packages/patches/gd-fix-gd2-read-test.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gegl-CVE-2012-4433.patch \
@ -597,7 +603,6 @@ dist_patch_DATA = \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/inkscape-drop-wait-for-targets.patch \
%D%/packages/patches/irrlicht-mesa-10.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/jansson-CVE-2016-4425.patch \
%D%/packages/patches/jasper-CVE-2007-2721.patch \
@ -712,6 +717,7 @@ dist_patch_DATA = \
%D%/packages/patches/ngircd-no-dns-in-tests.patch \
%D%/packages/patches/ninja-tests.patch \
%D%/packages/patches/ninja-zero-mtime.patch \
%D%/packages/patches/node-9077.patch \
%D%/packages/patches/nss-pkgconfig.patch \
%D%/packages/patches/nvi-assume-preserve-path.patch \
%D%/packages/patches/nvi-dbpagesize-binpower.patch \

4
gnu/packages/audio.scm

@ -910,7 +910,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
(define-public guitarix
(package
(name "guitarix")
(version "0.35.1")
(version "0.35.2")
(source (origin
(method url-fetch)
(uri (string-append
@ -918,7 +918,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
version ".tar.xz"))
(sha256
(base32
"066qva1zk63qw60s0vbi9g9jh22ljw67p91pk82kv11gw24h3vg6"))))
"1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p"))))
(build-system waf-build-system)
(arguments
`(#:tests? #f ; no "check" target

92
gnu/packages/bioinformatics.scm

@ -56,6 +56,8 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages glib)
#:use-module (gnu packages groff)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages java)
@ -7137,6 +7139,96 @@ ranges and it computes reads profiles and coverage profiles. It also handles
paired-end data.")
(license license:gpl2+)))
(define-public r-rcas
(package
(name "r-rcas")
(version "0.99.6")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/RCAS/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ljgl2b4r6w2n0i9i04d9xaphajsvhfkjdj2i2z830nha4m3w8f0"))))
(build-system r-build-system)
(native-inputs
`(("r-knitr" ,r-knitr)
("r-testthat" ,r-testthat)
;; During vignette building knitr checks that "pandoc-citeproc"
;; is in the PATH.
("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc)))
(propagated-inputs
`(("r-data-table" ,r-data-table)
("r-biomart" ,r-biomart)
("r-org-hs-eg-db" ,r-org-hs-eg-db)
("r-org-ce-eg-db" ,r-org-ce-eg-db)
("r-org-dm-eg-db" ,r-org-dm-eg-db)
("r-org-mm-eg-db" ,r-org-mm-eg-db)
("r-bsgenome-hsapiens-ucsc-hg19" ,r-bsgenome-hsapiens-ucsc-hg19)
("r-bsgenome-mmusculus-ucsc-mm9" ,r-bsgenome-mmusculus-ucsc-mm9)
("r-bsgenome-celegans-ucsc-ce10" ,r-bsgenome-celegans-ucsc-ce10)
("r-bsgenome-dmelanogaster-ucsc-dm3" ,r-bsgenome-dmelanogaster-ucsc-dm3)
("r-topgo" ,r-topgo)
("r-dt" ,r-dt)
("r-plotly" ,r-plotly)
("r-motifrg" ,r-motifrg)
("r-genomation" ,r-genomation)
("r-genomicfeatures" ,r-genomicfeatures)
("r-rtracklayer" ,r-rtracklayer)
("r-rmarkdown" ,r-rmarkdown)))
(synopsis "RNA-centric annotation system")
(description
"RCAS aims to be a standalone RNA-centric annotation system that provides
intuitive reports and publication-ready graphics. This package provides the R
library implementing most of the pipeline's features.")
(home-page "https://github.com/BIMSBbioinfo/RCAS")
(license license:expat)))
(define-public rcas-web
(package
(name "rcas-web")
(version "0.0.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/BIMSBbioinfo/rcas-web/"
"releases/download/v" version
"/rcas-web-" version ".tar.gz"))
(sha256
(base32
"0d3my0g8i7js59n184zzzjdki7hgmhpi4rhfvk7i6jsw01ba04qq"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(json (assoc-ref inputs "guile-json"))
(redis (assoc-ref inputs "guile-redis"))
(path (string-append
json "/share/guile/site/2.2:"
redis "/share/guile/site/2.2")))
(wrap-program (string-append out "/bin/rcas-web")
`("GUILE_LOAD_PATH" ":" = (,path))
`("GUILE_LOAD_COMPILED_PATH" ":" = (,path))
`("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE")))))
#t)))))
(inputs
`(("r" ,r)
("r-rcas" ,r-rcas)
("guile-next" ,guile-next)
("guile-json" ,guile2.2-json)
("guile-redis" ,guile2.2-redis)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/BIMSBbioinfo/rcas-web")
(synopsis "Web interface for RNA-centric annotation system (RCAS)")
(description "This package provides a simple web interface for the
@dfn{RNA-centric annotation system} (RCAS).")
(license license:agpl3+)))
(define-public emboss
(package
(name "emboss")

13
gnu/packages/cdrom.scm

@ -288,7 +288,7 @@ from an audio CD.")
(define-public abcde
(package
(name "abcde")
(version "2.7.1")
(version "2.7.2")
(home-page "https://abcde.einval.com/")
(source (origin
(method url-fetch)
@ -296,7 +296,7 @@ from an audio CD.")
version ".tar.gz"))
(sha256
(base32
"0l7j0nk8p30s97285i418rv9ym9bgns7bn6l8gldw3mjhnby609l"))
"1pakpi41k8yd780mfp0snhia6mmwjwxk9lcrq6gynimch8b8hfda"))
(modules '((guix build utils)))
(snippet
'(substitute* "Makefile"
@ -314,7 +314,12 @@ from an audio CD.")
(("^prefix = .*$")
(string-append "prefix = "
(assoc-ref outputs "out")
"\n")))))
"\n"))
(("^sysconfdir = .*$")
(string-append "sysconfdir = "
(assoc-ref outputs "out")
"/etc/\n")))
#t))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((wget (assoc-ref inputs "wget"))
@ -336,7 +341,7 @@ from an audio CD.")
(for-each wrap
(find-files (string-append out "/bin")
".*"))))))
#:tests? #f))
#:tests? #f)) ; no test target
(inputs `(("wget" ,wget)
("which" ,which)

71
gnu/packages/emacs.scm

@ -12,7 +12,7 @@
;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Alex Vong <alexvong1995@gmail.com>
@ -2981,6 +2981,54 @@ Lua programing language}.")
news items, openrc and runscripts.")
(license license:gpl2+)))
(define-public emacs-evil
(package
(name "emacs-evil")
(version "1.2.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://bitbucket.org/lyro/evil/get/"
version ".tar.bz2"))
(file-name (string-append name "-" version ".tar.bz2"))
(sha256
(base32
"17cda9fnbq3gmjcxs3lyq64gxswrf37y864bm53rldwsk3khq2yi"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-undo-tree" ,emacs-undo-tree)
("emacs-goto-chg" ,emacs-goto-chg)))
(home-page "https://bitbucket.com/lyro/evil")
(synopsis "Extensible Vi layer for Emacs")
(description
"Evil is an extensible vi layer for Emacs. It emulates the
main features of Vim, and provides facilities for writing custom
extensions.")
(license license:gpl3+)))
(define-public emacs-goto-chg
(package
(name "emacs-goto-chg")
(version "1.6")
(source
(origin
(method url-fetch)
;; There is no versioned source.
(uri "https://www.emacswiki.org/emacs/download/goto-chg.el")
(sha256
(base32
"078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij"))))
(build-system emacs-build-system)
;; There is no other home page.
(home-page "https://www.emacswiki.org/emacs/goto-chg.el")
(synopsis "Go to the last change in the Emacs buffer")
(description
"This package provides @code{M-x goto-last-change} command that goes to
the point of the most recent edit in the current Emacs buffer. When repeated,
go to the second most recent edit, etc. Negative argument, @kbd{C-u -}, is
used for reverse direction.")
(license license:gpl2+)))
(define-public emacs-writegood-mode
(package
(name "emacs-writegood-mode")
@ -3183,3 +3231,24 @@ display and edit the text.
This package contains the library runtime.")
(license license:lgpl2.1+)))
(define-public emacs-nginx-mode
(package
(name "emacs-nginx-mode")
(version "1.1.4")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/ajc/nginx-mode/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1lvkj07kq0jkskr2f61vqb5rlrbnaz9a76ikq40w6925i2r970rr"))))
(build-system emacs-build-system)
(home-page "https://github.com/ajc/nginx-mode")
(synopsis "Emacs major mode for editing nginx config files")
(description "This package provides an Emacs major mode for
editing nginx config files.")
(license license:gpl2+)))

60
gnu/packages/embedded.scm

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -24,9 +25,12 @@
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix build utils)
#:use-module (gnu packages)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages flex)
#:use-module (gnu packages gcc)
#:use-module (gnu packages perl)
#:use-module (gnu packages texinfo))
@ -97,6 +101,17 @@
(variable "CROSS_LIBRARY_PATH")
(files '("arm-none-eabi/lib"))))))))
(define-public gcc-arm-none-eabi-6
(package
(inherit gcc-arm-none-eabi-4.9)
(version (package-version gcc-6))
(source (origin (inherit (package-source gcc-6))
(patches
(append
(origin-patches (package-source gcc-6))
(search-patches "gcc-6-cross-environment-variables.patch"
"gcc-6-arm-none-eabi-multilib.patch")))))))
(define-public newlib-arm-none-eabi
(package
(name "newlib")
@ -163,3 +178,48 @@ usable on embedded products.")
"--enable-newlib-nano-formatted-io"
"--disable-nls"))))
(synopsis "Newlib variant for small systems with limited memory")))
(define (arm-none-eabi-toolchain xgcc newlib)
"Produce a cross-compiler toolchain package with the compiler XGCC and the C
library variant NEWLIB."
(let ((newlib-with-xgcc (package (inherit newlib)
(native-inputs
(alist-replace "xgcc" (list xgcc)
(package-native-inputs newlib))))))
(package
(name (string-append "arm-none-eabi"
(if (string=? (package-name newlib-with-xgcc)
"newlib-nano")
"-nano" "")
"-toolchain"))
(version (package-version xgcc))
(source #f)
(build-system trivial-build-system)
(arguments '(#:builder (mkdir %output)))
(propagated-inputs
`(("binutils" ,(cross-binutils "arm-none-eabi"))
("gcc" ,xgcc)
("newlib" ,newlib-with-xgcc)))
(synopsis "Complete GCC tool chain for ARM bare metal development")
(description "This package provides a complete GCC tool chain for ARM
bare metal development. This includes the GCC arm-none-eabi cross compiler
and newlib (or newlib-nano) as the C library. The supported programming
languages are C and C++.")
(home-page (package-home-page xgcc))
(license (package-license xgcc)))))
(define-public arm-none-eabi-toolchain-4.9
(arm-none-eabi-toolchain gcc-arm-none-eabi-4.9
newlib-arm-none-eabi))
(define-public arm-none-eabi-nano-toolchain-4.9
(arm-none-eabi-toolchain gcc-arm-none-eabi-4.9
newlib-nano-arm-none-eabi))
(define-public arm-none-eabi-toolchain-6
(arm-none-eabi-toolchain gcc-arm-none-eabi-6
newlib-arm-none-eabi))
(define-public arm-none-eabi-nano-toolchain-6
(arm-none-eabi-toolchain gcc-arm-none-eabi-6
newlib-nano-arm-none-eabi))

54
gnu/packages/finance.scm

@ -2,6 +2,7 @@
;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -41,7 +42,8 @@
#:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages upnp))
#:use-module (gnu packages upnp)
#:use-module (gnu packages gnuzilla))
(define-public bitcoin-core
(package
@ -188,3 +190,53 @@ in ability, and easy to use.")
"file://src/wcwidth.cc"
"See src/wcwidth.cc in the distribution.")
license:gpl2+)))) ; lisp/*
(define-public geierlein
(package
(name "geierlein")
(version "0.9.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/stesie/geierlein"
"/archive/V" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0b11fq8v5w8nxjb20jl4dsfhv76xky6n3sq3k3fbb0m2sq9ikikw"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; would require npm, python and a lot more
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'override-target-directory-and-tool-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "Makefile"
(("prefix := .*")
(string-append "prefix := " (assoc-ref outputs "out") "\n"))
;; Required for tests, unused for now:
;;(("PYTHON := .*")
;; (string-append (which "python") "\n")))
(("INSTALL := .*")
(string-append "INSTALL := " (which "install") "\n")))
(substitute* "bin/xgeierlein.in"
;; Use icecat as XULRUNNER
(("^for search ")
(string-append "XULRUNNER=" (which "icecat") "\n"
"for search ")))
#t)))))
(inputs
`(("icecat" ,icecat)))
(home-page "http://stesie.github.io/geierlein/")
(synopsis "Free Elster client, for sending Germany VAT declarations")
(description
"Geierlein is a free Elster client, i.e. an application that
allows to send VAT declarations to Germany's fiscal authorities.
Currently it is *not* possible to send returns that are due annually
(especially the income tax return) since the fiscal authority doesn't
allow to do that off the ERiC library (which is proprietary however).
It's not clear at the moment whether one day it will be possible to
do so.")
(license license:agpl3+)))

4
gnu/packages/game-development.scm

@ -183,7 +183,9 @@ clone.")
"0k2fl5xk3ni2q8bsxl0551inx26ww3w6cp6hssvww0wfjdjcirsm"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; no tests
'(#:configure-flags
(list "-DSFML_INSTALL_PKGCONFIG_FILES=TRUE")
#:tests? #f)) ; no tests
(inputs
`(("mesa" ,mesa)
("glew" ,glew)

50
gnu/packages/games.scm

@ -545,7 +545,7 @@ are primarily in English, however some in other languages are provided.")
(define-public irrlicht
(package
(name "irrlicht")
(version "1.8.1")
(version "1.8.4")
(source (origin
(method url-fetch)
(uri (string-append
@ -554,10 +554,10 @@ are primarily in English, however some in other languages are provided.")
"/" version "/irrlicht-" version ".zip"))
(sha256
(base32
"0yz9lvsc8aqk8wj4rnpanxrw90gqpwn9w5hxp94r8hnm2q0vjjw1"))))
"0cz4z4dwrv5ypl19ll67wl6jjpy5k6ly4vr042w4br88qq5jhazl"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
`(#:phases (alist-cons-after
'unpack 'fix-build-env
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@ -572,19 +572,13 @@ are primarily in English, however some in other languages are provided.")
(lambda* (#:key source #:allow-other-keys)
(and (zero? (system* "unzip" source))
;; The actual source is buried a few directories deep.
(chdir "irrlicht-1.8.1/source/Irrlicht/")))
(alist-cons-after
'unpack 'apply-patch/mesa-10-fix
(lambda* (#:key inputs #:allow-other-keys)
(zero? (system* "patch" "--force" "-p3" "-i"
(assoc-ref inputs "patch/mesa-10-fix"))))
;; No configure script
(alist-delete 'configure %standard-phases))))
(chdir (string-append "irrlicht-" ,version "/source/Irrlicht/"))))
;; No configure script
(alist-delete 'configure %standard-phases)))
#:tests? #f ; no check target
#:make-flags '("CC=gcc" "sharedlib")))
(native-inputs
`(("patch/mesa-10-fix" ,(search-patch "irrlicht-mesa-10.patch"))
("unzip" ,unzip)))
`(("unzip" ,unzip)))
(inputs
`(("mesa" ,mesa)
("glu" ,glu)))
@ -946,7 +940,7 @@ Protocol).")
(define-public extremetuxracer
(package
(name "extremetuxracer")
(version "0.6.0")
(version "0.7.3")
(source (origin
(method url-fetch)
(uri (string-append
@ -954,35 +948,13 @@ Protocol).")
version "/etr-" version ".tar.xz"))
(sha256
(base32
"0fl9pwkywqnsmgr6plfj9zb05xrdnl5xb2hcmbjk7ap9l4cjfca4"))))
"1lg3z7jhzmsjym53qss8mbydny8hafwjnfsc7x91hrr9zrkwblly"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("freetype" ,freetype)
("mesa" ,mesa)
("glu" ,glu)
("libice" ,libice)
("libpng" ,libpng)
("sdl" ,sdl)
("sdl-mixer" ,sdl-mixer)
("sdl-image" ,sdl-image)
("libsm" ,libsm)
("libunwind" ,libunwind)
("libx11" ,libx11)
("libxext" ,libxext)
("libxi" ,libxi)
("libxmu" ,libxmu)
("libxt" ,libxt)
("tcl" ,tcl)
("zlib" ,zlib)))
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-makefile
(lambda _
(substitute* "Makefile"
(("CXXFLAGS =") "CXXFLAGS = ${CFLAGS}")))))))
`(("glu" ,glu)
("sfml" ,sfml)))
(synopsis "High speed arctic racing game based on Tux Racer")
;; Snarfed straight from Debian
(description "Extreme Tux Racer, or etracer as it is called for short, is

1
gnu/packages/gd.scm

@ -51,6 +51,7 @@
(base32
"0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl"))
(patches (search-patches "gd-CVE-2016-7568.patch"
"gd-CVE-2016-8670.patch"
"gd-fix-gd2-read-test.patch"
"gd-fix-tests-on-i686.patch"))))
(build-system gnu-build-system)

1
gnu/packages/glib.scm

@ -140,6 +140,7 @@ shared NFS home directories.")
(let ((version "1.10.12"))
(origin
(method url-fetch)
(inherit (package-source dbus))
(uri (string-append
"https://dbus.freedesktop.org/releases/dbus/dbus-"
version ".tar.gz"))

28
gnu/packages/gnome.scm

@ -5583,3 +5583,31 @@ handling the startup notification side.")
"Calculator is an application that solves mathematical equations and
is suitable as a default application in a Desktop environment.")
(license license:gpl3)))
(define-public xpad
(package
(name "xpad")
(version "4.8.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://launchpad.net/xpad/trunk/4.8.0/+download/"
name "-" version ".tar.bz2"))
(sha256
(base32
"17f915yyvfa2fsavq6wh0q0dfhib28b4k1gc0292b9xdlrvy7f22"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+" ,gtk+)
("gtksourceview" ,gtksourceview)
("libsm" ,libsm)))
(home-page "https://wiki.gnome.org/Apps/Xpad")
(synopsis "Virtual sticky note")
(description
"Xpad is a sticky note that strives to be simple, fault tolerant,
and customizable. Xpad consists of independent pad windows, each is
basically a text box in which notes can be written.")
(license license:gpl3+)))

10
gnu/packages/graphics.scm

@ -142,20 +142,18 @@ application can be customized via its API for Python scripting.")
(define-public assimp
(package
(name "assimp")
(version "3.2")
(version "3.3.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/assimp/assimp/archive/v"
version ".zip"))
(file-name (string-append name "-" version ".zip"))
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"11sfahmbwnjjpd8vpzdsng1bx5mb0cmaqb20dz6sdwapqanqwmar"))))
"1gy7zlgkf4nmyv8n674p3f30asis0gjz8icyy11i693n13ww71fk"))))
(build-system cmake-build-system)
(inputs
`(("zlib" ,zlib)))
(native-inputs
`(("unzip" ,unzip)))
(home-page "http://assimp.org/")
(synopsis "Asset import library")
(description

7
gnu/packages/guile.scm

@ -7,6 +7,7 @@
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2016 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -321,7 +322,8 @@ applicable."
version ".tar.gz"))
(sha256
(base32
"19m3ak12cqk8js9d2mdg11kh4fjsq8frfpd10qw75h0zpr5cywpp"))))
"19m3ak12cqk8js9d2mdg11kh4fjsq8frfpd10qw75h0zpr5cywpp"))
(patches (search-patches "artanis-fix-Makefile.in.patch"))))
(build-system gnu-build-system)
;; TODO: Add guile-dbi and guile-dbd optional dependencies.
(inputs `(("guile" ,guile-2.0)))
@ -335,8 +337,7 @@ applicable."
(dir (string-append out "/share/guile/site/2.0")))
;; Don't use (%site-dir) for site paths.
(list (string-append "MOD_PATH=" dir)
(string-append "MOD_COMPILED_PATH=" dir)
(string-append "DESTDIR=" out)))
(string-append "MOD_COMPILED_PATH=" dir)))
#:test-target "test"
#:phases
(modify-phases %standard-phases

21
gnu/packages/image.scm

@ -570,18 +570,19 @@ supplies a generic doubly-linked list and some string functions.")
(sha256
(base32
"12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"))
(patches (search-patches "freeimage-CVE-2015-0852.patch"))))
(patches (search-patches "freeimage-CVE-2015-0852.patch"
"freeimage-CVE-2016-5684.patch"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-delete
'configure
(alist-cons-before
'build 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile.gnu"
(("/usr") (assoc-ref outputs "out"))
(("-o root -g root") "")))
%standard-phases))
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile.gnu"
(("/usr") (assoc-ref outputs "out"))
(("-o root -g root") ""))
#t)))
#:make-flags '("CC=gcc")
#:tests? #f)) ; no check target
(native-inputs

16
gnu/packages/linux.scm

@ -322,26 +322,26 @@ It has been modified to remove all non-free binary blobs.")
(define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
(define-public linux-libre
(make-linux-libre "4.8.1"
"0l57ab8v52nvx4d898qfvkl7c6zlrm7qd080z6jg0bg0adn4w5lf"
(make-linux-libre "4.8.2"
"111v014j9b2zgyhv8f0aka5lmyc3imdc5yag7azw6hv3vjqqkn67"
%intel-compatible-systems
#:configuration-file kernel-config))
(define-public linux-libre-4.4
(make-linux-libre "4.4.24"
"1wg1d9rq29612psr5v4krabx7nv1y1gzfshq7wpx6i1lpqf3lill"
(make-linux-libre "4.4.25"
"1a677h8vvjkbzqwnklqnjvhq33lwig5z453dwi125zzzvawgr463"
%intel-compatible-systems
#:configuration-file kernel-config))
(define-public linux-libre-4.1
(make-linux-libre "4.1.33"
"1s45vymx7zp7qwj4rx63dpj9xwm8hv5fd9nm27wqvmgnmd3q548h"
(make-linux-libre "4.1.34"
"0dajsb363p9lgga22ml8gp9k9lxd8mvrzxk9y3h9c6hpzfcmqdqr"
%intel-compatible-systems
#:configuration-file kernel-config))
;; Avoid rebuilding kernel variants when there is a minor version bump.
(define %linux-libre-version "4.8.1")
(define %linux-libre-hash "0l57ab8v52nvx4d898qfvkl7c6zlrm7qd080z6jg0bg0adn4w5lf")
(define %linux-libre-version "4.8.2")
(define %linux-libre-hash "111v014j9b2zgyhv8f0aka5lmyc3imdc5yag7azw6hv3vjqqkn67")
(define-public linux-libre-arm-generic
(make-linux-libre %linux-libre-version

48
gnu/packages/mail.scm

@ -443,6 +443,54 @@ attachments, create new maildirs, and so on.")
@code{notmuch} mail. It is written in Python using the @code{urwid} toolkit.")
(license gpl3+)))
(define-public notifymuch
(let
((commit "9d4aaf54599282ce80643b38195ff501120807f0")
(revision "1"))
(package
(name "notifymuch")
(version (string-append "0.1-" revision "." (string-take commit 7)))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/kspi/notifymuch.git")
(commit commit)))
(sha256
(base32
"1lssr7iv43mp5v6nzrfbqlfzx8jcc7m636wlfyhhnd8ydd39n6k4"))
(file-name (string-append name "-" version "-checkout"))))
(build-system python-build-system)
(inputs
`(("python-notmuch" ,python-notmuch)
("python-pygobject" ,python-pygobject)
("gobject-introspection" ,gobject-introspection)
("libnotify" ,libnotify)
("gtk+" ,gtk+)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-binary
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/notifymuch")))
(wrap-program bin
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append out "/lib/girepository-1.0")))))
#t)))))
(home-page "https://github.com/kspi/notifymuch")
(synopsis "Displays notifications for changes in the notmuch email database")
(description "notifymuch displays desktop notifications for messages in
the notmuch database. The notifications are sent using libnotify to a
notification daemon. The query to find messages to send a notification about
is configurable, and a notification for the same message will not be send
within a configurable period (defaults to 48 hours). To use notifymuch, run
@command{notifymuch} after new mail is indexed, this can be automated by
invoking @command{notifymuch} from the post-new hook.")
(license gpl3))))
(define-public notmuch
(package
(name "notmuch")

388
gnu/packages/music.scm

@ -1521,6 +1521,31 @@ synths, microtonal capabilities, custom envelopes, effects, etc. Yoshimi
improves on support for JACK features, such as JACK MIDI.")
(license license:gpl2)))
(define-public jack-keyboard
(package
(name "jack-keyboard")
(version "2.5")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/jack-keyboard/jack-keyboard/"
version "/jack-keyboard-" version ".tar.gz"))
(sha256
(base32
"0mzmg8aavybcfdlq2yd9d0vscqd6is5p6jzrgfpfm5j3xdcvh2s3"))))
(build-system gnu-build-system)
(inputs
`(("jack" ,jack-1)
("lash" ,lash)
("gtk+" ,gtk+-2)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://jack-keyboard.sourceforge.net/")
(synopsis "Virtual MIDI keyboard")
(description "Jack-keyboard is a virtual MIDI keyboard, a program that
allows you to send JACK MIDI events (i.e. play) using your PC keyboard.")
(license license:bsd-2)))
(define-public cursynth
(package
(name "cursynth")
@ -1965,3 +1990,366 @@ CSV file in the format created by midicsv may be converted back into a
standard MIDI file with the csvmidi program.")
(home-page "http://www.fourmilab.ch/webtools/midicsv/")
(license license:public-domain)))
(define-public gx-guvnor-lv2
(let ((commit "9f528a7623a201383e119bb6a2df32b18396a9d5")
(revision "1"))
(package
(name "gx-guvnor-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxGuvnor.lv2")
(commit commit)))
(sha256
(base32
"10zx84p2vd7i1yqc5ma9p17927265j4g0zfwv9rxladw0nm8y45k"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
`(;; The check target is used only to output a warning.
#:tests? #f
#:make-flags
(list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda _
(substitute* "Makefile"
(("INSTALL_DIR = .*") "INSTALL_DIR=/lib/lv2\n")
;; Avoid rebuilding everything
(("install : all") "install:"))
#t)))))
(inputs
`(("lv2" ,lv2)))
(home-page "https://github.com/brummer10/GxGuvnor.lv2")
(synopsis "Overdrive/distortion pedal simulation")
(description "This package provides the LV2 plugin \"GxGuvnor\", a
simulation of an overdrive or distortion pedal for guitars.")
;; The LICENSE file says GPLv3 but the license headers in the files say
;; GPLv2 or later.
(license license:gpl2+))))
(define-public gx-vbass-preamp-lv2
(let ((commit "0e599abab10c7669dd444e5d06f671c2fc1b9c6c")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-vbass-preamp-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxVBassPreAmp.lv2")
(commit commit)))
(sha256
(base32
"1dzksdfrva666gpi62fd2ni9rhf18sl917f1894qr0b17pbdh9k1"))
(file-name (string-append name "-" version "-checkout"))))
(home-page "https://github.com/brummer10/GxVBassPreAmp.lv2")
(synopsis "Simulation of the Vox Venue Bass 100 Pre Amp Section")
(description "This package provides the LV2 plugin \"GxVBassPreAmp\", a
pre-amplifier simulation modelled after the 1984 Vox Venue Bass 100 Pre Amp
Section."))))
(define-public gx-overdriver-lv2
(let ((commit "ed71801987449414bf3adaa0dbfac68e8775f1ce")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-overdriver-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxOverDriver.lv2")
(commit commit)))
(sha256
(base32
"13j614jh525fbkby79nnzwj0z1ac0c9wclyn5pfqvkmx6a7j24r8"))
(file-name (string-append name "-" version "-checkout"))))
(home-page "https://github.com/brummer10/GxOverDriver.lv2")
(synopsis "Overdrive effect with level and tone control")
(description "This package provides the LV2 plugin \"GxOverDriver\", an
overdrive effect."))))
(define-public gx-tone-mender-lv2
(let ((commit "b6780b4a3e4782b3ed0e5882d6788f178aed138f")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-tone-mender-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxToneMender.lv2")
(commit commit)))
(sha256
(base32
"07qdcfsvv2vdnfnjh91pfgvjdcs5y91nvwfm8c0z8fp6b4bk7a9q"))
(file-name (string-append name "-" version "-checkout"))))
(home-page "https://github.com/brummer10/GxToneMender.lv2")
(synopsis "Clean boost with a 3-knob tonestack")
(description "This package provides the LV2 plugin \"GxToneMender\", a
clean boost effect with a 3-knob tonestack."))))
(define-public gx-push-pull-lv2
(let ((commit "7f76ae2068498643ac8671ee0930b13ee3fd8eb5")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-push-pull-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxPushPull.lv2")
(commit commit)))
(sha256
(base32
"12f5hwck2irph0gjbj8xy8jqcqdwb8l1hlwf29k0clz52h1jhb5q"))
(file-name (string-append name "-" version "-checkout"))))
(home-page "https://github.com/brummer10/GxPushPull.lv2")
(synopsis "Octave up push pull transistor fuzz simulation")
(description "This package provides the LV2 plugin \"GxPushPull\", a
simulation of a push pull transistor fuzz effect with added high octave."))))
(define-public gx-suppa-tone-bender-lv2
(let ((commit "4e6dc713ec24e7fcf5ea23b7e685af627c01b9c9")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-suppa-tone-bender-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxSuppaToneBender.lv2")
(commit commit)))
(sha256
(base32
"1i22xr252nkbazkwidll2zb3i96610gx65qn5djdkijlz7j77138"))
(file-name (string-append name "-" version "-checkout"))))
(home-page "https://github.com/brummer10/GxSuppaToneBender.lv2")
(synopsis "Simulation of the Vox Suppa Tone Bender pedal")
(description "This package provides the LV2 plugin
\"GxSuppaToneBender\", a simulation modelled after the Vox Suppa Tone Bender
pedal."))))
(define-public gx-saturator-lv2
(let ((commit "361399245d234b4d02f11f066d25ac15d90c6bf8")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-saturator-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxSaturator.lv2")
(commit commit)))
(sha256
(base32
"13cf5gxr2wzp5954hdhbl79v98a665ll5434mb3668p4j33sv217"))
(file-name (string-append name "-" version "-checkout"))))
(arguments
(substitute-keyword-arguments (package-arguments gx-guvnor-lv2)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'escape-shell-commands
(lambda _
(substitute* "Makefile"
(("cat ") "$(shell cat ")
(("/dev/null") "/dev/null)")
(("SSE_CFLAGS = \"\"") "SSE_CFLAGS ="))
#t))))))
(home-page "https://github.com/brummer10/GxSaturator.lv2")
(synopsis "Saturation effect")
(description "This package provides the LV2 plugin \"GxSaturator\", a
saturation effect."))))
(define-public gx-hyperion-lv2
(let ((commit "7d993bc77f9946b3df0e481632c61b2dcbb6549f")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-hyperion-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxHyperion.lv2")
(commit commit)))
(sha256
(base32
"12klcyc6l9v93ii3478mqz44jzvh5np1sk8zzdmz42jp0w8qd429"))
(file-name (string-append name "-" version "-checkout"))))
(arguments
(substitute-keyword-arguments (package-arguments gx-guvnor-lv2)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'escape-shell-commands
(lambda _
(substitute* "Makefile"
(("cat ") "$(shell cat ")
(("/dev/null") "/dev/null)")
(("SSE_CFLAGS = \"\"") "SSE_CFLAGS ="))
#t))))))
(home-page "https://github.com/brummer10/GxHyperion.lv2")
(synopsis "Simulation of the Hyperion Fuzz pedal")
(description "This package provides the LV2 plugin \"GxHyperion\", a
simulation of the Hyperion Fuzz pedal."))))
(define-public gx-voodoo-fuzz-lv2
(let ((commit "d2d6b27bc279f98c2fd11bbd58ffe2fb2c321ec4")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-voodoo-fuzz-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxVoodoFuzz.lv2")
(commit commit)))
(sha256
(base32
"1ji915bly588a8xwvwspvsqv0nh8ljgi6rky2mk1d9d6nz96jrbk"))
(file-name (string-append name "-" version "-checkout"))))
(arguments
(substitute-keyword-arguments (package-arguments gx-guvnor-lv2)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'escape-shell-commands
(lambda _
(substitute* "Makefile"
(("cat ") "$(shell cat ")
(("/dev/null") "/dev/null)")
(("SSE_CFLAGS = \"\"") "SSE_CFLAGS ="))
#t))))))
(home-page "https://github.com/brummer10/GxVoodoFuzz.lv2")
(synopsis "Fuzz effect modelled after the Voodoo Lab SuperFuzz")
(description "This package provides the LV2 plugin \"GxVoodooFuzz\", a
simulation modelled after the Voodoo Lab SuperFuzz pedal. It's basically a
Bosstone circuit, followed by the tone control of the FoxToneMachine in
parallel with a DarkBooster, followed by a volume control."))))
(define-public gx-super-fuzz-lv2
(let ((commit "9800354caeb4082a64ca55b2daa9a9a1f79b8c21")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-super-fuzz-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxSuperFuzz.lv2")
(commit commit)))
(sha256
(base32
"1jclp53p01h94cpx17wm4765r7klbr41g7bvq87l53qwlrgkc7a9"))
(file-name (string-append name "-" version "-checkout"))))
(arguments
(substitute-keyword-arguments (package-arguments gx-guvnor-lv2)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'escape-shell-commands
(lambda _
(substitute* "Makefile"
(("cat ") "$(shell cat ")
(("/dev/null") "/dev/null)")
(("SSE_CFLAGS = \"\"") "SSE_CFLAGS ="))
#t))))))
(home-page "https://github.com/brummer10/GxSuperFuzz.lv2")
(synopsis "Fuzz effect modelled after the UniVox SuperFuzz")
(description "This package provides the LV2 plugin \"GxVoodooFuzz\", an
analog simulation of the UniVox SuperFuzz pedal. In this simulation the trim
pot, which is usualy in the housing, is exposed as a control parameter. It
adjusts the amount of harmonics."))))
(define-public gx-vintage-fuzz-master-lv2
(let ((commit "c3ab9a3019a8381a398718b98615940b4a225b9e")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-vintage-fuzz-master-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxVintageFuzzMaster.lv2")
(commit commit)))
(sha256
(base32
"0s1ghysggx6psalyhcpgjnmf38vama6jcqgbldqmxii5c2w2ybsc"))
(file-name (string-append name "-" version "-checkout"))))
(arguments
(substitute-keyword-arguments (package-arguments gx-guvnor-lv2)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'escape-shell-commands
(lambda _
(substitute* "Makefile"
(("cat ") "$(shell cat ")
(("/dev/null") "/dev/null)")
(("SSE_CFLAGS = \"\"") "SSE_CFLAGS ="))
#t))))))
(home-page "https://github.com/brummer10/GxVintageFuzzMaster.lv2")
(synopsis "Fuzz effect simulation of the vintage Fuzz Master")
(description "This package provides the LV2 plugin
\"GxVintageFuzzMaster\", a simulation of the vintage Fuzz Master pedal."))))
(define-public gx-slow-gear-lv2
(let ((commit "1071c2b2936ebad859242cb578af2f3415f8900f")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-slow-gear-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxSlowGear.lv2")
(commit commit)))
(sha256
(base32
"0c6099h5qkv7ilsvxxcrzwy1h6lkld1srh3fvbjxyw9q34kbqsyl"))
(file-name (string-append name "-" version "-checkout"))))
(arguments
(substitute-keyword-arguments (package-arguments gx-guvnor-lv2)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'escape-shell-commands
(lambda _
(substitute* "Makefile"
(("cat ") "$(shell cat ")
(("/dev/null") "/dev/null)")
(("SSE_CFLAGS = \"\"") "SSE_CFLAGS ="))
#t))))))
(home-page "https://github.com/brummer10/GxSlowGear.lv2")
(synopsis "Slow gear audio effect")
(description "This package provides the LV2 plugin \"GxSlowGear\", a
slow gear audio effect to produce volume swells."))))
(define-public gx-switchless-wah-lv2
(let ((commit "1d466240c482b7ce9136aee39044068ab96f1c92")
(revision "1"))
(package (inherit gx-guvnor-lv2)
(name "gx-switchless-wah-lv2")
(version (string-append "0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/brummer10/GxSwitchlessWah.lv2")
(commit commit)))
(sha256
(base32
"0g6njgsm8s76n6yys09a8w77z93pjjgqq9hzhhsrl73hhvyr9qmy"))
(file-name (string-append name "-" version "-checkout"))))
(arguments
(substitute-keyword-arguments (package-arguments gx-guvnor-lv2)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'escape-shell-commands
(lambda _
(substitute* "Makefile"
(("cat ") "$(shell cat ")
(("/dev/null") "/dev/null)")
(("SSE_CFLAGS = \"\"") "SSE_CFLAGS ="))
#t))))))
(home-page "https://github.com/brummer10/GxSwitchlessWah.lv2")
(synopsis "Wah emulation with switchless activation")
(description "This package provides the LV2 plugin \"GxSwitchlessWah\",
a simulation of an analog Wah pedal with switchless activation."))))

76
gnu/packages/networking.scm

@ -40,6 +40,7 @@
#:use-module (gnu packages audio)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages flex)
@ -54,7 +55,9 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages tls))
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind))
(define-public macchanger
(package
@ -474,7 +477,7 @@ network frames.")
(define-public httping
(package
(name "httping")
(version "2.4")
(version "2.5")
(source
(origin
(method url-fetch)
@ -482,7 +485,7 @@ network frames.")
version ".tgz"))
(sha256
(base32
"1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs"))))
"1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"))))
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)))
@ -857,3 +860,70 @@ other similar tasks that are particularly application specific so that the
library remains flexible, portable, and easily embeddable.")
(home-page "http://enet.bespin.org")
(license license:expat)))
(define-public sslh
(package
(name "sslh")
(version "1.18")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/yrutschle/sslh/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1vzw7a7s9lhspbn5zn3hw8hir4pkjgbd68yys4hfsnjp1h7bzjpn"))))
(build-system gnu-build-system)
(native-inputs
`(;; Tests dependencies.
("lcov" ,lcov)
("perl" ,perl)
("perl-io-socket-inet6" ,perl-io-socket-inet6)
("perl-socket6" ,perl-socket6)
("psmisc" ,psmisc)
("valgrind" ,valgrind)))
(inputs
`(("libcap" ,libcap)
("libconfig" ,libconfig)
("tcp-wrappers" ,tcp-wrappers)))
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-before 'check 'fix-tests
(lambda _
(substitute* "./t"
(("\"/tmp") "$ENV{\"TMPDIR\"} . \"")
;; The Guix build environment lacks ‘ip6-localhost’.
(("ip6-localhost") "localhost"))
#t))
;; Many of these files are mentioned in the man page. Install them.
(add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/sslh")))
(install-file "README.md" doc)
(for-each
(lambda (file)
(install-file file (string-append doc "/examples")))
(append (find-files "." "\\.cfg")
(find-files "scripts"))))
#t)))
#:make-flags (list "CC=gcc"
"USELIBCAP=1"
"USELIBWRAP=1"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:test-target "test"))
(home-page "http://www.rutschle.net/tech/sslh.shtml")
(synopsis "Applicative network protocol demultiplexer")
(description
"sslh is a network protocol demultiplexer. It acts like a switchboard,
accepting connections from clients on one port and forwarding them to different
servers based on the contents of the first received data packet. Detection of
common protocols like HTTP(S), SSL, SSH, OpenVPN, tinc, and XMPP is already
implemented, but any other protocol that matches a regular expression can be
added. sslh's name comes from its original application of serving both SSH and
HTTPS on port 443, allowing SSH connections from inside corporate firewalls
that block port 22.")
(license (list license:bsd-2 ; tls.[ch]
license:gpl2+)))) ; everything else

34
gnu/packages/node.scm

@ -25,6 +25,7 @@
#:use-module (guix derivations)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages gcc)
@ -37,14 +38,16 @@
(define-public node
(package
(name "node")
(version "6.0.0")
(version "6.8.0")
(source (origin
(method url-fetch)
(uri (string-append "http://nodejs.org/dist/v" version
"/node-v" version ".tar.gz"))
(sha256
(base32
"0cpw7ng193jgfbw2g1fd0kcglmjjkbj4xb89g00z8zz0lj0nvdbd"))))
"0lj3250hglz4w5ic4svd7wlg2r3qc49hnasvbva1v69l8yvx98m8"))
;; https://github.com/nodejs/node/pull/9077
(patches (search-patches "node-9077.patch"))))
(build-system gnu-build-system)
(arguments
;; TODO: Package http_parser and add --shared-http-parser.
@ -78,10 +81,10 @@
;; FIXME: These tests fail in the build container, but they don't
;; seem to be indicative of real problems in practice.
(for-each delete-file
'("test/parallel/test-cluster-master-error.js"
'("test/parallel/test-dgram-membership.js"
"test/parallel/test-cluster-master-error.js"
"test/parallel/test-cluster-master-kill.js"
"test/parallel/test-npm-install.js"
"test/parallel/test-stdout-close-unref.js"
"test/sequential/test-child-process-emfile.js"))
#t))
(replace 'configure
@ -101,22 +104,15 @@
(string-append (assoc-ref inputs "python")
"/bin/python")
"configure" flags)))))
(replace 'patch-shebangs
(lambda* (#:key outputs #:allow-other-keys #:rest all)
;; Work around <http://bugs.gnu.org/23723>.
(let* ((patch (assoc-ref %standard-phases 'patch-shebangs))
(npm (string-append (assoc-ref outputs "out")
"/bin/npm"))
(add-after 'patch-shebangs 'patch-npm-shebang
(lambda* (#:key outputs #:allow-other-keys)
(let* ((bindir (string-append (assoc-ref outputs "out")
"/bin"))
(npm (string-append bindir "/npm"))
(target (readlink npm)))
(and (apply patch all)
(with-directory-excursion (dirname npm)
;; Turn NPM into a symlink to TARGET again, which 'npm'
;; relies on for the resolution of relative file names
;; in JS files.