Merge remote-tracking branch 'origin/master' into core-updates

 Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm

1 files changed, 23 insertions, 0 deletions

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 666a0aa421..f0580eff8b 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -736,6 +736,29 @@ or for saving sensitive information that shouldn't be sent to an
 external server.")
     (license license:expat)))
 
+(define-public js-scianimator
+  (package
+    (name "js-scianimator")
+    (version "1.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/brentertz/scianimator.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0b4r6z85gnsjagdchvf1pvrhylfiaidh701hna8jrm0l4kbb735x"))))
+    (build-system minify-build-system)
+    (arguments
+     '(#:javascript-files
+       (list "assets/js/jquery.scianimator.js")))
+    (home-page "https://github.com/brentertz/scianimator")
+    (synopsis "Scientific image animator plugin for jQuery")
+    (description "SciAnimator provides a simple yet powerful interface for
+animating a series of images.")
+    (license license:expat)))
+
 (define-public mujs
   (package
     (name "mujs")