From 257e3247910610fe24ae1b86f38e85552d53e48c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 23 Sep 2018 04:46:59 -0400 Subject: gnu: icecat: Unbundle graphite2 and harfbuzz. * gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch: New file. * gnu/packages/patches/icecat-use-system-graphite2.patch, gnu/packages/patches/icecat-use-system-harfbuzz.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/gnuzilla.scm (icecat)[source]: Add new patch. Delete bundled graphite2 and harfbuzz in snippet. [inputs]: Add graphite2 and harfbuzz. [arguments]: Add --with-system-{graphite2,harfbuzz} to configure flags. --- gnu/local.mk | 3 +- gnu/packages/gnuzilla.scm | 19 +- .../icecat-use-system-graphite2+harfbuzz.patch | 226 +++++++++++++++++ .../patches/icecat-use-system-graphite2.patch | 248 ------------------ .../patches/icecat-use-system-harfbuzz.patch | 279 --------------------- 5 files changed, 236 insertions(+), 539 deletions(-) create mode 100644 gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch delete mode 100644 gnu/packages/patches/icecat-use-system-graphite2.patch delete mode 100644 gnu/packages/patches/icecat-use-system-harfbuzz.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index fe2b573dd5..35e78e7816 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -811,8 +811,7 @@ dist_patch_DATA = \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-CVE-2018-12383.patch \ - %D%/packages/patches/icecat-use-system-graphite2.patch \ - %D%/packages/patches/icecat-use-system-harfbuzz.patch \ + %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 653cee93d5..ad83444e3c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -495,9 +495,8 @@ security standards.") "0lqx7g79x15941rhjr3qsfwsny6vzc7d7abdmvjy6jjbqkqlc1zl")) (patches (list - (search-patch "icecat-avoid-bundled-libraries.patch") - ;; FIXME (search-patch "icecat-use-system-harfbuzz.patch") - ;; FIXME (search-patch "icecat-use-system-graphite2.patch") + (search-patch "icecat-avoid-bundled-libraries.patch") + (search-patch "icecat-use-system-graphite2+harfbuzz.patch") (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") (search-patch "icecat-CVE-2018-12383.patch") (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) @@ -535,8 +534,8 @@ security standards.") "media/libvpx" "security/nss" ;; UNBUNDLE-ME "gfx/cairo" - ;; UNBUNDLE-ME "gfx/harfbuzz" - ;; UNBUNDLE-ME "gfx/graphite2" + "gfx/harfbuzz" + "gfx/graphite2" "js/src/ctypes/libffi" "db/sqlite3")) ;; Delete .pyc files, typically present in icecat source tarballs @@ -557,10 +556,10 @@ security standards.") ("glib" ,glib) ("gtk+" ,gtk+) ("gtk+-2" ,gtk+-2) - ;; UNBUNDLE-ME ("graphite2" ,graphite2) + ("graphite2" ,graphite2) ("pango" ,pango) ("freetype" ,freetype) - ;; UNBUNDLE-ME ("harfbuzz" ,harfbuzz) + ("harfbuzz" ,harfbuzz) ("hunspell" ,hunspell) ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) @@ -643,8 +642,8 @@ security standards.") "--with-system-icu" "--with-system-nspr" "--with-system-nss" - ;; UNBUNDLE-ME "--with-system-harfbuzz" - ;; UNBUNDLE-ME "--with-system-graphite2" + "--with-system-harfbuzz" + "--with-system-graphite2" "--enable-system-pixman" ;; UNBUNDLE-ME "--enable-system-cairo" "--enable-system-ffi" @@ -697,7 +696,7 @@ security standards.") all))) #t)) (add-after 'patch-source-shebangs 'patch-cargo-checksums - (lambda* _ + (lambda _ (use-modules (guix build cargo-build-system)) (let ((null-file "/dev/null") (null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) diff --git a/gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch b/gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch new file mode 100644 index 0000000000..94c211b797 --- /dev/null +++ b/gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch @@ -0,0 +1,226 @@ +Allow building against system-wide graphite2/harfbuzz. +See +Based on: + https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bug847568?revision=472833&view=co +Modified for use with patch -p1, and to apply cleanly to GNU IceCat. + +--- icecat-60.2.0/config/system-headers.mozbuild ++++ icecat-60.2.0/config/system-headers.mozbuild +@@ -1311,6 +1311,19 @@ + 'pixman.h', + ] + ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ system_headers += [ ++ 'graphite2/Font.h', ++ 'graphite2/Segment.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ system_headers += [ ++ 'harfbuzz/hb-glib.h', ++ 'harfbuzz/hb-ot.h', ++ 'harfbuzz/hb.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', +--- icecat-60.2.0/dom/base/moz.build ++++ icecat-60.2.0/dom/base/moz.build +@@ -474,6 +474,9 @@ + if CONFIG['MOZ_X11']: + CXXFLAGS += CONFIG['TK_CFLAGS'] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + GENERATED_FILES += [ + 'PropertyUseCounterMap.inc', + 'UseCounterList.h', +--- icecat-60.2.0/gfx/graphite2/moz-gr-update.sh ++++ icecat-60.2.0/gfx/graphite2/moz-gr-update.sh +@@ -1,6 +1,7 @@ + #!/bin/bash + + # Script used to update the Graphite2 library in the mozilla source tree ++# and bump version for --with-system-graphite2 + + # This script lives in gfx/graphite2, along with the library source, + # but must be run from the top level of the mozilla-central tree. +@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla + #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + ++# chase version for --with-system-graphite2 ++perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ ++ if /GR2_VERSION_REQUIRE/" old-configure.in ++ + # summarize what's been touched + echo Updated to $RELEASE. + echo Here is what changed in the gfx/graphite2 directory: + echo + +-hg stat gfx/graphite2 ++hg stat old-configure.in gfx/graphite2 + + echo + echo If gfx/graphite2/src/files.mk has changed, please make corresponding +--- icecat-60.2.0/gfx/moz.build ++++ icecat-60.2.0/gfx/moz.build +@@ -10,6 +10,12 @@ with Files('**'): + if CONFIG['MOZ_TREE_CAIRO']: + DIRS += ['cairo'] + ++if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ DIRS += ['graphite2/src' ] ++ ++if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ DIRS += ['harfbuzz/src'] ++ + DIRS += [ + '2d', + 'ycbcr', +@@ -18,8 +24,6 @@ DIRS += [ + 'qcms', + 'gl', + 'layers', +- 'graphite2/src', +- 'harfbuzz/src', + 'ots/src', + 'thebes', + 'ipc', +--- icecat-60.2.0/gfx/skia/generate_mozbuild.py ++++ icecat-60.2.0/gfx/skia/generate_mozbuild.py +@@ -148,6 +148,9 @@ + '-Wno-unused-private-field', + ] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] +--- icecat-60.2.0/gfx/skia/moz.build ++++ icecat-60.2.0/gfx/skia/moz.build +@@ -822,6 +822,9 @@ + '-Wno-unused-private-field', + ] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] +--- icecat-60.2.0/gfx/thebes/moz.build ++++ icecat-60.2.0/gfx/thebes/moz.build +@@ -272,7 +272,13 @@ + + LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] + +-DEFINES['GRAPHITE2_STATIC'] = True ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] ++else: ++ DEFINES['GRAPHITE2_STATIC'] = True ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + + if CONFIG['CC_TYPE'] == 'clang': + # Suppress warnings from Skia header files. +--- icecat-60.2.0/intl/unicharutil/util/moz.build ++++ icecat-60.2.0/intl/unicharutil/util/moz.build +@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [ + 'nsUnicodeProperties.cpp', + ] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + FINAL_LIBRARY = 'xul' +--- icecat-60.2.0/netwerk/dns/moz.build ++++ icecat-60.2.0/netwerk/dns/moz.build +@@ -76,3 +76,6 @@ + + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + CXXFLAGS += ['-Wno-error=shadow'] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] +--- icecat-60.2.0/old-configure.in ++++ icecat-60.2.0/old-configure.in +@@ -3995,6 +3995,27 @@ + AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) + + dnl ======================================================== ++dnl Check for graphite2 ++dnl ======================================================== ++if test -n "$MOZ_SYSTEM_GRAPHITE2"; then ++ dnl graphite2.pc has bogus version, check manually ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" ++ AC_TRY_COMPILE([ #include ++ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ ++ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ ++ * 100 + GR2_VERSION_BUGFIX >= \ ++ (major) * 10000 + (minor) * 100 + (bugfix) ) ++ ], [ ++ #if !GR2_VERSION_REQUIRE(1,3,10) ++ #error "Insufficient graphite2 version." ++ #endif ++ ], [], ++ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) ++ CFLAGS=$_SAVE_CFLAGS ++fi ++ ++dnl ======================================================== + dnl Check for pixman and cairo + dnl ======================================================== + +--- icecat-60.2.0/toolkit/library/moz.build ++++ icecat-60.2.0/toolkit/library/moz.build +@@ -235,6 +235,12 @@ + if CONFIG['MOZ_SYSTEM_PNG']: + OS_LIBS += CONFIG['MOZ_PNG_LIBS'] + ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] ++ + if CONFIG['MOZ_SYSTEM_HUNSPELL']: + OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + +--- icecat-60.2.0/toolkit/moz.configure ++++ icecat-60.2.0/toolkit/moz.configure +@@ -1051,6 +1051,26 @@ + add_old_configure_assignment('FT2_CFLAGS', + ft2_info.cflags) + ++# Graphite2 ++# ============================================================== ++option('--with-system-graphite2', ++ help="Use system graphite2 (located with pkgconfig)") ++ ++system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', ++ when='--with-system-graphite2') ++ ++set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) ++ ++# HarfBuzz ++# ============================================================== ++option('--with-system-harfbuzz', ++ help="Use system harfbuzz (located with pkgconfig)") ++ ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.4', ++ when='--with-system-harfbuzz') ++ ++set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) ++ + # Mortar + # ============================================================== + option('--enable-mortar', help='Enable mortar extension') diff --git a/gnu/packages/patches/icecat-use-system-graphite2.patch b/gnu/packages/patches/icecat-use-system-graphite2.patch deleted file mode 100644 index 188fba2bc9..0000000000 --- a/gnu/packages/patches/icecat-use-system-graphite2.patch +++ /dev/null @@ -1,248 +0,0 @@ -Copied from -See - -diff --git a/config/Makefile.in b/config/Makefile.in ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -36,16 +36,17 @@ ifdef WRAP_SYSTEM_INCLUDES - export-preqs = \ - $(call mkdir_deps,system_wrappers) \ - $(NULL) - - export:: $(export-preqs) - $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \ - -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ -+ -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \ - -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \ - -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \ - -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ - -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ - -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \ - -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \ - -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ - -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -1260,16 +1260,20 @@ zlib.h - #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION - libsn/sn.h - libsn/sn-common.h - libsn/sn-launchee.h - libsn/sn-launcher.h - libsn/sn-monitor.h - libsn/sn-util.h - #endif -+#if MOZ_SYSTEM_GRAPHITE2==1 -+graphite2/Font.h -+graphite2/Segment.h -+#endif - #if MOZ_SYSTEM_HARFBUZZ==1 - harfbuzz/hb-glib.h - harfbuzz/hb-ot.h - harfbuzz/hb.h - #endif - #if MOZ_SYSTEM_HUNSPELL==1 - hunspell.hxx - #endif -diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh ---- a/gfx/graphite2/moz-gr-update.sh -+++ b/gfx/graphite2/moz-gr-update.sh -@@ -1,11 +1,12 @@ - #!/bin/bash - - # Script used to update the Graphite2 library in the mozilla source tree -+# and bump version for --with-system-graphite2 - - # This script lives in gfx/graphite2, along with the library source, - # but must be run from the top level of the mozilla-central tree. - - # Run as - # - # ./gfx/graphite2/moz-gr-update.sh RELEASE - # -@@ -32,22 +33,26 @@ echo "This directory contains the Graphi - echo "$TARBALL" >> gfx/graphite2/README.mozilla - echo "" - echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla - - # fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h) - #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - -+# chase version for --with-system-graphite2 -+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ -+ if /GR2_VERSION_REQUIRE/" old-configure.in -+ - # summarize what's been touched - echo Updated to $RELEASE. - echo Here is what changed in the gfx/graphite2 directory: - echo - --hg stat gfx/graphite2 -+hg stat old-configure.in gfx/graphite2 - - echo - echo If gfx/graphite2/src/files.mk has changed, please make corresponding - echo changes to gfx/graphite2/src/moz.build - echo - - echo - echo Now use hg commands to create a patch for the mozilla tree. -diff --git a/gfx/moz.build b/gfx/moz.build ---- a/gfx/moz.build -+++ b/gfx/moz.build -@@ -2,28 +2,30 @@ - # vim: set filetype=python: - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - if CONFIG['MOZ_TREE_CAIRO']: - DIRS += ['cairo'] - -+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ DIRS += ['graphite2/src' ] -+ - if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: - DIRS += ['harfbuzz/src'] - - DIRS += [ - '2d', - 'ycbcr', - 'angle', - 'src', - 'qcms', - 'gl', - 'layers', -- 'graphite2/src', - 'ots/src', - 'thebes', - 'ipc', - 'vr', - 'config', - ] - - if CONFIG['MOZ_ENABLE_SKIA']: -diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build ---- a/gfx/thebes/moz.build -+++ b/gfx/thebes/moz.build -@@ -261,16 +261,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] - LOCAL_INCLUDES += ['/media/libyuv/include'] - --DEFINES['GRAPHITE2_STATIC'] = True -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] -+else: -+ DEFINES['GRAPHITE2_STATIC'] = True - - if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] - - if CONFIG['CLANG_CXX']: - # Suppress warnings from Skia header files. - SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough'] -diff --git a/moz.configure b/moz.configure ---- a/moz.configure -+++ b/moz.configure -@@ -260,16 +260,28 @@ def extra_programs(target): - - check_prog('DSYMUTIL', delayed_getattr(extra_programs, 'DSYMUTIL'), - allow_missing=True) - check_prog('GENISOIMAGE', delayed_getattr(extra_programs, 'GENISOIMAGE'), - allow_missing=True) - check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'), - allow_missing=True) - -+option('--with-system-graphite2', -+ help="Use system graphite2 (located with pkgconfig)") -+ -+@depends('--with-system-graphite2', compile_environment) -+def check_for_graphite2(value, compile_env): -+ return value and compile_env -+ -+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', -+ check_for_graphite2) -+ -+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) -+ - option('--with-system-harfbuzz', - help="Use system harfbuzz (located with pkgconfig)") - - @depends('--with-system-harfbuzz', compile_environment) - def check_for_harfbuzz(value, compile_env): - return value and compile_env - - system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.3.3', -diff --git a/old-configure.in b/old-configure.in ---- a/old-configure.in -+++ b/old-configure.in -@@ -5060,16 +5060,37 @@ if test "$USE_FC_FREETYPE"; then - CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS" - MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], , - [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)], [#include ]) - CPPFLAGS="$_SAVE_CPPFLAGS" - fi - fi - - dnl ======================================================== -+dnl Check for graphite2 -+dnl ======================================================== -+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then -+ dnl graphite2.pc has bogus version, check manually -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" -+ AC_TRY_COMPILE([ #include -+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ -+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ -+ * 100 + GR2_VERSION_BUGFIX >= \ -+ (major) * 10000 + (minor) * 100 + (bugfix) ) -+ ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,8) -+ #error "Insufficient graphite2 version." -+ #endif -+ ], [], -+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) -+ CFLAGS=$_SAVE_CFLAGS -+fi -+ -+dnl ======================================================== - dnl Check for pixman and cairo - dnl ======================================================== - - MOZ_TREE_CAIRO=1 - MOZ_ARG_ENABLE_BOOL(system-cairo, - [ --enable-system-cairo Use system cairo (located with pkgconfig)], - MOZ_TREE_CAIRO=, - MOZ_TREE_CAIRO=1 ) -diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build ---- a/toolkit/library/moz.build -+++ b/toolkit/library/moz.build -@@ -221,16 +221,19 @@ if CONFIG['SERVO_TARGET_DIR']: - OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo'] - - if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] - - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - diff --git a/gnu/packages/patches/icecat-use-system-harfbuzz.patch b/gnu/packages/patches/icecat-use-system-harfbuzz.patch deleted file mode 100644 index 083d404c13..0000000000 --- a/gnu/packages/patches/icecat-use-system-harfbuzz.patch +++ /dev/null @@ -1,279 +0,0 @@ -Copied from -See - -diff --git a/config/Makefile.in b/config/Makefile.in ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -36,16 +36,17 @@ ifdef WRAP_SYSTEM_INCLUDES - export-preqs = \ - $(call mkdir_deps,system_wrappers) \ - $(NULL) - - export:: $(export-preqs) - $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \ - -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ -+ -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \ - -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \ - -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ - -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ - -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \ - -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \ - -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ - -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ - -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \ -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -1260,16 +1260,21 @@ zlib.h - #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION - libsn/sn.h - libsn/sn-common.h - libsn/sn-launchee.h - libsn/sn-launcher.h - libsn/sn-monitor.h - libsn/sn-util.h - #endif -+#if MOZ_SYSTEM_HARFBUZZ==1 -+harfbuzz/hb-glib.h -+harfbuzz/hb-ot.h -+harfbuzz/hb.h -+#endif - #if MOZ_SYSTEM_HUNSPELL==1 - hunspell.hxx - #endif - #if MOZ_SYSTEM_BZ2==1 - bzlib.h - #endif - #ifdef MOZ_ENABLE_GIO - gio/gio.h -diff --git a/dom/base/moz.build b/dom/base/moz.build ---- a/dom/base/moz.build -+++ b/dom/base/moz.build -@@ -474,16 +474,19 @@ for var in ('MOZ_B2G_RIL'): - DEFINES[var] = True - - if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: - DEFINES['HAVE_SIDEBAR'] = True - - if CONFIG['MOZ_X11']: - CXXFLAGS += CONFIG['TK_CFLAGS'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - GENERATED_FILES += [ - 'PropertyUseCounterMap.inc', - 'UseCounterList.h', - ] - - countermap = GENERATED_FILES['PropertyUseCounterMap.inc'] - countermap.script = 'gen-usecounters.py:property_map' - countermap.inputs = ['UseCounters.conf'] -diff --git a/gfx/harfbuzz/README-mozilla b/gfx/harfbuzz/README-mozilla ---- a/gfx/harfbuzz/README-mozilla -+++ b/gfx/harfbuzz/README-mozilla -@@ -14,8 +14,13 @@ this file when updating harfbuzz, and ch - - The normal approach to updating harfbuzz, therefore, is to pull the latest HB - source into a scratch directory and do a local build; then copy the original - sources AND the generated header mentioned above from the build directory into - the mozilla tree. - - If the collection of source files changes, manual updates to moz.build may be - needed, as we don't use the upstream makefiles. -+ -+The in-tree copy may be omitted during build by --with-system-harfbuzz. -+Make sure to keep pkg-config version check within old-configure.in in sync -+with checkout version or increment latest tag by one if it's not based -+on upstream release. -diff --git a/gfx/moz.build b/gfx/moz.build ---- a/gfx/moz.build -+++ b/gfx/moz.build -@@ -2,26 +2,28 @@ - # vim: set filetype=python: - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - if CONFIG['MOZ_TREE_CAIRO']: - DIRS += ['cairo'] - -+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ DIRS += ['harfbuzz/src'] -+ - DIRS += [ - '2d', - 'ycbcr', - 'angle', - 'src', - 'qcms', - 'gl', - 'layers', - 'graphite2/src', -- 'harfbuzz/src', - 'ots/src', - 'thebes', - 'ipc', - 'vr', - 'config', - ] - - if CONFIG['MOZ_ENABLE_SKIA']: -diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py ---- a/gfx/skia/generate_mozbuild.py -+++ b/gfx/skia/generate_mozbuild.py -@@ -138,16 +138,19 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA - if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: - CXXFLAGS += [ - '-Wno-implicit-fallthrough', - '-Wno-inconsistent-missing-override', - '-Wno-macro-redefined', - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - """ - -diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build ---- a/gfx/skia/moz.build -+++ b/gfx/skia/moz.build -@@ -748,14 +748,17 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA - if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: - CXXFLAGS += [ - '-Wno-implicit-fallthrough', - '-Wno-inconsistent-missing-override', - '-Wno-macro-redefined', - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] -diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build ---- a/gfx/thebes/moz.build -+++ b/gfx/thebes/moz.build -@@ -263,11 +263,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] - LOCAL_INCLUDES += ['/media/libyuv/include'] - - DEFINES['GRAPHITE2_STATIC'] = True - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['CLANG_CXX']: - # Suppress warnings from Skia header files. - SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough'] -diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build ---- a/intl/unicharutil/util/moz.build -+++ b/intl/unicharutil/util/moz.build -@@ -37,9 +37,12 @@ if CONFIG['_MSC_VER']: - DEFINES['_USE_ANSI_CPP'] = True - # Don't include directives about which CRT to use - CFLAGS += ['-Zl'] - CXXFLAGS += ['-Zl'] - - if CONFIG['ENABLE_INTL_API']: - USE_LIBS += ['icu'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - DIST_INSTALL = True -diff --git a/moz.configure b/moz.configure ---- a/moz.configure -+++ b/moz.configure -@@ -260,16 +260,28 @@ def extra_programs(target): - - check_prog('DSYMUTIL', delayed_getattr(extra_programs, 'DSYMUTIL'), - allow_missing=True) - check_prog('GENISOIMAGE', delayed_getattr(extra_programs, 'GENISOIMAGE'), - allow_missing=True) - check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'), - allow_missing=True) - -+option('--with-system-harfbuzz', -+ help="Use system harfbuzz (located with pkgconfig)") -+ -+@depends('--with-system-harfbuzz', compile_environment) -+def check_for_harfbuzz(value, compile_env): -+ return value and compile_env -+ -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.3.3', -+ check_for_harfbuzz) -+ -+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) -+ - option('--enable-system-hunspell', - help="Use system hunspell (located with pkgconfig)") - - @depends('--enable-system-hunspell', compile_environment) - def check_for_hunspell(value, compile_env): - return value and compile_env - - system_hunspell = pkg_check_modules('MOZ_HUNSPELL', 'hunspell', -diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build ---- a/netwerk/dns/moz.build -+++ b/netwerk/dns/moz.build -@@ -61,16 +61,19 @@ etld_data = GENERATED_FILES['etld_data.i - etld_data.script = 'prepare_tlds.py' - etld_data.inputs = ['effective_tld_names.dat'] - - # need to include etld_data.inc - LOCAL_INCLUDES += [ - '/netwerk/base', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['ENABLE_INTL_API']: - DEFINES['IDNA2008'] = True - USE_LIBS += ['icu'] - else: - UNIFIED_SOURCES += [ - 'nameprep.c', - ] - -diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build ---- a/toolkit/library/moz.build -+++ b/toolkit/library/moz.build -@@ -221,16 +221,19 @@ if CONFIG['SERVO_TARGET_DIR']: - OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo'] - - if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBVPX']: - OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] - -- cgit v1.2.3 From 94e96f7f68c3b9053fdb5dee5b0ab614163aaa08 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 24 Sep 2018 00:10:37 -0400 Subject: gnu: icecat: Unbundle libevent, libogg, and libvorbis. * gnu/packages/patches/icecat-use-system-media-libs.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/patches/icecat-avoid-bundled-libraries.patch: Add another hunk to enable removal of libevent. * gnu/packages/gnuzilla.scm (icecat)[source]: Add patch. In the snippet, add libevent, libogg, libvorbis, and libtremor to the list of bundled libraries to remove. Add a comment regarding theora. Remove comments regarding unbundling cairo, which is no longer supported. [inputs]: Add libevent, libogg, and libvorbis. [arguments]: Add --with-system-{libevent,ogg,vorbis} to configure flags. Add custom bootstrap phase. Add comments. --- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 39 ++- .../patches/icecat-avoid-bundled-libraries.patch | 14 + .../patches/icecat-use-system-media-libs.patch | 381 +++++++++++++++++++++ 4 files changed, 423 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/icecat-use-system-media-libs.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 35e78e7816..244c79d221 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -812,6 +812,7 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-CVE-2018-12383.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ + %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ad83444e3c..6834d82426 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -36,6 +36,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages databases) @@ -62,6 +63,7 @@ #:use-module (gnu packages rust) #:use-module (gnu packages icu4c) #:use-module (gnu packages video) + #:use-module (gnu packages xiph) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline)) @@ -497,6 +499,7 @@ security standards.") (list (search-patch "icecat-avoid-bundled-libraries.patch") (search-patch "icecat-use-system-graphite2+harfbuzz.patch") + (search-patch "icecat-use-system-media-libs.patch") (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") (search-patch "icecat-CVE-2018-12383.patch") (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) @@ -516,24 +519,29 @@ security standards.") ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; - ;; TODO: Use system media libraries. Waiting for: + ;; TODO: Use more system media libraries. See: ;; - ;; * libogg - ;; * libtheora - ;; * libvorbis - ;; * libtremor (not yet in guix) + ;; * libtheora: esr60 wants v1.2, not yet released. + ;; * soundtouch: avoiding the bundled library would + ;; result in some loss of functionality. There's + ;; also an issue with exception handling + ;; configuration. It seems that this is needed in + ;; some moz.build: + ;; DEFINES['ST_NO_EXCEPTION_HANDLING'] = 1 ;; * libopus ;; * speex - ;; * soundtouch (not yet in guix) ;; "modules/freetype2" "modules/zlib" "modules/libbz2" - ;; UNBUNDLE-ME "ipc/chromium/src/third_party/libevent" + "ipc/chromium/src/third_party/libevent" "media/libjpeg" "media/libvpx" + "media/libogg" + "media/libvorbis" + ;; "media/libtheora" ; wants theora-1.2, not yet released + "media/libtremor" "security/nss" - ;; UNBUNDLE-ME "gfx/cairo" "gfx/harfbuzz" "gfx/graphite2" "js/src/ctypes/libffi" @@ -549,7 +557,6 @@ security standards.") (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) - ;; UNBUNDLE-ME ("cairo" ,cairo) ("cups" ,cups) ("dbus-glib" ,dbus-glib) ("gdk-pixbuf" ,gdk-pixbuf) @@ -564,8 +571,11 @@ security standards.") ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) ("libjpeg-turbo" ,libjpeg-turbo) + ("libogg" ,libogg) + ;; ("libtheora" ,libtheora) ; wants theora-1.2, not yet released + ("libvorbis" ,libvorbis) ("libxft" ,libxft) - ;; UNBUNDLE-ME ("libevent" ,libevent-2.0) + ("libevent" ,libevent) ("libxinerama" ,libxinerama) ("libxscrnsaver" ,libxscrnsaver) ("libxcomposite" ,libxcomposite) @@ -637,7 +647,10 @@ security standards.") "--with-system-zlib" "--with-system-bz2" "--with-system-jpeg" ; must be libjpeg-turbo - ;; UNBUNDLE-ME "--with-system-libevent" + "--with-system-libevent" + "--with-system-ogg" + "--with-system-vorbis" + ;; "--with-system-theora" ; wants theora-1.2, not yet released "--with-system-libvpx" "--with-system-icu" "--with-system-nspr" @@ -645,7 +658,6 @@ security standards.") "--with-system-harfbuzz" "--with-system-graphite2" "--enable-system-pixman" - ;; UNBUNDLE-ME "--enable-system-cairo" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-sqlite" @@ -695,6 +707,9 @@ security standards.") 'avcodec', 'avutil', 'pulse' ]\n\n" all))) #t)) + (replace 'bootstrap + (lambda _ + (invoke "sh" "-c" "autoconf old-configure.in > old-configure"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-build-system)) diff --git a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch index b5e9fb887e..33203b1a33 100644 --- a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch +++ b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch @@ -33,3 +33,17 @@ Fixes needed when avoiding bundled libraries. '/dom/base', '/dom/storage', '/ipc/glue', +--- icecat-60.2.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build.orig 2018-09-13 17:40:54.000000000 -0400 ++++ icecat-60.2.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build 2018-09-23 21:33:12.319975105 -0400 +@@ -130,11 +130,6 @@ + DEFINES["WEBRTC_POSIX"] = True + DEFINES["_FILE_OFFSET_BITS"] = "64" + +- LOCAL_INCLUDES += [ +- "/ipc/chromium/src/third_party/libevent/include/", +- "/ipc/chromium/src/third_party/libevent/linux/" +- ] +- + UNIFIED_SOURCES += [ + "/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc", + "/media/webrtc/trunk/webrtc/base/task_queue_posix.cc" diff --git a/gnu/packages/patches/icecat-use-system-media-libs.patch b/gnu/packages/patches/icecat-use-system-media-libs.patch new file mode 100644 index 0000000000..648585a6f0 --- /dev/null +++ b/gnu/packages/patches/icecat-use-system-media-libs.patch @@ -0,0 +1,381 @@ +Support building with system media libraries. +See + +Based on: + https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-z-bug517422?revision=472833&view=markup + +Changes to files within the bundled libraries are omitted, since those files +are removed from Guix sources. Modified for use with patch -p1, and to apply +cleanly to GNU IceCat. + +--- icecat-60.2.0/build/moz.configure/old.configure ++++ icecat-60.2.0/build/moz.configure/old.configure +@@ -273,7 +273,12 @@ + '--with-system-libvpx', + '--with-system-nspr', + '--with-system-nss', ++ '--with-system-ogg', + '--with-system-png', ++ '--with-system-soundtouch', ++ '--with-system-theora', ++ '--with-system-tremor', ++ '--with-system-vorbis', + '--with-system-zlib', + '--with-thumb', + '--with-thumb-interwork', +--- icecat-60.2.0/config/external/moz.build ++++ icecat-60.2.0/config/external/moz.build +@@ -23,12 +23,21 @@ + + external_dirs += ['modules/xz-embedded'] + +-if CONFIG['MOZ_VORBIS']: ++if not CONFIG['MOZ_SYSTEM_OGG']: ++ external_dirs += ['media/libogg'] ++ ++if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']: + external_dirs += ['media/libvorbis'] + +-if CONFIG['MOZ_TREMOR']: ++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']: + external_dirs += ['media/libtremor'] + ++if not CONFIG['MOZ_SYSTEM_THEORA']: ++ external_dirs += ['media/libtheora'] ++ ++if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: ++ external_dirs += ['media/libsoundtouch'] ++ + if CONFIG['MOZ_WEBM_ENCODER']: + external_dirs += ['media/libmkv'] + +@@ -51,11 +60,8 @@ + 'media/kiss_fft', + 'media/libcubeb', + 'media/libnestegg', +- 'media/libogg', + 'media/libopus', +- 'media/libtheora', + 'media/libspeex_resampler', +- 'media/libsoundtouch', + 'media/mp4parse-rust', + 'media/psshparser' + ] +--- icecat-60.2.0/config/system-headers.mozbuild ++++ icecat-60.2.0/config/system-headers.mozbuild +@@ -1324,6 +1324,28 @@ + 'harfbuzz/hb.h', + ] + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ system_headers += [ ++ 'ogg/ogg.h', ++ 'ogg/os_types.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ system_headers += [ ++ 'theora/theoradec.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ system_headers += [ ++ 'vorbis/codec.h', ++ 'vorbis/vorbisenc.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ system_headers += [ ++ 'tremor/ivorbiscodec.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', +--- icecat-60.2.0/dom/media/AudioStream.cpp ++++ icecat-60.2.0/dom/media/AudioStream.cpp +@@ -121,7 +121,9 @@ + : mMonitor("AudioStream") + , mChannels(0) + , mOutChannels(0) ++#ifndef MOZ_SYSTEM_SOUNDTOUCH + , mTimeStretcher(nullptr) ++#endif + , mDumpFile(nullptr) + , mState(INITIALIZED) + , mDataSource(aSource) +@@ -142,9 +144,11 @@ + if (mDumpFile) { + fclose(mDumpFile); + } ++#ifndef MOZ_SYSTEM_SOUNDTOUCH + if (mTimeStretcher) { + soundtouch::destroySoundTouchObj(mTimeStretcher); + } ++#endif + #if defined(XP_WIN) + if (XRE_IsContentProcess()) { + audio::AudioNotificationReceiver::Unregister(this); +@@ -168,7 +172,11 @@ + { + mMonitor.AssertCurrentThreadOwns(); + if (!mTimeStretcher) { ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ mTimeStretcher = new soundtouch::SoundTouch(); ++#else + mTimeStretcher = soundtouch::createSoundTouchObj(); ++#endif + mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); + mTimeStretcher->setChannels(mOutChannels); + mTimeStretcher->setPitch(1.0); +--- icecat-60.2.0/dom/media/AudioStream.h ++++ icecat-60.2.0/dom/media/AudioStream.h +@@ -15,7 +15,11 @@ + #include "mozilla/TimeStamp.h" + #include "mozilla/UniquePtr.h" + #include "CubebUtils.h" ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++#include "soundtouch/SoundTouch.h" ++#else + #include "soundtouch/SoundTouchFactory.h" ++#endif + + #if defined(XP_WIN) + #include "mozilla/audio/AudioNotificationReceiver.h" +@@ -297,7 +301,11 @@ + uint32_t mChannels; + uint32_t mOutChannels; + AudioClock mAudioClock; ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ nsAutoPtr mTimeStretcher; ++#else + soundtouch::SoundTouch* mTimeStretcher; ++#endif + + // Output file for dumping audio + FILE* mDumpFile; +--- icecat-60.2.0/dom/media/moz.build ++++ icecat-60.2.0/dom/media/moz.build +@@ -327,6 +327,21 @@ + + DEFINES['MOZILLA_INTERNAL_API'] = True + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: ++ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] ++ + if CONFIG['MOZ_ANDROID_HLS_SUPPORT']: + DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True + +--- icecat-60.2.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp ++++ icecat-60.2.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp +@@ -15,9 +15,13 @@ + #include + #endif + ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++#include "nsXPCOMPrivate.h" // for XUL_DLL ++#else + // We use a known symbol located in lgpllibs to determine its location. + // soundtouch happens to be always included in lgpllibs + #include "soundtouch/SoundTouch.h" ++#endif + + namespace mozilla { + +@@ -64,6 +68,12 @@ + + sLinkStatus = LinkStatus_FAILED; + ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ // We retrieve the path of the XUL library as this is where mozavcodec and ++ // mozavutil libs are located. ++ char* path = ++ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); ++#else + // We retrieve the path of the lgpllibs library as this is where mozavcodec + // and mozavutil libs are located. + PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs"); +@@ -73,6 +83,7 @@ + PathString path = + GetLibraryFilePathname(lgpllibsname.get(), + (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); ++#endif + if (path.IsEmpty()) { + return false; + } +--- icecat-60.2.0/old-configure.in ++++ icecat-60.2.0/old-configure.in +@@ -2451,6 +2451,111 @@ + fi + fi # COMPILE_ENVIRONMENT + ++dnl ======================================================== ++dnl Check for libogg ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-ogg, ++[ --with-system-ogg Use system libogg (located with pkgconfig)], ++MOZ_SYSTEM_OGG=1, ++MOZ_SYSTEM_OGG=) ++ ++if test -n "$MOZ_SYSTEM_OGG"; then ++ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.3) ++ ++ _SAVE_LIBS=$LIBS ++ LIBS="$LIBS $MOZ_OGG_LIBS" ++ AC_CHECK_FUNC(ogg_set_mem_functions, [], ++ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) ++ LIBS=$_SAVE_LIBS ++fi ++ ++AC_SUBST(MOZ_SYSTEM_OGG) ++ ++dnl ======================================================== ++dnl Check for libvorbis ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-vorbis, ++[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], ++MOZ_SYSTEM_VORBIS=1, ++MOZ_SYSTEM_VORBIS=) ++ ++if test -n "$MOZ_SYSTEM_VORBIS"; then ++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.6) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_VORBIS) ++ ++dnl ======================================================== ++dnl Check for integer-only libvorbis aka tremor ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-tremor, ++[ --with-system-tremor Use system libtremor (located with pkgconfig)], ++MOZ_SYSTEM_TREMOR=1, ++MOZ_SYSTEM_TREMOR=) ++ ++if test -n "$MOZ_SYSTEM_TREMOR"; then ++ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_TREMOR) ++ ++dnl ======================================================== ++dnl Check for libtheora ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-theora, ++[ --with-system-theora Use system libtheora (located with pkgconfig)], ++MOZ_SYSTEM_THEORA=1, ++MOZ_SYSTEM_THEORA=) ++ ++if test -n "$MOZ_SYSTEM_THEORA"; then ++ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_THEORA) ++ ++dnl ======================================================== ++dnl Check for libSoundTouch ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-soundtouch, ++[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], ++MOZ_SYSTEM_SOUNDTOUCH=1, ++MOZ_SYSTEM_SOUNDTOUCH=) ++ ++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then ++ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) ++ ++ AC_LANG_SAVE ++ AC_LANG_CPLUSPLUS ++ _SAVE_CXXFLAGS=$CXXFLAGS ++ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" ++ AC_CACHE_CHECK(for soundtouch sample type, ++ ac_cv_soundtouch_sample_type, ++ [AC_TRY_COMPILE([#include ++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES ++ #error soundtouch expects float samples ++ #endif], ++ [], ++ [ac_cv_soundtouch_sample_type=short], ++ [ac_cv_soundtouch_sample_type=float])]) ++ CXXFLAGS=$_SAVE_CXXFLAGS ++ AC_LANG_RESTORE ++ ++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ ++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then ++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) ++ fi ++fi ++ ++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then ++ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) ++fi ++AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) ++ + dnl system libvpx Support + dnl ======================================================== + MOZ_ARG_WITH_BOOL(system-libvpx, +--- icecat-60.2.0/toolkit/library/moz.build ++++ icecat-60.2.0/toolkit/library/moz.build +@@ -244,6 +244,21 @@ + if CONFIG['MOZ_SYSTEM_HUNSPELL']: + OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: ++ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] ++ + if CONFIG['MOZ_SYSTEM_LIBEVENT']: + OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] + +--- icecat-60.2.0/xpcom/build/XPCOMInit.cpp ++++ icecat-60.2.0/xpcom/build/XPCOMInit.cpp +@@ -138,7 +138,9 @@ + + #include "mozilla/ipc/GeckoChildProcessHost.h" + ++#ifndef MOZ_OGG_NO_MEM_REPORTING + #include "ogg/ogg.h" ++#endif + #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) + #if defined(HAVE_STDINT_H) + // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in +@@ -639,11 +641,13 @@ + // this oddness. + mozilla::SetICUMemoryFunctions(); + ++#ifndef MOZ_OGG_NO_MEM_REPORTING + // Do the same for libogg. + ogg_set_mem_functions(OggReporter::CountingMalloc, + OggReporter::CountingCalloc, + OggReporter::CountingRealloc, + OggReporter::CountingFree); ++#endif + + #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) + // And for VPX. -- cgit v1.2.3 From 6d328879378fac95240005233331f596fb5c68ed Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 25 Sep 2018 17:13:59 -0400 Subject: gnu: icecat: Rebundle NSPR and NSS [security fix]. Works around . * gnu/packages/gnuzilla.scm (icecat)[source]: In snippet, don't remove NSS. [inputs]: Remove 'nspr' and 'nss'. [arguments]: Remove --with-system-{nspr,nss} from configure flags. --- gnu/packages/gnuzilla.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 6834d82426..ea3b61c231 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -519,6 +519,13 @@ security standards.") ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; + ;; FIXME: With the update to IceCat 60, using system NSS + ;; broke certificate validation. See + ;; . For now, we use + ;; the bundled NSPR and NSS. TODO: Investigate, + ;; and try to unbundle these libraries again. + ;; UNBUNDLE-ME! "security/nss" + ;; ;; TODO: Use more system media libraries. See: ;; ;; * libtheora: esr60 wants v1.2, not yet released. @@ -541,7 +548,6 @@ security standards.") "media/libvorbis" ;; "media/libtheora" ; wants theora-1.2, not yet released "media/libtremor" - "security/nss" "gfx/harfbuzz" "gfx/graphite2" "js/src/ctypes/libffi" @@ -588,8 +594,10 @@ security standards.") ("pulseaudio" ,pulseaudio) ("mesa" ,mesa) ("mit-krb5" ,mit-krb5) - ("nspr" ,nspr) - ("nss" ,nss) + ;; See + ;; and related comments in the 'snippet' above. + ;; UNBUNDLE-ME! ("nspr" ,nspr) + ;; UNBUNDLE-ME! ("nss" ,nss) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification) ("unzip" ,unzip) @@ -653,8 +661,12 @@ security standards.") ;; "--with-system-theora" ; wants theora-1.2, not yet released "--with-system-libvpx" "--with-system-icu" - "--with-system-nspr" - "--with-system-nss" + + ;; See + ;; and related comments in the 'snippet' above. + ;; UNBUNDLE-ME! "--with-system-nspr" + ;; UNBUNDLE-ME! "--with-system-nss" + "--with-system-harfbuzz" "--with-system-graphite2" "--enable-system-pixman" -- cgit v1.2.3 From fe73352e8073ea0a0e6f6b5591f24395671998ab Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 25 Sep 2018 19:31:50 -0400 Subject: gnu: linux-libre: Enable SHPC PCI Hotplug driver, now built-in only. Fixes . * gnu/packages/aux-files/linux-libre/4.18-x86_64.conf, gnu/packages/aux-files/linux-libre/4.18-i686.conf: Add CONFIG_HOTPLUG_PCI_SHPC=y, plus updates made by 'make oldconfig'. --- gnu/packages/aux-files/linux-libre/4.18-i686.conf | 6 ++++-- gnu/packages/aux-files/linux-libre/4.18-x86_64.conf | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/4.18-i686.conf b/gnu/packages/aux-files/linux-libre/4.18-i686.conf index 606616b9fa..859b8b10b6 100644 --- a/gnu/packages/aux-files/linux-libre/4.18-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.18-i686.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.0-gnu Kernel Configuration +# Linux/x86 4.18.9-gnu Kernel Configuration # # @@ -255,6 +255,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -294,6 +295,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -853,7 +855,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -# CONFIG_HOTPLUG_PCI_SHPC is not set +CONFIG_HOTPLUG_PCI_SHPC=y # # PCI controller drivers diff --git a/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf index 81fd822756..2a66c483d6 100644 --- a/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.0-gnu Kernel Configuration +# Linux/x86 4.18.9-gnu Kernel Configuration # # @@ -265,6 +265,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -304,6 +305,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -869,7 +871,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -# CONFIG_HOTPLUG_PCI_SHPC is not set +CONFIG_HOTPLUG_PCI_SHPC=y # # PCI controller drivers -- cgit v1.2.3 From 06619128274c0f7e3ebfefab03db337e886fec51 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 25 Sep 2018 17:57:59 +0200 Subject: Fix URL in emacs-magit and emacs-groovy-modes. * gnu/packages/emacs.scm (emacs-magit)[source]: Fix URL. * gnu/packages/emacs.scm (emacs-groovy-modes)[source]: Fix URL. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f29040c372..c541c51483 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -458,7 +458,7 @@ on stdout instead of using a socket as the Emacsclient does.") (method url-fetch) (uri (string-append "https://github.com/magit/magit/releases/download/" - version "/" name "-" version ".tar.gz")) + version "/magit-" version ".tar.gz")) (sha256 (base32 "1ygaah3dd3nxpyd17297xgvdcgr7pgzzwlmpnmchki0kiwgg3sbc")))) @@ -8019,7 +8019,7 @@ supports multiple backends such as @code{vlc}, @code{mpg123}, (source (origin (method url-fetch) (uri (string-append - "https://github.com/Groovy-Emacs-Modes/" name + "https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes" "/archive/" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 -- cgit v1.2.3 From 9bd85a785f47d039b027de854b78b9ded0892e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 15:42:15 +0200 Subject: gnu: shepherd: Update to 0.5.0. * gnu/packages/admin.scm (shepherd): Update to 0.5.0. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8f504cafef..ded7ce3b97 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -173,14 +173,14 @@ and provides a \"top-like\" mode (monitoring).") (define-public shepherd (package (name "shepherd") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://alpha.gnu.org/gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "1lgmsbxn8i8xdasxzkdp2cml75n128pplw6icvmspl6s0n9xmw8n")))) + "1wmciqml9yplnx1s4ynn00giqyk06rbrcsgvpjj2df47sawk2jp8")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) -- cgit v1.2.3 From 4245ddcbc9f935804c17c97872b90ec1050c2d75 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Sun, 26 Aug 2018 21:54:14 +1000 Subject: guix system: Load all services on reconfigure, not just stopped ones. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This uses the 'replacement' service slot introduced in the Shepherd version 0.5.0. * gnu/services/shepherd.scm (shepherd-service-upgrade): Return a list of services that need to be restarted to complete their upgrade. * guix/scripts/system.scm (call-with-service-upgrade-info): Rename an internal variable to reflect the change to shepherd-service-upgrade. (upgrade-shepherd-services): Call 'load-services/safe' instead of 'load-services'. Print a message about services that need to be manually restarted. * gnu/services/herd.scm (load-services/safe): New procedure. * doc/guix.texi (Invoking guix system): Document the new behaviour. Co-authored-by: Ludovic Courtès --- gnu/services/herd.scm | 20 ++++++++++++++++++++ gnu/services/shepherd.scm | 23 ++++++++--------------- 2 files changed, 28 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm index 8c96b70731..8ff817759d 100644 --- a/gnu/services/herd.scm +++ b/gnu/services/herd.scm @@ -50,6 +50,7 @@ unload-services unload-service load-services + load-services/safe start-service stop-service)) @@ -232,6 +233,25 @@ returns a shepherd object." `(primitive-load ,file)) files)))) +(define (load-services/safe files) + "This is like 'load-services', but make sure only the subset of FILES that +can be safely reloaded is actually reloaded. + +This is done to accommodate the Shepherd < 0.15.0 where services lacked the +'replacement' slot, and where 'register-services' would throw an exception +when passed a service with an already-registered name." + (eval-there `(let* ((services (map primitive-load ',files)) + (slots (map slot-definition-name + (class-slots ))) + (can-replace? (memq 'replacement slots))) + (define (registered? service) + (not (null? (lookup-services (canonical-name service))))) + + (apply register-services + (if can-replace? + services + (remove registered? services)))))) + (define (start-service name) (with-shepherd-action name ('start) result result)) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 4cd2249841..4c7e72049f 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2018 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -329,7 +330,7 @@ symbols provided/required by a service." (define (shepherd-service-upgrade live target) "Return two values: the subset of LIVE (a list of ) that needs to be unloaded, and the subset of TARGET (a list of ) that -needs to be loaded." +need to be restarted to complete their upgrade." (define (essential? service) (memq (first (live-service-provision service)) '(root shepherd))) @@ -346,12 +347,6 @@ needs to be loaded." (and=> (lookup-live (shepherd-service-canonical-name service)) live-service-running)) - (define (stopped service) - (match (lookup-live (shepherd-service-canonical-name service)) - (#f #f) - (service (and (not (live-service-running service)) - service)))) - (define live-service-dependents (shepherd-service-back-edges live #:provision live-service-provision @@ -362,16 +357,14 @@ needs to be loaded." (#f (every obsolete? (live-service-dependents service))) (_ #f))) - (define to-load - ;; Only load services that are either new or currently stopped. - (remove running? target)) + (define to-restart + ;; Restart services that are currently running. + (filter running? target)) (define to-unload - ;; Unload services that are (1) no longer required, or (2) are in TO-LOAD. - (remove essential? - (append (filter obsolete? live) - (filter-map stopped to-load)))) + ;; Unload services that are no longer required. + (remove essential? (filter obsolete? live))) - (values to-unload to-load)) + (values to-unload to-restart)) ;;; shepherd.scm ends here -- cgit v1.2.3 From 2a5f2b1f7550db701172a338e98179e1cac55a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 16:35:37 +0200 Subject: gnu: Remove incorrect Emacs package deprecations. This is a followup to 5c8031ff7382ec9079040d08ae5a05b4dd2352b7. An upgrade would wrongfully report things like: guix package: package 'emacs-typo' has been superseded by 'emacs-typo' guix package: package 'emacs-org-tree-slide' has been superseded by 'emacs-org-tree-slide' guix package: package 'emacs-emms' has been superseded by 'emacs-emms' * gnu/packages/emacs.scm (flycheck, emms, typo, org-tree-slide) (butler): Remove. (emacs-emms-mode-line-cycle)[propagated-inputs]: Use EMACS-EMMS instead of EMMS. --- gnu/packages/emacs.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c541c51483..9dc11c59fc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -782,9 +782,6 @@ different tools. It highlights errors and warnings inline in the buffer, and provides an optional IDE-like error list.") (license license:gpl3+))) ;+GFDLv1.3+ for the manual -(define-public flycheck - (deprecated-package "flycheck" emacs-flycheck)) - ;;; ;;; Web browsing. @@ -1066,9 +1063,6 @@ light user interface.") (home-page "https://www.gnu.org/software/emms/") (license license:gpl3+))) -(define-public emms - (deprecated-package "emacs-emms" emacs-emms)) - (define-public emacs-emms-player-mpv ;; A new mpv backend is included in Emms from 5.0. (deprecated-package "emacs-emms-player-mpv" emacs-emms)) @@ -1088,7 +1082,7 @@ light user interface.") "0ifszi930pnaxk1x8pcydmvnp06868gc7nfx14q17zbajbx735k6")))) (build-system emacs-build-system) (propagated-inputs - `(("emms" ,emms))) + `(("emms" ,emacs-emms))) (home-page "https://github.com/momomo5717/emms-mode-line-cycle") (synopsis "Display the EMMS mode line as a ticker") (description @@ -2722,9 +2716,6 @@ view the build status of those servers' build jobs, and possibly to trigger build jobs.") (license license:gpl3+))) -(define-public butler - (deprecated-package "emacs-butler" emacs-butler)) - (define-public emacs-company (package (name "emacs-company") @@ -2874,9 +2865,6 @@ automatically inserts a Unicode opening or closing quotation mark, depending on context.") (license license:gpl3+))) -(define-public typo - (deprecated-package "emacs-typo" emacs-typo)) - (define-public emacs-scheme-complete (let ((commit "9b5cf224bf2a5994bc6d5b152ff487517f1a9bb5")) (package @@ -8061,9 +8049,6 @@ navigation with the grails mode.") @kbd{C-<} to jump to the next and previous slide.") (license license:gpl3+)))) -(define-public org-tree-slide - (deprecated-package "emacs-org-tree-slide" emacs-org-tree-slide)) - (define-public emacs-scratch-el (let ((commit "2cdf2b841ce7a0987093f65b0cc431947549f897") (revision "1")) -- cgit v1.2.3 From 6f03b08089167ec863361352ab200830bffeb0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 22:30:16 +0200 Subject: services: dhcp-client: Use 'read-pid-file'. * gnu/services/networking.scm (dhcp-client-service-type)[start]: Use 'read-pid-file' instead of the custom and possibly infinite loop. --- gnu/services/networking.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index bd1d5a2706..3fdb2bb9f7 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 John Darrington @@ -191,19 +191,7 @@ fe80::1%lo0 apps.facebook.com\n") (cons* #$dhclient "-nw" "-pf" #$pid-file ifaces)))) (and (zero? (cdr (waitpid pid))) - (let loop () - (catch 'system-error - (lambda () - (call-with-input-file #$pid-file read)) - (lambda args - ;; 'dhclient' returned before PID-FILE was created, - ;; so try again. - (let ((errno (system-error-errno args))) - (if (= ENOENT errno) - (begin - (sleep 1) - (loop)) - (apply throw args)))))))))) + (read-pid-file #$pid-file))))) (stop #~(make-kill-destructor)))))) (define* (dhcp-client-service #:key (dhcp isc-dhcp)) -- cgit v1.2.3 From a56c4eb8f43ae5555985d8a84308d150c0763c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 22:52:38 +0200 Subject: services: shepherd: Add workaround for 0.5.0 in containers. * gnu/services/shepherd.scm (%containerized-shepherd-service): New service. * gnu/system.scm (essential-services): Use it when CONTAINER? is true. --- gnu/services/shepherd.scm | 16 ++++++++++++++++ gnu/system.scm | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 4c7e72049f..49d08cc30f 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -59,6 +59,7 @@ %default-modules shepherd-service-file + %containerized-shepherd-service shepherd-service-lookup-procedure shepherd-service-back-edges @@ -327,6 +328,21 @@ symbols provided/required by a service." (lambda (service) (vhash-foldq* cons '() service edges))) +(define %containerized-shepherd-service + ;; XXX: This service works around a bug in the Shepherd 0.5.0: shepherd + ;; calls reboot(2) (via 'disable-reboot-on-ctrl-alt-del') when it starts, + ;; but in a container that fails with EINVAL. This was fixed in Shepherd + ;; commit 92e806bac1abaeeaf5d60f0ab50d1ae85ba6a62f. + (simple-service 'containerized-shepherd + shepherd-root-service-type + (list (shepherd-service + (provision '(containerized-shepherd)) + (start #~(lambda () + (set! (@@ (shepherd) + disable-reboot-on-ctrl-alt-del) + (const #t)) + #t)))))) + (define (shepherd-service-upgrade live target) "Return two values: the subset of LIVE (a list of ) that needs to be unloaded, and the subset of TARGET (a list of ) that diff --git a/gnu/system.scm b/gnu/system.scm index e4a57475a9..99bc09873d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -501,7 +501,7 @@ a container or that of a \"bare metal\" system." ;; Add the firmware service, unless we are building for a ;; container. (if container? - '() + (list %containerized-shepherd-service) (list %linux-bare-metal-service (service firmware-service-type (operating-system-firmware os)))))))) -- cgit v1.2.3 From 23784f0c3342a0fab5bf2a1c15c300b9f0856872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 22:58:23 +0200 Subject: services: udev: Don't attempt to read "modules.devname" from a container. Fixes . Reported by Julien Lepiller . * gnu/services/base.scm (udev-shepherd-service)[start]: Check whether DIRECTORY exists and skip 'make-static-device-nodes' call if it doesn't. --- gnu/services/base.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 5ba2c6b86d..9dfabd9807 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1881,7 +1881,12 @@ item of @var{packages}." (string-append linux-module-directory "/" kernel-release)) (old-umask (umask #o022))) - (make-static-device-nodes directory) + ;; If we're in a container, DIRECTORY might not exist, + ;; for instance because the host runs a different + ;; kernel. In that case, skip it; we'll just miss a few + ;; nodes like /dev/fuse. + (when (file-exists? directory) + (make-static-device-nodes directory)) (umask old-umask)) (let ((pid (fork+exec-command (list udevd)))) -- cgit v1.2.3 From 09b7300c01a8e7100467c6caae9b2c8d8e673971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 Sep 2018 23:01:33 +0200 Subject: services: virtual-terminal: Write to "default_utf8" only if necessary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a bug in containers whereby 'virtual-terminal' would always fail to start because writing to /sys/…/default_utf8 would fail with EROFS. * gnu/services/base.scm (virtual-terminal-service-type): Read from "default_utf8" before attempting to write to it. --- gnu/services/base.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 9dfabd9807..47c7d8bb27 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -685,17 +685,20 @@ to add @var{device} to the kernel's entropy pool. The service will fail if (shepherd-service-type 'virtual-terminal (lambda (utf8?) - (shepherd-service - (documentation "Set virtual terminals in UTF-8 module.") - (provision '(virtual-terminal)) - (requirement '(root-file-system)) - (start #~(lambda _ - (call-with-output-file - "/sys/module/vt/parameters/default_utf8" - (lambda (port) - (display 1 port))) - #t)) - (stop #~(const #f)))) + (let ((knob "/sys/module/vt/parameters/default_utf8")) + (shepherd-service + (documentation "Set virtual terminals in UTF-8 module.") + (provision '(virtual-terminal)) + (requirement '(root-file-system)) + (start #~(lambda _ + ;; In containers /sys is read-only so don't insist on + ;; writing to this file. + (unless (= 1 (call-with-input-file #$knob read)) + (call-with-output-file #$knob + (lambda (port) + (display 1 port)))) + #t)) + (stop #~(const #f))))) #t)) ;default to UTF-8 (define console-keymap-service-type -- cgit v1.2.3 From e15ede6e28cfaf5fe951faf88d7c1e3213a476a4 Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Wed, 26 Sep 2018 17:01:33 +0200 Subject: gnu: enlightenment: Fix initial locale and keyboard selection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/enlightenment.scm (enlightenment)[arguments]: In 'set-system-actions', set absolute file name to 'locale' and 'xorg.lst'. Signed-off-by: Ludovic Courtès --- gnu/packages/enlightenment.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 45dc1dbbeb..c7812e8874 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Timo Eisenmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -268,13 +269,19 @@ Libraries with some extra bells and whistles.") (add-before 'configure 'set-system-actions (lambda* (#:key inputs #:allow-other-keys) (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) - (utils (assoc-ref inputs "util-linux"))) + (utils (assoc-ref inputs "util-linux")) + (libc (assoc-ref inputs "libc"))) ;; We need to patch the path to 'base.lst' to be able ;; to switch the keyboard layout in E. - (substitute* "src/modules/xkbswitch/e_mod_parse.c" + (substitute* (list "src/modules/xkbswitch/e_mod_parse.c" + "src/modules/wizard/page_011.c") (("/usr/share/X11/xkb/rules/xorg.lst") (string-append xkeyboard "/share/X11/xkb/rules/base.lst"))) + (substitute* (list "src/bin/e_intl.c" + "src/modules/conf_intl/e_int_config_intl.c" + "src/modules/wizard/page_010.c") + (("locale -a") (string-append libc "/bin/locale -a"))) (substitute* "src/modules/everything/evry_plug_apps.c" (("/usr/bin/") "")) (substitute* "configure" -- cgit v1.2.3 From a9994b273585914a273f5c50bf2d39af1f657fd0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 20:58:07 +0200 Subject: gnu: perl-crypt-openssl-rsa: Update to 0.31. * gnu/packages/tls.scm (perl-crypt-openssl-rsa): Update to 0.31. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 0cdb02b0aa..bdb63c0dbf 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -681,7 +681,7 @@ servers or clients for more complicated applications.") (define-public perl-crypt-openssl-rsa (package (name "perl-crypt-openssl-rsa") - (version "0.30") + (version "0.31") (source (origin (method url-fetch) @@ -691,7 +691,7 @@ servers or clients for more complicated applications.") ".tar.gz")) (sha256 (base32 - "1b19kaaw4wda8dy6kjiwqa2prpbs2dqcyjyj9zdh5wbs74qkbq93")))) + "0djl5i6kibl7862b6ih29q8dhg5zpwzq77q9j8hp6xngshx40ws1")))) (build-system perl-build-system) (native-inputs `(("perl-crypt-openssl-guess" ,perl-crypt-openssl-guess))) -- cgit v1.2.3 From 6f52db245564b5732577e4e40e0f3127d37fcaf0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 23:27:44 +0200 Subject: gnu: perl-catalyst-runtime: Update to 5.90119. * gnu/packages/web.scm (perl-catalyst-runtime): Update to 5.90119. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 26c2e9128a..2251daabf7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1862,15 +1862,15 @@ MIME type directly to the browser, without being processed through Catalyst.") (define-public perl-catalyst-runtime (package (name "perl-catalyst-runtime") - (version "5.90118") + (version "5.90119") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" + (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Catalyst-Runtime-" version ".tar.gz")) (sha256 (base32 - "0cws3szx3vvh0372qdx8fypgv6qphcc3v81rbq30sl1ghby7ksd3")))) + "1iw7x9rqk3sz2hm1bw01blz5vwm7zlljdf4xj3r8vz54f1yggzqr")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal))) -- cgit v1.2.3 From af44f05af78e3187589c2c628c3d3436df7ceed0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 12:38:47 +0200 Subject: gnu: perl-net-dns: Update to 1.18. * gnu/packages/networking.scm (perl-net-dns): Update to 1.18. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4800c2496b..0d6de040e5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -902,7 +902,7 @@ private (reserved).") (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) @@ -914,7 +914,7 @@ private (reserved).") version ".tar.gz"))) (sha256 (base32 - "1q62w9rf2w8kjzqagzr0rdn20ybl8gj3l6cdq4k8fw0sxa7zsycs")))) + "1lx902cbvlfl63bqfdrnyavmfwbjvrfdnwgdc1dgs1wpzja19kjj")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) -- cgit v1.2.3 From 3d190d6a219d03dc94c8d33614766df0fed1473f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 27 Sep 2018 03:47:24 +0200 Subject: gnu: dico: Update to 2.7. * gnu/packages/dico.scm (dico): Update to 2.7. [arguments]: Work around dodgy test in 'check' phase. --- gnu/packages/dico.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm index a85987d9b1..d96dbb86d9 100644 --- a/gnu/packages/dico.scm +++ b/gnu/packages/dico.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2018 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,14 +38,14 @@ (define-public dico (package (name "dico") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/dico/dico-" version ".tar.xz")) (sha256 (base32 - "0zmi041gv5nd5fmyzgdrgrsy2pvjaq9p8dvvhxwi842hiyng5b7i")))) + "0dg4aacnmlf3ljssd7dwh8z5644xzq8k1501mbsx8nz8p8a9mbsq")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output @@ -57,7 +58,11 @@ ;; infrastructure. Gag it. (setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_WARN_DEPRECATED" "no") - #t))))) + #t)) + (replace 'check + (lambda _ + ;; Test '71: append + dooffs + env' fails if $V is not 2. + (invoke "make" "check" "V=2")))))) (inputs `(("m4" ,m4) ;used at run time ("pcre" ,pcre) -- cgit v1.2.3 From b733dbc0fb5bd1648f1fdce6471f048886e69e73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:15:37 +0200 Subject: gnu: python-setproctitle: Use INVOKE. * gnu/packages/python.scm (python-setproctitle)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5c6c79da88..4703d95a2d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10482,7 +10482,7 @@ theme for the Sphinx documentation system. It's the default theme of Sphinx.") (setenv "CC" "gcc") ;; No need to extend PYTHONPATH to find the built package, since ;; the Makefile will build anyway - (zero? (system* "make" "check"))))))) + (invoke "make" "check")))))) (native-inputs `(("procps" ,procps))) ; required for tests (home-page -- cgit v1.2.3 From 428d2ca2ecc57780fb4be90ca6009ea1d00eeade Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 20:33:00 +0200 Subject: gnu: youtube-dl: Update to 2018.09.18. * gnu/packages/video.scm (youtube-dl): Update to 2018.09.18. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 448773e0d9..54ffef86de 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1271,7 +1271,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.09.08") + (version "2018.09.18") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1279,7 +1279,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "0vwc4faqdddrb3nm4fzmkr60n5rc2zwyy8jwrrjad60kcp8isf05")))) + "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From c4a3ea38850e97cdc12252440c7fa9cdefd5790f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 27 Sep 2018 09:50:01 +0200 Subject: gnu: mame: Update to 0.202. * gnu/packages/emulators.scm (mame): Update to 0.202. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 782bff5b18..443137f141 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1184,7 +1184,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.201") + (version "0.202") (source (origin (method git-fetch) @@ -1194,7 +1194,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "00whiig4ld3d4fkl34q48vlf28ygvvp5g7fp0rb5n31ymhl4kajk")) + "1v9gm124p65nbj678gfkcvwphp9qc15ky2p12ca6g3rllma94di5")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From e07cb04d40eaea8aa792e2375f7f127ef54a79f3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:51:20 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.158. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.158. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 170c77374d..95a5234c76 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.157" - "00bnfqwkr0jfdabmwx5qk5bqxn5vwnnzwqbm5rfg7lggii74kk54" + (make-linux-libre "4.4.158" + "1l3blfaw50a8l9bp735vzsmk1naq4l40qidza10dwkkrd2ip3n41" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 202190ec392d3284b0dae753b356cb74f4962682 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:52:00 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.129. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.129. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 95a5234c76..b3ccaef89f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.128" - "0lww23xcyyg0dwzrap5x9d700gy3lbxln55n6sqqkm7m89dkqwha" + (make-linux-libre "4.9.129" + "0y7p1xgbpn4nmr5pmqb58shr54lvryr5rxwm9m66knwzj332f3rh" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From e0b6085a7f69a8b2a8ff4fe90d8ef28f9ef50769 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:52:52 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.72. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.72. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b3ccaef89f..93005e16da 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.71") -(define %linux-libre-4.14-hash "1akvykaccy7ikl8v04grwxvgs4z2rrs7drf2s85ysqwq79mdh3gq") +(define %linux-libre-4.14-version "4.14.72") +(define %linux-libre-4.14-hash "1ngz5p8mvga45y1n6hbw6niy0ji5mfl4vc3bxlckjg42dcp5qf64") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 1d1e4f8f9c46b13ed2c4a61bc4c5f25c6748649b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:53:46 -0400 Subject: gnu: linux-libre: Update to 4.18.10. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.10. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 93005e16da..2503676396 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.9") -(define %linux-libre-hash "0wwmhnfvcsdlqhzwwwyz1x5a3ldjky6l0xir1pi6pysr0lak402x") +(define %linux-libre-version "4.18.10") +(define %linux-libre-hash "1znc6kh3j8plmxail6hn2ss0r0fvbcp50s3xv5gxys7jc7k42znj") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From de1158d53fd106103214e79f8523a91b9cfa89d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Sep 2018 19:55:49 +0200 Subject: gnu: eolie: Update to 0.9.38. * gnu/packages/gnome.scm (eolie): Update to 0.9.38. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1e8522c500..de938e4b14 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4090,15 +4090,15 @@ work and the interface is well tested.") (define-public eolie (package (name "eolie") - (version "0.9.37") + (version "0.9.38") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/eolie/" - "uploads/4341cb428b7a45670308ee3fb3fa07dd/" + "uploads/9814c06a1bc83ea09c3da8719a9ed11b/" "eolie-" version ".tar.xz")) (sha256 (base32 - "126m0nwwy3lqv7z8aj9hiwangih03b1nlkg3xja9p7wbf7zcvp2n")))) + "10vrh91rapgfmqwc6jkcybpmlvn4q0y8bnklw3rddzigf9kvqsff")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From ea1a3601999887a0762a942460317145f3f53b30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Sep 2018 20:02:55 +0200 Subject: gnu: emacs-ert-runner: Do not use package name in directory. * gnu/packages/emacs.scm (emacs-ert-runner)[arguments]: Use the upstream name instead of the Guix package name in the "install-executable" phase. This is a follow-up to commit 5c8031ff7382ec9079040d08ae5a05b4dd2352b7. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9dc11c59fc..8da5add886 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6982,8 +6982,8 @@ Emacs.") (substitute* "bin/ert-runner" (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp/guix.d/" - ,name "-" ,version))) + "/share/emacs/site-lisp/guix.d/ert-runner-" + ,version))) (install-file "bin/ert-runner" (string-append out "/bin")) (wrap-program (string-append out "/bin/ert-runner") (list "EMACSLOADPATH" ":" 'prefix -- cgit v1.2.3 From 363d7d6608d599776f78525e50a920b1d641805b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Sep 2018 21:52:07 +0200 Subject: gnu: yoshimi: Update to 1.5.9. * gnu/packages/music.scm (yoshimi): Update to 1.5.9. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e563062018..2d834d8c1f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1996,7 +1996,7 @@ capabilities, custom envelopes, effects, etc.") (define-public yoshimi (package (name "yoshimi") - (version "1.5.8.2") + (version "1.5.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/yoshimi/" @@ -2004,7 +2004,7 @@ capabilities, custom envelopes, effects, etc.") "/yoshimi-" version ".tar.bz2")) (sha256 (base32 - "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc")))) + "1nqwxwq6814m860zrh33r85vdyi2bgkvjg5372h3ngcdmxnb7wr0")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From c32863e094d3489d2e08ccb3188988d7c6410976 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 27 Sep 2018 23:38:36 +0200 Subject: gnu: sshuttle: Patch FHS assumptions. Reported-By: Nam Nguyen * gnu/packages/vpn.scm (sshuttle)[arguments]: Set correct paths to 'env' and 'sh'. --- gnu/packages/vpn.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 85bbe7e9c6..de5df5039d 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -347,6 +347,17 @@ private network between hosts on the internet.") (base32 "0pqk43kd7crqhg6qgnl8kapncwgw1xgaf02zarzypcw64kvdih9h")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-FHS-file-names + (lambda _ + (substitute* "sshuttle/client.py" + (("/usr/bin/env") (which "env"))) + (substitute* "sshuttle/ssh.py" + ;; Perhaps this is unreachable, but don't let's take risks. + (("/bin/sh") (which "sh"))) + #t))))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) ;; For tests only. -- cgit v1.2.3 From 697c5846651cbee20538d96446cc48adb8e2462a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:41:39 +0200 Subject: gnu: mbpfan: Update to 2.1.0. * gnu/packages/linux.scm (mbpfan): Update to 2.1.0. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2503676396..ba0022a8a6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4827,7 +4827,7 @@ interface to this kernel feature.") (define-public mbpfan (package (name "mbpfan") - (version "2.0.2") + (version "2.1.0") (source (origin (method url-fetch) @@ -4836,10 +4836,10 @@ interface to this kernel feature.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wifsws9icki95hhfh4zw1hmk07ddmkcz9mg5a9jr7q2kkrk01cx")))) + "1j44bpwv2zszih3cia9h7i7gb2gbfhzqh0s4kscbl7nplvyk3rlp")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + '(#:tests? #f ; tests ask to be run as root #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) "CC=gcc")) @@ -4850,7 +4850,7 @@ interface to this kernel feature.") (substitute* "Makefile" (("/usr") "")) #t)) - (delete 'configure)))) ; There's no configure phase. + (delete 'configure)))) ; there's no configure phase (home-page "https://github.com/dgraziotin/mbpfan") (synopsis "Control fan speed on Macbooks") (description -- cgit v1.2.3 From 5478ab1ecea15b506c1c286af1aa8ec89f26aa10 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:44:50 +0200 Subject: gnu: mbpfan: Don't use unstable tarball. * gnu/packages/linux.scm (mbpfan)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/linux.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ba0022a8a6..9e279b91e8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4830,13 +4830,14 @@ interface to this kernel feature.") (version "2.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dgraziotin/mbpfan/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dgraziotin/mbpfan.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1j44bpwv2zszih3cia9h7i7gb2gbfhzqh0s4kscbl7nplvyk3rlp")))) + "1gysq778rkl6dvvj9a1swxcl15wvz0bng5bn4nwq118cl8p8pask")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; tests ask to be run as root -- cgit v1.2.3 From a4764ff00afff0840fb7e92c73d5137281fbc4b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:55:40 +0200 Subject: gnu: python-fakeredis: Edit description. * gnu/packages/databases.scm (python-fakeredis)[description]: Fix (upstream) typo. Get carried away. --- gnu/packages/databases.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9e8c9d8f9e..9c966494ad 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2673,12 +2673,14 @@ parsing code in hiredis. It primarily speeds up parsing of multi bulk replies." `(#:tests? #f)) (home-page "https://github.com/jamesls/fakeredis") (synopsis "Fake implementation of redis API for testing purposes") - (description "Fakeredis is a pure python implementation of the redis-py -python client that simulates talking to a redis server. This was created for a -single purpose: to write unittests. Setting up redis is not hard, but many time - you want to write unittests that do not talk to an external server (such as -redis). This module now allows tests to simply use this module as a reasonable -substitute for redis.") + (description + "Fakeredis is a pure-Python implementation of the redis-py Python client +that simulates talking to a redis server. It was created for a single purpose: +to write unit tests. + +Setting up redis is not hard, but one often wants to write unit tests that don't +talk to an external server such as redis. This module can be used as a +reasonable substitute.") (license license:bsd-3))) (define-public python2-fakeredis -- cgit v1.2.3 From 5abcb1b0e6fe849d206b3683444c76d91f21a3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 28 Sep 2018 00:29:25 +0200 Subject: gnu: guix: Update to 7fed935. * gnu/packages/package-management.scm (guix): Update to 7fed935. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3bc8ac6073..69788c9463 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -101,8 +101,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.15.0") - (commit "3d43017026f9995ad128915db8ca5eafe061bf75") - (revision 3)) + (commit "7fed9353ece5974ff431fa666a530da237a12085") + (revision 4)) (package (name "guix") @@ -118,7 +118,7 @@ (commit commit))) (sha256 (base32 - "167rzz2h33xmmchkplwzfq94s5jwdn5nabsq2lb84s54ps0sm89m")) + "11j13xszjcrf3barf38bixx3hbrfj5w81fskjp8gn6m42knx1yal")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 7edfcd61a1d42f8e1f21c8e7b46d5d61aaeb4598 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 28 Sep 2018 14:22:11 +0200 Subject: gnu: httpd: Update to 2.4.35. * gnu/packages/web.scm (httpd): Update to 2.4.35. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2251daabf7..8e776258b3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -124,14 +124,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.34") + (version "2.4.35") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs")))) + "0mlvwsm7hmpc7db6lfc2nx3v4cll3qljjxhjhgsw6aniskywc1r6")))) (build-system gnu-build-system) (native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(("apr" ,apr) -- cgit v1.2.3 From 29bdfe1367af34a0b9cf33f7ab021a23206c4bd7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 28 Sep 2018 10:06:32 -0400 Subject: gnu: Krita: Update to 4.1.3. * gnu/packages/kde.scm (krita): Update to 4.1.3. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index aa5be6b515..a835f42749 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -236,7 +236,7 @@ plugins, as well as code to create plugins, or complete applications.") (define-public krita (package (name "krita") - (version "4.1.1") + (version "4.1.3") (source (origin (method url-fetch) (uri (string-append @@ -245,7 +245,7 @@ plugins, as well as code to create plugins, or complete applications.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw")))) + "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 4353981eb095459c47a9e12950745ac0304162ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 01:45:05 +0200 Subject: tests: Add missing copyright statement. This is a follow-up to commit 3b97a1779f3b65d582b8edc8c154b6414314b946. * gnu/tests/web.scm: Update copyright header. --- gnu/tests/web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index bcc919137b..2e209fee97 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 87c39618719374f7f3cb0dc81c8ab587773c4c66 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 19:06:38 +0200 Subject: gnu: newsboat: Update to 2.13. * gnu/packages/syndication.scm (newsboat): Update to 2.13. --- gnu/packages/syndication.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 6247d1f3b6..a7c685fdc1 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -35,7 +35,7 @@ (define-public newsboat (package (name "newsboat") - (version "2.12") + (version "2.13") (source (origin (method url-fetch) @@ -43,7 +43,7 @@ "/newsboat-" version ".tar.xz")) (sha256 (base32 - "1x23zlgljaqf46v7sp8wnkyf6wighvirvn48ankpa34yr8mvrgcv")))) + "0pik1d98ydzqi6055vdbkjg5krwifbk2hy2f5jp5p1wcy2s16dn7")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From c6b772a059da1f47a0561ca915f43c1399ee8c65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 19:09:45 +0200 Subject: gnu: rng-tools: Update home page. * gnu/packages/linux.scm (rng-tools)[home-page]: Set to URL mentioned in legacy wiki. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9e279b91e8..a6efded72d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3668,6 +3668,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (define-public rng-tools (package (name "rng-tools") + (home-page "https://github.com/nhorman/rng-tools") (version "6.4") (source (origin (method url-fetch) @@ -3691,7 +3692,6 @@ The collection contains a set of bandwidth and latency benchmark such as: (description "Monitor a hardware random number generator, and supply entropy from that to the system kernel's @file{/dev/random} machinery.") - (home-page "https://sourceforge.net/projects/gkernel") ;; The source package is offered under the GPL2+, but the files ;; 'rngd_rdrand.c' and 'rdrand_asm.S' are only available under the GPL2. (license (list license:gpl2 license:gpl2+)))) -- cgit v1.2.3 From f289820c31f0d493caaa6d1d9fac7750176ba492 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 19:13:07 +0200 Subject: gnu: rng-tools: Don't use unstable tarball. * gnu/packages/linux.scm (rng-tools)[source]: Use GIT-FETCH. --- gnu/packages/linux.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a6efded72d..a3c2c4c946 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3671,13 +3671,13 @@ The collection contains a set of bandwidth and latency benchmark such as: (home-page "https://github.com/nhorman/rng-tools") (version "6.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/nhorman/rng-tools/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "005krksl8iz37l5p1nx8apl1yg7q78yrsb6inby31d2g5ck8nnwa")))) + "10r8vy240q04xx6j48qm063w0ssp0dkxchvq6x3fwd9bwp8m3sj7")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. -- cgit v1.2.3 From 31f0fc612fe0baf949c647138cba7217b60cae26 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Sep 2018 19:13:53 +0200 Subject: gnu: rng-tools: Update to 6.5. * gnu/packages/linux.scm (rng-tools): Update to 6.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a3c2c4c946..cb8203da0b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3669,7 +3669,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (package (name "rng-tools") (home-page "https://github.com/nhorman/rng-tools") - (version "6.4") + (version "6.5") (source (origin (method git-fetch) (uri (git-reference (url home-page) @@ -3677,7 +3677,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (file-name (git-file-name name version)) (sha256 (base32 - "10r8vy240q04xx6j48qm063w0ssp0dkxchvq6x3fwd9bwp8m3sj7")))) + "11kw1rcgzmgzwk7g1w2g0nzjraqb0pf24gxpy50k4ls2qxslw3rk")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. -- cgit v1.2.3 From 02817df07e965c3413e6986966b3e607de47709c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 20:38:18 +0200 Subject: gnu: libreoffice: Update to 6.1.2.1. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.2.1. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 35d49b0216..68b4e265f3 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -926,7 +926,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.1.0.3") + (version "6.1.2.1") (source (origin (method url-fetch) @@ -936,7 +936,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1n7b6abc0bp9x8lddx60w5br444wf62mdlkqmfk2zmkmiwkcvv2l")) + "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 595af457aedb887c5fb4409f2fbaf4d23c059024 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 13 Jul 2018 20:39:34 +0100 Subject: gnu: Modify the gitolite package to support the Guix service. Previously the gitolite package worked, but there were problems using it for the service where you might have a minimal PATH. This commit patches the source and scripts where possible to use store paths, and also wraps the gitolite script to handle the harder dependencies. * gnu/packages/version-control.scm (gitolite)[arguments]: Add more patching to the patch-scripts phase, and add two new phases (patch-source and wrap-scripts). [inputs]: Add coreutils, findutils and inetutils. --- gnu/packages/version-control.scm | 53 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 204ec403f6..d06055de45 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1031,12 +1031,48 @@ also walk each side of a merge and test those changes individually.") ((" perl -") (string-append " " perl " -"))) + (substitute* (find-files "src/triggers" ".*") + ((" sed ") + (string-append " " (which "sed") " "))) + + (substitute* + '("src/triggers/post-compile/update-gitweb-access-list" + "src/triggers/post-compile/ssh-authkeys-split" + "src/triggers/upstream") + ((" grep ") + (string-append " " (which "grep") " "))) + ;; Avoid references to the store in authorized_keys. ;; This works because gitolite-shell is in the PATH. (substitute* "src/triggers/post-compile/ssh-authkeys" (("\\$glshell \\$user") "gitolite-shell $user")) #t))) + (add-before 'install 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + ;; Gitolite uses cat to test the readability of the + ;; pubkey + (substitute* "src/lib/Gitolite/Setup.pm" + (("\"cat ") + (string-append "\"" (which "cat") " ")) + (("\"ssh-keygen") + (string-append "\"" (which "ssh-keygen")))) + + (substitute* '("src/lib/Gitolite/Hooks/PostUpdate.pm" + "src/lib/Gitolite/Hooks/Update.pm") + (("/usr/bin/perl") + (string-append (assoc-ref inputs "perl") + "/bin/perl"))) + + (substitute* "src/lib/Gitolite/Common.pm" + (("\"ssh-keygen") + (string-append "\"" (which "ssh-keygen"))) + (("\"logger\"") + (string-append "\"" + (assoc-ref inputs "inetutils") + "/bin/logger\""))) + + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((output (assoc-ref outputs "out")) @@ -1050,9 +1086,24 @@ also walk each side of a merge and test those changes individually.") (symlink (string-append sharedir "/" script) (string-append bindir "/" script))) '("gitolite" "gitolite-shell")) + #t))) + (add-after 'install 'wrap-scripts + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (coreutils (assoc-ref inputs "coreutils")) + (findutils (assoc-ref inputs "findutils")) + (git (assoc-ref inputs "git"))) + (wrap-program (string-append out "/bin/gitolite") + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list out coreutils findutils git)))) #t)))))) (inputs - `(("perl" ,perl))) + `(("perl" ,perl) + ("coreutils" ,coreutils) + ("findutils" ,findutils) + ("inetutils" ,inetutils))) ;; git and openssh are propagated because trying to patch the source via ;; regexp matching is too brittle and prone to false positives. (propagated-inputs -- cgit v1.2.3 From 258a6d944ed891fa92fa87a16731e5dfe0bac477 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 13 Jul 2018 20:39:46 +0100 Subject: services: Add Gitolite. * gnu/services/version-control.scm (, ): New record types. (gitolite-accounts, gitolite-activation): New procedures. (gitolite-service-type): New variables. * gnu/tests/version-control.scm (%gitolite-test-admin-keypair, %gitolite-os, %test-gitolite): New variables. (run-gitolite-test): New procedure. * doc/guix.texi (Version Control): Document the gitolite service. --- gnu/services/version-control.scm | 179 ++++++++++++++++++++++++++++++++++++++- gnu/tests/version-control.scm | 114 ++++++++++++++++++++++++- 2 files changed, 291 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 58274c8bee..cc8cd22021 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,23 @@ git-http-configuration git-http-configuration? - git-http-nginx-location-configuration)) + git-http-nginx-location-configuration + + + gitolite-configuration + gitolite-configuration-package + gitolite-configuration-user + gitolite-configuration-rc-file + gitolite-configuration-admin-pubkey + + + gitolite-rc-file + gitolite-rc-file-umask + gitolite-rc-file-git-config-keys + gitolite-rc-file-roles + gitolite-rc-file-enable + + gitolite-service-type)) ;;; Commentary: ;;; @@ -197,3 +214,163 @@ access to exported repositories under @file{/srv/git}." "") (list "fastcgi_param GIT_PROJECT_ROOT " git-root ";") "fastcgi_param PATH_INFO $1;")))))) + + +;;; +;;; Gitolite +;;; + +(define-record-type* + gitolite-rc-file make-gitolite-rc-file + gitolite-rc-file? + (umask gitolite-rc-file-umask + (default #o0077)) + (git-config-keys gitolite-rc-file-git-config-keys + (default "")) + (roles gitolite-rc-file-roles + (default '(("READERS" . 1) + ("WRITERS" . 1)))) + (enable gitolite-rc-file-enable + (default '("help" + "desc" + "info" + "perms" + "writable" + "ssh-authkeys" + "git-config" + "daemon" + "gitweb")))) + +(define-gexp-compiler (gitolite-rc-file-compiler + (file ) system target) + (match file + (($ umask git-config-keys roles enable) + (apply text-file* "gitolite.rc" + `("%RC = (\n" + " UMASK => " ,(format #f "~4,'0o" umask) ",\n" + " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" + " ROLES => {\n" + ,@(map (match-lambda + ((role . value) + (simple-format #f " ~A => ~A,\n" role value))) + roles) + " },\n" + "\n" + " ENABLE => [\n" + ,@(map (lambda (value) + (simple-format #f " '~A',\n" value)) + enable) + " ],\n" + ");\n" + "\n" + "1;\n"))))) + +(define-record-type* + gitolite-configuration make-gitolite-configuration + gitolite-configuration? + (package gitolite-configuration-package + (default gitolite)) + (user gitolite-configuration-user + (default "git")) + (group gitolite-configuration-group + (default "git")) + (home-directory gitolite-configuration-home-directory + (default "/var/lib/gitolite")) + (rc-file gitolite-configuration-rc-file + (default (gitolite-rc-file))) + (admin-pubkey gitolite-configuration-admin-pubkey)) + +(define gitolite-accounts + (match-lambda + (($ package user group home-directory + rc-file admin-pubkey) + ;; User group and account to run Gitolite. + (list (user-group (name user) (system? #t)) + (user-account + (name user) + (group group) + (system? #t) + (comment "Gitolite user") + (home-directory home-directory)))))) + +(define gitolite-activation + (match-lambda + (($ package user group home + rc-file admin-pubkey) + #~(begin + (use-modules (ice-9 match) + (guix build utils)) + + (let* ((user-info (getpwnam #$user)) + (admin-pubkey #$admin-pubkey) + (pubkey-file (string-append + #$home "/" + (basename + (strip-store-file-name admin-pubkey))))) + + (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) + (copy-file #$rc-file #$(string-append home "/.gitolite.rc")) + + ;; The key must be writable, so copy it from the store + (copy-file admin-pubkey pubkey-file) + + (chmod pubkey-file #o500) + (chown pubkey-file + (passwd:uid user-info) + (passwd:gid user-info)) + + ;; Set the git configuration, to avoid gitolite trying to use + ;; the hostname command, as the network might not be up yet + (with-output-to-file #$(string-append home "/.gitconfig") + (lambda () + (display "[user] + name = GNU Guix + email = guix@localhost +"))) + ;; Run Gitolite setup, as this updates the hooks and include the + ;; admin pubkey if specified. The admin pubkey is required for + ;; initial setup, and will replace the previous key if run after + ;; initial setup + (match (primitive-fork) + (0 + ;; Exit with a non-zero status code if an exception is thrown. + (dynamic-wind + (const #t) + (lambda () + (setenv "HOME" (passwd:dir user-info)) + (setenv "USER" #$user) + (setgid (passwd:gid user-info)) + (setuid (passwd:uid user-info)) + (primitive-exit + (system* #$(file-append package "/bin/gitolite") + "setup" + "-m" "gitolite setup by GNU Guix" + "-pk" pubkey-file))) + (lambda () + (primitive-exit 1)))) + (pid (waitpid pid))) + + (when (file-exists? pubkey-file) + (delete-file pubkey-file))))))) + +(define gitolite-service-type + (service-type + (name 'gitolite) + (extensions + (list (service-extension activation-service-type + gitolite-activation) + (service-extension account-service-type + gitolite-accounts) + (service-extension profile-service-type + ;; The Gitolite package in Guix uses + ;; gitolite-shell in the authorized_keys file, so + ;; gitolite-shell needs to be on the PATH for + ;; gitolite to work. + (lambda (config) + (list + (gitolite-configuration-package config)))))) + (description + "Setup @command{gitolite}, a Git hosting tool providing access over SSH.. +By default, the @code{git} user is used, but this is configurable. +Additionally, Gitolite can integrate with with tools like gitweb or cgit to +provide a web interface to view selected repositories."))) diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 3b935a1b48..4409b8a12b 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2017, 2018 Clément Lassieur +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +28,17 @@ #:use-module (gnu services) #:use-module (gnu services version-control) #:use-module (gnu services cgit) + #:use-module (gnu services ssh) #:use-module (gnu services web) #:use-module (gnu services networking) #:use-module (gnu packages version-control) + #:use-module (gnu packages ssh) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix modules) #:export (%test-cgit - %test-git-http)) + %test-git-http + %test-gitolite)) (define README-contents "Hello! This is what goes inside the 'README' file.") @@ -300,3 +304,111 @@ HTTP-PORT." (name "git-http") (description "Connect to a running Git HTTP server.") (value (run-git-http-test)))) + + +;;; +;;; Gitolite. +;;; + +(define %gitolite-test-admin-keypair + (computed-file + "gitolite-test-admin-keypair" + (with-imported-modules (source-module-closure + '((guix build utils))) + #~(begin + (use-modules (ice-9 match) (srfi srfi-26) + (guix build utils)) + + (mkdir #$output) + (invoke #$(file-append openssh "/bin/ssh-keygen") + "-f" (string-append #$output "/test-admin") + "-t" "rsa" + "-q" + "-N" ""))))) + +(define %gitolite-os + (simple-operating-system + (dhcp-client-service) + (service openssh-service-type) + (service gitolite-service-type + (gitolite-configuration + (admin-pubkey + (file-append %gitolite-test-admin-keypair "/test-admin.pub")))))) + +(define (run-gitolite-test) + (define os + (marionette-operating-system + %gitolite-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((2222 . 22))))) + + (define test + (with-imported-modules '((gnu build marionette) + (guix build utils)) + #~(begin + (use-modules (srfi srfi-64) + (rnrs io ports) + (gnu build marionette) + (guix build utils)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "gitolite") + + ;; Wait for sshd to be up and running. + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'ssh-daemon)) + marionette)) + + (display #$%gitolite-test-admin-keypair) + + (setenv "GIT_SSH_VARIANT" "ssh") + (setenv "GIT_SSH_COMMAND" + (string-join + '(#$(file-append openssh "/bin/ssh") + "-i" #$(file-append %gitolite-test-admin-keypair + "/test-admin") + "-o" "UserKnownHostsFile=/dev/null" + "-o" "StrictHostKeyChecking=no"))) + + (test-assert "cloning the admin repository" + (invoke #$(file-append git "/bin/git") + "clone" "-v" + "ssh://git@localhost:2222/gitolite-admin" + "/tmp/clone")) + + (test-assert "admin key exists" + (file-exists? "/tmp/clone/keydir/test-admin.pub")) + + (with-directory-excursion "/tmp/clone" + (invoke #$(file-append git "/bin/git") + "-c" "user.name=Guix" "-c" "user.email=guix" + "commit" + "-m" "Test commit" + "--allow-empty") + + (test-assert "pushing, and the associated hooks" + (invoke #$(file-append git "/bin/git") "push"))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "gitolite" test)) + +(define %test-gitolite + (system-test + (name "gitolite") + (description "Clone the Gitolite admin repository.") + (value (run-gitolite-test)))) -- cgit v1.2.3 From ccccb467fb5dec58023717c7ec2699f2955f0d62 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Fri, 28 Sep 2018 11:18:01 -0400 Subject: gnu: mcabber: Update to 1.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (mcabber): Update to 1.1.0 Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9b1aea788c..af67c922b4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1385,7 +1385,7 @@ protocol allows.") (define-public mcabber (package (name "mcabber") - (version "1.0.5") + (version "1.1.0") (source (origin (method url-fetch) @@ -1393,7 +1393,7 @@ protocol allows.") name "-" version ".tar.bz2")) (sha256 (base32 - "0ixdzk5b3s31a4bdfqgqrsiq7vbgdzhqr49p9pz9cq9bgn0h1wm0")))) + "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list "--enable-otr" -- cgit v1.2.3 From be7c64ba2d82f6d800ad6577ff8e9e6306071977 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 23 Sep 2018 22:36:15 +0200 Subject: gnu: Add tegola. * gnu/packages/geo.scm (tegola): New variable. --- gnu/packages/geo.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ae6ba024e0..5641c742b4 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -26,6 +26,7 @@ (define-module (gnu packages geo) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system scons) #:use-module (guix build-system r) @@ -760,3 +761,48 @@ location queries to be run in SQL.") license:bsd-3 ; files only say "BSD" ;; doc license:cc-by-sa3.0)))) + +(define-public tegola + (package + (name "tegola") + (version "0.7.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/go-spatial/tegola/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09vnzxfn0r70kmd776kcdfqxhzdj11syxa0b27z4ci1k367v7viw")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/go-spatial/tegola/cmd/tegola" + #:unpack-path "github.com/go-spatial" + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-version + (lambda _ + (with-directory-excursion + (string-append "src/github.com/go-spatial/tegola-" ,version) + (substitute* '("cmd/tegola/cmd/root.go" + "cmd/tegola_lambda/main.go") + (("version not set") ,version))) + #t)) + (add-before 'build 'rename-import + (lambda _ + (rename-file (string-append "src/github.com/go-spatial/tegola-" ,version) + "src/github.com/go-spatial/tegola") + #t))))) + (home-page "http://tegola.io") + (synopsis "Vector tile server for maps") + (description "Tegola is a free vector tile server written in Go. Tegola +takes geospatial data and slices it into vector tiles that can be efficiently +delivered to any client.") + (license (list + license:expat + ;; Some packages in vendor have other licenses + license:asl2.0 + license:bsd-2 + license:bsd-3 + license:wtfpl2)))) -- cgit v1.2.3 From 3bd7611e4acbffc501f8cabdbf581ffc442ee72a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 23 Sep 2018 22:36:45 +0200 Subject: gnu: Add imposm3. * gnu/packages/geo.scm (imposm3): New variable. --- gnu/packages/geo.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5641c742b4..c5b5dbcfd0 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -806,3 +806,47 @@ delivered to any client.") license:bsd-2 license:bsd-3 license:wtfpl2)))) + +(define-public imposm3 + (package + (name "imposm3") + (version "0.6.0-alpha.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/omniscale/imposm3/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06f0kwmv52yd5m9jlckqxqmkf0cnqy3hamakrvg9lspplyqrds80")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/omniscale/imposm3/cmd/imposm" + #:unpack-path "github.com/omniscale" + #:phases + (modify-phases %standard-phases + (add-before 'build 'rename-import + (lambda _ + (rename-file (string-append "src/github.com/omniscale/imposm3-" ,version) + "src/github.com/omniscale/imposm3") + #t)) + (add-before 'build 'set-version + (lambda _ + (substitute* "src/github.com/omniscale/imposm3/version.go" + (("0.0.0-dev") ,version)) + #t))))) + (inputs + `(("geos" ,geos) + ("leveldb" ,leveldb))) + (home-page "https://imposm.org/") + (synopsis "OpenStreetMap importer for PostGIS") + (description "Imposm is an importer for OpenStreetMap data. It reads PBF +files and imports the data into PostgreSQL/PostGIS databases. It is designed +to create databases that are optimized for rendering/tile/map-services.") + (license (list + license:asl2.0 + ;; Some dependencies in vendor have different licenses + license:expat + license:bsd-2 + license:bsd-3)))) -- cgit v1.2.3 From 8fa3451c6fd56373555e2ada00f3978e1eed32a0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 27 Sep 2018 22:16:31 +0200 Subject: gnu: Add protozero. * gnu/packages/geo.scm (protozero): New variable. --- gnu/packages/geo.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c5b5dbcfd0..dda981c90a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -24,6 +24,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages geo) + #: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 go) @@ -850,3 +851,26 @@ to create databases that are optimized for rendering/tile/map-services.") license:expat license:bsd-2 license:bsd-3)))) + +(define-public protozero + (package + (name "protozero") + (version "1.6.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/mapbox/protozero/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xaj4phz1r7xn0vgdfvfkz8b0bizgb6mavjky1zqcvdmbwgwgly5")))) + (build-system cmake-build-system) + (home-page "https://github.com/mapbox/protozero") + (synopsis "Minimalistic protocol buffer decoder and encoder in C++") + (description "Protozero is a minimalistic protocol buffer decored and +encoder in C++. The developer using protozero has to manually translate the +@file{.proto} description into code.") + (license (list + license:asl2.0; for folly + license:bsd-2)))) -- cgit v1.2.3 From 889e94e343b0784598134b333cc328ed41f387ba Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 27 Sep 2018 22:38:32 +0200 Subject: gnu: Add libosmium. * gnu/packages/geo.scm (libosmium): New variable. --- gnu/packages/geo.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index dda981c90a..990c2a6b02 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -39,6 +39,8 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) + #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) #:use-module (gnu packages cran) #:use-module (gnu packages glib) @@ -874,3 +876,34 @@ encoder in C++. The developer using protozero has to manually translate the (license (list license:asl2.0; for folly license:bsd-2)))) + +(define-public libosmium + (package + (name "libosmium") + (version "2.14.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/osmcode/libosmium/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0d9b46qiw7zkw1h9lygjdwqxnbhm3c7v8kydzw9f9f778cyagc94")))) + (build-system cmake-build-system) + (propagated-inputs + `(("boost" ,boost) + ("expat" ,expat) + ("gdal" ,gdal) + ("geos" ,geos) + ("proj.4" ,proj.4) + ("protozero" ,protozero) + ("sparsehash" ,sparsehash) + ("zlib" ,zlib))) + (native-inputs + `(("doxygen" ,doxygen))) + (home-page "https://osmcode.org/libosmium/") + (synopsis "C++ library for working with OpenStreetMap data") + (description "Libosmium is a fast and flexible C++ library for working with +OpenStreetMap data.") + (license license:boost1.0))) -- cgit v1.2.3 From b0e2299ad8164b986ae0f9081dad30f3332c91e5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 23 Sep 2018 22:37:17 +0200 Subject: gnu: Add osm2pgsql. * gnu/packages/geo.scm (osm2pgsql): New variable. --- gnu/packages/geo.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 990c2a6b02..9644bf9d9e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages icu4c) + #:use-module (gnu packages lua) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -907,3 +908,50 @@ encoder in C++. The developer using protozero has to manually translate the (description "Libosmium is a fast and flexible C++ library for working with OpenStreetMap data.") (license license:boost1.0))) + +(define-public osm2pgsql + (package + (name "osm2pgsql") + (version "0.96.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/openstreetmap/osm2pgsql/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08y7776r4l9v9177a4q6cfdri0lpirky96m6g699hwl7v1vhw0mn")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "contrib/protozero") + (delete-file-recursively "contrib/libosmium") + #t)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f; tests fail because we need to setup a database + #:configure-flags + (list (string-append "-DOSMIUM_INCLUDE_DIR=" + (assoc-ref %build-inputs "libosmium") + "/include") + (string-append "-DPROTOZERO_INCLUDE_DIR=" + (assoc-ref %build-inputs "protozero") + "/include")))) + (inputs + `(("boost" ,boost) + ("expat" ,expat) + ("libosmium" ,libosmium) + ("lua" ,lua) + ("postgresql" ,postgresql) + ("proj.4" ,proj.4) + ("protozero" ,protozero) + ("zlib" ,zlib))) + (native-inputs + `(("python-2" ,python-2) + ("python2-psycopg2" ,python2-psycopg2))) + (home-page "https://github.com/openstreetmap/osm2pgsql") + (synopsis "OSM data importer to postgresql") + (description "Osm2pgsql is a tool for loading OpenStreetMap data into a +PostgreSQL / PostGIS database suitable for applications like rendering into a +map, geocoding with Nominatim, or general analysis.") + (license license:gpl2+))) -- cgit v1.2.3 From 6f91223fd4889301a099f75ecc855031a300fcfe Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 27 Sep 2018 22:12:46 +0200 Subject: gnu: Add tippecanoe. * gnu/packages/geo.scm (tippecanoe): New variable. --- gnu/packages/geo.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9644bf9d9e..4275476e34 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -955,3 +955,34 @@ OpenStreetMap data.") PostgreSQL / PostGIS database suitable for applications like rendering into a map, geocoding with Nominatim, or general analysis.") (license license:gpl2+))) + +(define-public tippecanoe + (package + (name "tippecanoe") + (version "1.31.5") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mapbox/tippecanoe/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1057na1dkgjaryr7jr15lqkxpam111d3l5zdpdkqzzzpxmdjxqcf")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases (delete 'configure)) + #:test-target "test" + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (inputs + `(("perl" ,perl) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (home-page "https://github.com/mapbox/tippecanoe") + (synopsis "Vector tile server for maps") + (description "Tippecanoe creates scale-independent view of data, so that +the texture and density of features is visible at every zoom level, instead of +dropping features at lower levels.") + (license license:bsd-2))) -- cgit v1.2.3 From bfb22078fd3a184f60968938851ada97d7dead58 Mon Sep 17 00:00:00 2001 From: fis trivial Date: Sat, 29 Sep 2018 04:05:15 +0000 Subject: gnu: pocl: Update to 1.2. * gnu/packages/opencl.scm (pocl): Update to 1.2. Signed-off-by: Leo Famulari --- gnu/packages/opencl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index d32e696438..da979253b0 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -294,23 +294,23 @@ back-end for the LLVM compiler framework.") (define-public pocl (package (name "pocl") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/pocl/pocl.git") (commit (string-append "v" version)))) - (file-name (git-file-name name version)) (sha256 - (base32 "1z3sqn20ddv1030adchpzs65qng436gc2mb99p213mkh95jkh1l5")))) + (base32 "0fyiwd9nrqhl0jsac0bx17p9acpfzhyxp50mmp28mzn7psb9qidg")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs `(("libltdl" ,libltdl) ("pkg-config" ,pkg-config))) (inputs `(("clang" ,clang) - ("hwloc" ,hwloc "lib") + ("hwloc" ,hwloc-2.0 "lib") ("llvm" ,llvm) ("ocl-icd" ,ocl-icd))) (arguments -- cgit v1.2.3 From 81e69ba85d6f613b4ff900f6aa50a8a2386ee271 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 11:57:53 -0400 Subject: gnu: BIND: Update to 9.12.2-P2. * gnu/packages/dns.scm (isc-bind): Update to 9.12.2-P2. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 00135294be..4fc1c25229 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -104,7 +104,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.12.2-P1") + (version "9.12.2-P2") (source (origin (method url-fetch) (uri (string-append @@ -112,7 +112,7 @@ and BOOTP/TFTP for network booting of diskless machines.") version ".tar.gz")) (sha256 (base32 - "192ld6w8f4n46hvdmmzzrfkd28apf4dwmbpbi3j2q1d2p315ajww")))) + "0gk9vwqlbdmn10m21f2awvmiccfbadvcwi8zsgm91awbx4k7h0l7")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From 2a1267d3d7dbce9bf2c16ea5972eb7ee4717cf67 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 11:58:59 -0400 Subject: gnu: isc-dhcp: Update bundled BIND to 9.11.4-P2. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Update bundled BIND to 9.11.4-P2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ded7ce3b97..a0ab431ddd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -613,7 +613,7 @@ connection alive.") (bind-minor-version "11") (bind-patch-version "4") (bind-release-type "-P") ; for patch release, use "-P" - (bind-release-version "1") ; for patch release, e.g. "6" + (bind-release-version "2") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version "." bind-minor-version @@ -730,7 +730,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "08zyy13b8ydfbg26b3y6mw299qs89ba90gymraqqjsgjicydrq5h")))) + "04fq17zksd2b3w6w6padps5n7b6s2lasxpksbhl4378h56vgfnm8")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. -- cgit v1.2.3 From 44fa365e7774a31bc98adff4e87430a3d1e19e26 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 15:55:23 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.159. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.159. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cb8203da0b..dbe00b567f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.158" - "1l3blfaw50a8l9bp735vzsmk1naq4l40qidza10dwkkrd2ip3n41" + (make-linux-libre "4.4.159" + "12wrhni1ikmakwv55cgzsznx9llzp82irsisbjjs7bc8z2hzwr6l" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 63e98a4c416957e08bf3d267f52c780f4c6b84f2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 15:56:16 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.130. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.130. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dbe00b567f..de13a36a36 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.129" - "0y7p1xgbpn4nmr5pmqb58shr54lvryr5rxwm9m66knwzj332f3rh" + (make-linux-libre "4.9.130" + "1l3ra1pbgz0wbpp1ci90sj9x9iamvagx1vdbdfbmpjsgh1cfnpmq" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 92011cbf7eb73469cae4478701ef3a1171841d52 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 15:56:49 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.73. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.73. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index de13a36a36..042e7fd280 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.72") -(define %linux-libre-4.14-hash "1ngz5p8mvga45y1n6hbw6niy0ji5mfl4vc3bxlckjg42dcp5qf64") +(define %linux-libre-4.14-version "4.14.73") +(define %linux-libre-4.14-hash "0s2aphqgasx0lnprb2hzaqgbcd5i9774gfyhz5a6sqj6dygr00xy") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From e72ca4111fce4b05bf2a685e451f26e06680e36c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 15:58:27 -0400 Subject: gnu: linux-libre: Update to 4.18.11. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.11. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 042e7fd280..ec2520cdff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.10") -(define %linux-libre-hash "1znc6kh3j8plmxail6hn2ss0r0fvbcp50s3xv5gxys7jc7k42znj") +(define %linux-libre-version "4.18.11") +(define %linux-libre-hash "1r4yf7gr7rf8igkg5jv781wa8vn6ii7fsdnffyshin1slnxbd79k") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 17bea1803cf706d8db053d8d73302a4455684d29 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 29 Sep 2018 21:18:45 -0400 Subject: Revert "services: Add Gitolite." This reverts commit 258a6d944ed891fa92fa87a16731e5dfe0bac477. --- gnu/services/version-control.scm | 179 +-------------------------------------- gnu/tests/version-control.scm | 114 +------------------------ 2 files changed, 2 insertions(+), 291 deletions(-) (limited to 'gnu') diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index cc8cd22021..58274c8bee 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -3,7 +3,6 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2017 Clément Lassieur -;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,23 +40,7 @@ git-http-configuration git-http-configuration? - git-http-nginx-location-configuration - - - gitolite-configuration - gitolite-configuration-package - gitolite-configuration-user - gitolite-configuration-rc-file - gitolite-configuration-admin-pubkey - - - gitolite-rc-file - gitolite-rc-file-umask - gitolite-rc-file-git-config-keys - gitolite-rc-file-roles - gitolite-rc-file-enable - - gitolite-service-type)) + git-http-nginx-location-configuration)) ;;; Commentary: ;;; @@ -214,163 +197,3 @@ access to exported repositories under @file{/srv/git}." "") (list "fastcgi_param GIT_PROJECT_ROOT " git-root ";") "fastcgi_param PATH_INFO $1;")))))) - - -;;; -;;; Gitolite -;;; - -(define-record-type* - gitolite-rc-file make-gitolite-rc-file - gitolite-rc-file? - (umask gitolite-rc-file-umask - (default #o0077)) - (git-config-keys gitolite-rc-file-git-config-keys - (default "")) - (roles gitolite-rc-file-roles - (default '(("READERS" . 1) - ("WRITERS" . 1)))) - (enable gitolite-rc-file-enable - (default '("help" - "desc" - "info" - "perms" - "writable" - "ssh-authkeys" - "git-config" - "daemon" - "gitweb")))) - -(define-gexp-compiler (gitolite-rc-file-compiler - (file ) system target) - (match file - (($ umask git-config-keys roles enable) - (apply text-file* "gitolite.rc" - `("%RC = (\n" - " UMASK => " ,(format #f "~4,'0o" umask) ",\n" - " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" - " ROLES => {\n" - ,@(map (match-lambda - ((role . value) - (simple-format #f " ~A => ~A,\n" role value))) - roles) - " },\n" - "\n" - " ENABLE => [\n" - ,@(map (lambda (value) - (simple-format #f " '~A',\n" value)) - enable) - " ],\n" - ");\n" - "\n" - "1;\n"))))) - -(define-record-type* - gitolite-configuration make-gitolite-configuration - gitolite-configuration? - (package gitolite-configuration-package - (default gitolite)) - (user gitolite-configuration-user - (default "git")) - (group gitolite-configuration-group - (default "git")) - (home-directory gitolite-configuration-home-directory - (default "/var/lib/gitolite")) - (rc-file gitolite-configuration-rc-file - (default (gitolite-rc-file))) - (admin-pubkey gitolite-configuration-admin-pubkey)) - -(define gitolite-accounts - (match-lambda - (($ package user group home-directory - rc-file admin-pubkey) - ;; User group and account to run Gitolite. - (list (user-group (name user) (system? #t)) - (user-account - (name user) - (group group) - (system? #t) - (comment "Gitolite user") - (home-directory home-directory)))))) - -(define gitolite-activation - (match-lambda - (($ package user group home - rc-file admin-pubkey) - #~(begin - (use-modules (ice-9 match) - (guix build utils)) - - (let* ((user-info (getpwnam #$user)) - (admin-pubkey #$admin-pubkey) - (pubkey-file (string-append - #$home "/" - (basename - (strip-store-file-name admin-pubkey))))) - - (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) - (copy-file #$rc-file #$(string-append home "/.gitolite.rc")) - - ;; The key must be writable, so copy it from the store - (copy-file admin-pubkey pubkey-file) - - (chmod pubkey-file #o500) - (chown pubkey-file - (passwd:uid user-info) - (passwd:gid user-info)) - - ;; Set the git configuration, to avoid gitolite trying to use - ;; the hostname command, as the network might not be up yet - (with-output-to-file #$(string-append home "/.gitconfig") - (lambda () - (display "[user] - name = GNU Guix - email = guix@localhost -"))) - ;; Run Gitolite setup, as this updates the hooks and include the - ;; admin pubkey if specified. The admin pubkey is required for - ;; initial setup, and will replace the previous key if run after - ;; initial setup - (match (primitive-fork) - (0 - ;; Exit with a non-zero status code if an exception is thrown. - (dynamic-wind - (const #t) - (lambda () - (setenv "HOME" (passwd:dir user-info)) - (setenv "USER" #$user) - (setgid (passwd:gid user-info)) - (setuid (passwd:uid user-info)) - (primitive-exit - (system* #$(file-append package "/bin/gitolite") - "setup" - "-m" "gitolite setup by GNU Guix" - "-pk" pubkey-file))) - (lambda () - (primitive-exit 1)))) - (pid (waitpid pid))) - - (when (file-exists? pubkey-file) - (delete-file pubkey-file))))))) - -(define gitolite-service-type - (service-type - (name 'gitolite) - (extensions - (list (service-extension activation-service-type - gitolite-activation) - (service-extension account-service-type - gitolite-accounts) - (service-extension profile-service-type - ;; The Gitolite package in Guix uses - ;; gitolite-shell in the authorized_keys file, so - ;; gitolite-shell needs to be on the PATH for - ;; gitolite to work. - (lambda (config) - (list - (gitolite-configuration-package config)))))) - (description - "Setup @command{gitolite}, a Git hosting tool providing access over SSH.. -By default, the @code{git} user is used, but this is configurable. -Additionally, Gitolite can integrate with with tools like gitweb or cgit to -provide a web interface to view selected repositories."))) diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 4409b8a12b..3b935a1b48 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -2,7 +2,6 @@ ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2017, 2018 Clément Lassieur -;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,17 +27,14 @@ #:use-module (gnu services) #:use-module (gnu services version-control) #:use-module (gnu services cgit) - #:use-module (gnu services ssh) #:use-module (gnu services web) #:use-module (gnu services networking) #:use-module (gnu packages version-control) - #:use-module (gnu packages ssh) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix modules) #:export (%test-cgit - %test-git-http - %test-gitolite)) + %test-git-http)) (define README-contents "Hello! This is what goes inside the 'README' file.") @@ -304,111 +300,3 @@ HTTP-PORT." (name "git-http") (description "Connect to a running Git HTTP server.") (value (run-git-http-test)))) - - -;;; -;;; Gitolite. -;;; - -(define %gitolite-test-admin-keypair - (computed-file - "gitolite-test-admin-keypair" - (with-imported-modules (source-module-closure - '((guix build utils))) - #~(begin - (use-modules (ice-9 match) (srfi srfi-26) - (guix build utils)) - - (mkdir #$output) - (invoke #$(file-append openssh "/bin/ssh-keygen") - "-f" (string-append #$output "/test-admin") - "-t" "rsa" - "-q" - "-N" ""))))) - -(define %gitolite-os - (simple-operating-system - (dhcp-client-service) - (service openssh-service-type) - (service gitolite-service-type - (gitolite-configuration - (admin-pubkey - (file-append %gitolite-test-admin-keypair "/test-admin.pub")))))) - -(define (run-gitolite-test) - (define os - (marionette-operating-system - %gitolite-os - #:imported-modules '((gnu services herd) - (guix combinators)))) - - (define vm - (virtual-machine - (operating-system os) - (port-forwardings `((2222 . 22))))) - - (define test - (with-imported-modules '((gnu build marionette) - (guix build utils)) - #~(begin - (use-modules (srfi srfi-64) - (rnrs io ports) - (gnu build marionette) - (guix build utils)) - - (define marionette - (make-marionette (list #$vm))) - - (mkdir #$output) - (chdir #$output) - - (test-begin "gitolite") - - ;; Wait for sshd to be up and running. - (test-assert "service running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'ssh-daemon)) - marionette)) - - (display #$%gitolite-test-admin-keypair) - - (setenv "GIT_SSH_VARIANT" "ssh") - (setenv "GIT_SSH_COMMAND" - (string-join - '(#$(file-append openssh "/bin/ssh") - "-i" #$(file-append %gitolite-test-admin-keypair - "/test-admin") - "-o" "UserKnownHostsFile=/dev/null" - "-o" "StrictHostKeyChecking=no"))) - - (test-assert "cloning the admin repository" - (invoke #$(file-append git "/bin/git") - "clone" "-v" - "ssh://git@localhost:2222/gitolite-admin" - "/tmp/clone")) - - (test-assert "admin key exists" - (file-exists? "/tmp/clone/keydir/test-admin.pub")) - - (with-directory-excursion "/tmp/clone" - (invoke #$(file-append git "/bin/git") - "-c" "user.name=Guix" "-c" "user.email=guix" - "commit" - "-m" "Test commit" - "--allow-empty") - - (test-assert "pushing, and the associated hooks" - (invoke #$(file-append git "/bin/git") "push"))) - - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) - - (gexp->derivation "gitolite" test)) - -(define %test-gitolite - (system-test - (name "gitolite") - (description "Clone the Gitolite admin repository.") - (value (run-gitolite-test)))) -- cgit v1.2.3 From 3b362c8a8366b55a172817d7c347098accd3d56b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Sep 2018 13:37:06 +0300 Subject: gnu: mtools: Update to 4.0.19. * gnu/packages/mtools.scm (mtools): Update to 4.0.19. --- gnu/packages/mtools.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index f49a035b41..e4750f579f 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013 John Darrington ;;; Copyright © 2015 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,7 +28,7 @@ (define-public mtools (package (name "mtools") - (version "4.0.18") + (version "4.0.19") (source (origin (method url-fetch) @@ -35,7 +36,7 @@ version ".tar.gz")) (sha256 (base32 - "1hxciksv7av5ilnkvwbidyxxr1gzn24lr0mz9z8drkml7780im1h")))) + "003qnj4rs22v2sih3is55scvav8xq9p1dp5b7gnyl67a60ky516r")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/mtools/") (synopsis "Access MS-DOS disks without mounting") -- cgit v1.2.3 From cebec8bd1ca3871dead210c2e8404e3f5cec8ab7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Sep 2018 15:46:46 +0300 Subject: gnu: font-culmus: Update to 0.133. * gnu/packages/fonts.scm (font-culmus): Update to 0.133. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 218b04baa1..6d4abc637b 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1210,7 +1210,7 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold") (define-public font-culmus (package (name "font-culmus") - (version "0.132") + (version "0.133") (source (origin (method url-fetch) @@ -1219,7 +1219,7 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold") version ".tar.gz")) (sha256 (base32 - "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z")))) + "02akysgsqhi15cck54xcacm16q5raf4l7shgb8fnj7xr3c1pbfyp")))) (build-system font-build-system) (arguments `(#:phases -- cgit v1.2.3 From f2bc53af70eea7b7147b9e7e40280941866ed128 Mon Sep 17 00:00:00 2001 From: pimi Date: Sun, 30 Sep 2018 14:08:42 -0400 Subject: gnu: Add porechop. * gnu/packages/bioinformatics.scm (porechop): New variable. --- gnu/packages/bioinformatics.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e74abf005f..b84498d042 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13869,3 +13869,33 @@ single-cell transcriptomic map of the human and mouse pancreas reveals inter- and intra-cell population structure.\" Baron et al. Cell Systems (2016) @url{https://www.ncbi.nlm.nih.gov/pubmed/27667365}.") (license license:gpl2+)))) + +(define-public porechop + ;; The recommended way to install is to clone the git repository + ;; https://github.com/rrwick/Porechop#installation + (let ((commit "289d5dca4a5fc327f97b3f8cecb68ecaf1014861") + (revision "1")) + (package + (name "porechop") + (version (git-version "0.2.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rrwick/Porechop.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05ps43gig0d3ia9x5lj84lb00hbsl6ba9n7y7jz927npxbr2ym23")))) + (build-system python-build-system) + (home-page "https://github.com/rrwick/porechop") + (synopsis "Finding, trimming or splitting adapters, in Oxford Nanopore reads") + (description + "The porechop package is a tool for finding and removing adapters from Oxford +Nanopore reads. Adapters on the ends of reads are trimmed off, and when a read +has an adapter in its middle, it is treated as chimeric and chopped into +separate reads. Porechop performs thorough alignments to effectively find +adapters, even at low sequence identity. Porechop also supports demultiplexing +of Nanopore reads that were barcoded with the Native Barcoding Kit, PCR +Barcoding Kit or Rapid Barcoding Kit.") + (license license:gpl3+)))) -- cgit v1.2.3 From 0e2d3ce20e7bd71aaad5baa6b977b9684216b66e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Sep 2018 21:12:06 +0200 Subject: gnu: sshuttle: Rely on $PATH to find a POSIX sh. This fixes a regression introduced in commit c32863e094d3489d2e08ccb3188988d7c6410976, where the sshuttle client will try to invoke its own /gnu/store/.../bin/sh on the server. Rely on $PATH instead of regressing to upstream's hard-coded /bin/sh. * gnu/packages/vpn.scm (sshuttle)[arguments]: SUBSTITUTE* "sh" for "/bin/sh". --- gnu/packages/vpn.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index de5df5039d..9b1f26aa7d 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -355,8 +355,7 @@ private network between hosts on the internet.") (substitute* "sshuttle/client.py" (("/usr/bin/env") (which "env"))) (substitute* "sshuttle/ssh.py" - ;; Perhaps this is unreachable, but don't let's take risks. - (("/bin/sh") (which "sh"))) + (("/bin/sh") "sh")) #t))))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) -- cgit v1.2.3 From dde15fea25b86c75512f204de91bb0c82a152967 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 14:10:20 -0400 Subject: gnu: ghc: Use GHC 8.4.3 as the default GHC. * gnu/packages/haskell.scm (ghc): Switch to ghc-8. --- gnu/packages/haskell.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6b774c358a..1e7a502d8f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -559,7 +559,7 @@ interactive environment for the functional language Haskell.") (file-pattern ".*\\.conf\\.d$") (file-type 'directory)))))) -(define-public ghc ghc-8.0) +(define-public ghc ghc-8) (define-public ghc-hostname (package -- cgit v1.2.3 From f54f04756f6d90c9fb3b5e45f3947329287f9b05 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 17:08:08 -0400 Subject: gnu: ghc-mtl: Remove built-in Haskell package. * gnu/packages/agda.scm (agda)[inputs]: Remove ghc-mtl. * gnu/packages/games.scm (raincat)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-check.scm (ghc-tasty-ant-xml, ghc-tasty-golden, ghc-tasty, ghc-tasty-kat, ghc-tasty-rerun, ghc-crypto-cipher-tests)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-crypto.scm (ghc-asn1-encoding, ghc-pem, ghc-x509, ghc-x509-store, ghc-x509-validation, ghc-x509-system)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-web.scm (ghc-http, ghc-http-conduit, ghc-yesod-core)[inputs]: Remove ghc-mtl. * gnu/packages/haskell.scm (ghc-convertible, ghc-libxml, ghc-cgi, ghc-happy, ghc-haskell-src-exts, ghc-resourcet, cabal-install, ghc-indents, ghc-regex-base, ghc-regex-tdfa-rc, ghc-trifecta, ghc-zip-archive, ghc-logict, ghc-exceptions, ghc-smallcheck, ghc-syb, ghc-fgl, ghc-chasingbottoms, ghc-parsec, ghc-megaparsec, ghc-edisonapi, ghc-edisoncore, ghc-mmorph, ghc-ifelse, ghc-kan-extensions, ghc-lens, ghc-cheapskate, ghc-free, ghc-adjunctions, ghc-equivalence, ghc-texmath, ghc-texmath-for-pandoc-1, ghc-highlighting-kate, ghc-th-reify-many, ghc-th-orphans, ghc-geniplate-mirror, ghc-conduit, ghc-filemanip, ghc-juicypixels, ghc-hslua, ghc-hourglass, ghc-skylighting, ghc-skylighting-for-pandoc-1, ghc-pandoc, ghc-pandoc-1, ghc-pandoc-citeproc, ghc-regex-tdfa, ghc-stmonadtrans, ghc-constraints, ghc-lifted-async, ghc-shelly, ghc-hslogger, ghc-json, shellcheck, ghc-vector-algorithms, ghc-monad-par-extras, ghc-monad-par, ghc-monadrandom, ghc-either, ghc-rebase, ghc-aws, ghc-monad-logger, ghc-persistent, ghc-bytes, ghc-missingh, ghc-operational, ghc-chart)[inputs]: Remove ghc-mtl. (ghc-conduit-combinators)[native-inputs]: Remove ghc-mtl. (ghc-mtl): Remove variable. * gnu/packages/idris.scm (idris)[inputs]: Remove ghc-mtl. * gnu/packages/tls.scm (ghc-tls)[inputs]: Remove ghc-mtl. * gnu/packages/version-control.scm (darcs, git-annex)[inputs]: Remove ghc-mtl. * gnu/packages/wm.scm (xmonad, ghc-xmonad-contrib)[inputs]: Remove ghc-mtl. * gnu/packages/xml.scm (ghc-hxt)[inputs]: Remove ghc-mtl. --- gnu/packages/agda.scm | 1 - gnu/packages/games.scm | 1 - gnu/packages/haskell-check.scm | 8 +- gnu/packages/haskell-crypto.scm | 14 +--- gnu/packages/haskell-web.scm | 3 - gnu/packages/haskell.scm | 154 +++++++-------------------------------- gnu/packages/idris.scm | 1 - gnu/packages/tls.scm | 3 +- gnu/packages/version-control.scm | 2 - gnu/packages/wm.scm | 4 +- gnu/packages/xml.scm | 1 - 11 files changed, 33 insertions(+), 159 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index df4968c445..572de5bbeb 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -58,7 +58,6 @@ ("ghc-hashtables" ,ghc-hashtables) ("ghc-ieee754" ,ghc-ieee754) ("ghc-monadplus" ,ghc-monadplus) - ("ghc-mtl" ,ghc-mtl) ("ghc-murmur-hash" ,ghc-murmur-hash) ("ghc-uri-encode" ,ghc-uri-encode) ("ghc-parallel" ,ghc-parallel) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8be87f6f55..8155876313 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2136,7 +2136,6 @@ on the screen and keyboard to display letters.") (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("ghc-mtl" ,ghc-mtl) ("ghc-random" ,ghc-random) ("ghc-glut" ,ghc-glut) ("freeglut" ,freeglut) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 31407ca259..4324c9c44d 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -54,7 +54,6 @@ (inputs `(("ghc-generic-deriving" ,ghc-generic-deriving) ("ghc-xml" ,ghc-xml) - ("ghc-mtl" ,ghc-mtl) ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) @@ -140,7 +139,6 @@ Haskell test framework.") (inputs `(("ghc-temporary" ,ghc-temporary) ("ghc-tasty" ,ghc-tasty) - ("ghc-mtl" ,ghc-mtl) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-tagged" ,ghc-tagged) ("ghc-async" ,ghc-async) @@ -197,7 +195,6 @@ timer functions of different operating systems via a unified API.") (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) - ("ghc-mtl" ,ghc-mtl) ("ghc-tagged" ,ghc-tagged) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-regex-tdfa-rc" ,ghc-regex-tdfa-rc) @@ -250,7 +247,6 @@ test framework.") (build-system haskell-build-system) (inputs `(("ghc-tasty" ,ghc-tasty) - ("ghc-mtl" ,ghc-mtl) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://github.com/vincenthz/tasty-kat") @@ -299,8 +295,7 @@ test-framework.") "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-optparse-applicative" ,ghc-optparse-applicative) + `(("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-reducers" ,ghc-reducers) ("ghc-split" ,ghc-split) ("ghc-stm" ,ghc-stm) @@ -827,7 +822,6 @@ minimal dependencies.") "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-mtl" ,ghc-mtl) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index b0be30cb6b..1326de0923 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -70,8 +70,7 @@ format.") (inputs `(("ghc-hourglass" ,ghc-hourglass) ("ghc-asn1-types" ,ghc-asn1-types) - ("ghc-text" ,ghc-text) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) @@ -345,8 +344,7 @@ to obtain cryptographically strong entropy.") "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-base64-bytestring" ,ghc-base64-bytestring))) + `(("ghc-base64-bytestring" ,ghc-base64-bytestring))) (native-inputs `(("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) @@ -431,7 +429,6 @@ libraries, like OpenSSL.") (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) - ("ghc-mtl" ,ghc-mtl) ("ghc-hourglass" ,ghc-hourglass) ("ghc-pem" ,ghc-pem) ("ghc-asn1-types" ,ghc-asn1-types) @@ -461,8 +458,7 @@ libraries, like OpenSSL.") "0yw09nwkvr324qz4sc27c0p28bz2h6gns6lkaz9mz92mgqf2dza9")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-pem" ,ghc-pem) + `(("ghc-pem" ,ghc-pem) ("ghc-asn1-types" ,ghc-asn1-types) ("ghc-asn1-encoding" ,ghc-asn1-encoding) ("ghc-cryptonite" ,ghc-cryptonite) @@ -490,7 +486,6 @@ collections, certificates, revocation lists, and exception lists.") (inputs `(("ghc-memory" ,ghc-memory) ("ghc-byteable" ,ghc-byteable) - ("ghc-mtl" ,ghc-mtl) ("ghc-hourglass" ,ghc-hourglass) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-pem" ,ghc-pem) @@ -520,8 +515,7 @@ list validation.") "0k7zc0xp7r6kqmi39rpiicvq78xb0pr2cq6q5s3kmmsshllg13nr")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-pem" ,ghc-pem) + `(("ghc-pem" ,ghc-pem) ("ghc-x509" ,ghc-x509) ("ghc-x509-store" ,ghc-x509-store))) (home-page "https://github.com/vincenthz/hs-certificate") diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a043ffcc0d..9ef9486b3f 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -171,7 +171,6 @@ both client and server code).") ("ghc-old-time" ,ghc-old-time) ("ghc-parsec" ,ghc-parsec) ("ghc-puremd5" ,ghc-puremd5) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) ("ghc-split" ,ghc-split))) @@ -350,7 +349,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") ("ghc-http-client" ,ghc-http-client) ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-mtl" ,ghc-mtl) ("ghc-exceptions" ,ghc-exceptions) ("ghc-unliftio" ,ghc-unliftio))) (native-inputs @@ -1039,7 +1037,6 @@ avoid any issues with characters.") ("ghc-text" ,ghc-text) ("ghc-shakespeare" ,ghc-shakespeare) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-mtl" ,ghc-mtl) ("ghc-clientsession" ,ghc-clientsession) ("ghc-random" ,ghc-random) ("ghc-cereal" ,ghc-cereal) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1e7a502d8f..95e89a3b06 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -596,7 +596,6 @@ determine the hostname.") (inputs `(("ghc-old-time" ,ghc-old-time) ("ghc-old-locale" ,ghc-old-locale) - ("ghc-mtl" ,ghc-mtl) ("ghc-text" ,ghc-text))) (home-page "https://hackage.haskell.org/package/convertible") (synopsis "Typeclasses and instances for converting between types") @@ -649,8 +648,7 @@ between double precision floating point and text.") "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("libxml2" ,libxml2))) + `(("libxml2" ,libxml2))) (arguments `(#:configure-flags `(,(string-append "--extra-include-dirs=" @@ -1041,8 +1039,7 @@ tool lex or flex for C/C++.") ("ghc-exceptions" ,ghc-exceptions) ("ghc-multipart" ,ghc-multipart) ("ghc-network-uri" ,ghc-network-uri) - ("ghc-network" ,ghc-network) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-network" ,ghc-network))) (native-inputs `(("ghc-doctest" ,ghc-doctest) ("ghc-quickcheck" ,ghc-quickcheck))) @@ -1111,8 +1108,6 @@ postfix notation. For more information on stack based languages, see (base32 "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd")))) (build-system haskell-build-system) - (inputs - `(("ghc-mtl" ,ghc-mtl))) (home-page "https://hackage.haskell.org/package/happy") (synopsis "Parser generator for Haskell") (description "Happy is a parser generator for Haskell. Given a grammar @@ -1199,7 +1194,6 @@ examination.") (inputs `(("cpphs" ,cpphs) ("ghc-happy" ,ghc-happy) - ("ghc-mtl" ,ghc-mtl) ("ghc-pretty-show" ,ghc-pretty-show-for-haskell-src-exts))) (native-inputs `(("ghc-smallcheck" ,ghc-smallcheck) @@ -1317,7 +1311,6 @@ unwanted suggestions, and to add your own custom suggestions.") `(("ghc-transformers-base" ,ghc-transformers-base) ("ghc-monad-control" ,ghc-monad-control) ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-mtl" ,ghc-mtl) ("ghc-mmorph" ,ghc-mmorph) ("ghc-exceptions" ,ghc-exceptions) ("ghc-unliftio-core" ,ghc-unliftio-core))) @@ -1812,7 +1805,6 @@ versions of GHC (i.e., < 6.10).") (build-system haskell-build-system) (inputs `(("ghc-http" ,ghc-http) - ("ghc-mtl" ,ghc-mtl) ("ghc-network-uri" ,ghc-network-uri) ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) @@ -1848,37 +1840,6 @@ configuration. This library provides the common bits for writing custom @file{Setup.hs} files.") (license license:bsd-3))) -(define-public ghc-mtl - (package - (name "ghc-mtl") - (version "2.2.1") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/mtl/mtl-" - version - ".tar.gz")) - (sha256 - (base32 - "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa")))) - (build-system haskell-build-system) - ;; This is an official revision, relaxing the requirement transformers == - ;; 0.4 to transformers >= 0.4 && < 0.6; see - ;; https://hackage.haskell.org/package/mtl-2.2.1/revision/1.cabal - (arguments - `(#:configure-flags (list "--allow-newer=transformers"))) - (home-page "https://github.com/ekmett/mtl") - (synopsis - "Monad classes, using functional dependencies") - (description "Monad classes using functional dependencies, with instances -for various monad transformers, inspired by the paper 'Functional Programming -with Overloading and Higher-Order Polymorphism', by Mark P Jones, in 'Advanced -School of Functional Programming', 1995. See -@uref{https://web.cecs.pdx.edu/~mpj/pubs/springschool.html, the paper}.") - (license license:bsd-3))) - (define-public ghc-parsec-numbers (package (name "ghc-parsec-numbers") @@ -2535,8 +2496,7 @@ isn't available, portable implementations are used.") (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) - ("ghc-concatenative" ,ghc-concatenative) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-concatenative" ,ghc-concatenative))) (home-page "http://patch-tag.com/r/salazar/indents") (synopsis "Indentation sensitive parser-combinators for parsec") (description @@ -2611,8 +2571,6 @@ supported systems.") (base32 "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10")))) (build-system haskell-build-system) - (inputs - `(("ghc-mtl" ,ghc-mtl))) (home-page "https://sourceforge.net/projects/lazy-regex") (synopsis "Replaces/Enhances Text.Regex") @@ -2684,8 +2642,7 @@ Haskell library @code{regex-base}.") (build-system haskell-build-system) (inputs `(("ghc-regex-base" ,ghc-regex-base) - ("ghc-parsec" ,ghc-parsec) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-parsec" ,ghc-parsec))) (home-page "https://hackage.haskell.org/package/regex-tdfa") (synopsis "Tagged DFA regex engine for Haskell") @@ -2815,7 +2772,6 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s ("ghc-fingertree" ,ghc-fingertree) ("ghc-hashable" ,ghc-hashable) ("ghc-lens" ,ghc-lens) - ("ghc-mtl" ,ghc-mtl) ("ghc-parsers" ,ghc-parsers) ("ghc-profunctors" ,ghc-profunctors) ("ghc-quickcheck" ,ghc-quickcheck) @@ -2904,7 +2860,6 @@ complicated text/binary file formats.") `(("ghc-old-time" ,ghc-old-time) ("ghc-digest" ,ghc-digest) ("zip" ,zip) - ("ghc-mtl" ,ghc-mtl) ("ghc-temporary" ,ghc-temporary) ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) @@ -3249,7 +3204,6 @@ syntax and semantics as Perl 5.") (base32 "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi")))) (build-system haskell-build-system) - (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page "http://code.haskell.org/~dolio/") (synopsis "Backtracking logic-programming monad") (description "This library provides a continuation-based, backtracking, @@ -3332,7 +3286,6 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (inputs `(("ghc-stm" ,ghc-stm) - ("ghc-mtl" ,ghc-mtl) ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/exceptions/") (synopsis "Extensible optionally-pure exceptions") @@ -3410,8 +3363,7 @@ This is a better maintained fork of the \"temporary\" package.") "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h")))) (build-system haskell-build-system) (inputs - `(("ghc-logict" ,ghc-logict) - ("ghc-mtl" ,ghc-mtl))) + `(("ghc-logict" ,ghc-logict))) (home-page "https://github.com/feuerbach/smallcheck") (synopsis "Property-based testing library") @@ -3495,8 +3447,7 @@ to cases.") "1p3cnqjm13677r4a966zffzhi9b3a321aln8zs8ckqj0d9z1z3d3")))) (build-system haskell-build-system) (inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-mtl" ,ghc-mtl))) + `(("ghc-hunit" ,ghc-hunit))) (home-page "http://www.cs.uu.nl/wiki/GenericProgramming/SYB") (synopsis "Scrap Your Boilerplate") @@ -3528,8 +3479,7 @@ variety of traversals.") `(#:configure-flags (list "--allow-newer=QuickCheck" "--allow-newer=hspec"))) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-hspec" ,ghc-hspec) + `(("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://web.engr.oregonstate.edu/~erwig/fgl/haskell") (synopsis @@ -3554,8 +3504,7 @@ encourages inductive, recursive definitions of graph algorithms.") "04jwwjs22mqc4hvpp4c3gpb79inrrq5sapks5khknspv2hslm61q")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-quickcheck" ,ghc-quickcheck) + `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-random" ,ghc-random) ("ghc-syb" ,ghc-syb))) (home-page "https://hackage.haskell.org/package/ChasingBottoms") @@ -3764,8 +3713,7 @@ mainstream languages.") (native-inputs `(("ghc-hunit" ,ghc-hunit))) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-mtl" ,ghc-mtl))) + `(("ghc-text" ,ghc-text))) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (home-page @@ -3814,7 +3762,6 @@ combinators.") (build-system haskell-build-system) (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-mtl" ,ghc-mtl) ("ghc-parser-combinators" ,ghc-parser-combinators) ("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text))) @@ -4043,7 +3990,6 @@ representing a store for a single element.") (sha256 (base32 "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm")))) (build-system haskell-build-system) - (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page "http://rwd.rdockins.name/edison/home/") (synopsis "Library of efficient, purely-functional data structures (API)") (description @@ -4069,8 +4015,7 @@ finite maps and priority queues where the priority and element are distinct.") (base32 "06shxmcqxcahcn6zgl64vlqix4fnq53d97drcgsh94qp7gp201ry")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-quickcheck" ,ghc-quickcheck) + `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-edisonapi" ,ghc-edisonapi))) (home-page "http://rwd.rdockins.name/edison/home/") (synopsis "Library of efficient, purely-functional data structures") @@ -4096,8 +4041,7 @@ with various performance characteristics.") "1i8dzrc5qi3ryc9vrrmpn3sihmramsbhhd592w4w2k5g26qr3hql")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-transformers-compat" ,ghc-transformers-compat))) + `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://hackage.haskell.org/package/mmorph") (synopsis "Monad morphisms") (description @@ -4118,7 +4062,6 @@ manipulating monad transformer stacks.") (base32 "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa")))) (build-system haskell-build-system) - (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page "http://hackage.haskell.org/package/IfElse") (synopsis "Monadic control flow with anaphoric variants") (description "This library provides functions for control flow inside of @@ -4638,7 +4581,6 @@ given term should not exist.") ("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) ("ghc-free" ,ghc-free) - ("ghc-mtl" ,ghc-mtl) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-tagged" ,ghc-tagged))) (home-page "https://github.com/ekmett/kan-extensions/") @@ -4728,7 +4670,6 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("ghc-comonad" ,ghc-comonad) ("ghc-contravariant" ,ghc-contravariant) ("ghc-hashable" ,ghc-hashable) - ("ghc-mtl" ,ghc-mtl) ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) ("ghc-tagged" ,ghc-tagged) @@ -4772,8 +4713,7 @@ indexed variants.") "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-text" ,ghc-text) + `(("ghc-text" ,ghc-text) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-xss-sanitize" ,ghc-xss-sanitize) ("ghc-data-default" ,ghc-data-default) @@ -4936,7 +4876,6 @@ semigroup.") ("ghc-bifunctors" ,ghc-bifunctors) ("ghc-comonad" ,ghc-comonad) ("ghc-distributive" ,ghc-distributive) - ("ghc-mtl" ,ghc-mtl) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups))) (home-page "https://github.com/ekmett/free/") @@ -4971,7 +4910,6 @@ definition of @code{Monad}.") ("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) ("ghc-free" ,ghc-free) - ("ghc-mtl" ,ghc-mtl) ("ghc-tagged" ,ghc-tagged) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups) @@ -4995,8 +4933,7 @@ for Haskell.") (base32 "0a85bdyyvjqs5z4kfhhf758210k9gi9dv42ik66a3jl0z7aix8kx")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-stmonadtrans" ,ghc-stmonadtrans) + `(("ghc-stmonadtrans" ,ghc-stmonadtrans) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-test-framework" ,ghc-test-framework) @@ -5393,7 +5330,6 @@ building up, manipulating and serialising @code{Pandoc} structures.") ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-xml" ,ghc-xml) ("ghc-parsec" ,ghc-parsec) - ("ghc-mtl" ,ghc-mtl) ("ghc-pandoc-types" ,ghc-pandoc-types))) (home-page "https://github.com/jgm/texmath") (synopsis "Conversion between formats used to represent mathematics") @@ -5417,8 +5353,7 @@ it can parse and apply LaTeX macros.") (base32 "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd")))) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-network-uri" ,ghc-network-uri) + `(("ghc-network-uri" ,ghc-network-uri) ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) ("ghc-parsec" ,ghc-parsec) ("ghc-split" ,ghc-split) @@ -5492,8 +5427,7 @@ and utilities for pretty printing.") (native-inputs `(("ghc-parsec" ,ghc-parsec) ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-utf8-string" ,ghc-utf8-string))) (home-page "https://github.com/jgm/highlighting-kate") (synopsis "Syntax highlighting library") (description @@ -5747,8 +5681,7 @@ instances. This package provides orphan instances for @code{containers}, "1b76zjxkj0v0n8zj9l0nwav2irm0c43rx6qjihfw8klmmxvx59df")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-safe" ,ghc-safe) + `(("ghc-safe" ,ghc-safe) ("ghc-th-expand-syns" ,ghc-th-expand-syns))) (home-page "https://github.com/mgsloan/th-reify-many") (synopsis "Recurseively reify template haskell datatype info") @@ -5775,7 +5708,6 @@ function which generates instances.") `(("ghc-th-lift" ,ghc-th-lift) ("ghc-th-lift-instances" ,ghc-th-lift-instances) ("ghc-th-reify-many" ,ghc-th-reify-many) - ("ghc-mtl" ,ghc-mtl) ("ghc-generic-deriving" ,ghc-generic-deriving))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) @@ -5801,7 +5733,6 @@ package, and that's where the version number started.") (sha256 (base32 "17vjps2118s5z3k39ij00lkmkxv3mqf8h59wv6qdamlgmhyr36si")))) (build-system haskell-build-system) - (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page "https://github.com/danr/geniplate") (synopsis "Use Template Haskell to generate Uniplate-like functions") (description @@ -5877,7 +5808,6 @@ template-haskell abstract syntax.") ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-mono-traversable" ,ghc-mono-traversable) ("ghc-mmorph" ,ghc-mmorph) - ("ghc-mtl" ,ghc-mtl) ("ghc-resourcet" ,ghc-resourcet) ("ghc-silently" ,ghc-silently) ("ghc-transformers-base" ,ghc-transformers-base) @@ -6003,8 +5933,7 @@ back-ends.") "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-unix-compat" ,ghc-unix-compat))) + `(("ghc-unix-compat" ,ghc-unix-compat))) (home-page "https://github.com/bos/filemanip") (synopsis "File and directory manipulation for Haskell") (description @@ -6048,8 +5977,7 @@ do on-demand loading.") "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-zlib" ,ghc-zlib) + `(("ghc-zlib" ,ghc-zlib) ("ghc-vector" ,ghc-vector) ("ghc-primitive" ,ghc-primitive) ("ghc-mmap" ,ghc-mmap))) @@ -6078,7 +6006,6 @@ TIFF and GIF formats.") `(("lua" ,lua) ("ghc-exceptions" ,ghc-exceptions) ("ghc-fail" ,ghc-fail) - ("ghc-mtl" ,ghc-mtl) ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) @@ -6176,8 +6103,7 @@ wrapping a bytestring with stronger and more meaniful name.") "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-old-locale" ,ghc-old-locale))) + `(("ghc-old-locale" ,ghc-old-locale))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) @@ -6322,7 +6248,6 @@ the choice of SSL/TLS, and SOCKS.") ("ghc-colour" ,ghc-colour) ("ghc-diff" ,ghc-diff) ("ghc-hxt" ,ghc-hxt) - ("ghc-mtl" ,ghc-mtl) ("ghc-pretty-show" ,ghc-pretty-show) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-safe" ,ghc-safe) @@ -6388,7 +6313,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-diff" ,ghc-diff) ("ghc-hxt" ,ghc-hxt) - ("ghc-mtl" ,ghc-mtl) ("ghc-pretty-show" ,ghc-pretty-show) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-safe" ,ghc-safe) @@ -6483,7 +6407,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-http-types" ,ghc-http-types) ("ghc-juicypixels" ,ghc-juicypixels) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) ("ghc-old-locale" ,ghc-old-locale) @@ -6560,7 +6483,6 @@ provided for those who need a drop-in replacement for Markdown.pl.") ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-http-types" ,ghc-http-types) ("ghc-juicypixels" ,ghc-juicypixels) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) ("ghc-old-time" ,ghc-old-time) @@ -6782,8 +6704,7 @@ the @code{conduit} package.") (add-after 'install 'post-install-check (assoc-ref %standard-phases 'check))))) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-pandoc-types" ,ghc-pandoc-types) + `(("ghc-pandoc-types" ,ghc-pandoc-types) ("ghc-pandoc" ,ghc-pandoc) ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-aeson" ,ghc-aeson) @@ -6935,8 +6856,7 @@ regular expressions. Parsers can be built using Applicative interface.") "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-parsec" ,ghc-parsec) + `(("ghc-parsec" ,ghc-parsec) ("ghc-regex-base" ,ghc-regex-base))) (home-page "https://github.com/ChrisKuklewicz/regex-tdfa") (synopsis "POSIX extended regular expressions in Haskell.") @@ -7070,8 +6990,6 @@ an index.") (sha256 (base32 "1nr26fnmi5fdjc6d00w13kjhmfyvb5b837d0006w4dj0yxndaksp")))) (build-system haskell-build-system) - (inputs - `(("ghc-mtl" ,ghc-mtl))) (home-page "https://hackage.haskell.org/package/STMonadTrans") (synopsis "Monad transformer version of the ST monad") (description @@ -7288,7 +7206,6 @@ and edge labels with positional information, etc. (build-system haskell-build-system) (inputs `(("ghc-hashable" ,ghc-hashable) - ("ghc-mtl" ,ghc-mtl) ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/constraints/") (synopsis "Constraint manipulation") @@ -7319,7 +7236,6 @@ a vocabulary for working with them.") ("ghc-monad-control" ,ghc-monad-control) ("ghc-constraints" ,ghc-constraints) ("ghc-hunit" ,ghc-hunit) - ("ghc-mtl" ,ghc-mtl) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-th" ,ghc-tasty-th))) @@ -7408,8 +7324,7 @@ which can't be decoded in the current locale encoding.") "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-unix-compat" ,ghc-unix-compat) + `(("ghc-unix-compat" ,ghc-unix-compat) ("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) ("ghc-system-fileio-bootstrap" ,ghc-system-fileio-bootstrap) ("ghc-monad-control" ,ghc-monad-control) @@ -8102,8 +8017,7 @@ files in Haskell.") "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-network" ,ghc-network) + `(("ghc-network" ,ghc-network) ("ghc-old-locale" ,ghc-old-locale))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) @@ -8148,7 +8062,6 @@ handled safely, this is what you're left with.") (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb) - ("ghc-mtl" ,ghc-mtl) ("ghc-text" ,ghc-text) ("ghc-parsec" ,ghc-parsec))) (home-page "https://hackage.haskell.org/package/json") @@ -8213,7 +8126,6 @@ generated SQL and optimize it for your backend.") (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-json" ,ghc-json) - ("ghc-mtl" ,ghc-mtl) ("ghc-parsec" ,ghc-parsec) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "https://github.com/koalaman/shellcheck") @@ -8546,7 +8458,6 @@ between 2 and 3 times faster than the Mersenne Twister.") #t))))) (inputs `(("ghc-vector" ,ghc-vector) - ("ghc-mtl" ,ghc-mtl) ("ghc-mwc-random" ,ghc-mwc-random))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) @@ -8622,8 +8533,7 @@ module for more details.") (build-system haskell-build-system) (inputs `(("ghc-abstract-par" ,ghc-abstract-par) ("ghc-cereal" ,ghc-cereal) - ("ghc-random" ,ghc-random) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-random" ,ghc-random))) (home-page "https://github.com/simonmar/monad-par") (synopsis "Combinators and extra features for Par monads for Haskell") (description "This Haskell package provides additional data structures, @@ -8685,8 +8595,7 @@ This package also includes a simple reference implementation based on ("ghc-abstract-deque" ,ghc-abstract-deque) ("ghc-monad-par-extras" ,ghc-monad-par-extras) ("ghc-mwc-random" ,ghc-mwc-random) - ("ghc-parallel" ,ghc-parallel) - ("ghc-mtl" ,ghc-mtl))) + ("ghc-parallel" ,ghc-parallel))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) @@ -8879,7 +8788,6 @@ statically known size.") "1h1nhswrcmhy3mq6vd530p0df51fcnnf4csbwnljar7cf0mb2h6y")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-mtl" ,ghc-mtl) ("ghc-primitive" ,ghc-primitive) ("ghc-fail" ,ghc-fail) ("ghc-random" ,ghc-random))) @@ -8908,7 +8816,6 @@ which consume random values.") ("ghc-free" ,ghc-free) ("ghc-monad-control" ,ghc-monad-control) ("ghc-manodrandom" ,ghc-monadrandom) - ("ghc-mtl" ,ghc-mtl) ("ghc-mmorph" ,ghc-mmorph) ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) @@ -9057,7 +8964,6 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") ("ghc-contravariant" ,ghc-contravariant) ("ghc-contravariant-extras" ,ghc-contravariant-extras) ("ghc-semigroups" ,ghc-semigroups) - ("ghc-mtl" ,ghc-mtl) ("ghc-either" ,ghc-either) ("ghc-fail" ,ghc-fail) ("ghc-base-prelude" ,ghc-base-prelude))) @@ -9219,7 +9125,6 @@ data structures as non-empty.") ("ghc-mono-traversable" ,ghc-mono-traversable))) (native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-silently" ,ghc-silently) - ("ghc-mtl" ,ghc-mtl) ("ghc-safe" ,ghc-safe) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/snoyberg/mono-traversable") @@ -9258,7 +9163,6 @@ as well as a convenient Conduit module.") ("ghc-http-conduit" ,ghc-http-conduit) ("ghc-http-types" ,ghc-http-types) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-old-locale" ,ghc-old-locale) ("ghc-safe" ,ghc-safe) @@ -9411,7 +9315,6 @@ operators for looping.") ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-monad-control" ,ghc-monad-control) ("ghc-monad-loops" ,ghc-monad-loops) - ("ghc-mtl" ,ghc-mtl) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-exceptions" ,ghc-exceptions))) (home-page "https://github.com/kazu-yamamoto/logger") @@ -9652,7 +9555,6 @@ Haskell data types to and from HTTP API data.") ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-silently" ,ghc-silently) - ("ghc-mtl" ,ghc-mtl) ("ghc-fast-logger" ,ghc-fast-logger) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged))) @@ -9932,7 +9834,6 @@ address string against RFC 5322.") (inputs `(("ghc-cereal" ,ghc-cereal) ("cabal-doctest" ,cabal-doctest) ("ghc-doctest" ,ghc-doctest-0.13) - ("ghc-mtl" ,ghc-mtl) ("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) @@ -10032,7 +9933,6 @@ This package provides an orphan instance.") (inputs `(("ghc-network" ,ghc-network) ("ghc-parsec" ,ghc-parsec) - ("ghc-mtl" ,ghc-mtl) ("ghc-hunit" ,ghc-hunit) ("ghc-regex-compat" ,ghc-regex-compat) ("ghc-hslogger" ,ghc-hslogger) @@ -10088,8 +9988,7 @@ example code on the home page for a quick introduction.") "1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-random" ,ghc-random))) + `(("ghc-random" ,ghc-random))) (home-page "http://wiki.haskell.org/Operational") (synopsis "Implementation of difficult monads made easy with operational semantics") (description @@ -10146,7 +10045,6 @@ tools are not needed to actually run Gtk2Hs programs.") (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) - ("ghc-mtl" ,ghc-mtl) ("ghc-lens" ,ghc-lens) ("ghc-colour" ,ghc-colour) ("ghc-data-default-class" ,ghc-data-default-class) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 79f89d6f54..7f1af62c1f 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -106,7 +106,6 @@ ("ghc-fingertree" ,ghc-fingertree) ("ghc-fsnotify" ,ghc-fsnotify) ("ghc-ieee754" ,ghc-ieee754) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-regex-tdfa" ,ghc-regex-tdfa) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index bdb63c0dbf..6c4c64e507 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -881,8 +881,7 @@ coding footprint.") "1rdidf18i781c0vdvy9yn79yh08hmcacf6fp3sgghyiy3h0wyh5l")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-cereal" ,ghc-cereal) + `(("ghc-cereal" ,ghc-cereal) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-memory" ,ghc-memory) ("ghc-cryptonite" ,ghc-cryptonite) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d06055de45..c8ad067ff1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1895,7 +1895,6 @@ be served with a HTTP file server of your choice.") ("ghc-hashable" ,ghc-hashable) ("ghc-html" ,ghc-html) ("ghc-mmap" ,ghc-mmap) - ("ghc-mtl" ,ghc-mtl) ("ghc-old-time" ,ghc-old-time) ("ghc-parsec" ,ghc-parsec) ("ghc-random" ,ghc-random) @@ -2188,7 +2187,6 @@ directory full of HOWTOs.") ("ghc-memory" ,ghc-memory) ("ghc-monad-control" ,ghc-monad-control) ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-old-locale" ,ghc-old-locale) ("ghc-optparse-applicative" ,ghc-optparse-applicative) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 08f82ba2d2..163281ac67 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -467,7 +467,6 @@ desktop environment.") (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("ghc-mtl" ,ghc-mtl) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-semigroups" ,ghc-semigroups) ("ghc-setlocale" ,ghc-setlocale) @@ -560,8 +559,7 @@ Haskell, no knowledge of the language is required to install and use it.") "1660w3xhbfrlq8b8s1rviq2mcn1vyqpypli4023gqxwry52brk6y")))) (build-system haskell-build-system) (propagated-inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-old-time" ,ghc-old-time) + `(("ghc-old-time" ,ghc-old-time) ("ghc-random" ,ghc-random) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index aa1395286f..2bf5ea3569 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2078,7 +2078,6 @@ derivations of regular expressions.") (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) - ("ghc-mtl" ,ghc-mtl) ("ghc-hxt-charproperties" ,ghc-hxt-charproperties) ("ghc-hxt-unicode" ,ghc-hxt-unicode) ("ghc-hxt-regex-xmlschema" ,ghc-hxt-regex-xmlschema) -- cgit v1.2.3 From 988dee48d048af6bf324c07a6d7f615b4c768fcc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:12:05 -0400 Subject: gnu: cabal-doctest: Update Cabal file to r1. * gnu/packages/haskell.scm (cabal-doctest): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 95e89a3b06..7fa63eb116 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1832,6 +1832,9 @@ installation of Haskell libraries and programs.") (base32 "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld"))) (home-page "https://github.com/phadej/cabal-doctest") (synopsis "Setup.hs helper for running doctests") (description -- cgit v1.2.3 From 6bacde7cd7c47dd8f83265f53a4098dace9569f1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:22:20 -0400 Subject: gnu: ghc-basement: Update to 0.0.8. * gnu/packages/haskell.scm (ghc-basement): Update to 0.0.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7fa63eb116..e6a88f295d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9197,7 +9197,7 @@ Web Services.") (define-public ghc-basement (package (name "ghc-basement") - (version "0.0.7") + (version "0.0.8") (source (origin (method url-fetch) @@ -9205,7 +9205,7 @@ Web Services.") "basement/basement-" version ".tar.gz")) (sha256 (base32 - "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm")))) + "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67")))) (build-system haskell-build-system) (home-page "https://github.com/haskell-foundation/foundation") (synopsis "Basic primitives for Foundation starter pack") -- cgit v1.2.3 From d3cc0eb2f35df66262402c2432adeff4694f202d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:22:43 -0400 Subject: gnu: ghc-base-prelude: Update to 1.3. * gnu/packages/haskell.scm (ghc-base-prelude): Update to 1.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e6a88f295d..9c79eb654d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8701,7 +8701,7 @@ classy-prelude.") (define-public ghc-base-prelude (package (name "ghc-base-prelude") - (version "1.2.0.1") + (version "1.3") (source (origin (method url-fetch) @@ -8710,7 +8710,7 @@ classy-prelude.") "base-prelude-" version ".tar.gz")) (sha256 (base32 - "17hivs7lmsglagdlzxd9q9zsddmgqin2788mpq911zwnb57lj6l1")))) + "1zk728sd09hh2r4xwz4lazsrrgg5cshydn64932sm0vckplndk73")))) (build-system haskell-build-system) (home-page "https://github.com/nikita-volkov/base-prelude") (synopsis "The most complete prelude formed solely from the Haskell's base -- cgit v1.2.3 From 0ff8558a4d337a89d4d6bb43bf70a0dc3a008f67 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:23:41 -0400 Subject: gnu: ghc-cmdargs: Update to 0.10.20. * gnu/packages/haskell.scm (ghc-cmdargs): Update to 0.10.20. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9c79eb654d..f5a5299379 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1053,7 +1053,7 @@ tool lex or flex for C/C++.") (define-public ghc-cmdargs (package (name "ghc-cmdargs") - (version "0.10.18") + (version "0.10.20") (source (origin (method url-fetch) @@ -1062,7 +1062,7 @@ tool lex or flex for C/C++.") version ".tar.gz")) (sha256 (base32 - "1lnmcsf6p9yrwwz1zvrw5lbc32xpff7b70yz4ylawaflnlz6wrlh")))) + "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf")))) (build-system haskell-build-system) (home-page "http://community.haskell.org/~ndm/cmdargs/") -- cgit v1.2.3 From d05d03dda05588cd31e1d5d05c1583c8d17dfa6e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:28:08 -0400 Subject: gnu: ghc-colour: Update to 2.3.4. * gnu/packages/haskell.scm (ghc-colour): Update to 2.3.4. [arguments]: Disable tests. --- gnu/packages/haskell.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f5a5299379..e1dfb9b1f0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7073,7 +7073,7 @@ the @code{mtl-tf} package.") (define-public ghc-colour (package (name "ghc-colour") - (version "2.3.3") + (version "2.3.4") (source (origin (method url-fetch) @@ -7082,7 +7082,11 @@ the @code{mtl-tf} package.") version ".tar.gz")) (sha256 (base32 - "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd")))) + "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg")))) + (arguments + ;; The tests for this package have the following dependency cycle: + ;; ghc-test-framework -> ghc-ansi-terminal -> ghc-colour. + `(#:tests? #f)) (build-system haskell-build-system) (home-page "https://www.haskell.org/haskellwiki/Colour") (synopsis "Model for human colour perception") -- cgit v1.2.3 From 7d887a2ceccdbec2abb6eaf5ae97c12849a7cbc6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:33:08 -0400 Subject: gnu: ghc-easy-file: Update to 0.2.2. * gnu/packages/haskell.scm (ghc-easy-file): Update to 0.2.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e1dfb9b1f0..9df5e030a0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4253,7 +4253,7 @@ library for Haskell.") (define-public ghc-easy-file (package (name "ghc-easy-file") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) @@ -4263,7 +4263,7 @@ library for Haskell.") ".tar.gz")) (sha256 (base32 - "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz")))) + "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj")))) (build-system haskell-build-system) (home-page "https://github.com/kazu-yamamoto/easy-file") -- cgit v1.2.3 From a7427ff7780bc7907b7e7fe1446d21625ceeddb1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:33:58 -0400 Subject: gnu: ghc-entropy: Update to 0.4.1.1. * gnu/packages/haskell-crypto.scm (ghc-entropy): Update to 0.4.1.1. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 1326de0923..6a1eff6821 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -314,7 +314,7 @@ are implemented as FFI bindings to efficient code from zlib.") (define-public ghc-entropy (package (name "ghc-entropy") - (version "0.3.8") + (version "0.4.1.1") (source (origin (method url-fetch) @@ -323,7 +323,7 @@ are implemented as FFI bindings to efficient code from zlib.") "entropy-" version ".tar.gz")) (sha256 (base32 - "1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl")))) + "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf")))) (build-system haskell-build-system) (home-page "https://github.com/TomMD/entropy") (synopsis "Provides platform independent entropy source for Haskell") -- cgit v1.2.3 From 6b850af42d20016c8a33d575b6388acdfb6a0a88 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:28:57 -0400 Subject: gnu: ghc-geniplate-mirror: Update to 0.7.6. * gnu/packages/haskell.scm (ghc-geniplate-mirror): Update to 0.7.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9df5e030a0..98cd790865 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5726,7 +5726,7 @@ package, and that's where the version number started.") (define-public ghc-geniplate-mirror (package (name "ghc-geniplate-mirror") - (version "0.7.5") + (version "0.7.6") (source (origin (method url-fetch) @@ -5734,7 +5734,7 @@ package, and that's where the version number started.") "/geniplate-mirror" "/geniplate-mirror-" version ".tar.gz")) (sha256 - (base32 "17vjps2118s5z3k39ij00lkmkxv3mqf8h59wv6qdamlgmhyr36si")))) + (base32 "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb")))) (build-system haskell-build-system) (home-page "https://github.com/danr/geniplate") (synopsis "Use Template Haskell to generate Uniplate-like functions") -- cgit v1.2.3 From a3aaf87a99316f694d2c220c5e578eaad55accbf Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:29:30 -0400 Subject: gnu: ghc-happy: Update to 1.19.9. * gnu/packages/haskell.scm (ghc-happy): Update to 1.19.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 98cd790865..98c2c3f67e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1096,7 +1096,7 @@ postfix notation. For more information on stack based languages, see (define-public ghc-happy (package (name "ghc-happy") - (version "1.19.8") + (version "1.19.9") (source (origin (method url-fetch) @@ -1106,7 +1106,7 @@ postfix notation. For more information on stack based languages, see ".tar.gz")) (sha256 (base32 - "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd")))) + "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/happy") (synopsis "Parser generator for Haskell") -- cgit v1.2.3 From 9959625056ad70b45632799535a350da3aac73b0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:45:49 -0400 Subject: gnu: ghc-ieee754: Update to 0.8.0. * gnu/packages/haskell.scm (ghc-ieee754): Update to 0.8.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 98c2c3f67e..f1e26bb69c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7862,7 +7862,7 @@ specific Windows, Mac, and Linux file system event notification.") (define-public ghc-ieee754 (package (name "ghc-ieee754") - (version "0.7.8") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append @@ -7870,7 +7870,7 @@ specific Windows, Mac, and Linux file system event notification.") "ieee754-" version ".tar.gz")) (sha256 (base32 - "1zvfnnd5nm5kgr60214cdyks0kqdqyzpwk5sdh0s60yr8b7fyjny")))) + "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f")))) (build-system haskell-build-system) (home-page "https://github.com/patperry/hs-ieee754") (synopsis "Utilities for dealing with IEEE floating point numbers") -- cgit v1.2.3 From f06b5f23c0f6677e3692928250dbde68ec5d6bd7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:47:51 -0400 Subject: gnu: ghc-microlens: Update to 0.4.9.1. * gnu/packages/haskell.scm (ghc-microlens): Update to 0.4.9.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f1e26bb69c..c674c970b6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9665,7 +9665,7 @@ functions.") (define-public ghc-microlens (package (name "ghc-microlens") - (version "0.4.8.3") + (version "0.4.9.1") (source (origin (method url-fetch) @@ -9674,7 +9674,7 @@ functions.") "microlens-" version ".tar.gz")) (sha256 (base32 - "17qx2mbqdrlnkc3gxq8njbp7qw8nh51drmz6fc8khgj9bls5ni2k")))) + "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51")))) (build-system haskell-build-system) (home-page "https://github.com/aelve/microlens") -- cgit v1.2.3 From e433898d8cb407479b700132cd800114d4bb3768 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:50:11 -0400 Subject: gnu: ghc-network-info: Update to 0.2.0.10. * gnu/packages/haskell.scm (ghc-network-info): Update to 0.2.0.10. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c674c970b6..9452555540 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8856,7 +8856,7 @@ ByteStrings in the style of other common *nix hex dump tools.") (define-public ghc-network-info (package (name "ghc-network-info") - (version "0.2.0.8") + (version "0.2.0.10") (source (origin (method url-fetch) @@ -8865,7 +8865,7 @@ ByteStrings in the style of other common *nix hex dump tools.") "network-info-" version ".tar.gz")) (sha256 (base32 - "0xndvg776241fgjmynxfpy81f1csjmh8dg33yf0c8m71ychz3pzc")))) + "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n")))) (build-system haskell-build-system) (home-page "https://github.com/jystic/network-info") (synopsis "Access the local computer's basic network configuration") -- cgit v1.2.3 From 12eb67dcc94cfd6c110576d50cb6cd28c7fc2e74 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 15:12:07 -0400 Subject: gnu: ghc-old-locale: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-old-locale): Update Cabal file to r2. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9452555540..e0ebe09dd3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1686,7 +1686,8 @@ configurations to coexist without resorting to mutable global variables or (base32 "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=base"))) + `(#:cabal-revision + ("2" "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs"))) (home-page "https://hackage.haskell.org/package/old-locale") (synopsis "Adapt to locale conventions") (description -- cgit v1.2.3 From 62f97b121725689a3ba81285ff857749b44603f9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:51:30 -0400 Subject: gnu: ghc-parallel: Update to 3.2.2.0. * gnu/packages/haskell.scm (ghc-parallel): Update to 3.2.2.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e0ebe09dd3..aa471fa0ad 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2093,7 +2093,7 @@ case with other forms of concurrent communication, such as locks or (define-public ghc-parallel (package (name "ghc-parallel") - (version "3.2.1.0") + (version "3.2.2.0") (outputs '("out" "doc")) (source (origin @@ -2104,7 +2104,7 @@ case with other forms of concurrent communication, such as locks or ".tar.gz")) (sha256 (base32 - "09l52k1gsn667lmv0pp052cbwkzkbhfivp51f2xkrlfzf6xwvqsd")))) + "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/parallel") (synopsis "Parallel programming library") -- cgit v1.2.3 From e21822026672b8348b8ec1582609e8931a087634 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:57:19 -0400 Subject: gnu: ghc-parser-combinators: Update to 1.0.0. * gnu/packages/haskell.scm (ghc-parser-combinators): Update to 1.0.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index aa471fa0ad..7de08a7d2d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3732,7 +3732,7 @@ is also parametric in the input stream type.") (define-public ghc-parser-combinators (package (name "ghc-parser-combinators") - (version "0.4.0") + (version "1.0.0") (source (origin (method url-fetch) @@ -3741,7 +3741,7 @@ is also parametric in the input stream type.") version ".tar.gz")) (sha256 (base32 - "1azkz0a6ikym02s8wydjcklp7rz8k512bs4s9lp9g1g03m0yj95i")))) + "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75")))) (build-system haskell-build-system) (home-page "https://github.com/mrkkrp/parser-combinators") (synopsis "Commonly useful parser combinators") -- cgit v1.2.3 From 30a8c0d81e5b0195e566b3c8e11afd7ba75b3eba Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:02:11 -0400 Subject: gnu: ghc-sdl: Update to 0.6.7.0. * gnu/packages/haskell.scm (ghc-sdl): Update to 0.6.7.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7de08a7d2d..51170adbfb 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1349,7 +1349,7 @@ OpenAL.") (define-public ghc-sdl (package (name "ghc-sdl") - (version "0.6.5.1") + (version "0.6.7.0") (source (origin (method url-fetch) @@ -1359,7 +1359,7 @@ OpenAL.") ".tar.gz")) (sha256 (base32 - "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46")))) + "00y67v80a8l09i3k76z09lg25kw72ivl09nag8ckdlk4a0cfnzfq")))) (build-system haskell-build-system) (inputs `(("sdl" ,sdl))) -- cgit v1.2.3 From 42f2732e13c0d36f7e70b2131a629a54c59987f7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:03:30 -0400 Subject: gnu: ghc-setlocale: Update to 1.0.0.8. * gnu/packages/haskell.scm (ghc-setlocale): Update to 1.0.0.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 51170adbfb..fa588b8dbe 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1936,7 +1936,7 @@ environment variables.") (define-public ghc-setlocale (package (name "ghc-setlocale") - (version "1.0.0.6") + (version "1.0.0.8") (source (origin (method url-fetch) (uri (string-append @@ -1944,7 +1944,7 @@ environment variables.") version "/setlocale-" version ".tar.gz")) (sha256 (base32 - "1rl8qb8vzv8fdbczy2dxwgn4cb68lfrjdxf2w8nn9wy1acqzcyjq")))) + "0sdrsmkhw08483d73ysgm2926fdbhii61br03lqpqw0lfzj4ilbd")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/setlocale") (synopsis "Haskell bindings to setlocale") -- cgit v1.2.3 From c2e393cccb3280e0a5ff517999f468e37fe2b54c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:03:55 -0400 Subject: gnu: ghc-simple-reflect: Update to 0.3.3. * gnu/packages/haskell.scm (ghc-simple-reflect): Update to 0.3.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fa588b8dbe..e711d46bd8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -938,7 +938,7 @@ documentation-generation tool for Haskell libraries.") (define-public ghc-simple-reflect (package (name "ghc-simple-reflect") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) @@ -948,7 +948,7 @@ documentation-generation tool for Haskell libraries.") ".tar.gz")) (sha256 (base32 - "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq")))) + "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7")))) (build-system haskell-build-system) (home-page "https://twanvl.nl/blog/haskell/simple-reflection-of-expressions") -- cgit v1.2.3 From 4112a2e7c44c999cb65270e020fbe8f241874829 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:07:18 -0400 Subject: gnu: ghc-stringbuilder: Update to 0.5.1. * gnu/packages/haskell.scm (ghc-stringbuilder): Update to 0.5.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e711d46bd8..ddbd9098d0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2007,7 +2007,7 @@ parts.") (define-public ghc-stringbuilder (package (name "ghc-stringbuilder") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) @@ -2017,7 +2017,7 @@ parts.") ".tar.gz")) (sha256 (base32 - "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9")))) + "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: circular dependencies with tests ; enabled -- cgit v1.2.3 From 5fe52835d926d8fa79495dbd0d6e3e47d07e9bc8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:12:22 -0400 Subject: gnu: ghc-th-abstraction: Update to 0.2.8.0. * gnu/packages/haskell.scm (ghc-th-abstraction): Update to 0.2.8.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ddbd9098d0..ad84eeeff5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5584,7 +5584,7 @@ asynchronous exceptions.") (define-public ghc-th-abstraction (package (name "ghc-th-abstraction") - (version "0.2.6.0") + (version "0.2.8.0") (source (origin (method url-fetch) @@ -5593,7 +5593,7 @@ asynchronous exceptions.") version ".tar.gz")) (sha256 (base32 - "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5")))) + "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya")))) (build-system haskell-build-system) (home-page "https://github.com/glguy/th-abstraction") (synopsis "Nicer interface for reified information about data types") -- cgit v1.2.3 From d7f14885bbb12edd86ae66782a06e32046bc469e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:12:56 -0400 Subject: gnu: ghc-transformers-compat: Update to 0.6.2. * gnu/packages/haskell.scm (ghc-transformers-compat): Update to 0.6.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ad84eeeff5..4183c9c49d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2415,7 +2415,7 @@ compatibility to run on old versions of the platform.") (define-public ghc-transformers-compat (package (name "ghc-transformers-compat") - (version "0.5.1.4") + (version "0.6.2") (source (origin (method url-fetch) @@ -2424,7 +2424,7 @@ compatibility to run on old versions of the platform.") "/transformers-compat-" version ".tar.gz")) (sha256 (base32 - "17yam0199fh9ndsn9n69jx9nvbsmymzzwbi23dck3dk4q57fz0fq")))) + "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw")))) (build-system haskell-build-system) (home-page "https://github.com/ekmett/transformers-compat/") (synopsis "Small compatibility shim between transformers 0.3 and 0.4") -- cgit v1.2.3 From 58c102e08d28d69851fa779fdb4ee0701b23eb24 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:14:42 -0400 Subject: gnu: ghc-unbounded-delays: Update to 0.1.1.0. * gnu/packages/haskell.scm (ghc-unbounded-delays): Update to 0.1.1.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4183c9c49d..0d4501328a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4426,7 +4426,7 @@ having to unsafely pass dummy arguments.") (define-public ghc-unbounded-delays (package (name "ghc-unbounded-delays") - (version "0.1.0.9") + (version "0.1.1.0") (source (origin (method url-fetch) @@ -4436,7 +4436,7 @@ having to unsafely pass dummy arguments.") ".tar.gz")) (sha256 (base32 - "1f4h87503m3smhip432q027wj3zih18pmz2rnafh60589ifcl420")))) + "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa")))) (build-system haskell-build-system) (home-page "https://github.com/basvandijk/unbounded-delays") (synopsis "Unbounded thread delays and timeouts") -- cgit v1.2.3 From 06dae8ffe92100d7f5818f68a24642a032fc2593 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:17:26 -0400 Subject: gnu: ghc-unexceptionalio: Update to 0.4.0. * gnu/packages/haskell.scm (ghc-unexceptionalio): Update to 0.4.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0d4501328a..63564b23b5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8040,14 +8040,14 @@ handler built in.") (define-public ghc-unexceptionalio (package (name "ghc-unexceptionalio") - (version "0.3.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "unexceptionalio-" version "/" "unexceptionalio-" version ".tar.gz")) - (sha256 (base32 "1f7h7zwky4scdcyjspg4ksfh7x6yra0wjybxq70p7vcwpgk2nzlj")))) + (sha256 (base32 "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p")))) (build-system haskell-build-system) (home-page "https://github.com/singpolyma/unexceptionalio") (synopsis "IO without any non-error, synchronous exceptions") -- cgit v1.2.3 From 32a9a3808711feac2ee30379256c1ac95d29857b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:18:01 -0400 Subject: gnu: ghc-unix-compat: Update to 0.5.1. * gnu/packages/haskell.scm (ghc-unix-compat): Update to 0.5.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 63564b23b5..3ebefeea3a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2464,7 +2464,7 @@ for Unix time in Haskell.") (define-public ghc-unix-compat (package (name "ghc-unix-compat") - (version "0.4.2.0") + (version "0.5.1") (source (origin (method url-fetch) @@ -2474,7 +2474,7 @@ for Unix time in Haskell.") ".tar.gz")) (sha256 (base32 - "036nv05w0yjxc3rfpar60ddjrlzc40mdgr5k6ihvwlvqfmq1gw9m")))) + "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3")))) (build-system haskell-build-system) (home-page "https://github.com/jystic/unix-compat") -- cgit v1.2.3 From f871a555026b94e2f3a34ae9410388a1ce0368ac Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:20:28 -0400 Subject: gnu: ghc-unliftio-core: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-unliftio-core): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3ebefeea3a..32a530853e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9655,6 +9655,9 @@ functions for the ghc-persistent package.") (base32 "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"))) (home-page "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme") (synopsis "The MonadUnliftIO typeclass for unlifting monads to IO") -- cgit v1.2.3 From c325dde2702540332d30b5525be1dc1441dd0281 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 10:53:19 -0400 Subject: gnu: ghc-utf8-string: Update Cabal file to r3. * gnu/packages/haskell.scm (ghc-utf8-string): Update Cabal file to r3. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 32a530853e..d8cb73c83a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1903,7 +1903,8 @@ configuration. This library provides the common bits for writing custom (base32 "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=base"))) + `(#:cabal-revision + ("3" "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38"))) (home-page "https://github.com/glguy/utf8-string/") (synopsis "Support for reading and writing UTF8 Strings") (description -- cgit v1.2.3 From 061832f1f96dbe60b5e0961650e37017a0116675 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:21:00 -0400 Subject: gnu: ghc-wl-pprint: Update to 1.2.1. * gnu/packages/haskell.scm (ghc-wl-pprint): Update to 1.2.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d8cb73c83a..696f42118d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3634,7 +3634,7 @@ a variety of ways.") (define-public ghc-wl-pprint (package (name "ghc-wl-pprint") - (version "1.2") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append @@ -3642,7 +3642,7 @@ a variety of ways.") version ".tar.gz")) (sha256 (base32 - "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r")))) + "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/wl-pprint") (synopsis "Wadler/Leijen pretty printer") -- cgit v1.2.3 From 6c76f51f96737d5e0fc2148343b4f5605a6e95a4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:21:29 -0400 Subject: gnu: ghc-xhtml: Update to 3000.2.2.1. * gnu/packages/haskell-web.scm (ghc-xhtml): Update to 3000.2.2.1. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 9ef9486b3f..0a53136f97 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -708,7 +708,7 @@ documents.") (define-public ghc-xhtml (package (name "ghc-xhtml") - (version "3000.2.1") + (version "3000.2.2.1") (source (origin (method url-fetch) @@ -718,7 +718,7 @@ documents.") ".tar.gz")) (sha256 (base32 - "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik")))) + "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w")))) (build-system haskell-build-system) (home-page "https://github.com/haskell/xhtml") (synopsis "XHTML combinator library") -- cgit v1.2.3 From e09ef4fccaddfeb74ecab8cc7ab9a24be9b019f9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 14:08:08 -0400 Subject: gnu: ghc-zlib: Relax test framework dependency constraints. * gnu/packages/haskell.scm (ghc-zlib)[arguments]: Remove "--allow-newer" configure flag and add a phase that removes dependency version constraints from some of the test frameworks. --- gnu/packages/haskell.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 696f42118d..9ed7554bb0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2044,7 +2044,15 @@ literals.") (base32 "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d")))) (build-system haskell-build-system) - (arguments `(#:configure-flags (list "--allow-newer=tasty"))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'strip-test-framework-constraints + (lambda _ + (substitute* "zlib.cabal" + (("tasty >= 0\\.8 && < 0\\.12") "tasty") + (("tasty-hunit >= 0\\.8 && < 0\\.10") "tasty-hunit") + (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) (inputs `(("zlib" ,zlib))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 8642b86a0080343d000aafc54b518f0cb4d2d286 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:22:01 -0400 Subject: gnu: hscolour: Update to 1.24.4. * gnu/packages/haskell.scm (hscolour): Update to 1.24.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9ed7554bb0..93d855dd12 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2974,7 +2974,7 @@ parser isolation, and labeled blocks for better error messages.") (define-public hscolour (package (name "hscolour") - (version "1.24.1") + (version "1.24.4") (source (origin (method url-fetch) @@ -2984,7 +2984,7 @@ parser isolation, and labeled blocks for better error messages.") ".tar.gz")) (sha256 (base32 - "1j3rpzjygh3igvnd1n2xn63bq68rs047cjxr2qi6xyfnivgf6vz4")))) + "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/hscolour") (synopsis "Script to colourise Haskell code") -- cgit v1.2.3 From ecefe4ce870e69009117d8e14382ad9c2e69720d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:20:26 -0400 Subject: gnu: ghc-ansi-terminal: Update to 0.8.0.4. * gnu/packages/haskell.scm (ghc-ansi-terminal): Update to 0.8.0.4. [inputs]: Add ghc-colour. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 93d855dd12..cc5dc152f6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3943,7 +3943,7 @@ package into this package.") (define-public ghc-ansi-terminal (package (name "ghc-ansi-terminal") - (version "0.6.2.3") + (version "0.8.0.4") (source (origin (method url-fetch) @@ -3953,8 +3953,10 @@ package into this package.") ".tar.gz")) (sha256 (base32 - "0hpfw0k025y681m9ml1c712skrb1p4vh7z5x1f0ci9ww7ssjrh2d")))) + "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b")))) (build-system haskell-build-system) + (inputs + `(("ghc-colour" ,ghc-colour))) (home-page "https://github.com/feuerbach/ansi-terminal") (synopsis "ANSI terminal support for Haskell") (description "This package provides ANSI terminal support for Haskell. It -- cgit v1.2.3 From e95cc1087a13ab4c26244c31b7e6512c37042a5b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 09:53:24 -0400 Subject: gnu: Add ghc-bsb-http-chunked. * gnu/packages/haskell-web.scm (ghc-bsb-http-chunked): New variable. --- gnu/packages/haskell-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0a53136f97..190bec8dd2 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -524,6 +524,30 @@ functionality.") Haskell's Web Application Interface (WAI).") (license license:expat))) +(define-public ghc-bsb-http-chunked + (package + (name "ghc-bsb-http-chunked") + (version "0.0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "bsb-http-chunked/bsb-http-chunked-" + version ".tar.gz")) + (sha256 + (base32 + "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8")))) + (build-system haskell-build-system) + (inputs + `(("ghc-bytestring-builder" ,ghc-bytestring-builder))) + (home-page "http://github.com/sjakobi/bsb-http-chunked") + (synopsis "Chunked HTTP transfer encoding for bytestring builders") + (description "This Haskell library contains functions for encoding +bytestring builders for chunked Hypertext Transfer Protocol (HTTP) 1.1 +transfers.") + (license license:bsd-3))) + (define-public ghc-warp (package (name "ghc-warp") -- cgit v1.2.3 From 95415545ab5b33e7e4d813b97d101c810b1ae338 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:28:17 -0400 Subject: gnu: ghc-foundation: Update to 0.0.21. * gnu/packages/haskell.scm (ghc-foundation): Update to 0.0.21. [arguments]: Add a phase to create missing "Setup.hs" file. --- gnu/packages/haskell.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cc5dc152f6..860834d795 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9233,7 +9233,7 @@ packages.") (define-public ghc-foundation (package (name "ghc-foundation") - (version "0.0.20") + (version "0.0.21") (source (origin (method url-fetch) @@ -9241,8 +9241,18 @@ packages.") "foundation/foundation-" version ".tar.gz")) (sha256 (base32 - "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms")))) + "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'add-setup-script + (lambda _ + ;; The usual "Setup.hs" script is missing from the source. + (with-output-to-file "Setup.hs" + (lambda () + (format #t "import Distribution.Simple~%") + (format #t "main = defaultMain~%")))))))) (inputs `(("ghc-basement" ,ghc-basement))) (home-page "https://github.com/haskell-foundation/foundation") (synopsis "Alternative prelude with batteries and no dependencies") -- cgit v1.2.3 From acf13271302ae531b577b42502d790bd7e5a46d5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:28:37 -0400 Subject: gnu: ghc-generics-sop: Update to 0.3.2.0. * gnu/packages/haskell.scm (ghc-generics-sop): Update to 0.3.2.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 860834d795..567bf75b5d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9464,7 +9464,7 @@ from aeson.") (define-public ghc-generics-sop (package (name "ghc-generics-sop") - (version "0.3.1.0") + (version "0.3.2.0") (source (origin (method url-fetch) @@ -9473,7 +9473,7 @@ from aeson.") "generics-sop-" version ".tar.gz")) (sha256 (base32 - "1bazlhgmxcwv7vd44jhdx74cnhmaz6yy47jxfycapjj4mjrnp0x7")))) + "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/well-typed/generics-sop") -- cgit v1.2.3 From c18122265e45419df9cbc6a8db9ec1fb5a450e5f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:32:26 -0400 Subject: gnu: ghc-microlens-th: Update to 0.4.2.2. * gnu/packages/haskell.scm (ghc-microlens-th): Update to 0.4.2.2. [inputs]: Add ghc-th-abstraction. --- gnu/packages/haskell.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 567bf75b5d..4bfde42b2b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9715,7 +9715,7 @@ stripped. As the result, this package has no dependencies.") (define-public ghc-microlens-th (package (name "ghc-microlens-th") - (version "0.4.1.3") + (version "0.4.2.2") (source (origin (method url-fetch) @@ -9724,9 +9724,10 @@ stripped. As the result, this package has no dependencies.") "microlens-th-" version ".tar.gz")) (sha256 (base32 - "15a12cqxlgbcn1n73zwrxnp2vfm8b0ma0a0sdd8zmjbs8zy3np4f")))) + "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05")))) (build-system haskell-build-system) - (inputs `(("ghc-microlens" ,ghc-microlens))) + (inputs `(("ghc-microlens" ,ghc-microlens) + ("ghc-th-abstraction" ,ghc-th-abstraction))) (home-page "https://github.com/aelve/microlens") (synopsis "Automatic generation of record lenses for -- cgit v1.2.3 From 8b5d1142c28ba51442c1190aa9b2dc54d151d6c5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:32:51 -0400 Subject: gnu: ghc-mmorph: Update to 1.1.2. * gnu/packages/haskell.scm (ghc-mmorph): Update to 1.1.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4bfde42b2b..a7e7404932 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4043,7 +4043,7 @@ with various performance characteristics.") (define-public ghc-mmorph (package (name "ghc-mmorph") - (version "1.0.6") + (version "1.1.2") (source (origin (method url-fetch) @@ -4053,7 +4053,7 @@ with various performance characteristics.") ".tar.gz")) (sha256 (base32 - "1i8dzrc5qi3ryc9vrrmpn3sihmramsbhhd592w4w2k5g26qr3hql")))) + "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) -- cgit v1.2.3 From d58fda7d65f28a25e514aef45f09188b934a4ea5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:33:22 -0400 Subject: gnu: ghc-monadrandom: Update to 0.5.1.1. * gnu/packages/haskell.scm (ghc-monadrandom): Update to 0.5.1.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a7e7404932..4798636c65 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8795,7 +8795,7 @@ statically known size.") (define-public ghc-monadrandom (package (name "ghc-monadrandom") - (version "0.4.2.3") + (version "0.5.1.1") (source (origin (method url-fetch) @@ -8804,7 +8804,7 @@ statically known size.") "MonadRandom-" version ".tar.gz")) (sha256 (base32 - "1h1nhswrcmhy3mq6vd530p0df51fcnnf4csbwnljar7cf0mb2h6y")))) + "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-primitive" ,ghc-primitive) -- cgit v1.2.3 From e37775110e8909665ddb10889759567474fb2d7f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:09:36 -0400 Subject: gnu: ghc-old-time: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-old-time): Update Cabal file to r2. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4798636c65..8228d8b480 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1711,7 +1711,8 @@ date and time formats.") "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=base"))) + `(#:cabal-revision + ("2" "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9"))) (inputs `(("ghc-old-locale" ,ghc-old-locale))) (home-page "https://hackage.haskell.org/package/old-time") -- cgit v1.2.3 From 6b19c5a477c08b0f168519d730ff9edb1357005c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:15:15 -0400 Subject: gnu: ghc-pretty-show: Update to 1.7. * gnu/packages/haskell.scm (ghc-pretty-show): Update to 1.7. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8228d8b480..4a5a7a9f5b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1138,7 +1138,7 @@ Happy works in a similar way to the yacc tool for C.") (define-public ghc-pretty-show (package (name "ghc-pretty-show") - (version "1.6.12") + (version "1.7") (source (origin (method url-fetch) @@ -1146,7 +1146,7 @@ Happy works in a similar way to the yacc tool for C.") "pretty-show-" version ".tar.gz")) (sha256 (base32 - "1fblcxw4z4ry14brin1mvwccs6hqqlhi7xhwv1f23szjq25cjacn")))) + "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq")))) (build-system haskell-build-system) (inputs `(("ghc-haskell-lexer" ,ghc-haskell-lexer) -- cgit v1.2.3 From cfd1a7d0663402d6c180db22e932567add683a4c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:37:02 -0400 Subject: gnu: ghc-sdl-image: Update to 0.6.2.0. * gnu/packages/haskell.scm (ghc-sdl-image): Update to 0.6.2.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4a5a7a9f5b..59fbb514c1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1406,7 +1406,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") (define-public ghc-sdl-image (package (name "ghc-sdl-image") - (version "0.6.1.2") + (version "0.6.2.0") (source (origin (method url-fetch) @@ -1416,7 +1416,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") ".tar.gz")) (sha256 (base32 - "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281")))) + "1gxwrvswgwjw6g7ym52gik22l9l3ljy592phv97jdmcf3gi6qcg1")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 214fae871ba3a6a19c43993d98c40514b1880045 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:39:10 -0400 Subject: gnu: ghc-sdl-mixer: Update to 0.6.3.0. * gnu/packages/haskell.scm (ghc-sdl-mixer): Update to 0.6.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 59fbb514c1..99d056e62f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1375,7 +1375,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") (define-public ghc-sdl-mixer (package (name "ghc-sdl-mixer") - (version "0.6.2.0") + (version "0.6.3.0") (source (origin (method url-fetch) @@ -1385,7 +1385,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") ".tar.gz")) (sha256 (base32 - "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r")))) + "0k26hqgdh789ka3mv4dsk6rin6x6vwcs6hjmnsqq7j3mnrh1342r")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From c9fa2a286ceff8495e2c9bdfcce94c15468677ef Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:39:29 -0400 Subject: gnu: ghc-statevar: Update to 1.1.1.1. * gnu/packages/haskell.scm (ghc-statevar): Update to 1.1.1.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 99d056e62f..b70df5bf2e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4637,7 +4637,7 @@ call stacks with different versions of the compiler.") (define-public ghc-statevar (package (name "ghc-statevar") - (version "1.1.0.4") + (version "1.1.1.1") (source (origin (method url-fetch) @@ -4647,7 +4647,7 @@ call stacks with different versions of the compiler.") ".tar.gz")) (sha256 (base32 - "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks")))) + "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm))) -- cgit v1.2.3 From 70ee3228bb4125814c7812c4a36352031040e9a3 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 16:40:07 -0400 Subject: gnu: ghc-tagged: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-tagged): Update Cabal file to r2. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b70df5bf2e..881936efb5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4427,6 +4427,9 @@ periodic, on-demand actions in Haskell.") (base32 "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5"))) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://hackage.haskell.org/package/tagged") -- cgit v1.2.3 From 44f717efff4b2d789597ee00b94f0d12dd4df1bc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:08:57 -0400 Subject: gnu: ghc-text: Update to 1.2.3.0. * gnu/packages/haskell.scm (ghc-text): Update to 1.2.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 881936efb5..7d59b5ada5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2149,7 +2149,7 @@ are not exception safe and can be broken by @code{killThread}.") (define-public ghc-text (package (name "ghc-text") - (version "1.2.2.2") + (version "1.2.3.0") (outputs '("out" "doc")) (source (origin @@ -2160,7 +2160,7 @@ are not exception safe and can be broken by @code{killThread}.") ".tar.gz")) (sha256 (base32 - "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii")))) + "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10")))) (build-system haskell-build-system) ;; The test dependencies depend on ghc-text: ghc-test-framework -> ghc-xml -> ghc-text (arguments `(#:tests? #f)) -- cgit v1.2.3 From 08c3993f4f4cdb323aa79bc7de6dce6a6324050d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:12:41 -0400 Subject: gnu: ghc-th-lift: Update to 0.7.11. * gnu/packages/haskell.scm (ghc-th-lift): Update to 0.7.11. [inputs]: Add ghc-th-abstraction. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7d59b5ada5..63a7825ed4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5622,15 +5622,17 @@ Template Haskell.") (define-public ghc-th-lift (package (name "ghc-th-lift") - (version "0.7.8") + (version "0.7.11") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "th-lift/th-lift-" version ".tar.gz")) (sha256 (base32 - "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c")))) + "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m")))) (build-system haskell-build-system) + (inputs + `(("ghc-th-abstraction" ,ghc-th-abstraction))) (home-page "https://github.com/mboes/th-lift") (synopsis "Derive Template Haskell's Lift class for datatypes") (description -- cgit v1.2.3 From 9b6d49e84ab6e3f30753d247437f659c66a8bcd7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:09:31 -0400 Subject: gnu: ghc-time-locale-compat: Update to 0.1.1.5. * gnu/packages/haskell.scm (ghc-time-locale-compat): Update to 0.1.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 63a7825ed4..7d63ec7596 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2802,7 +2802,7 @@ with slicing and Clang-style colored diagnostics.") (define-public ghc-time-locale-compat (package (name "ghc-time-locale-compat") - (version "0.1.1.3") + (version "0.1.1.5") (source (origin (method url-fetch) @@ -2811,7 +2811,7 @@ with slicing and Clang-style colored diagnostics.") version ".tar.gz")) (sha256 (base32 - "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i")))) + "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale))) (home-page "https://github.com/khibino/haskell-time-locale-compat") -- cgit v1.2.3 From f46cbe1ec4312f3b2e234f1806612b5a60cd74d4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:09:48 -0400 Subject: gnu: ghc-transformers-base: Update to 0.4.5.2. * gnu/packages/haskell.scm (ghc-transformers-base): Update to 0.4.5.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7d63ec7596..b778e603c8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2397,7 +2397,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") (define-public ghc-transformers-base (package (name "ghc-transformers-base") - (version "0.4.4") + (version "0.4.5.2") (source (origin (method url-fetch) @@ -2407,7 +2407,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") ".tar.gz")) (sha256 (base32 - "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va")))) + "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) -- cgit v1.2.3 From 2a7c296a5df83c42537ea6fc09ef4c96d443a405 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:10:12 -0400 Subject: gnu: ghc-blaze-builder: Update to 0.4.1.0. * gnu/packages/haskell.scm (ghc-blaze-builder): Update to 0.4.1.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b778e603c8..2d6b9ebd25 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4209,7 +4209,7 @@ pragmas in your code.") (define-public ghc-blaze-builder (package (name "ghc-blaze-builder") - (version "0.4.0.2") + (version "0.4.1.0") (source (origin (method url-fetch) @@ -4219,7 +4219,7 @@ pragmas in your code.") ".tar.gz")) (sha256 (base32 - "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws")))) + "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Missing test libraries. (inputs -- cgit v1.2.3 From 343c23988ad70f3760691ef1cade25a6a20215bd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 22:53:34 -0400 Subject: gnu: ghc-system-filepath-bootstrap: Update to 0.4.14. * gnu/packages/haskell.scm (ghc-system-filepath-bootstrap): Update to 0.4.14. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2d6b9ebd25..16638af2c5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7278,7 +7278,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") (define ghc-system-filepath-bootstrap (package (name "ghc-system-filepath-bootstrap") - (version "0.4.13.4") + (version "0.4.14") (source (origin (method url-fetch) @@ -7287,7 +7287,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") version ".tar.gz")) (sha256 (base32 - "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l")))) + "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) -- cgit v1.2.3 From 6a9730a0c41b7033a600593b2c2720d610919126 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:11:55 -0400 Subject: gnu: ghc-chell: Update to 0.4.0.2. * gnu/packages/haskell.scm (ghc-chell): Update to 0.4.0.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 16638af2c5..8ef95a4800 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7399,7 +7399,7 @@ easily work with command-line options.") (define-public ghc-chell (package (name "ghc-chell") - (version "0.4.0.1") + (version "0.4.0.2") (source (origin (method url-fetch) @@ -7408,7 +7408,7 @@ easily work with command-line options.") version ".tar.gz")) (sha256 (base32 - "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz")))) + "10ingy9qnbmc8cqh4i9pskcw43l0mzk8f3d76b3qz3fig5ary3j9")))) (build-system haskell-build-system) (inputs `(("ghc-options-bootstrap" ,ghc-options-bootstrap) -- cgit v1.2.3 From 0ceaff6f2fb463cf96b461fc78062128cda20be0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:12:56 -0400 Subject: gnu: ghc-cmark-gfm: Update to 0.1.5. * gnu/packages/haskell.scm (ghc-cmark-gfm): Update to 0.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8ef95a4800..be26a146d7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5488,7 +5488,7 @@ sources, and does not require prior installation of the C library.") (define-public ghc-cmark-gfm (package (name "ghc-cmark-gfm") - (version "0.1.3") + (version "0.1.5") (source (origin (method url-fetch) @@ -5497,7 +5497,7 @@ sources, and does not require prior installation of the C library.") version ".tar.gz")) (sha256 (base32 - "1fkisbrydmdx5h8yad09fzk8h1b1j53r02g7vb81izgdwj9b673k")))) + "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 8d75edc01055712004598d66d6d5875e31ff61a8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:13:30 -0400 Subject: gnu: ghc-mime-types: Update to 0.1.0.8. * gnu/packages/haskell-web.scm (ghc-mime-types): Update to 0.1.0.8. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 190bec8dd2..54eedf5044 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -688,7 +688,7 @@ Haskell.") (define-public ghc-mime-types (package (name "ghc-mime-types") - (version "0.1.0.7") + (version "0.1.0.8") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -696,7 +696,7 @@ Haskell.") version ".tar.gz")) (sha256 (base32 - "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3")))) + "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text))) -- cgit v1.2.3 From d9c620bab0e84ddb882a608027b4d0a537a66c4d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:13:59 -0400 Subject: gnu: ghc-monad-control: Update to 1.0.2.3. * gnu/packages/haskell.scm (ghc-monad-control): Update to 1.0.2.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index be26a146d7..1050777b43 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4088,7 +4088,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like (define-public ghc-monad-control (package (name "ghc-monad-control") - (version "1.0.1.0") + (version "1.0.2.3") (source (origin (method url-fetch) @@ -4097,7 +4097,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like "/monad-control-" version ".tar.gz")) (sha256 (base32 - "1x018gi5irznx5rgzmkr2nrgh26r8cvqwkcfc6n6y05pdjf21c6l")))) + "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) -- cgit v1.2.3 From 8ebdab0dc4fa389f5238203eb785a1d17cb1d478 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:14:39 -0400 Subject: gnu: ghc-parsec: Update to 3.1.13.0. * gnu/packages/haskell.scm (ghc-parsec): Update to 3.1.13.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1050777b43..7994b6c33c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3712,7 +3712,7 @@ mainstream languages.") (define-public ghc-parsec (package (name "ghc-parsec") - (version "3.1.11") + (version "3.1.13.0") (outputs '("out" "doc")) (source (origin @@ -3722,7 +3722,7 @@ mainstream languages.") version ".tar.gz")) (sha256 - (base32 "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg")))) + (base32 "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq")))) (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit))) -- cgit v1.2.3 From 09b52698babe9a09a4f0aba2f34e1732094b88a1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 13:20:13 -0400 Subject: gnu: ghc-quickcheck: Update to 2.11.3. This commit also removes extra versions of ghc-quickcheck that have no dependents. * gnu/packages/haskell-check.scm (ghc-quickcheck): Update to 2.11.3. [arguments]: Remove "-f base4" configure flag. (ghc-quickcheck-latest): Delete variable. (ghc-quickcheck-2.9): Delete variable. --- gnu/packages/haskell-check.scm | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 4324c9c44d..57e7f0edc1 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -421,7 +421,7 @@ use HUnit assertions as QuickCheck properties.") (define-public ghc-quickcheck (package (name "ghc-quickcheck") - (version "2.10.1") + (version "2.11.3") (outputs '("out" "doc")) (source (origin @@ -432,11 +432,10 @@ use HUnit assertions as QuickCheck properties.") ".tar.gz")) (sha256 (base32 - "1rfmns3lj3hl93k1jws85ajkkw7z9ll8cw292n9m7zald1w5dfqx")))) + "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328")))) (build-system haskell-build-system) (arguments - `(#:tests? #f ; FIXME: currently missing libraries used for tests. - #:configure-flags '("-f base4"))) + `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (inputs `(("ghc-random" ,ghc-random) ("ghc-tf-random" ,ghc-tf-random))) @@ -450,33 +449,6 @@ hold in a large number of randomly generated cases. Specifications are expressed in Haskell, using combinators defined in the QuickCheck library.") (license license:bsd-3))) -(define-public ghc-quickcheck-2.9 - (package - (inherit ghc-quickcheck) - (name "ghc-quickcheck") - (version "2.9.2") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/QuickCheck-2.9.2/QuickCheck-" - version ".tar.gz")) - (sha256 - (base32 - "119np67qvx8hyp9vkg4gr2wv3lj3j6ay2vl4hxspkg43ymb1cp0m")))))) - -(define-public ghc-quickcheck-latest - (package (inherit ghc-quickcheck) - (version "2.11.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/QuickCheck/QuickCheck-" - version - ".tar.gz")) - (sha256 - (base32 - "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328")))))) - (define-public ghc-test-framework (package (name "ghc-test-framework") -- cgit v1.2.3 From e7e74518221a97496d8e1e4b0de61ccf25135ae9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:17:08 -0400 Subject: gnu: ghc-reflection: Update to 2.1.4. * gnu/packages/haskell.scm (ghc-reflection): Update to 2.1.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7994b6c33c..5df71e87e7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1649,7 +1649,7 @@ unlit literate code files; and an option to turn off macro-expansion.") (define-public ghc-reflection (package (name "ghc-reflection") - (version "2.1.2") + (version "2.1.4") (source (origin (method url-fetch) @@ -1659,7 +1659,7 @@ unlit literate code files; and an option to turn off macro-expansion.") ".tar.gz")) (sha256 (base32 - "0f9w0akbm6p8h7kzgcd2f6nnpw1wy84pqn45vfz1ch5j0hn8h2d9")))) + "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj")))) (build-system haskell-build-system) (inputs `(("ghc-tagged" ,ghc-tagged))) (home-page "https://github.com/ekmett/reflection") -- cgit v1.2.3 From 80d06b8d98094a1f0661264e9b6cedae7ebe7cfe Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:17:57 -0400 Subject: gnu: ghc-syb: Update to 0.7. * gnu/packages/haskell.scm (ghc-syb): Update to 0.7. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5df71e87e7..ae708bd94b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3447,7 +3447,7 @@ to cases.") (define-public ghc-syb (package (name "ghc-syb") - (version "0.6") + (version "0.7") (outputs '("out" "doc")) (source (origin @@ -3458,7 +3458,7 @@ to cases.") ".tar.gz")) (sha256 (base32 - "1p3cnqjm13677r4a966zffzhi9b3a321aln8zs8ckqj0d9z1z3d3")))) + "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq")))) (build-system haskell-build-system) (inputs `(("ghc-hunit" ,ghc-hunit))) -- cgit v1.2.3 From 0588525b0612b394fb1ce18571206c27e4c8f8be Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:18:23 -0400 Subject: gnu: ghc-unix-time: Update to 0.3.8. * gnu/packages/haskell.scm (ghc-unix-time): Update to 0.3.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ae708bd94b..b3441650be 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2447,7 +2447,7 @@ but also need those types.") (define-public ghc-unix-time (package (name "ghc-unix-time") - (version "0.3.7") + (version "0.3.8") (source (origin (method url-fetch) @@ -2457,7 +2457,7 @@ but also need those types.") ".tar.gz")) (sha256 (base32 - "1qdlc9raih8s0m3x8x3n7q3ngh4faw2alv9l78sp6gnx648k0c8i")))) + "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Test fails with "System.Time not found". This -- cgit v1.2.3 From 7de7ec7d45e46232771be423b8e575383f154642 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:19:15 -0400 Subject: gnu: ghc-alex: Update to 3.2.4. * gnu/packages/haskell.scm (ghc-alex): Update to 3.2.4. [arguments]: Add a phase to set environment variables for tests. [native-inputs]: Add which. --- gnu/packages/haskell.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b3441650be..f1c358065b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -994,7 +994,7 @@ package are to parse or generate Haskell 98 code.") (define-public ghc-alex (package (name "ghc-alex") - (version "3.2.3") + (version "3.2.4") (source (origin (method url-fetch) @@ -1004,9 +1004,20 @@ package are to parse or generate Haskell 98 code.") ".tar.gz")) (sha256 (base32 - "0bi1cs9b8ir33h1fl6x2xw4ymygapqbr713ridpf7rmk2wa7jqqs")))) + "0cpjixgsr0b2x4s6hz4aa6gnmjw9i7xd9nlfi8m37zqlidq4v3nm")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-check-variables + (lambda _ + (setenv "PATH" (string-append (getcwd) "/dist/build/alex:" + (getenv "PATH"))) + (setenv "alex_datadir" (string-append (getcwd) "/data")) + #t))))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) + (native-inputs + `(("which" ,which))) (home-page "https://www.haskell.org/alex/") (synopsis "Tool for generating lexical analysers in Haskell") -- cgit v1.2.3 From fa9c33dc8e012316f3dc3d4d6d0aa7e6cd7df70d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:19:48 -0400 Subject: gnu: ghc-chasingbottoms: Update to 1.3.1.4. * gnu/packages/haskell.scm (ghc-chasingbottoms): Update to 1.3.1.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f1c358065b..c4eee42a6a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3518,7 +3518,7 @@ encourages inductive, recursive definitions of graph algorithms.") (define-public ghc-chasingbottoms (package (name "ghc-chasingbottoms") - (version "1.3.1.3") + (version "1.3.1.4") (source (origin (method url-fetch) @@ -3526,7 +3526,7 @@ encourages inductive, recursive definitions of graph algorithms.") "ChasingBottoms-" version ".tar.gz")) (sha256 (base32 - "04jwwjs22mqc4hvpp4c3gpb79inrrq5sapks5khknspv2hslm61q")))) + "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 4a3f50e36c09e18e10be894141ea996fcae1aa52 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 22:42:54 -0400 Subject: gnu: ghc-chell-quickcheck: Allow newer QuickCheck. * gnu/packages/haskell.scm (ghc-chell-quickcheck)[arguments]: Add a phase that patches the Cabal file to allow newer versions of QuickCheck. (ghc-chell-quickcheck-bootstrap)[arguments]: Ditto. --- gnu/packages/haskell.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c4eee42a6a..1294671e76 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7455,7 +7455,14 @@ testing strategies.") ("ghc-random" ,ghc-random) ("ghc-quickcheck" ,ghc-quickcheck))) (arguments - `(#:tests? #f)) + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "chell-quickcheck.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.11") + "QuickCheck >= 2.3 && < 2.12"))))))) (home-page "https://john-millikin.com/software/chell/") (synopsis "QuickCheck support for the Chell testing library") (description "More complex tests for @code{chell}.") @@ -7475,6 +7482,14 @@ testing strategies.") (base32 "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "chell-quickcheck.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.11") + "QuickCheck >= 2.3 && < 2.12"))))))) (inputs `(("ghc-chell" ,ghc-chell) ("ghc-chell-quickcheck-bootstrap" ,ghc-chell-quickcheck-bootstrap) -- cgit v1.2.3 From 38922e49ca4f62e8e10fad8c0a3ee58a4e49d45d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:22:21 -0400 Subject: gnu: ghc-edisoncore: Update to 1.3.2.1. * gnu/packages/haskell.scm (ghc-edisoncore): Update to 1.3.2.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1294671e76..86ec0b2cd5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4032,14 +4032,14 @@ finite maps and priority queues where the priority and element are distinct.") (define-public ghc-edisoncore (package (name "ghc-edisoncore") - (version "1.3.1.1") + (version "1.3.2.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/EdisonCore" "/EdisonCore-" version ".tar.gz")) (sha256 - (base32 "06shxmcqxcahcn6zgl64vlqix4fnq53d97drcgsh94qp7gp201ry")))) + (base32 "0fgj5iwiv3v2gdgx7kjcr15dcs4x1kvmjspp3p99wyhh0x6h3ikk")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 3ea018c7428d3a08a143dcf917bea0e89bf8f704 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:24:24 -0400 Subject: gnu: ghc-haskell-src: Update to 1.0.3.0. * gnu/packages/haskell.scm (ghc-haskell-src): Update to 1.0.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 86ec0b2cd5..44e8960b5e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -965,7 +965,7 @@ them.") (define-public ghc-haskell-src (package (name "ghc-haskell-src") - (version "1.0.2.0") + (version "1.0.3.0") (source (origin (method url-fetch) @@ -975,7 +975,7 @@ them.") ".tar.gz")) (sha256 (base32 - "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a")))) + "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l")))) (build-system haskell-build-system) (inputs `(("ghc-happy" ,ghc-happy) -- cgit v1.2.3 From 568cafd56a341266dd3926e54136610728e7ba28 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:27:11 -0400 Subject: gnu: ghc-hs-bibutils: Update to 6.6.0.0. * gnu/packages/haskell.scm (ghc-hs-bibutils): Update to 6.6.0.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 44e8960b5e..101fca3a0e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6543,7 +6543,7 @@ provided for those who need a drop-in replacement for Markdown.pl.") (define-public ghc-hs-bibutils (package (name "ghc-hs-bibutils") - (version "6.2.0.1") + (version "6.6.0.0") (source (origin (method url-fetch) @@ -6552,7 +6552,7 @@ provided for those who need a drop-in replacement for Markdown.pl.") version ".tar.gz")) (sha256 (base32 - "0c56sjgg82kjcg5rrplnyn7vf02ccsj3kkcbgc87zxlv0j880rjb")))) + "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) (home-page "https://hackage.haskell.org/package/hs-bibutils") -- cgit v1.2.3 From ddfb799e5d3dda9c773ec752f5638433c0a65185 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:31:17 -0400 Subject: gnu: ghc-indents: Update to 0.5.0.0. * gnu/packages/haskell.scm (ghc-indents): Update to 0.5.0.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 101fca3a0e..fa00f68b83 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2509,7 +2509,7 @@ isn't available, portable implementations are used.") (define-public ghc-indents (package (name "ghc-indents") - (version "0.3.3") + (version "0.5.0.0") (source (origin (method url-fetch) (uri (string-append @@ -2517,7 +2517,7 @@ isn't available, portable implementations are used.") version ".tar.gz")) (sha256 (base32 - "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn")))) + "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n")))) (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) -- cgit v1.2.3 From 1a8f5eb2e1b4e0bfe36010ca6bfb568618ecc588 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:32:04 -0400 Subject: gnu: ghc-json: Update to 0.9.2. * gnu/packages/haskell.scm (ghc-json): Update to 0.9.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fa00f68b83..c8dcefeb12 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8101,7 +8101,7 @@ handled safely, this is what you're left with.") (define-public ghc-json (package (name "ghc-json") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) @@ -8109,7 +8109,7 @@ handled safely, this is what you're left with.") "json-" version ".tar.gz")) (sha256 (base32 - "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn")))) + "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb) -- cgit v1.2.3 From 4a2100b8ae3dd3297f2748f312da3586795776bd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:32:40 -0400 Subject: gnu: ghc-lifted-base: Update to 0.2.3.12. * gnu/packages/haskell.scm (ghc-lifted-base): Update to 0.2.3.12. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c8dcefeb12..f195563516 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5074,7 +5074,7 @@ It is modeled after doctest for Python, see (define-public ghc-lifted-base (package (name "ghc-lifted-base") - (version "0.2.3.8") + (version "0.2.3.12") (source (origin (method url-fetch) @@ -5084,7 +5084,7 @@ It is modeled after doctest for Python, see ".tar.gz")) (sha256 (base32 - "17yz4n7q96x4cp8vxai8csn2vmpigxvipkfh48arahf91f0xy18n")))) + "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Missing testing libraries. (inputs -- cgit v1.2.3 From 4729cfacebe95de6283a4e9efca319f3af400991 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:33:13 -0400 Subject: gnu: ghc-multipart: Update to 0.1.3. * gnu/packages/haskell-web.scm (ghc-multipart): Update to 0.1.3. [inputs]: Add ghc-stringsearch. --- gnu/packages/haskell-web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 54eedf5044..bb4f419e66 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -911,7 +911,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") (define-public ghc-multipart (package (name "ghc-multipart") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -921,9 +921,11 @@ of a JSON value into a @code{Data.Aeson.Value}.") ".tar.gz")) (sha256 (base32 - "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5")))) + "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z")))) (build-system haskell-build-system) - (inputs `(("ghc-parsec" ,ghc-parsec))) + (inputs + `(("ghc-parsec" ,ghc-parsec) + ("ghc-stringsearch" ,ghc-stringsearch))) (home-page "http://www.github.com/silkapp/multipart") (synopsis -- cgit v1.2.3 From 3e6fe51f9a332315e9d90c3b0e6cd8299b7df3b8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:35:41 -0400 Subject: gnu: ghc-regex-tdfa: Update to 1.2.3.1. * gnu/packages/haskell.scm (ghc-regex-tdfa): Update to 1.2.3.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f195563516..f44eadbbe8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6876,7 +6876,7 @@ regular expressions. Parsers can be built using Applicative interface.") (define-public ghc-regex-tdfa (package (name "ghc-regex-tdfa") - (version "1.2.2") + (version "1.2.3.1") (source (origin (method url-fetch) @@ -6885,7 +6885,7 @@ regular expressions. Parsers can be built using Applicative interface.") version ".tar.gz")) (sha256 (base32 - "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb")))) + "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala")))) (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) -- cgit v1.2.3 From 17539a7ed1abba1f69045baf505581d0b5f2ccd2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:59:40 -0400 Subject: gnu: ghc-safe: Update to 0.3.17. * gnu/packages/haskell.scm (ghc-safe): Update to 0.3.17. [native-inputs]: Add ghc-quickcheck. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f44eadbbe8..a4bb28eecd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3144,7 +3144,7 @@ style.") (define-public ghc-safe (package (name "ghc-safe") - (version "0.3.9") + (version "0.3.17") (source (origin (method url-fetch) @@ -3154,8 +3154,10 @@ style.") ".tar.gz")) (sha256 (base32 - "1jdnp5zhvalf1xy8i872n29nljfjz6lnl9ghj80ffisrnnkrwcfh")))) + "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ndmitchell/safe#readme") (synopsis "Library of safe (exception free) functions") (description "This library provides wrappers around @code{Prelude} and -- cgit v1.2.3 From 5285d61490f1c4fbdbdc82ad6e6daaab863e1a46 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:36:52 -0400 Subject: gnu: ghc-split: Update to 0.2.3.3. * gnu/packages/haskell.scm (ghc-split): Update to 0.2.3.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a4bb28eecd..a555cea5e9 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3700,7 +3700,7 @@ colored output using the ansi-terminal package.") (define-public ghc-split (package (name "ghc-split") - (version "0.2.3.1") + (version "0.2.3.3") (outputs '("out" "doc")) (source (origin @@ -3711,7 +3711,7 @@ colored output using the ansi-terminal package.") ".tar.gz")) (sha256 (base32 - "12660m16c6sib3laaxn6w9s453pyx1b49myrmzfij372vq5bc5bn")))) + "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) -- cgit v1.2.3 From 46f8898118ae2b27d42c005a520064d5c53c0ab9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:37:49 -0400 Subject: gnu: ghc-th-expand-syns: Update to 0.4.4.0. * gnu/packages/haskell.scm (ghc-th-expand-syns): Update to 0.4.4.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a555cea5e9..2601db0a99 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5682,7 +5682,7 @@ instances. This package provides orphan instances for @code{containers}, (define-public ghc-th-expand-syns (package (name "ghc-th-expand-syns") - (version "0.4.0.0") + (version "0.4.4.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5690,7 +5690,7 @@ instances. This package provides orphan instances for @code{containers}, version ".tar.gz")) (sha256 (base32 - "1sjy7a17zwyvlbkc8gklii67sy78wpnw35fyb00lsbnpk4cryd2r")))) + "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) -- cgit v1.2.3 From 9e3e6ee026c95deafef7f4532a1333863f3e5d81 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:39:54 -0400 Subject: gnu: ghc-utility-ht: Update to 0.0.14. * gnu/packages/haskell.scm (ghc-utility-ht): Update to 0.0.14. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2601db0a99..575a7be4a8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7808,14 +7808,14 @@ Accessor to access state in transformers State monad.") (define-public ghc-utility-ht (package (name "ghc-utility-ht") - (version "0.0.12") + (version "0.0.14") (home-page "https://hackage.haskell.org/package/utility-ht") (source (origin (method url-fetch) (uri (string-append home-page "/utility-ht-" version ".tar.gz")) (sha256 - (base32 "1vq5bd51rl9l5lgfmaqxgiggddk38hzgngcj7qgrqnalcd1myi54")))) + (base32 "1a7bgk7wv7sqbxbiv7kankiimr3wij7zdm7s83zwsf886ghyxhk9")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) (synopsis "Haskell helper functions for Lists, Maybes, Tuples, Functions") -- cgit v1.2.3 From 57203a15cb2d1c6164b20d16cbb60c02b63dc305 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 10:57:38 -0400 Subject: gnu: ghc-vector: Update Cabal file to r3. * gnu/packages/haskell.scm (ghc-vector): Update Cabal file to r3. --- gnu/packages/haskell.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 575a7be4a8..caa8c681cc 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3823,7 +3823,10 @@ speed, flexibility, and quality of parse errors.") (build-system haskell-build-system) ;; FIXME: To simplify upgrading all Haskell packages, we leave the tests ;; disabled for now. - (arguments `(#:tests? #f)) + (arguments + `(#:cabal-revision + ("3" "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x") + #:tests? #f)) (inputs `(("ghc-primitive" ,ghc-primitive) ("ghc-random" ,ghc-random) -- cgit v1.2.3 From 50eff0d5ff2d50038f652a44f12410160651c389 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:41:35 -0400 Subject: gnu: ghc-boxes: Update to 0.1.5. * gnu/packages/haskell.scm (ghc-boxes): Update to 0.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index caa8c681cc..481502857b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5226,14 +5226,14 @@ notation}.") (define-public ghc-boxes (package (name "ghc-boxes") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/boxes/boxes-" version ".tar.gz")) (sha256 - (base32 "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf")))) + (base32 "1hsnmw95i58d4bkpxby3ddsj1cawypw4mdyb18m393s5i8p7iq9q")))) (build-system haskell-build-system) (inputs `(("ghc-split" ,ghc-split) -- cgit v1.2.3 From 38f0d04e5971d4228824300f278cd7d6930d8893 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:43:08 -0400 Subject: gnu: ghc-juicypixels: Update to 3.2.9.5. * gnu/packages/haskell.scm (ghc-juicypixels): Update to 3.2.9.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 481502857b..e1c81f28b2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6003,7 +6003,7 @@ do on-demand loading.") (define-public ghc-juicypixels (package (name "ghc-juicypixels") - (version "3.2.9.3") + (version "3.2.9.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -6011,7 +6011,7 @@ do on-demand loading.") version ".tar.gz")) (sha256 (base32 - "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn")))) + "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744")))) (build-system haskell-build-system) (inputs `(("ghc-zlib" ,ghc-zlib) -- cgit v1.2.3 From 19b29882878a6558e5f16d587265eb3a0c0cdec6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:43:52 -0400 Subject: gnu: ghc-language-c: Update to 0.8.1. * gnu/packages/haskell.scm (ghc-language-c): Update to 0.8.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e1c81f28b2..aaf9f6c6a2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7950,7 +7950,7 @@ dependency.") (define-public ghc-language-c (package (name "ghc-language-c") - (version "0.5.0") + (version "0.8.1") (source (origin (method url-fetch) @@ -7958,7 +7958,7 @@ dependency.") "language-c/language-c-" version ".tar.gz")) (sha256 (base32 - "08i2bl7jmmymn2sldzlbz6ig7lx3wfwhlpadzibs3fx72z08pmc6")))) + "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) (native-inputs -- cgit v1.2.3 From 5209fc22e1fe1c24f154b0eeecc2b5587aa64a1f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:46:48 -0400 Subject: gnu: ghc-th-reify-many: Update to 0.1.8. * gnu/packages/haskell.scm (ghc-th-reify-many): Update to 0.1.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index aaf9f6c6a2..fce0c81c3e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5707,7 +5707,7 @@ instances. This package provides orphan instances for @code{containers}, (define-public ghc-th-reify-many (package (name "ghc-th-reify-many") - (version "0.1.6") + (version "0.1.8") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5715,7 +5715,7 @@ instances. This package provides orphan instances for @code{containers}, version ".tar.gz")) (sha256 (base32 - "1b76zjxkj0v0n8zj9l0nwav2irm0c43rx6qjihfw8klmmxvx59df")))) + "0hzy6hvhvcd6i60vx5cp2b7ggmnnjh9rx4h8bm8xw4grglcaxjnf")))) (build-system haskell-build-system) (inputs `(("ghc-safe" ,ghc-safe) -- cgit v1.2.3 From d9404fc122530b21e00ec3d150742d9c20dee66a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:36:42 -0400 Subject: gnu: ghc-vector-algorithms: Update to 0.7.0.4. * gnu/packages/haskell.scm (ghc-vector-algorithms): Update to 0.7.0.4. [arguments]: Remove unneeded "--allow-newer=vector" configure flag; remove test-patching phase. [inputs]: Remove ghc-mwc-random. --- gnu/packages/haskell.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fce0c81c3e..6036a12ee1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8490,7 +8490,7 @@ between 2 and 3 times faster than the Mersenne Twister.") (define-public ghc-vector-algorithms (package (name "ghc-vector-algorithms") - (version "0.7.0.1") + (version "0.7.0.4") (source (origin (method url-fetch) @@ -8499,22 +8499,10 @@ between 2 and 3 times faster than the Mersenne Twister.") "vector-algorithms-" version ".tar.gz")) (sha256 (base32 - "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd")))) + "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg")))) (build-system haskell-build-system) - ;; The limits have been adjusted in a revision of the cabal file. - (arguments - '(#:configure-flags (list "--allow-newer=vector") - #:phases - (modify-phases %standard-phases - ;; The tests cannot be built due to type errors. - (add-after 'unpack 'do-not-build-quickcheck-tests - (lambda _ - (substitute* "vector-algorithms.cabal" - (("\\!flag\\(properties\\)") "True")) - #t))))) (inputs - `(("ghc-vector" ,ghc-vector) - ("ghc-mwc-random" ,ghc-mwc-random))) + `(("ghc-vector" ,ghc-vector))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/bos/math-functions") -- cgit v1.2.3 From bc8bda501cb8d9156afe001a440589b893d7b110 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:37:21 -0400 Subject: gnu: ghc-test-framework: Update to 0.8.2.0. * gnu/packages/haskell.scm (ghc-semigroups-bootstrap, ghc-hashable-bootstrap, ghc-nats-bootstrap, ghc-unordered-containers-bootstrap): New variables for breaking a dependency cycle with ghc-test-framework. * gnu/packages/haskell-check.scm (ghc-test-framework): Update to 0.8.2.0. [arguments]: Add a phase to patch the Cabal file to allow a newer QuickCheck. [inputs]: Add ghc-semigroups-bootstrap. --- gnu/packages/haskell-check.scm | 16 ++++++++++++---- gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 57e7f0edc1..a9ff6af041 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -452,7 +452,7 @@ expressed in Haskell, using combinators defined in the QuickCheck library.") (define-public ghc-test-framework (package (name "ghc-test-framework") - (version "0.8.1.1") + (version "0.8.2.0") (source (origin (method url-fetch) @@ -460,10 +460,17 @@ expressed in Haskell, using combinators defined in the QuickCheck library.") "test-framework-" version ".tar.gz")) (sha256 (base32 - "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq")))) + "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=time"))) + `(#:tests? #f ; FIXME: Tests do not build. + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "test-framework.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.10") + "QuickCheck >= 2.3 && < 2.12"))))))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck))) @@ -475,7 +482,8 @@ expressed in Haskell, using combinators defined in the QuickCheck library.") ("ghc-random" ,ghc-random) ("ghc-regex-posix" ,ghc-regex-posix) ("ghc-xml" ,ghc-xml) - ("ghc-libxml" ,ghc-libxml))) + ("ghc-libxml" ,ghc-libxml) + ("ghc-semigroups" ,ghc-semigroups-bootstrap))) (home-page "https://batterseapower.github.io/test-framework/") (synopsis "Framework for running and organising tests") (description diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6036a12ee1..a12e7e894b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2266,6 +2266,14 @@ data structures. The package provides instances for basic types and a way to combine hash values.") (license license:bsd-3))) +(define-public ghc-hashable-bootstrap + (package + (inherit ghc-hashable) + (name "ghc-hashable-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) + (define-public ghc-hashable-time (package (name "ghc-hashable-time") @@ -3580,6 +3588,15 @@ optimized for performance critical use, both in terms of large data quantities and high speed.") (license license:bsd-3))) +(define-public ghc-unordered-containers-bootstrap + (package + (inherit ghc-unordered-containers) + (name "ghc-unordered-containers-bootstrap") + (arguments `(#:tests? #f)) + (inputs + `(("ghc-hashable" ,ghc-hashable-bootstrap))) + (properties '(hidden? #t)))) + (define-public ghc-uniplate (package (name "ghc-uniplate") @@ -4569,6 +4586,14 @@ Compatibility package for older packages.") (description "This library provides the natural numbers for Haskell.") (license license:bsd-3))) +(define-public ghc-nats-bootstrap + (package + (inherit ghc-nats) + (name "ghc-nats-bootstrap") + (inputs + `(("ghc-hashable" ,ghc-hashable-bootstrap))) + (properties '((hidden? #t))))) + (define-public ghc-void (package (name "ghc-void") @@ -4889,6 +4914,18 @@ where every element did not have to have an inverse, thus the name semigroup.") (license license:bsd-3))) +(define-public ghc-semigroups-bootstrap + (package + (inherit ghc-semigroups) + (name "ghc-semigroups-bootstrap") + (inputs + `(("ghc-nats" ,ghc-nats-bootstrap) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap) + ("ghc-text" ,ghc-text) + ("ghc-hashable" ,ghc-hashable-bootstrap))) + (properties '(hidden? #t)))) + (define-public ghc-free (package (name "ghc-free") -- cgit v1.2.3 From aeb1c6abd5b0f6e02ad569bb50e1fb740165f094 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 11:12:46 -0400 Subject: gnu: ghc-test-framework-hunit: Update Cabal file to r3. * gnu/packages/haskell-check.scm (ghc-test-framework-hunit): Update Cabal file to r3. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index a9ff6af041..3bef4e5802 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -508,9 +508,9 @@ reporting and test statistics output.") (base32 "1y0b6vg8nfm43v90lxxcydhi6qlxhfy4vpxbzm5ic2w55bh8xjwm")))) (build-system haskell-build-system) - ;; The official revision of the cabal file allows for HUnit lower than 1.7 (arguments - `(#:configure-flags (list "--allow-newer=HUnit"))) + `(#:cabal-revision + ("3" "0i9mlalv7cl1iq43ld5myrnpszq5rxmd79hk495dcb08rglhgl3z"))) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-hunit" ,ghc-hunit) -- cgit v1.2.3 From c2d2f27537367ac9248cc0162a86e258bcb4a673 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 11:16:01 -0400 Subject: gnu: ghc-test-framework-quickcheck2: Update Cabal file to r1. * gnu/packages/haskell-check.scm (ghc-test-framework-quickcheck2): Update Cabal file to r1. --- gnu/packages/haskell-check.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 3bef4e5802..ef19645346 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -535,6 +535,9 @@ reporting and test statistics output.") (base32 "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff"))) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From d09b2ad42801e974eb433593891b51f9894147d9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:07:16 -0400 Subject: gnu: ghc-x11: Update to 1.9. * gnu/packages/haskell.scm (ghc-x11): Update to 1.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a12e7e894b..1b66d88faa 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1968,14 +1968,14 @@ environment variables.") (define-public ghc-x11 (package (name "ghc-x11") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/X11/" "X11-" version ".tar.gz")) (sha256 - (base32 "13lxq36856fzp61y4api78vssykyh8fm2aplr0nsj18ymdm1c6sl")))) + (base32 "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh")))) (build-system haskell-build-system) (inputs `(("libx11" ,libx11) -- cgit v1.2.3 From 5e4058ad85416bc256bc414df4985bbfd4e5eeac Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 21:19:12 -0400 Subject: gnu: ghc-bytestring-handle: Allow newer base and QuickCheck. * gnu/packages/haskell.scm (ghc-bytestring-handle)[arguments]: Add a phase that patches the Cabal file to allow newer versions of base and QuickCheck. --- gnu/packages/haskell.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1b66d88faa..d8cd4cbba5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7008,6 +7008,16 @@ this problem.") (base32 "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "bytestring-handle.cabal" + (("QuickCheck >= 2\\.1\\.2 && < 2\\.11") + "QuickCheck >= 2.1.2 && < 2.12") + (("base >= 4\\.2 && < 4\\.11") + "base >= 4.2 && < 4.12"))))))) (inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 91ffeed70a451620dcd4f87d29bb4c40e5057f47 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:52:17 -0400 Subject: gnu: ghc-cereal: Update to 0.5.7.0. * gnu/packages/haskell.scm (ghc-cereal): Update to 0.5.7.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d8cd4cbba5..eb1c34c1fe 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2939,7 +2939,7 @@ Dual to @code{Traversable}.") (define-public ghc-cereal (package (name "ghc-cereal") - (version "0.5.3.0") + (version "0.5.7.0") (source (origin (method url-fetch) @@ -2949,7 +2949,7 @@ Dual to @code{Traversable}.") ".tar.gz")) (sha256 (base32 - "1x4aib7nnaf4x2b9zlndq5n5zsqniw78jifkf55nhnbmvryf05n3")))) + "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 5f4327df7fb03363f6cc0be9a97886aff6f76953 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:16:24 -0400 Subject: gnu: ghc-deepseq-generics: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-deepseq-generics): Update Cabal file to r2. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index eb1c34c1fe..b6657f115f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5295,6 +5295,9 @@ using a simple box model.") (base32 "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb"))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) -- cgit v1.2.3 From d340ee858f82c9e34da87deb2a62d27b22415959 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 23:35:30 -0400 Subject: gnu: ghc-edit-distance: Replace "--allow-newer" flag. * gnu/packages/haskell.scm (ghc-edit-distance)[arguments]: Replace "--allow-newer" configure flag with a phase that patches the Cabal file. --- gnu/packages/haskell.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b6657f115f..ec262f143f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6208,7 +6208,13 @@ representations of current time.") (base32 "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "edit-distance.cabal" + (("QuickCheck >= 2\\.4 && <2\\.9") + "QuickCheck >= 2.4 && < 2.12"))))))) (inputs `(("ghc-random" ,ghc-random) ("ghc-test-framework" ,ghc-test-framework) -- cgit v1.2.3 From 5f192d52a31d58e25c809e18cb4361f2df611532 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:53:55 -0400 Subject: gnu: ghc-exceptions: Update to 0.10.0. * gnu/packages/haskell.scm (ghc-exceptions): Update to 0.10.0. [arguments]: Remove unneeded "--allow-newer=QuickCheck" configure flag. [native-inputs]: Add ghc-quickcheck, ghc-test-framework, and ghc-test-framework-hunit. --- gnu/packages/haskell.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ec262f143f..ee88b89c9a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3302,7 +3302,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") (define-public ghc-exceptions (package (name "ghc-exceptions") - (version "0.8.3") + (version "0.10.0") (source (origin (method url-fetch) @@ -3312,12 +3312,12 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") ".tar.gz")) (sha256 (base32 - "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd")))) + "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) (native-inputs - `(("ghc-test-framework" ,ghc-test-framework) + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (inputs `(("ghc-stm" ,ghc-stm) -- cgit v1.2.3 From 9c072f820e05736e4e6536192d0af213e0277408 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:54:47 -0400 Subject: gnu: ghc-fingertree: Update to 0.1.4.1. * gnu/packages/haskell.scm (ghc-fingertree): Update to 0.1.4.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ee88b89c9a..e23ebb6afe 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4348,7 +4348,7 @@ will eventually deliver a value of type @code{a}.") (define-public ghc-fingertree (package (name "ghc-fingertree") - (version "0.1.3.0") + (version "0.1.4.1") (source (origin (method url-fetch) @@ -4357,7 +4357,7 @@ will eventually deliver a value of type @code{a}.") version ".tar.gz")) (sha256 (base32 - "1ryjj7qrx70ckcjlr02x9zh86kfp76azbxq05r7hawqkaqg44sfs")))) + "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p")))) (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit) -- cgit v1.2.3 From c496fb987316251a5ff8d491d83bd76b13fa9d25 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:58:23 -0400 Subject: gnu: ghc-hashable: Update to 1.2.7.0. * gnu/packages/haskell.scm (ghc-hashable): Update to 1.2.7.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e23ebb6afe..85889b20dc 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2235,7 +2235,7 @@ IO operations.") (define-public ghc-hashable (package (name "ghc-hashable") - (version "1.2.6.1") + (version "1.2.7.0") (outputs '("out" "doc")) (source (origin @@ -2246,7 +2246,7 @@ IO operations.") ".tar.gz")) (sha256 (base32 - "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll")))) + "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text) -- cgit v1.2.3 From c1c35c3b0e853b2a422cd40ddef35ec741d23481 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:59:41 -0400 Subject: gnu: ghc-sha: Update to 1.6.4.4. * gnu/packages/haskell-crypto.scm (ghc-sha): Update to 1.6.4.4. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 6a1eff6821..c675564a77 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -391,14 +391,14 @@ interface.") (define-public ghc-sha (package (name "ghc-sha") - (version "1.6.4.2") + (version "1.6.4.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "SHA/SHA-" version ".tar.gz")) (sha256 (base32 - "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64")))) + "0i4b2wjisivdy72synal711ywhx05mfqfba5n65rk8qidggm1nbb")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From b925e1f537c37f46c324b737888ce8290deb1ea8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:49:09 -0400 Subject: gnu: ghc-async: Update to 2.2.1. * gnu/packages/haskell.scm (ghc-async): Update to 2.2.1. [inputs]: Add ghc-hashable. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 85889b20dc..3bd1757f80 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4320,7 +4320,7 @@ library for Haskell.") (define-public ghc-async (package (name "ghc-async") - (version "2.1.1.1") + (version "2.2.1") (source (origin (method url-fetch) @@ -4330,10 +4330,11 @@ library for Haskell.") ".tar.gz")) (sha256 (base32 - "1qj4fp1ynwg0l453gmm27vgkzb5k5m2hzdlg5rdqi9kf8rqy90yd")))) + "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) + ("ghc-hashable" ,ghc-hashable) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) -- cgit v1.2.3 From f5aa584541f076773e5b226e09ae3fcc8d8142c2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:00:05 -0400 Subject: gnu: ghc-case-insensitive: Update to 1.2.0.11. * gnu/packages/haskell.scm (ghc-case-insensitive): Update to 1.2.0.11. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3bd1757f80..c82fd2aafe 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3434,7 +3434,7 @@ writing to stdout and other handles.") (define-public ghc-case-insensitive (package (name "ghc-case-insensitive") - (version "1.2.0.7") + (version "1.2.0.11") (outputs '("out" "doc")) (source (origin @@ -3445,7 +3445,7 @@ writing to stdout and other handles.") ".tar.gz")) (sha256 (base32 - "1j6ahvrz1g5q89y2difyk838yhwjc8z67zr0v2z512qdznc3h38n")))) + "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7")))) (build-system haskell-build-system) (inputs `(("ghc-hunit" ,ghc-hunit))) -- cgit v1.2.3 From 0f108b33a727f338a8a71757a132d5b599c7237c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:01:17 -0400 Subject: gnu: ghc-crypto-api: Update to 0.13.3. * gnu/packages/haskell-crypto.scm (ghc-crypto-api): Update to 0.13.3. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index c675564a77..f27d7dc23a 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -107,7 +107,7 @@ when ASN1 pattern matching is not convenient.") (define-public ghc-crypto-api (package (name "ghc-crypto-api") - (version "0.13.2") + (version "0.13.3") (source (origin (method url-fetch) @@ -116,7 +116,7 @@ when ASN1 pattern matching is not convenient.") "crypto-api-" version ".tar.gz")) (sha256 (base32 - "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak")))) + "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) ("ghc-tagged" ,ghc-tagged) -- cgit v1.2.3 From 24e18bf937f80aa28f2f9d3d1b587b2cc1ae9c9e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:01:33 -0400 Subject: gnu: ghc-errors: Update to 2.3.0. * gnu/packages/haskell.scm (ghc-errors): Update to 2.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c82fd2aafe..c81b37a7c3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8405,7 +8405,7 @@ matching patterns against file paths.") (define-public ghc-errors (package (name "ghc-errors") - (version "2.2.2") + (version "2.3.0") (source (origin (method url-fetch) @@ -8414,7 +8414,7 @@ matching patterns against file paths.") "errors-" version ".tar.gz")) (sha256 (base32 - "13sflhglcm5skwrxb48fw96skdcx7ydiy4zg22200733pxhjncpn")))) + "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7")))) (build-system haskell-build-system) (inputs `(("ghc-exceptions" ,ghc-exceptions) -- cgit v1.2.3 From 75c07ef5199179cba554a733048d21649f6c0d15 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:13:10 -0400 Subject: gnu: ghc-hashable-time: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-hashable-time): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c81b37a7c3..bfc061c107 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2289,6 +2289,9 @@ combine hash values.") (base32 "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0rv40xkg3gj8jnqsry1gq3f5s5la6d5arg8fzkirnwdpcgha1as6"))) (inputs `(("ghc-hashable" ,ghc-hashable))) (home-page "http://hackage.haskell.org/package/hashable-time") (synopsis "Hashable instances for Data.Time") -- cgit v1.2.3 From fef71dbc9d28cccda627922d036ebf70844dbc84 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 14:13:09 -0400 Subject: gnu: ghc-hashtables: Update to 1.2.3.1. * gnu/packages/haskell.scm (ghc-hashtables): Update to 1.2.3.1. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bfc061c107..c4dbbc7d75 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7804,7 +7804,7 @@ Haskell, using gnuplot for rendering.") (define-public ghc-hashtables (package (name "ghc-hashtables") - (version "1.2.1.0") + (version "1.2.3.1") (source (origin (method url-fetch) @@ -7812,10 +7812,8 @@ Haskell, using gnuplot for rendering.") "https://hackage.haskell.org/package/hashtables/hashtables-" version ".tar.gz")) (sha256 - (base32 "1b6w9xznk42732vpd8ili60k12yq190xnajgga0iwbdpyg424lgg")))) + (base32 "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=vector"))) (inputs `(("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive) -- cgit v1.2.3 From d62f695119ff036762c93c5b8464c9ca5448e2c5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:04:02 -0400 Subject: gnu: ghc-nats: Update to 1.1.2. * gnu/packages/haskell.scm (ghc-nats): Update to 1.1.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c4dbbc7d75..6230270f30 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4570,7 +4570,7 @@ Compatibility package for older packages.") (define-public ghc-nats (package (name "ghc-nats") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) @@ -4580,7 +4580,7 @@ Compatibility package for older packages.") ".tar.gz")) (sha256 (base32 - "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k")))) + "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr")))) (build-system haskell-build-system) (arguments `(#:haddock? #f)) (inputs -- cgit v1.2.3 From 6062c4610ebab3b4ba5dcd954972ff1a0ee09eb5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:04:41 -0400 Subject: gnu: ghc-psqueues: Update to 0.2.7.0. * gnu/packages/haskell.scm (ghc-psqueues): Update to 0.2.7.0. [arguments]: Remove unneeded "--allow-newer=QuickCheck" configure flag. --- gnu/packages/haskell.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6230270f30..b9f40fe90f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8309,7 +8309,7 @@ bytestrings and their hexademical representation.") (define-public ghc-psqueues (package (name "ghc-psqueues") - (version "0.2.6.0") + (version "0.2.7.0") (source (origin (method url-fetch) @@ -8318,10 +8318,8 @@ bytestrings and their hexademical representation.") "psqueues-" version ".tar.gz")) (sha256 (base32 - "0n39s1i88j6s7vvsdhpbhcr3gpbwlzabwcc3nbd7nqb4kb4i0sls")))) + "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-hashable" ,ghc-hashable))) (native-inputs -- cgit v1.2.3 From e0b8cc34a483beb19a6651a3fac8ad2eeb89cd46 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:06:16 -0400 Subject: gnu: ghc-unordered-containers: Update to 0.2.9.0. * gnu/packages/haskell.scm (ghc-unordered-containers): Update to 0.2.9.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b9f40fe90f..4cec8d0ba7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3561,7 +3561,7 @@ Partial and Infinite Values\"}.") (define-public ghc-unordered-containers (package (name "ghc-unordered-containers") - (version "0.2.7.1") + (version "0.2.9.0") (outputs '("out" "doc")) (source (origin @@ -3571,7 +3571,7 @@ Partial and Infinite Values\"}.") "/unordered-containers-" version ".tar.gz")) (sha256 (base32 - "00npqiphivjp2d7ryqsdavfn4m5v3w1lq2azhdsrfh0wsvqpg4ig")))) + "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37")))) (build-system haskell-build-system) (inputs `(("ghc-chasingbottoms" ,ghc-chasingbottoms) -- cgit v1.2.3 From e59983ece567b9131b45113777a317394ed68e25 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:36:17 -0400 Subject: gnu: ghc-hinotify: Update to 0.3.10. * gnu/packages/haskell.scm (ghc-hinotify): Update to 0.3.10. [inputs]: Add ghc-async. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4cec8d0ba7..6e9185cb3f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7921,7 +7921,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") (define-public ghc-hinotify (package (name "ghc-hinotify") - (version "0.3.8.1") + (version "0.3.10") (source (origin (method url-fetch) (uri (string-append @@ -7929,8 +7929,10 @@ helper functions for Lists, Maybes, Tuples, Functions.") "hinotify-" version ".tar.gz")) (sha256 (base32 - "03c1f4d7x805zdiq2w26kl09xrfjw19saycdkhnixzv2qcr6xm1p")))) + "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg")))) (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async))) (home-page "https://github.com/kolmodin/hinotify.git") (synopsis "Haskell binding to inotify") (description "This library provides a wrapper to the Linux kernel's inotify -- cgit v1.2.3 From 42c000dcf568f98208b3fe7390ac89decc170912 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:15:13 -0400 Subject: gnu: ghc-semigroups: Update to 0.18.5. * gnu/packages/haskell.scm (ghc-semigroups): Update to 0.18.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6e9185cb3f..762df9b6fd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4889,7 +4889,7 @@ just a @code{Semigroup} are added.") (define-public ghc-semigroups (package (name "ghc-semigroups") - (version "0.18.2") + (version "0.18.5") (source (origin (method url-fetch) @@ -4899,7 +4899,7 @@ just a @code{Semigroup} are added.") ".tar.gz")) (sha256 (base32 - "1r6hsn3am3dpf4rprrj4m04d9318v9iq02bin0pl29dg4a3gzjax")))) + "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb")))) (build-system haskell-build-system) (inputs `(("ghc-nats" ,ghc-nats) -- cgit v1.2.3 From 48f8ba91ca948154f3b75a50aa014c72aff3ffff Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:22:09 -0400 Subject: gnu: ghc-chunked-data: Update to 0.3.1. * gnu/packages/haskell.scm (ghc-chunked-data): Update to 0.3.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 762df9b6fd..ad27832f1f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8776,7 +8776,7 @@ and regression and autocorrelation analysis. (define-public ghc-chunked-data (package (name "ghc-chunked-data") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) @@ -8785,7 +8785,7 @@ and regression and autocorrelation analysis. "chunked-data-" version ".tar.gz")) (sha256 (base32 - "0bszq6fijnr4pmadzz89smj7kfmzx0ca3wd9ga8gv0in9jk9vgp1")))) + "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p")))) (build-system haskell-build-system) (inputs `(("ghc-vector" ,ghc-vector) ("ghc-semigroups" ,ghc-semigroups) -- cgit v1.2.3 From 2927343183efdcdd6bbd732bb1211540ba6ece51 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:22:58 -0400 Subject: gnu: ghc-glob: Update to 0.9.2. * gnu/packages/haskell.scm (ghc-glob): Update to 0.9.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ad27832f1f..df1746b1a2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8376,7 +8376,7 @@ Typical applications of Priority Search Queues include: (define-public ghc-glob (package (name "ghc-glob") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) @@ -8385,7 +8385,7 @@ Typical applications of Priority Search Queues include: "Glob-" version ".tar.gz")) (sha256 (base32 - "0rzmsknl02p332dxmm36fyrz3dpma7bchn0ymyjipxvqil20pjw0")))) + "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg")))) (build-system haskell-build-system) (inputs `(("ghc-dlist" ,ghc-dlist) -- cgit v1.2.3 From c839da85129858fb7b374c5f903f1d32ae676abc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:42:16 -0400 Subject: gnu: ghc-hmatrix: Update to 0.19.0.0. * gnu/packages/haskell.scm (ghc-hmatrix): Update to 0.19.0.0. [inputs]: Add ghc-semigroups. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index df1746b1a2..76feb10a12 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7675,7 +7675,7 @@ and Fortran complex data types.") (define-public ghc-hmatrix (package (name "ghc-hmatrix") - (version "0.18.1.0") + (version "0.19.0.0") (source (origin (method url-fetch) @@ -7683,12 +7683,13 @@ and Fortran complex data types.") "https://hackage.haskell.org/package/hmatrix/hmatrix-" version ".tar.gz")) (sha256 - (base32 "07zkwvg872hfk6jyn4s54ws8mvclynazaxf7fsbqi16dmf9dn61c")))) + (base32 "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj")))) (build-system haskell-build-system) (inputs `(("ghc-random" ,ghc-random) ("ghc-split" ,ghc-split) ("ghc-storable-complex" ,ghc-storable-complex) + ("ghc-semigroups" ,ghc-semigroups) ("ghc-vector" ,ghc-vector) ;;("openblas" ,openblas) ("lapack" ,lapack))) -- cgit v1.2.3 From e99625b5aeed7d000de947afc57454444894d8c5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:26:23 -0400 Subject: gnu: ghc-void: Update to 0.7.2. * gnu/packages/haskell.scm (ghc-void): Update to 0.7.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 76feb10a12..38bdd7c05b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4601,7 +4601,7 @@ Compatibility package for older packages.") (define-public ghc-void (package (name "ghc-void") - (version "0.7.1") + (version "0.7.2") (source (origin (method url-fetch) @@ -4611,7 +4611,7 @@ Compatibility package for older packages.") ".tar.gz")) (sha256 (base32 - "1x15x2axz84ndw2bf60vjqljhrb0w95lddaljsxrl0hcd29zvw69")))) + "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk")))) (build-system haskell-build-system) (inputs `(("ghc-semigroups" ,ghc-semigroups) -- cgit v1.2.3 From c64e832f1008bec9a11481b4f48b5f619ce0319d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:29:18 -0400 Subject: gnu: xmonad: Update to 0.14.2. * gnu/packages/wm.scm (xmonad): Update to 0.14.2. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 163281ac67..db345cd2fd 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -455,7 +455,7 @@ desktop environment.") (define-public xmonad (package (name "xmonad") - (version "0.14") + (version "0.14.2") (synopsis "Tiling window manager") (source (origin (method url-fetch) @@ -463,7 +463,7 @@ desktop environment.") name "-" version ".tar.gz")) (sha256 (base32 - "0lq3k0ap7jxrrswpd954mqa6h8diccbif5srcgbmr39y6y8x0mm4")))) + "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949")))) (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) -- cgit v1.2.3 From 0b0e45d829df59ee8cb4973f674e44ebf7c60843 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:32:09 -0400 Subject: gnu: ghc-contravariant: Update to 1.4.1. * gnu/packages/haskell.scm (ghc-contravariant): Update to 1.4.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 38bdd7c05b..d826f5d8a7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4863,7 +4863,7 @@ just a @code{Semigroup} are added.") (define-public ghc-contravariant (package (name "ghc-contravariant") - (version "1.4") + (version "1.4.1") (source (origin (method url-fetch) @@ -4873,7 +4873,7 @@ just a @code{Semigroup} are added.") ".tar.gz")) (sha256 (base32 - "117fff8kkrvlmr8cb2jpj71z7lf2pdiyks6ilyx89mry6zqnsrp1")))) + "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9")))) (build-system haskell-build-system) (inputs `(("ghc-void" ,ghc-void) -- cgit v1.2.3 From 3c00bc13a5b78f0cfb240d60b4e283b1873b7ed9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:58:48 -0400 Subject: gnu: ghc-hmatrix-gsl: Update to 0.19.0.1. * gnu/packages/haskell.scm (ghc-hmatrix-gsl): Update to 0.19.0.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d826f5d8a7..5ea7ed8831 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7706,7 +7706,7 @@ numerical computations based on BLAS and LAPACK.") (define-public ghc-hmatrix-gsl (package (name "ghc-hmatrix-gsl") - (version "0.18.0.1") + (version "0.19.0.1") (source (origin (method url-fetch) @@ -7714,7 +7714,7 @@ numerical computations based on BLAS and LAPACK.") "https://hackage.haskell.org/package/hmatrix-gsl/hmatrix-gsl-" version ".tar.gz")) (sha256 - (base32 "0mflm7zg6c6a5vy092pa429rzpyv5drc1589r3x4fbmvcyqc79gx")))) + (base32 "0v6dla426x4ywaq59jm89ql1i42n39iw6z0j378xwb676v9kfxhm")))) (build-system haskell-build-system) (inputs `(("ghc-hmatrix" ,ghc-hmatrix) -- cgit v1.2.3 From 9d1944a4939ae006b6f53c4203c49bc727c55dfd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 5 Sep 2018 14:22:28 -0400 Subject: gnu: ghc-tasty: Update to 1.1.0.3. * gnu/packages/haskell.scm (ghc-integer-logarithms-bootstrap, ghc-scientific-bootstrap, ghc-attoparsec-bootstrap, ghc-wcwidth-bootstrap): New variables to break a dependency cycle from ghc-tasty. * gnu/packages/haskell-check.scm (ghc-tasty): Update to 1.1.0.3. [inputs]: Add ghc-wcwidth-bootstrap; remove ghc-regex-tdfa-rc. --- gnu/packages/haskell-check.scm | 8 ++++---- gnu/packages/haskell.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index ef19645346..913835a807 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -181,7 +181,7 @@ timer functions of different operating systems via a unified API.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "0.11.0.4") + (version "1.1.0.3") (source (origin (method url-fetch) @@ -191,18 +191,18 @@ timer functions of different operating systems via a unified API.") ".tar.gz")) (sha256 (base32 - "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0")))) + "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-regex-tdfa" ,ghc-regex-tdfa) - ("ghc-regex-tdfa-rc" ,ghc-regex-tdfa-rc) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-unbounded-delays" ,ghc-unbounded-delays) ("ghc-async" ,ghc-async) ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-clock-bootstrap" ,ghc-clock-bootstrap))) + ("ghc-clock-bootstrap" ,ghc-clock-bootstrap) + ("ghc-wcwidth" ,ghc-wcwidth-bootstrap))) (home-page "http://documentup.com/feuerbach/tasty") (synopsis "Modern and extensible testing framework") (description "Tasty is a modern testing framework for Haskell. It lets diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5ea7ed8831..b50bf3d5d4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2877,6 +2877,17 @@ aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) +(define-public ghc-attoparsec-bootstrap + (package + (inherit ghc-attoparsec) + (name "ghc-attoparsec-bootstrap") + (arguments `(#:tests? #f)) + (inputs + `(("ghc-scientific" ,ghc-scientific-bootstrap) + ("ghc-text" ,ghc-text))) + (native-inputs '()) + (properties '(hidden? #t)))) + (define-public ghc-zip-archive (package (name "ghc-zip-archive") @@ -5227,6 +5238,14 @@ occurrences of a substring (the first in case of overlaps) with another.") in migrated modules.") (license license:expat))) +(define-public ghc-integer-logarithms-bootstrap + (package + (inherit ghc-integer-logarithms) + (name "ghc-integer-logarithms-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '(hidden? #t)))) + (define-public ghc-scientific (package (name "ghc-scientific") @@ -5264,6 +5283,19 @@ and space efficient. They are represented using notation}.") (license license:bsd-3))) +(define-public ghc-scientific-bootstrap + (package + (inherit ghc-scientific) + (name "ghc-scientific-bootstrap") + (arguments `(#:tests? #f)) + (inputs + `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) + ("ghc-text" ,ghc-text) + ("ghc-hashable" ,ghc-hashable) + ("ghc-primitive" ,ghc-primitive))) + (native-inputs '()) + (properties '(hidden? #t)))) + (define-public ghc-boxes (package (name "ghc-boxes") @@ -10199,4 +10231,14 @@ The command line tool can compile a width table to Haskell code that assigns widths to the Char type.") (license license:bsd-3))) +(define-public ghc-wcwidth-bootstrap + (package + (inherit ghc-wcwidth) + (name "ghc-wcwidth-bootstrap") + (inputs + `(("ghc-setlocale" ,ghc-setlocale) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-attoparsec" ,ghc-attoparsec-bootstrap))) + (properties '(hidden? #t)))) + ;;; haskell.scm ends here -- cgit v1.2.3 From c1cf4c70f2828c86febb3c5eb2efd5e2e4173afa Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:39:34 -0400 Subject: gnu: ghc-contravariant-extras: Update to 0.3.4. * gnu/packages/haskell.scm (ghc-contravariant-extras): Update to 0.3.4. [inputs]: Add ghc-semigroups. --- gnu/packages/haskell.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b50bf3d5d4..a8a90f919d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8888,7 +8888,7 @@ statically known size.") (define-public ghc-contravariant-extras (package (name "ghc-contravariant-extras") - (version "0.3.3.1") + (version "0.3.4") (source (origin (method url-fetch) @@ -8897,11 +8897,13 @@ statically known size.") "contravariant-extras-" version ".tar.gz")) (sha256 (base32 - "1mbrgjybdx8fjdck4ldwi8955w4qnmm0ql56zix7dyn0s7s9spgk")))) + "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n")))) (build-system haskell-build-system) - (inputs `(("ghc-tuple-th" ,ghc-tuple-th) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-base-prelude" ,ghc-base-prelude))) + (inputs + `(("ghc-tuple-th" ,ghc-tuple-th) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-base-prelude" ,ghc-base-prelude) + ("ghc-semigroups" ,ghc-semigroups))) (home-page "https://github.com/nikita-volkov/contravariant-extras") (synopsis "Extras for the @code{ghc-contravariant} Haskell package") (description "This Haskell package provides extras for the -- cgit v1.2.3 From 722d3bd80b3c740e4b3244b61ced62dc33eb1e81 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:03:10 -0400 Subject: gnu: ghc-hmatrix-special: Update to 0.19.0.0. * gnu/packages/haskell.scm (ghc-hmatrix-special): Update to 0.19.0.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a8a90f919d..d621c00840 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7764,7 +7764,7 @@ using GSL.") (define-public ghc-hmatrix-special (package (name "ghc-hmatrix-special") - (version "0.4.0.1") + (version "0.19.0.0") (source (origin (method url-fetch) @@ -7773,7 +7773,7 @@ using GSL.") "https://hackage.haskell.org/package/hmatrix-special/hmatrix-special-" version ".tar.gz")) (sha256 - (base32 "0kpcqdchi7ikzhqacy4rh4dxz3v37paxyb84wqa66sysb72wkabj")))) + (base32 "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz")))) (build-system haskell-build-system) (inputs `(("ghc-hmatrix" ,ghc-hmatrix) -- cgit v1.2.3 From 665615e93beb0c1825b7e37bfbd265ca32d5f8a4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:16:12 -0400 Subject: gnu: ghc-tasty-expected-failure: Update to 0.11.1.1. * gnu/packages/haskell-check.scm (ghc-tasty-expected-failure): Update to 0.11.1.1. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 913835a807..561cf0402f 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -312,7 +312,7 @@ been added since previous test run.") (define-public ghc-tasty-expected-failure (package (name "ghc-tasty-expected-failure") - (version "0.11.0.4") + (version "0.11.1.1") (source (origin (method url-fetch) @@ -321,7 +321,7 @@ been added since previous test run.") version ".tar.gz")) (sha256 (base32 - "0r555f18d2gj96pjyc13chn1nxaxl81am4xgip3mvvjhw8s5mva1")))) + "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji")))) (build-system haskell-build-system) (inputs `(("ghc-tagged" ,ghc-tagged) -- cgit v1.2.3 From 58182daa3f284922893c7b5574b74e9cd40b0831 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:16:30 -0400 Subject: gnu: ghc-tasty-hunit: Update to 0.10.0.1. * gnu/packages/haskell-check.scm (ghc-tasty-hunit): Update to 0.10.0.1. [inputs]: Add ghc-call-stack. --- gnu/packages/haskell-check.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 561cf0402f..232975e6b4 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -213,7 +213,7 @@ and any other types of tests into a single test suite.") (define-public ghc-tasty-hunit (package (name "ghc-tasty-hunit") - (version "0.9.2") + (version "0.10.0.1") (source (origin (method url-fetch) @@ -223,10 +223,11 @@ and any other types of tests into a single test suite.") ".tar.gz")) (sha256 (base32 - "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf")))) + "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g")))) (build-system haskell-build-system) (inputs - `(("ghc-tasty" ,ghc-tasty))) + `(("ghc-call-stack" ,ghc-call-stack-boot) + ("ghc-tasty" ,ghc-tasty))) (home-page "http://documentup.com/feuerbach/tasty") (synopsis "HUnit support for the Tasty test framework") (description "This package provides HUnit support for the Tasty Haskell -- cgit v1.2.3 From 59a50276043d2054eb7f74a64a4e5cc8b8f1157e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:25:50 -0400 Subject: gnu: ghc-tasty-quickcheck: Update to 0.10. * gnu/packages/haskell-check.scm (ghc-tasty-quickcheck): Update to 0.10. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 232975e6b4..0ab0b9a61d 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -96,7 +96,7 @@ Haskell test framework.") (define-public ghc-tasty-quickcheck (package (name "ghc-tasty-quickcheck") - (version "0.8.4") + (version "0.10") (source (origin (method url-fetch) @@ -105,7 +105,7 @@ Haskell test framework.") "tasty-quickcheck-" version ".tar.gz")) (sha256 (base32 - "15rjxib5jmjq0hzj47x15kgp3awc73va4cy1pmpf7k3hvfv4qprn")))) + "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From c70f00e203e913226c08c5bba4bc2b9c57571117 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:31:40 -0400 Subject: gnu: ghc-blaze-markup: Update to 0.8.2.1. * gnu/packages/haskell.scm (ghc-blaze-markup): Update to 0.8.2.1. [arguments]: Add a phase that patches the Cabal file to allow newer versions of tasty. --- gnu/packages/haskell.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d621c00840..92703ee668 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4284,7 +4284,7 @@ interoperate with code that uses the new implementation.") (define-public ghc-blaze-markup (package (name "ghc-blaze-markup") - (version "0.8.2.0") + (version "0.8.2.1") (source (origin (method url-fetch) @@ -4293,8 +4293,16 @@ interoperate with code that uses the new implementation.") version ".tar.gz")) (sha256 (base32 - "0m3h3ryxj5r74mv5g5dnfq5jbbwmvkl7ray18vi20d5vd93sydj4")))) + "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "blaze-markup.cabal" + (("tasty >= 1\\.0 && < 1\\.1") + "tasty >= 1.0 && < 1.2"))))))) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 083c9c73757c97afc1e3cdbeb200c2ab1dc33547 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:32:33 -0400 Subject: gnu: ghc-cookie: Update to 0.4.4. * gnu/packages/haskell-web.scm (ghc-cookie): Update to 0.4.4. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index bb4f419e66..72defb3446 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -64,7 +64,7 @@ for screen-scraping.") (define-public ghc-cookie (package (name "ghc-cookie") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) @@ -74,7 +74,7 @@ for screen-scraping.") ".tar.gz")) (sha256 (base32 - "0qpdydhb9gw590ffabqg70x7xvjpg8l74idqnrfbhv5yrr7hryzv")))) + "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) -- cgit v1.2.3 From 6ef7c05c8d9bb9f77cd1d4145d85c938899e114f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:06:10 -0400 Subject: gnu: ghc-cryptohash-md5: Update Cabal file to r2. * gnu/packages/haskell-crypto.scm (ghc-cryptohash-md5): Update Cabal file to r2. --- gnu/packages/haskell-crypto.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index f27d7dc23a..b1db19bdeb 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -210,7 +210,9 @@ that hides the C implementation.") "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi")))) (build-system haskell-build-system) (arguments - `(#:tests? #f)) ; tests require old version of ghc-hunit (0.9) + `(#:cabal-revision + ("2" "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a") + #:tests? #f)) ; tests require old version of ghc-hunit (0.9) (native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring) ("ghc-puremd5" ,ghc-puremd5) ("ghc-tasty" ,ghc-tasty) -- cgit v1.2.3 From f89bf67491d62755a9777c71c453e3b308ab8220 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:07:32 -0400 Subject: gnu: ghc-cryptohash-sha1: Update Cabal file to r2. * gnu/packages/haskell-crypto.scm (ghc-cryptohash-sha1): Update Cabal file to r2. --- gnu/packages/haskell-crypto.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index b1db19bdeb..87e6cd3c15 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -238,7 +238,9 @@ that hides the C implementation.") "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w")))) (build-system haskell-build-system) (arguments - `(#:tests? #f)) ; tests require old version of ghc-hunit (0.9) + `(#:cabal-revision + ("2" "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m") + #:tests? #f)) ; tests require old version of ghc-hunit (0.9) (native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring) ("ghc-sha" ,ghc-sha) ("ghc-tasty" ,ghc-tasty) -- cgit v1.2.3 From bef2ee1c588ad6f207f84e1a43e2ade2c4839bce Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:34:20 -0400 Subject: gnu: ghc-hourglass: Update to 0.2.12. * gnu/packages/haskell.scm (ghc-hourglass): Update to 0.2.12. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 92703ee668..5875e9b02e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6214,14 +6214,14 @@ wrapping a bytestring with stronger and more meaniful name.") (define-public ghc-hourglass (package (name "ghc-hourglass") - (version "0.2.10") + (version "0.2.12") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "hourglass/hourglass-" version ".tar.gz")) (sha256 (base32 - "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym")))) + "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale))) -- cgit v1.2.3 From 6b05cfb4e47c28d3432d01d58ae4157d816d9d67 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 5 Sep 2018 14:55:56 -0400 Subject: gnu: ghc-integer-logarithms: Replace "--allow-newer" flag. * gnu/packages/haskell.scm (ghc-integer-logarithms)[arguments]: Replace "--allow-newer" configure flag with a phase that patches the Cabal file. --- gnu/packages/haskell.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5875e9b02e..9dbeae194c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5227,7 +5227,13 @@ occurrences of a substring (the first in case of overlaps) with another.") "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=tasty"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "integer-logarithms.cabal" + (("tasty >= 0\\.10 && < 1\\.1") + "tasty >= 0.10 && < 1.2"))))))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-smallcheck" ,ghc-smallcheck) -- cgit v1.2.3 From 221c3563162926a44be20ba3899d4f8b7601b3c9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:34:59 -0400 Subject: gnu: ghc-tar: Update to 0.5.1.0. * gnu/packages/haskell.scm (ghc-tar): Update to 0.5.1.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9dbeae194c..fdc77c3d95 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7091,7 +7091,7 @@ this problem.") (define-public ghc-tar (package (name "ghc-tar") - (version "0.5.0.3") + (version "0.5.1.0") (source (origin (method url-fetch) @@ -7100,7 +7100,7 @@ this problem.") version ".tar.gz")) (sha256 (base32 - "18qq94j9bm91iswnxq2dm5dws5c7wm4k01q2rpf8py35cf3svnfq")))) + "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8")))) (build-system haskell-build-system) ;; FIXME: 2/24 tests fail. (arguments `(#:tests? #f)) -- cgit v1.2.3 From fe3ecc307f87d3f2d12dbeecbd180c68ab16d483 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 15:18:15 -0400 Subject: gnu: ghc-uuid-types: Relax test framework dependency constraints. * gnu/packages/haskell.scm (ghc-uuid-types)[arguments]: Remove "--allow-newer" configure flags and add a phase that removes dependency version constraints from all of the test frameworks. --- gnu/packages/haskell.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fdc77c3d95..a5f1628854 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9034,8 +9034,16 @@ IPv4, IPv6 and MAC addresses.") "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'strip-test-framework-constraints + (lambda _ + (substitute* "uuid-types.cabal" + (("HUnit >=1\\.2 && < 1\\.4") "HUnit") + (("QuickCheck >=2\\.4 && < 2\\.9") "QuickCheck") + (("tasty >= 0\\.10 && < 0\\.12") "tasty") + (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") + (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) (inputs `(("ghc-hashable" ,ghc-hashable) ("ghc-random" ,ghc-random) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 4f2f0eb02f1e5435846e8437e47d754af79b6b6c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 20:51:46 -0400 Subject: gnu: ghc-vector-binary-instances: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-vector-binary-instances): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a5f1628854..9a5632c47d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3889,6 +3889,9 @@ optimisation framework.") (base32 "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i"))) (inputs `(("ghc-vector" ,ghc-vector))) (native-inputs -- cgit v1.2.3 From b8afa2da58bb04ea5ac021547601e956341f814e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:39:02 -0400 Subject: gnu: ghc-blaze-html: Update to 0.9.1.1. * gnu/packages/haskell-web.scm (ghc-blaze-html): Update to 0.9.1.1. [arguments]: Remove unneeded "--allow-newer" configure flags. --- gnu/packages/haskell-web.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 72defb3446..a60bf007af 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -754,7 +754,7 @@ Strict, Transitional and Frameset variants.") (define-public ghc-blaze-html (package (name "ghc-blaze-html") - (version "0.9.0.1") + (version "0.9.1.1") (source (origin (method url-fetch) @@ -763,11 +763,8 @@ Strict, Transitional and Frameset variants.") version ".tar.gz")) (sha256 (base32 - "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf")))) + "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-text" ,ghc-text) -- cgit v1.2.3 From 3a066eb5ee852338d7de1d37ddc524df92efe2a2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:40:01 -0400 Subject: gnu: ghc-extra: Update to 1.6.9. * gnu/packages/haskell.scm (ghc-extra): Update to 1.6.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9a5632c47d..9f2b6f2bef 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3062,7 +3062,7 @@ Strings.") (define-public ghc-extra (package (name "ghc-extra") - (version "1.6.3") + (version "1.6.9") (source (origin (method url-fetch) @@ -3072,7 +3072,7 @@ Strings.") ".tar.gz")) (sha256 (base32 - "06ds0jlx6sljwdf63l154qbzia9mnsri79i9qm3xikky3nj9ia1m")))) + "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b")))) (build-system haskell-build-system) (inputs `(("ghc-clock" ,ghc-clock) -- cgit v1.2.3 From 9720cca2e53e1c3310d91a465084269c84e90f7c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:59:18 -0400 Subject: gnu: ghc-pem: Update to 0.2.4. * gnu/packages/haskell-crypto.scm (ghc-pem): Update to 0.2.4. [inputs]: Remove ghc-base64-bytestring; add ghc-basement and ghc-memory. --- gnu/packages/haskell-crypto.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 87e6cd3c15..bb0ee074c2 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -338,17 +338,18 @@ to obtain cryptographically strong entropy.") (define-public ghc-pem (package (name "ghc-pem") - (version "0.2.2") + (version "0.2.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "pem/pem-" version ".tar.gz")) (sha256 (base32 - "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p")))) + "1m7qjsxrd8m88cvkqmr8kscril500j2a9y0iynvksjyjkhdlq33p")))) (build-system haskell-build-system) (inputs - `(("ghc-base64-bytestring" ,ghc-base64-bytestring))) + `(("ghc-basement" ,ghc-basement) + ("ghc-memory" ,ghc-memory))) (native-inputs `(("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) -- cgit v1.2.3 From 4828f040df32b2fef214034d3eddce94052f760e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:41:46 -0400 Subject: gnu: ghc-securemem: Update to 0.1.10. * gnu/packages/haskell.scm (ghc-securemem): Update to 0.1.10. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9f2b6f2bef..5d5815a8d4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9535,7 +9535,7 @@ interpolates variables according to the type being inserted.") (define-public ghc-securemem (package (name "ghc-securemem") - (version "0.1.9") + (version "0.1.10") (source (origin (method url-fetch) @@ -9544,7 +9544,7 @@ interpolates variables according to the type being inserted.") "securemem-" version ".tar.gz")) (sha256 (base32 - "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy")))) + "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j")))) (build-system haskell-build-system) (inputs `(("ghc-byteable" ,ghc-byteable) ("ghc-memory" ,ghc-memory))) -- cgit v1.2.3 From a11ce10666aa19f6be3c4d261812866163ed97f2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 16:07:50 -0400 Subject: gnu: ghc-uuid: Update Cabal file to r2 and relax dependencies. * gnu/packages/haskell.scm (ghc-uuid): Update Cabal file to r2. [arguments]: Add a phase to remove test framework dependency version constraints. --- gnu/packages/haskell.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5d5815a8d4..da29e156ec 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9078,8 +9078,18 @@ functions.") "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) + `(#:cabal-revision + ("2" "0m185q62jkfb5jsv358nxbnrkv8y8hd0qqvgvh22wvc5g9ipz0r9") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'strip-test-framework-constraints + (lambda _ + (substitute* "uuid.cabal" + (("HUnit >= 1\\.2 && < 1\\.4") "HUnit") + (("QuickCheck >= 2\\.4 && < 2\\.10") "QuickCheck") + (("tasty >= 0\\.10 && < 0\\.12") "tasty") + (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") + (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) (inputs `(("ghc-cryptohash-sha1" ,ghc-cryptohash-sha1) ("ghc-cryptohash-md5" ,ghc-cryptohash-md5) ("ghc-entropy" ,ghc-entropy) -- cgit v1.2.3 From a98973651ed8bafdeadfacf376b9a71254e0ea8e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:45:22 -0400 Subject: gnu: ghc-highlighting-kate: Update to 0.6.4. * gnu/packages/haskell.scm (ghc-highlighting-kate): Update to 0.6.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index da29e156ec..007bcf0836 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5539,7 +5539,7 @@ and utilities for pretty printing.") (define-public ghc-highlighting-kate (package (name "ghc-highlighting-kate") - (version "0.6.3") + (version "0.6.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5547,7 +5547,7 @@ and utilities for pretty printing.") version ".tar.gz")) (sha256 (base32 - "03c4flh4h1jd48bx0qmplax3q8w6wj1dhbh6j0xhaf5h95fbinki")))) + "1bqv00gfmrsf0jjr4qf3lhshvfkyzmhbi3pjb6mafbnsyn2k7f6q")))) (build-system haskell-build-system) (inputs `(("ghc-diff" ,ghc-diff) -- cgit v1.2.3 From 19533b321695356cf892e79afde4c428306426a2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:46:25 -0400 Subject: gnu: ghc-base-orphans: Update to 0.7. * gnu/packages/haskell.scm (ghc-base-orphans): Update to 0.7. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 007bcf0836..0b59d3c071 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4428,7 +4428,7 @@ command line options in Haskell.") (define-public ghc-base-orphans (package (name "ghc-base-orphans") - (version "0.6") + (version "0.7") (source (origin (method url-fetch) @@ -4438,7 +4438,7 @@ command line options in Haskell.") ".tar.gz")) (sha256 (base32 - "03mdww5j0gwai7aqlx3m71ldmjcr99jzpkcclzjfclk6a6kjla67")))) + "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 3ff7232ae724a82a774680fa05598685181dec97 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:00:35 -0400 Subject: gnu: ghc-constraints: Update to 0.10.1. * gnu/packages/haskell.scm (ghc-constraints): Update to 0.10.1. [inputs]: Add ghc-semigroups. [native-inputs]: Add ghc-hspec and ghc-hspec-discover. --- gnu/packages/haskell.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0b59d3c071..9bb81cda6d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7343,7 +7343,7 @@ and edge labels with positional information, etc. (define-public ghc-constraints (package (name "ghc-constraints") - (version "0.8") + (version "0.10.1") (source (origin (method url-fetch) @@ -7352,11 +7352,15 @@ and edge labels with positional information, etc. version ".tar.gz")) (sha256 (base32 - "120mmv9rwbahslisc1z8zx9lw7v6hl5fzid4l0hiy5as6ijqgl2c")))) + "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q")))) (build-system haskell-build-system) (inputs `(("ghc-hashable" ,ghc-hashable) + ("ghc-semigroups" ,ghc-semigroups) ("ghc-transformers-compat" ,ghc-transformers-compat))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/ekmett/constraints/") (synopsis "Constraint manipulation") (description -- cgit v1.2.3 From 98993f605b3562f4b9df5061da37df4e75a1c4fe Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 21:03:38 -0400 Subject: gnu: ghc-fgl: Replace "--allow-newer" flags. * gnu/packages/haskell.scm (ghc-fgl)[arguments]: Replace "--allow-newer" configure flags with a phase that patches the Cabal file. --- gnu/packages/haskell.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9bb81cda6d..4ddd6dc47c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3525,8 +3525,15 @@ variety of traversals.") "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=hspec"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "fgl.cabal" + (("QuickCheck >= 2\\.8 && < 2\\.10") + "QuickCheck >= 2.8 && < 2.12") + (("hspec >= 2\\.1 && < 2\\.5") + "hspec >= 2.1 && < 2.6"))))))) (inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) -- cgit v1.2.3 From b408c5a768345907f69772e42a75d7e4ecaa97c0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:49:02 -0400 Subject: gnu: ghc-generic-deriving: Update to 1.12.2. * gnu/packages/haskell.scm (ghc-generic-deriving): Update to 1.12.2. [inputs]: Add ghc-th-abstraction. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4ddd6dc47c..b942d2d4ce 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3190,7 +3190,7 @@ exceptions.") (define-public ghc-generic-deriving (package (name "ghc-generic-deriving") - (version "1.11.1") + (version "1.12.2") (source (origin (method url-fetch) @@ -3200,8 +3200,10 @@ exceptions.") ".tar.gz")) (sha256 (base32 - "1sdh5hpcwvh3b6zvgfk3pr3hla8p88l82njnih880c0gk5zl53dk")))) + "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n")))) (build-system haskell-build-system) + (inputs + `(("ghc-th-abstraction" ,ghc-th-abstraction))) (native-inputs `(("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) -- cgit v1.2.3 From 16b4b6d1b93cefc565500ff35cac434a9dda21bb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 20:35:11 -0400 Subject: gnu: ghc-half: Update to 0.3. * gnu/packages/haskell.scm (ghc-half): Update to 0.3. [native-inputs]: Add ghc-hspec and ghc-quickcheck. --- gnu/packages/haskell.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b942d2d4ce..6327b4fe84 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1447,7 +1447,7 @@ PNG, PNM, TGA, TIFF, XCF, XPM, XV.") (define-public ghc-half (package (name "ghc-half") - (version "0.2.2.3") + (version "0.3") (source (origin (method url-fetch) @@ -1456,8 +1456,11 @@ PNG, PNM, TGA, TIFF, XCF, XPM, XV.") version ".tar.gz")) (sha256 (base32 - "0p4sb7vv9cljv48wlx65wgdnkryrk5d6yfh7g4yrm20w1p449hl5")))) + "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ekmett/half") (synopsis "Half-precision floating-point computations") (description "This library provides a half-precision floating-point -- cgit v1.2.3 From 1cf4f2729f05872eb3d7a2eade1bde5120e502f8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:49:28 -0400 Subject: gnu: ghc-logging-facade: Update to 0.3.0. * gnu/packages/haskell.scm (ghc-logging-facade): Update to 0.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6327b4fe84..3a607bfb4e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5975,7 +5975,7 @@ space as enumerator/iteratee and pipes.") (define-public ghc-logging-facade (package (name "ghc-logging-facade") - (version "0.1.1") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5983,7 +5983,7 @@ space as enumerator/iteratee and pipes.") version ".tar.gz")) (sha256 (base32 - "18ldv6rsff480rqpbs3iabjpvn1fhw0i2a0g80jnhxg9ajfz5yb0")))) + "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) -- cgit v1.2.3 From 073f5ae1fe78de76c46659e4c938f1b8ef84652a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 00:00:06 -0400 Subject: gnu: Add ghc-newtype-generics. * gnu/packages/haskell.scm (ghc-newtype-generics): New variable. --- gnu/packages/haskell.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3a607bfb4e..5c49e9074a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -823,6 +823,32 @@ code pages on Windows. On all other operating systems, the library does nothing.") (license license:bsd-3))) +(define-public ghc-newtype-generics + (package + (name "ghc-newtype-generics") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "newtype-generics/newtype-generics-" + version ".tar.gz")) + (sha256 + (base32 + "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "http://github.com/sjakobi/newtype-generics") + (synopsis "Typeclass and set of functions for working with newtypes") + (description "The @code{Newtype} typeclass represents the packing and +unpacking of a newtype, and allows you to operate under that newtype with +functions such as @code{ala}. Generics support was added in version 0.4, +making this package a full replacement for the original newtype package, +and an alternative to newtype-th.") + (license license:bsd-3))) + (define-public ghc-haddock-library (package (name "ghc-haddock-library") -- cgit v1.2.3 From 96d214a6d9d0585589432de4e2a77523c4590743 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:50:33 -0400 Subject: gnu: ghc-unliftio: Update to 0.2.7.0. * gnu/packages/haskell.scm (ghc-unliftio): Update to 0.2.7.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5c49e9074a..7b187899ac 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9936,7 +9936,7 @@ used both from lens and microlens).") (define-public ghc-unliftio (package (name "ghc-unliftio") - (version "0.2.4.0") + (version "0.2.7.0") (source (origin (method url-fetch) @@ -9946,7 +9946,7 @@ used both from lens and microlens).") ".tar.gz")) (sha256 (base32 - "0vpncmwaq5zb6bziqfns4qdgxmq8ky0rlxna2yngxp170s5zxx9z")))) + "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH (inputs -- cgit v1.2.3 From f9a97fb553fc26f2ea443f7e425b39fea51e47cd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:00:43 -0400 Subject: gnu: ghc-doctest: Update to 0.16.0. * gnu/packages/haskell.scm (ghc-doctest): Update to 0.16.0. [inputs]: Add ghc-code-page. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7b187899ac..75ba7f7993 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5115,7 +5115,7 @@ monad transformer (instead of the IO monad).") (define-public ghc-doctest (package (name "ghc-doctest") - (version "0.11.0") + (version "0.16.0") (source (origin (method url-fetch) @@ -5125,13 +5125,14 @@ monad transformer (instead of the IO monad).") ".tar.gz")) (sha256 (base32 - "0xv4vx1r3mk7cmiwywzrq25545cx3i7imhcx33mk47r88j5c49fj")))) + "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: missing test framework (inputs `(("ghc-syb" ,ghc-syb) ("ghc-paths" ,ghc-paths) ("ghc-base-compat" ,ghc-base-compat) + ("ghc-code-page" ,ghc-code-page) ("ghc-hunit" ,ghc-hunit) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 11afd13d70389abeadb274639ddfe1166c8ff4b6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 22:40:43 -0400 Subject: gnu: ghc-fgl-arbitrary: Replace "--allow-newer" flags. * gnu/packages/haskell.scm (ghc-fgl-arbitrary)[arguments]: Replace "--allow-newer" configure flags with a phase that patches the Cabal file. --- gnu/packages/haskell.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 75ba7f7993..76e2d22001 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7316,8 +7316,15 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") "0ln1szgfy8fa78l3issq4fx3aqnnd54w3cb4wssrfi48vd5rkfjm")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=hspec"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "fgl-arbitrary.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.10") + "QuickCheck >= 2.3 && < 2.12") + (("hspec >= 2\\.1 && < 2\\.5") + "hspec >= 2.1 && < 2.6"))))))) (inputs `(("ghc-fgl" ,ghc-fgl) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From cd40c4d6c360ce52aaf006cb1b0f9190cb5e4d14 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 14:20:06 -0400 Subject: gnu: Add ghc-memotrie. * gnu/packages/haskell.scm (ghc-memotrie): New variable. --- gnu/packages/haskell.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 76e2d22001..1ae8eb993a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -849,6 +849,29 @@ making this package a full replacement for the original newtype package, and an alternative to newtype-th.") (license license:bsd-3))) +(define-public ghc-memotrie + (package + (name "ghc-memotrie") + (version "0.6.9") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/MemoTrie/MemoTrie-" + version + ".tar.gz")) + (sha256 + (base32 + "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x")))) + (build-system haskell-build-system) + (inputs + `(("ghc-newtype-generics" ,ghc-newtype-generics))) + (home-page "https://github.com/conal/MemoTrie") + (synopsis "Trie-based memo functions") + (description "This package provides a functional library for creating +efficient memo functions using tries.") + (license license:bsd-3))) + (define-public ghc-haddock-library (package (name "ghc-haddock-library") -- cgit v1.2.3 From 1aacec9e3d4294d3dadd153170878a9a4748ca24 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:14:17 -0400 Subject: gnu: ghc-openglraw: Update to 3.3.1.0. * gnu/packages/haskell.scm (ghc-openglraw): Update to 3.3.1.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1ae8eb993a..70847aec1f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1539,7 +1539,7 @@ arithmetic.") (define-public ghc-openglraw (package (name "ghc-openglraw") - (version "3.2.7.0") + (version "3.3.1.0") (source (origin (method url-fetch) @@ -1549,7 +1549,7 @@ arithmetic.") ".tar.gz")) (sha256 (base32 - "024aln102d1mmsdalq9jd5mmwjbnrb8gxcak73lybrc7q87kswk2")))) + "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb")))) (build-system haskell-build-system) (inputs `(("ghc-half" ,ghc-half) -- cgit v1.2.3 From ded4ac387173cedbaf917479bdf763cffbb22e73 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:05:45 -0400 Subject: gnu: ghc-temporary: Update to 1.3. * gnu/packages/haskell.scm (ghc-temporary): Update to 1.3. [inputs]: Add ghc-random. [native-inputs]: Add ghc-base-compat, ghc-tasty, and ghc-tasty-hunit. --- gnu/packages/haskell.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 70847aec1f..dfe3756649 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3399,7 +3399,7 @@ for Haskell.") (define-public ghc-temporary (package (name "ghc-temporary") - (version "1.2.0.4") + (version "1.3") (source (origin (method url-fetch) @@ -3409,9 +3409,15 @@ for Haskell.") ".tar.gz")) (sha256 (base32 - "0qk741yqnpd69sksgks2vb7zi50rglp9m498lzw4sh268a017rsi")))) + "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c")))) (build-system haskell-build-system) - (inputs `(("ghc-exceptions" ,ghc-exceptions))) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-random" ,ghc-random))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://www.github.com/batterseapower/temporary") (synopsis "Temporary file and directory support") (description "The functions for creating temporary files and directories -- cgit v1.2.3 From 7307a2f8a41fa11a56baa88ae22934572b1900f2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:21:12 -0400 Subject: gnu: ghc-th-orphans: Update to 0.13.6. * gnu/packages/haskell.scm (ghc-th-orphans): Update to 0.13.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index dfe3756649..8676948aa3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5893,14 +5893,14 @@ function which generates instances.") (define-public ghc-th-orphans (package (name "ghc-th-orphans") - (version "0.13.2") + (version "0.13.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "th-orphans/th-orphans-" version ".tar.gz")) (sha256 (base32 - "0102vkyzpgnp2fys8pvw4khrhrh2y1b8dp1slgvn020vg4s351mc")))) + "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp")))) (build-system haskell-build-system) (inputs `(("ghc-th-lift" ,ghc-th-lift) -- cgit v1.2.3 From bb7d443d85a3dfc8577ae14fc5d38315c61b233b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:21:43 -0400 Subject: gnu: ghc-x509: Update to 1.7.3. * gnu/packages/haskell-crypto.scm (ghc-x509): Update to 1.7.3. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index bb0ee074c2..cff678d724 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -423,14 +423,14 @@ libraries, like OpenSSL.") (define-public ghc-x509 (package (name "ghc-x509") - (version "1.6.4") + (version "1.7.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "x509/x509-" version ".tar.gz")) (sha256 (base32 - "0hixx76wpb4qxida017ka5zr6lrsycahrqyw8z90q9mxvndpy3my")))) + "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) -- cgit v1.2.3 From 68dc0c294a6090db2bac109c61b2308eeffb797e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 23:56:01 -0400 Subject: gnu: ghc-distributive: Update Cabal file to r6. * gnu/packages/haskell.scm (ghc-distributive): Update Cabal file to r6. [native-inputs]: Replace ghc-doctest-0.12 with ghc-doctest. --- gnu/packages/haskell.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8676948aa3..cac1fcddc3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2985,6 +2985,9 @@ modifying, and extracting files from zip archives in Haskell.") (base32 "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("6" "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"))) (inputs `(("ghc-tagged" ,ghc-tagged) ("ghc-base-orphans" ,ghc-base-orphans) @@ -2993,7 +2996,7 @@ modifying, and extracting files from zip archives in Haskell.") ("ghc-generic-deriving" ,ghc-generic-deriving))) (native-inputs `(("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest-0.12) + ("ghc-doctest" ,ghc-doctest) ("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/ekmett/distributive/") -- cgit v1.2.3 From 211b213367c7bafb0701e03c777c31902b9a8415 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:22:40 -0400 Subject: gnu: ghc-gluraw: Update to 2.0.0.4. * gnu/packages/haskell.scm (ghc-gluraw): Update to 2.0.0.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cac1fcddc3..911cdccfc0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1599,7 +1599,7 @@ programs.") (define-public ghc-gluraw (package (name "ghc-gluraw") - (version "2.0.0.2") + (version "2.0.0.4") (source (origin (method url-fetch) @@ -1609,7 +1609,7 @@ programs.") ".tar.gz")) (sha256 (base32 - "1phmvxr0kkxq89ykmr8rj77inj8dvcxd6h72z1ncdgdazfz3sjw8")))) + "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq")))) (build-system haskell-build-system) (inputs `(("ghc-openglraw" ,ghc-openglraw))) -- cgit v1.2.3 From f9f2877d54fdf72e0579bce6cfca87b8712144be Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:14:14 -0400 Subject: gnu: ghc-gnuplot: Update to 0.5.5.2. * gnu/packages/haskell.scm (ghc-gnuplot): Update to 0.5.5.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 911cdccfc0..df4ba82a30 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8019,7 +8019,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") (define-public ghc-gnuplot (package (name "ghc-gnuplot") - (version "0.5.4.1") + (version "0.5.5.2") (source (origin (method url-fetch) @@ -8027,7 +8027,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") "mirror://hackage/package/gnuplot/gnuplot-" version ".tar.gz")) (sha256 - (base32 "1xz8prw9xjk0rsyrkp9bsmxykzrbhpv9qhhkdapy75mdbmgwjm7s")))) + (base32 "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) -- cgit v1.2.3 From ad91386a277f7b084ce59c6e7f1c9f57ec5501e4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 22:30:50 -0400 Subject: gnu: ghc-graphviz: Remove unneeded configure flag. * gnu/packages/haskell.scm (ghc-graphviz)[arguments]: Remove unneeded "--allow-newer=QuickCheck" configure flag. --- gnu/packages/haskell.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index df4ba82a30..6198180194 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7382,8 +7382,6 @@ for generating graph-like data structures.") (base32 "0kj7ap0gnliviq2p8lscw1m06capnsa90vpvcys24nqy5nw2wrp7")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-colour" ,ghc-colour) -- cgit v1.2.3 From a15411176342ba58914d9119296ad6da7f7aa35b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:08:39 -0400 Subject: gnu: ghc-markdown-unlit: Update to 0.5.0. * gnu/packages/haskell.scm (ghc-markdown-unlit): Update to 0.5.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6198180194..d754ecdc1b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8165,7 +8165,7 @@ and a large set of GNU extensions.") (define-public ghc-markdown-unlit (package (name "ghc-markdown-unlit") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append @@ -8173,7 +8173,7 @@ and a large set of GNU extensions.") "markdown-unlit-" version ".tar.gz")) (sha256 (base32 - "1kj2bffl7ndd8ygwwa3r1mbpwbxbfhyfgnbla8k8g9i6ffp0qrbw")))) + "1gy79vr85vcp13rdjh0hz7zv6daqqffww4j0cqn2lpjjh9xhsbg7")))) (build-system haskell-build-system) (inputs `(("ghc-base-compat" ,ghc-base-compat) -- cgit v1.2.3 From b3cd1712a8acc59b1d7302627bb997912aad9a28 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:14:19 -0400 Subject: gnu: ghc-mockery: Update to 0.3.5. * gnu/packages/haskell.scm (ghc-mockery): Update to 0.3.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d754ecdc1b..9b906e1524 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6057,14 +6057,14 @@ back-ends.") (define-public ghc-mockery (package (name "ghc-mockery") - (version "0.3.3") + (version "0.3.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "mockery/mockery-" version ".tar.gz")) (sha256 (base32 - "1m7sq2vclgir3qbpngzl3g87ks4034blwwf7p3h02c0jlcwpl5b1")))) + "09ypgm3z69gq8mj6y66ss58kbjnk15r8frwcwbqcfbfksfnfv8dp")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) -- cgit v1.2.3 From 5a92fb411c0cac4032c885d977192f212daaa493 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:26:03 -0400 Subject: gnu: ghc-network: Update to 2.6.3.6. * gnu/packages/haskell.scm (ghc-network): Update to 2.6.3.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9b906e1524..935b126077 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4004,7 +4004,7 @@ interface.") (define-public ghc-network (package (name "ghc-network") - (version "2.6.3.1") + (version "2.6.3.6") (outputs '("out" "doc")) (source (origin @@ -4015,7 +4015,7 @@ interface.") ".tar.gz")) (sha256 (base32 - "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p")))) + "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv")))) (build-system haskell-build-system) ;; The regression tests depend on an unpublished module. (arguments `(#:tests? #f)) -- cgit v1.2.3 From 10ae734585c9f11fd0bd5353120d026d058e1950 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:50:16 -0400 Subject: gnu: ghc-typed-process: Update to 0.2.3.0. * gnu/packages/haskell.scm (ghc-typed-process): Update to 0.2.3.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 935b126077..d7b09065dd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6764,7 +6764,7 @@ better for some purposes.") (define-public ghc-typed-process (package (name "ghc-typed-process") - (version "0.2.2.0") + (version "0.2.3.0") (source (origin (method url-fetch) @@ -6773,7 +6773,7 @@ better for some purposes.") version ".tar.gz")) (sha256 (base32 - "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2")))) + "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) -- cgit v1.2.3 From 0618a71b1e5d0e5d79b440509791c49740a43f38 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:50:55 -0400 Subject: gnu: ghc-wave: Update to 0.1.5. * gnu/packages/haskell.scm (ghc-wave): Update to 0.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d7b09065dd..b804117d84 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8223,7 +8223,7 @@ Rust syntax. It is intended to be useful for two different purposes: (define-public ghc-wave (package (name "ghc-wave") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (string-append @@ -8232,7 +8232,7 @@ Rust syntax. It is intended to be useful for two different purposes: ".tar.gz")) (sha256 (base32 - "1g5nmqfk6p25v9ismwz4i66ay91bd1qh39xwj0hm4z6a5mw8frk8")))) + "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) -- cgit v1.2.3 From 245a2555bcdd551cc6e0fe8fde6ccffa1248f741 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:26:37 -0400 Subject: gnu: ghc-x509-store: Update to 1.6.6. * gnu/packages/haskell-crypto.scm (ghc-x509-store): Update to 1.6.6. [native-inputs]: Add ghc-tasty and ghc-tasty-hunit. --- gnu/packages/haskell-crypto.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index cff678d724..9903555e6b 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -452,7 +452,7 @@ libraries, like OpenSSL.") (define-public ghc-x509-store (package (name "ghc-x509-store") - (version "1.6.2") + (version "1.6.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -460,7 +460,7 @@ libraries, like OpenSSL.") version ".tar.gz")) (sha256 (base32 - "0yw09nwkvr324qz4sc27c0p28bz2h6gns6lkaz9mz92mgqf2dza9")))) + "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va")))) (build-system haskell-build-system) (inputs `(("ghc-pem" ,ghc-pem) @@ -468,6 +468,9 @@ libraries, like OpenSSL.") ("ghc-asn1-encoding" ,ghc-asn1-encoding) ("ghc-cryptonite" ,ghc-cryptonite) ("ghc-x509" ,ghc-x509))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://github.com/vincenthz/hs-certificate") (synopsis "X.509 collection accessing and storing methods") (description -- cgit v1.2.3 From 74f490ec0b1fab0d5df54a5b5b79b9f511197aa5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:21:18 -0400 Subject: gnu: ghc-zip-archive: Update to 0.3.3. * gnu/packages/haskell.scm (ghc-zip-archive): Update to 0.3.3. [inputs]: Remove ghc-old-time and zip. [native-inputs]: Add unzip. --- gnu/packages/haskell.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b804117d84..7c5fef6c9b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2943,7 +2943,7 @@ complicated text/binary file formats.") (define-public ghc-zip-archive (package (name "ghc-zip-archive") - (version "0.3.0.5") + (version "0.3.3") (source (origin (method url-fetch) @@ -2953,17 +2953,16 @@ complicated text/binary file formats.") ".tar.gz")) (sha256 (base32 - "1iwpzjck4jg9bz1yqky051i2wljsqc14q5zbi10dydfp8ip3d0yw")))) + "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq")))) (build-system haskell-build-system) (inputs - `(("ghc-old-time" ,ghc-old-time) - ("ghc-digest" ,ghc-digest) - ("zip" ,zip) + `(("ghc-digest" ,ghc-digest) ("ghc-temporary" ,ghc-temporary) ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs - `(("ghc-hunit" ,ghc-hunit))) + `(("ghc-hunit" ,ghc-hunit) + ("unzip" ,unzip))) (home-page "https://hackage.haskell.org/package/zip-archive") (synopsis "Zip archive library for Haskell") (description "The zip-archive library provides functions for creating, -- cgit v1.2.3 From 0f9e74e9f7bef9157c7869cd9cb6ed50a8364e2d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 30 Aug 2018 11:39:41 -0400 Subject: gnu: ghc-attoparsec: Enable tests and allow newer QuickCheck. * gnu/packages/haskell.scm (ghc-attoparsec)[arguments]: Enable tests and add a phase that patches the Cabal file to allow a newer QuickCheck and removes a failing test. --- gnu/packages/haskell.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7c5fef6c9b..5c1bb6f309 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2909,10 +2909,19 @@ with slicing and Clang-style colored diagnostics.") (base32 "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx")))) (build-system haskell-build-system) - ;; FIXME: at least on test fails with QuickCheck > 2.9.2. Once upstream - ;; has updated the tests to work with a later version of QuickCheck we can - ;; re-enable them. - (arguments `(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-for-newer-quickcheck + (lambda _ + (substitute* "attoparsec.cabal" + (("QuickCheck >= 2\\.7 && < 2\\.10") + "QuickCheck >= 2.7 && < 2.12")) + ;; This test fails because of the newer QuickCheck: + ;; . + (substitute* "tests/QC/ByteString.hs" + ((", testProperty \"satisfyWith\" satisfyWith") + ""))))))) (inputs `(("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 40a8d0762f7f872696cf23d5111fbecb28dbdd5f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:27:32 -0400 Subject: gnu: ghc-bytes: Update to 0.15.5. * gnu/packages/haskell.scm (ghc-bytes): Update to 0.15.5. [inputs]: Replace ghc-doctest-0.13 with ghc-doctest. --- gnu/packages/haskell.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5c1bb6f309..d2db25c019 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10092,7 +10092,7 @@ address string against RFC 5322.") (define-public ghc-bytes (package (name "ghc-bytes") - (version "0.15.4") + (version "0.15.5") (source (origin (method url-fetch) @@ -10103,11 +10103,11 @@ address string against RFC 5322.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "121x3iqlm8pghw8cd9g30cnqbl7jrdpfjxdanmqdqllajw6xivrm")))) + "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) ("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest-0.13) + ("ghc-doctest" ,ghc-doctest) ("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) -- cgit v1.2.3 From c2828c8149ee06577c861f21acfcf4418bd711f8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:29:10 -0400 Subject: gnu: ghc-comonad: Update to 5.0.4. * gnu/packages/haskell.scm (ghc-comonad): Update to 5.0.4. [native-inputs]: Add cabal-doctest and ghc-doctest. --- gnu/packages/haskell.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d2db25c019..0e883d1ff3 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3043,7 +3043,7 @@ parser isolation, and labeled blocks for better error messages.") (define-public ghc-comonad (package (name "ghc-comonad") - (version "5") + (version "5.0.4") (source (origin (method url-fetch) @@ -3053,10 +3053,11 @@ parser isolation, and labeled blocks for better error messages.") ".tar.gz")) (sha256 (base32 - "0anb36m9z52y9xsipxzj9w1b41b2rj8r389cxd6d20dplnfv3rbq")))) + "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q")))) (build-system haskell-build-system) (native-inputs - `(("ghc-doctest" ,ghc-doctest))) + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest))) (inputs `(("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) -- cgit v1.2.3 From 14b0ade66fac4d8f9945f14c2031bd41352139b5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:33:24 -0400 Subject: gnu: ghc-haskell-src-exts: Update to 1.20.2. * gnu/packages/haskell.scm (ghc-haskell-src-exts): Update to 1.20.2. [inputs]: Replace ghc-pretty-show-for-haskell-src-exts with ghc-pretty-show. (ghc-pretty-show-for-haskell-src-exts): Remove. --- gnu/packages/haskell.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0e883d1ff3..5772e6a4a4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1223,23 +1223,10 @@ complex generic values into an interactive Html page, for easier examination.") (license license:expat))) -(define-public ghc-pretty-show-for-haskell-src-exts - (package (inherit ghc-pretty-show) - (name "ghc-pretty-show") - (version "1.6.10") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/pretty-show/" - "pretty-show-" version ".tar.gz")) - (sha256 - (base32 - "133s4l1gk46saf6ycm785rswycy8g3j0qqrv93b5wp8cp50kd0ww")))))) - (define-public ghc-haskell-src-exts (package (name "ghc-haskell-src-exts") - (version "1.20.1") + (version "1.20.2") (source (origin (method url-fetch) @@ -1249,12 +1236,12 @@ examination.") ".tar.gz")) (sha256 (base32 - "1jsjl9hja2dpcfq4mzlfpwyr6axwnwgacfb7aa070kz4lbygzaa8")))) + "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) ("ghc-happy" ,ghc-happy) - ("ghc-pretty-show" ,ghc-pretty-show-for-haskell-src-exts))) + ("ghc-pretty-show" ,ghc-pretty-show))) (native-inputs `(("ghc-smallcheck" ,ghc-smallcheck) ("ghc-tasty" ,ghc-tasty) -- cgit v1.2.3 From b9a6398692b78db8ce6038ffcba534c0d4b77e97 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:31:42 -0400 Subject: gnu: ghc-iproute: Update to 1.7.5. * gnu/packages/haskell.scm (ghc-iproute): Update to 1.7.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5772e6a4a4..fa57aebe66 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2583,7 +2583,7 @@ lines continued at an indented level below.") (define-public ghc-iproute (package (name "ghc-iproute") - (version "1.7.1") + (version "1.7.5") (source (origin (method url-fetch) @@ -2593,7 +2593,7 @@ lines continued at an indented level below.") ".tar.gz")) (sha256 (base32 - "1viyxq3m1aifl05w0hxwrhhhcfpmvwz4ymil2gngi4nfm0yd1f2p")))) + "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find System.ByteOrder, ; exported by ghc-byteorder. Doctest issue. -- cgit v1.2.3 From 81caf9488546f438c7d6397959e827f6af9273cb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:32:07 -0400 Subject: gnu: ghc-megaparsec: Update to 6.5.0. * gnu/packages/haskell.scm (ghc-megaparsec): Update to 6.5.0. [arguments]: Update Cabal file to r4. --- gnu/packages/haskell.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fa57aebe66..142c96f63c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3873,7 +3873,7 @@ combinators.") (define-public ghc-megaparsec (package (name "ghc-megaparsec") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) @@ -3882,8 +3882,11 @@ combinators.") version ".tar.gz")) (sha256 (base32 - "0h9azhs0dfrc359vrbd1jljrg3yfdbwd4p62cxqkn7mnh8913jpd")))) + "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("4" "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"))) (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-parser-combinators" ,ghc-parser-combinators) -- cgit v1.2.3 From ce88eae9a30d23d10cc771fb06659da293d1ae9b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:44:29 -0400 Subject: gnu: ghc-opengl: Update to 3.0.2.2. * gnu/packages/haskell.scm (ghc-opengl): Update to 3.0.2.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 142c96f63c..d1046a81bf 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1610,7 +1610,7 @@ basis for a nicer interface.") (define-public ghc-opengl (package (name "ghc-opengl") - (version "3.0.1.0") + (version "3.0.2.2") (source (origin (method url-fetch) @@ -1620,7 +1620,7 @@ basis for a nicer interface.") ".tar.gz")) (sha256 (base32 - "1nm2mzrn1h2nnfs9vl5p088hqpll7rdvcsyqsn8q641im9jhqp7l")))) + "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text) -- cgit v1.2.3 From fc0424875f4f7c39ed1b5f88192ae4b77445ac3d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 22:47:48 -0400 Subject: gnu: ghc-quickcheck-instances: Update Cabal file to r1. * gnu/packages/haskell-check.scm (ghc-quickcheck-instances) Update Cabal file to r1. [arguments]: Remove unneeded "--allow-newer" configure flag. --- gnu/packages/haskell-check.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 0ab0b9a61d..d8c2e47dbe 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -352,7 +352,8 @@ development.") "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=base-compat"))) + `(#:cabal-revision + ("1" "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly"))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-base-compat" ,ghc-base-compat) -- cgit v1.2.3 From fd358b34c356b9caaa73ea4df84efeeb67b88dce Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:32:48 -0400 Subject: gnu: ghc-socks: Update to 0.5.6. * gnu/packages/haskell.scm (ghc-socks): Update to 0.5.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d1046a81bf..689a24a12f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6383,14 +6383,14 @@ set, memory copy, ..) and more") (define-public ghc-socks (package (name "ghc-socks") - (version "0.5.5") + (version "0.5.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "socks/socks-" version ".tar.gz")) (sha256 (base32 - "0s689w1hh9g8ifl75xhzbv96ir07hwn04b4lgvbxzl8swa9ylir6")))) + "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) -- cgit v1.2.3 From ddbe020756f65176d7a693b02f54e71bdd1b0685 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:33:57 -0400 Subject: gnu: ghc-x509-system: Update to 1.6.6. * gnu/packages/haskell-crypto.scm (ghc-x509-system): Update to 1.6.6. --- gnu/packages/haskell-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 9903555e6b..a4e0a22faf 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -512,7 +512,7 @@ list validation.") (define-public ghc-x509-system (package (name "ghc-x509-system") - (version "1.6.4") + (version "1.6.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -520,7 +520,7 @@ list validation.") version ".tar.gz")) (sha256 (base32 - "0k7zc0xp7r6kqmi39rpiicvq78xb0pr2cq6q5s3kmmsshllg13nr")))) + "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20")))) (build-system haskell-build-system) (inputs `(("ghc-pem" ,ghc-pem) -- cgit v1.2.3 From bb84b01d51c3293fdd56e0907be87ac94f593197 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:34:16 -0400 Subject: gnu: ghc-x509-validation: Update to 1.6.10. * gnu/packages/haskell-crypto.scm (ghc-x509-validation): Update to 1.6.10. [native-inputs]: Add ghc-tasty and ghc-tasty-hunit. --- gnu/packages/haskell-crypto.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index a4e0a22faf..ff44970be0 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -481,7 +481,7 @@ collections, certificates, revocation lists, and exception lists.") (define-public ghc-x509-validation (package (name "ghc-x509-validation") - (version "1.6.5") + (version "1.6.10") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -489,7 +489,7 @@ collections, certificates, revocation lists, and exception lists.") version ".tar.gz")) (sha256 (base32 - "190w1sr3w6w49v3yvqz4grb0v09ym4gll3n8bxwijvbvcybk3xyi")))) + "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) @@ -502,6 +502,9 @@ collections, certificates, revocation lists, and exception lists.") ("ghc-x509" ,ghc-x509) ("ghc-x509-store" ,ghc-x509-store) ("ghc-cryptonite" ,ghc-cryptonite))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://github.com/vincenthz/hs-certificate") (synopsis "X.509 certificate and revocation list validation") (description -- cgit v1.2.3 From 2dbecb3a7515eb50e54c431d9830ca7a30d42af1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:38:09 -0400 Subject: gnu: ghc-aeson: Update to 1.3.1.1. * gnu/packages/haskell-web.scm (ghc-aeson): Update to 1.3.1.1. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a60bf007af..2e863965ae 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -783,7 +783,7 @@ Strict, Transitional and Frameset variants.") (define-public ghc-aeson (package (name "ghc-aeson") - (version "1.2.4.0") + (version "1.3.1.1") (source (origin (method url-fetch) @@ -793,7 +793,7 @@ Strict, Transitional and Frameset variants.") ".tar.gz")) (sha256 (base32 - "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l")))) + "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs -- cgit v1.2.3 From 8e4394a571ac8a25cc08a5a42f401011c5aa37a1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 14:01:22 -0400 Subject: gnu: ghc-attoparsec-iso8601: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-attoparsec-iso8601): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 689a24a12f..397132d4dd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9684,6 +9684,9 @@ connections.") (base32 "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"))) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-base-compat" ,ghc-base-compat) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 8574e6c704f3e89e243b36793fedbfa0ea3bade0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:38:44 -0400 Subject: gnu: ghc-bifunctors: Update to 5.5.3. * gnu/packages/haskell.scm (ghc-bifunctors): Update to 5.5.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 397132d4dd..45a43d6272 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4886,7 +4886,7 @@ cross-site scripting (@dfn{XSS}) attacks.") (define-public ghc-bifunctors (package (name "ghc-bifunctors") - (version "5.5.2") + (version "5.5.3") (source (origin (method url-fetch) @@ -4896,7 +4896,7 @@ cross-site scripting (@dfn{XSS}) attacks.") ".tar.gz")) (sha256 (base32 - "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark")))) + "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l")))) (build-system haskell-build-system) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) -- cgit v1.2.3 From 892d5546472e214849fced1a5ab23a7afab53e94 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 13:55:55 -0400 Subject: gnu: ghc-cgi: Adjust dependency constraints. * gnu/packages/haskell.scm (ghc-cgi)[arguments]: Remove "--allow-newer" configure flag; add a phase that patches the Cabal file to allow newer versions of exceptions, time, doctest, and QuickCheck. --- gnu/packages/haskell.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 45a43d6272..ba8491429b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1093,7 +1093,19 @@ tool lex or flex for C/C++.") "1hbpplss1m4rdpm4ibip6fpimlhssqa14fl338kl2jbc463i64cj")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "cgi.cabal" + (("exceptions < 0\\.9") + "exceptions < 0.11") + (("time >= 1\\.5 && < 1\\.7") + "time >= 1.5 && < 1.9") + (("doctest >= 0\\.8 && < 0\\.12") + "doctest >= 0.8 && < 0.17") + (("QuickCheck >= 2\\.8\\.1 && < 2\\.10") + "QuickCheck >= 2.8.1 && < 2.12"))))))) (inputs `(("ghc-parsec" ,ghc-parsec) ("ghc-exceptions" ,ghc-exceptions) -- cgit v1.2.3 From 146198f89890035f5ffe32cebdf026cc38740fa2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:39:51 -0400 Subject: gnu: ghc-email-validate: Update to 2.3.2.6. * gnu/packages/haskell.scm (ghc-email-validate): Update to 2.3.2.6. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ba8491429b..c65bff34c4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10053,7 +10053,7 @@ system dependencies.") (define-public ghc-email-validate (package (name "ghc-email-validate") - (version "2.3.2.1") + (version "2.3.2.6") (source (origin (method url-fetch) @@ -10064,7 +10064,7 @@ system dependencies.") ".tar.gz")) (sha256 (base32 - "0qvxysiap3r4mi3xff5nsk9qv6diqxfgwj186bypbamzvzlz0lav")))) + "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) -- cgit v1.2.3 From 2dee63943b3b9c215264c926e27a7af9e93ec886 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:55:11 -0400 Subject: gnu: ghc-glut: Update to 2.7.0.14. * gnu/packages/haskell.scm (ghc-glut): Update to 2.7.0.14. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c65bff34c4..4fd8e69ee9 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1571,7 +1571,7 @@ found at runtime, a userError is thrown.") (define-public ghc-glut (package (name "ghc-glut") - (version "2.7.0.10") + (version "2.7.0.14") (source (origin (method url-fetch) @@ -1581,7 +1581,7 @@ found at runtime, a userError is thrown.") ".tar.gz")) (sha256 (base32 - "0sbm943bg896nf3qjmlnsg3zzrr3pl330rzh9g0hwv47nzwwn4ab")))) + "01i162fly4q1751fp60lgkzlb8kr0qqbvmxj74zc6skb19qggy2w")))) (build-system haskell-build-system) (inputs `(("ghc-statevar" ,ghc-statevar) -- cgit v1.2.3 From 255a31f8413073c5c5e78d85adb9d466b09c18df Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:40:23 -0400 Subject: gnu: ghc-haskell-src-exts-util: Update to 0.2.3. * gnu/packages/haskell.scm (ghc-haskell-src-exts-util): Update to 0.2.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4fd8e69ee9..f545e5ee93 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1271,7 +1271,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (define-public ghc-haskell-src-exts-util (package (name "ghc-haskell-src-exts-util") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) @@ -1280,7 +1280,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") version ".tar.gz")) (sha256 (base32 - "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg")))) + "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8")))) (build-system haskell-build-system) (inputs `(("ghc-data-default" ,ghc-data-default) -- cgit v1.2.3 From dcfee7b6d56b4308433c2d23b8ae1700460f62f3 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:25:38 -0400 Subject: gnu: ghc-haskell-src-meta: Update to 0.8.0.3. * gnu/packages/haskell.scm (ghc-haskell-src-meta): Update to 0.8.0.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f545e5ee93..aad8649170 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5978,7 +5978,7 @@ info for more informative bug reports.") (define-public ghc-haskell-src-meta (package (name "ghc-haskell-src-meta") - (version "0.8.0.2") + (version "0.8.0.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5986,7 +5986,7 @@ info for more informative bug reports.") version ".tar.gz")) (sha256 (base32 - "12rc4v5dbbbcwdp7j8isvnm9vqpazv124j5kdfwlgwgwjhxi8ysb")))) + "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4")))) (build-system haskell-build-system) (inputs `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) -- cgit v1.2.3 From 867ac7fe58f6defe202e040803e41fc3f8e3d646 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:40:25 -0400 Subject: gnu: ghc-hslua: Update to 0.9.5.2. * gnu/packages/haskell.scm (ghc-hslua): Update to 0.9.5.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index aad8649170..b43844fb7f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6203,14 +6203,14 @@ TIFF and GIF formats.") (define-public ghc-hslua (package (name "ghc-hslua") - (version "0.9.5") + (version "0.9.5.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "hslua/hslua-" version ".tar.gz")) (sha256 (base32 - "1j2zk7f7nyywg2b0n6kb2yf6ljc7cn2sk9jz0h76g3ag2b70l12n")))) + "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f")))) (build-system haskell-build-system) (arguments `(#:configure-flags '("-fsystem-lua"))) -- cgit v1.2.3 From 40e1af35bee20984563a4bf48810777d4b7c488b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:41:19 -0400 Subject: gnu: ghc-http-date: Update to 0.0.8. * gnu/packages/haskell-web.scm (ghc-http-date): Update to 0.0.8. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 2e863965ae..742d3abcba 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -261,7 +261,7 @@ libraries, such as http-conduit.") (define-public ghc-http-date (package (name "ghc-http-date") - (version "0.0.6.1") + (version "0.0.8") (source (origin (method url-fetch) @@ -270,7 +270,7 @@ libraries, such as http-conduit.") "http-date-" version ".tar.gz")) (sha256 (base32 - "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj")))) + "09slbzqayjnqqz9zybk7slgzvizgplikqgg4b2flzgks91466k0g")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec))) -- cgit v1.2.3 From 774f3984146dffb33573ff119dee056580bacff6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:42:31 -0400 Subject: gnu: ghc-parsers: Update to 0.12.9. * gnu/packages/haskell.scm (ghc-parsers): Update to 0.12.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b43844fb7f..bdb1205082 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2800,7 +2800,7 @@ copious examples.") (define-public ghc-parsers (package (name "ghc-parsers") - (version "0.12.4") + (version "0.12.9") (source (origin (method url-fetch) @@ -2810,7 +2810,7 @@ copious examples.") ".tar.gz")) (sha256 (base32 - "07najh7f9y3ahh42z96sw4hnd0kc4x3wm0xlf739y0gh81ys5097")))) + "1r05sc1mcglk8w596kq9a1brfn9c2vll8lq16j07ln0vsz4jzrc1")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Test fails with "cannot satisfy ; -package attoparsec-0.13.0.1" -- cgit v1.2.3 From 310d782eaf1f8db59f6e8746132ffe93341db67e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:17:42 -0400 Subject: gnu: ghc-tasty-th: Update to 0.1.7. * gnu/packages/haskell-check.scm (ghc-tasty-th): Update to 0.1.7. [inputs]: Add ghc-haskell-src-exts and ghc-tasty-hunit. --- gnu/packages/haskell-check.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index d8c2e47dbe..ce1030eef1 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -260,7 +260,7 @@ tasty.") (define-public ghc-tasty-th (package (name "ghc-tasty-th") - (version "0.1.4") + (version "0.1.7") (source (origin (method url-fetch) @@ -269,10 +269,12 @@ tasty.") version ".tar.gz")) (sha256 (base32 - "0dff9si8i1qp0s7p4hlk0l29vq7wxfglw6mvlgmld43h7rllv88q")))) + "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3")))) (build-system haskell-build-system) (inputs - `(("ghc-tasty" ,ghc-tasty))) + `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://github.com/bennofs/tasty-th") (synopsis "Automatically generate tasty TestTrees") (description -- cgit v1.2.3 From 66c5de39485fe543f1dd6a0df86dffa1dd33ade7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:42:50 -0400 Subject: gnu: ghc-tls: Update to 1.4.1. * gnu/packages/tls.scm (ghc-tls): Update to 1.4.1. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6c4c64e507..bf462981ee 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -871,14 +871,14 @@ coding footprint.") (define-public ghc-tls (package (name "ghc-tls") - (version "1.3.8") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "tls/tls-" version ".tar.gz")) (sha256 (base32 - "1rdidf18i781c0vdvy9yn79yh08hmcacf6fp3sgghyiy3h0wyh5l")))) + "1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) -- cgit v1.2.3 From bad349d8a620a055bcec4293a27e60bb20f3ce0e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:43:13 -0400 Subject: gnu: ghc-uri-bytestring: Update to 0.3.2.0. * gnu/packages/haskell.scm (ghc-uri-bytestring): Update to 0.3.2.0. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bdb1205082..40c77c9439 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9734,7 +9734,7 @@ each constructor are represented using an n-ary product.") (define-public ghc-uri-bytestring (package (name "ghc-uri-bytestring") - (version "0.3.1.0") + (version "0.3.2.0") (source (origin (method url-fetch) @@ -9743,7 +9743,7 @@ each constructor are represented using an n-ary product.") "uri-bytestring-" version ".tar.gz")) (sha256 (base32 - "04qjv1sgyrdg538290p9hqnvyxnahvr5cjwl8vm1rn9j0fv3ymq9")))) + "1q04j5ybvk37zk2m0bkjwyhblz0ymdj0cn4rvsvdca1ikn5xdv5c")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-fail" ,ghc-fail) -- cgit v1.2.3 From 5ebadb584bc642d58bf6c8dbb54468e4b7f266bd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:44:15 -0400 Subject: gnu: agda: Update to 2.5.4.1. * gnu/packages/agda.scm (agda): Update to 2.5.4.1. --- gnu/packages/agda.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 572de5bbeb..418025bc37 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -30,7 +30,7 @@ (define-public agda (package (name "agda") - (version "2.5.3") + (version "2.5.4.1") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.gz")) (sha256 (base32 - "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a")))) + "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) -- cgit v1.2.3 From 22b5a1a47719f57fd6cfe391e517f1e7a3def7fe Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:44:40 -0400 Subject: gnu: ghc-aeson-compat: Update to 0.3.8. * gnu/packages/haskell.scm (ghc-aeson-compat): Update to 0.3.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 40c77c9439..94ebae2629 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9845,7 +9845,7 @@ way.") (define-public ghc-aeson-compat (package (name "ghc-aeson-compat") - (version "0.3.7.1") + (version "0.3.8") (source (origin (method url-fetch) @@ -9854,7 +9854,7 @@ way.") "aeson-compat-" version ".tar.gz")) (sha256 (base32 - "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r")))) + "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.10 (inputs `(("ghc-base-compat" ,ghc-base-compat) -- cgit v1.2.3 From d1d27a67bbb9d8e790cc411067daba7a737fe8fe Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:45:20 -0400 Subject: gnu: ghc-aeson-pretty: Update to 0.8.7. * gnu/packages/haskell-web.scm (ghc-aeson-pretty): Update to 0.8.7. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 742d3abcba..4c29964e67 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -842,7 +842,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") (define-public ghc-aeson-pretty (package (name "ghc-aeson-pretty") - (version "0.8.5") + (version "0.8.7") (source (origin (method url-fetch) (uri (string-append @@ -850,7 +850,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") version ".tar.gz")) (sha256 (base32 - "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx")))) + "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) -- cgit v1.2.3 From f4585fd1fda9912801b02490aaa02e7eac1ba00a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:48:11 -0400 Subject: gnu: ghc-connection: Update to 0.2.8. * gnu/packages/haskell.scm (ghc-connection): Update to 0.2.8. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 94ebae2629..c158a1be59 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6416,7 +6416,7 @@ set, memory copy, ..) and more") (define-public ghc-connection (package (name "ghc-connection") - (version "0.2.6") + (version "0.2.8") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -6424,7 +6424,7 @@ set, memory copy, ..) and more") version ".tar.gz")) (sha256 (base32 - "1c1prsgad669cmf6qrqlb5hmh0dnam2imijqzpwcr4ja14l6rh83")))) + "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh")))) (build-system haskell-build-system) (inputs `(("ghc-byteable" ,ghc-byteable) -- cgit v1.2.3 From dfe5f60f2d1790bf931d5519814225570d37f755 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:48:34 -0400 Subject: gnu: ghc-doctemplates: Update to 0.2.2.1. * gnu/packages/haskell.scm (ghc-doctemplates): Update to 0.2.2.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c158a1be59..b72fa27423 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6540,7 +6540,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (define-public ghc-doctemplates (package (name "ghc-doctemplates") - (version "0.2.1") + (version "0.2.2.1") (source (origin (method url-fetch) @@ -6549,7 +6549,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") version ".tar.gz")) (sha256 (base32 - "1bfs2kl5j5al2w2y4qpbn68p0xsnb65r7h51l356kpkzc326646p")))) + "1gyckfg3kgvzhxw14i7iwrw0crygvsp86sy53bbr1yn7bxbgn33b")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) -- cgit v1.2.3 From 085f26d1e12b077950f1262b24f7f8c15c8cb033 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 09:25:40 -0400 Subject: gnu: ghc-hslua-module-text: Update Cabal file to r1. * gnu/packages/haskell.scm (ghc-hslua-module-text): Update Cabal file to r1. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b72fa27423..d604526cdd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6268,6 +6268,9 @@ described in @url{https://www.lua.org/}.") (base32 "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"))) (inputs `(("ghc-hslua" ,ghc-hslua) ("ghc-text" ,ghc-text))) -- cgit v1.2.3 From de02e56bcb6ac6baef80a015d587208fd97319f7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:49:42 -0400 Subject: gnu: ghc-http-api-data: Update to 0.3.8.1. * gnu/packages/haskell.scm (ghc-http-api-data): Update to 0.3.8.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d604526cdd..521f02c2f0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9771,7 +9771,7 @@ parser that uses ByteStrings for parsing and representing the URI data.") (define-public ghc-http-api-data (package (name "ghc-http-api-data") - (version "0.3.7.1") + (version "0.3.8.1") (source (origin (method url-fetch) @@ -9780,7 +9780,7 @@ parser that uses ByteStrings for parsing and representing the URI data.") "http-api-data-" version ".tar.gz")) (sha256 (base32 - "1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc")))) + "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.9 (inputs `(("ghc-attoparsec" ,ghc-attoparsec) -- cgit v1.2.3 From a57c91a192d34d3ad1d80e3d40d2495b96eaa7b0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:23:33 -0400 Subject: gnu: ghc-lifted-async: Update to 0.10.0.2. * gnu/packages/haskell.scm (ghc-lifted-async): Update to 0.10.0.2. [inputs]: Add ghc-tasty-expected-failure. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 521f02c2f0..d50aef9170 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7462,7 +7462,7 @@ a vocabulary for working with them.") (define-public ghc-lifted-async (package (name "ghc-lifted-async") - (version "0.9.0") + (version "0.10.0.2") (source (origin (method url-fetch) @@ -7471,7 +7471,7 @@ a vocabulary for working with them.") version ".tar.gz")) (sha256 (base32 - "00fnwfcnc6niq9jbbb9rap9rkdgv5qhcglwanzc5fi8834j94c1r")))) + "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) @@ -7481,6 +7481,7 @@ a vocabulary for working with them.") ("ghc-constraints" ,ghc-constraints) ("ghc-hunit" ,ghc-hunit) ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-th" ,ghc-tasty-th))) (home-page "https://github.com/maoe/lifted-async") -- cgit v1.2.3 From 4979dcd195366faa70534ced47982613eee9eb0f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 09:28:53 -0400 Subject: gnu: ghc-pandoc-types: Remove unneeded "--allow-newer" flag. * gnu/packages/haskell.scm (ghc-pandoc-types)[arguments]: Remove the unneeded "--allow-newer=QuickCheck" confingure flag. --- gnu/packages/haskell.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d50aef9170..d359ce4a70 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5481,8 +5481,6 @@ and bytestrings.") (base32 "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) (inputs `(("ghc-syb" ,ghc-syb) ("ghc-aeson" ,ghc-aeson) -- cgit v1.2.3 From bf73366886e5c8c1b37e35f23b9cf21b011521e8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 21:56:59 -0400 Subject: gnu: ghc-profunctors: Update Cabal file to r2. * gnu/packages/haskell.scm (ghc-profunctors): Update Cabal file to r2. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d359ce4a70..5a6fbb2d95 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3163,6 +3163,9 @@ this package makes them available back to GHC 7.2.") (base32 "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq"))) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-bifunctors" ,ghc-bifunctors) -- cgit v1.2.3 From 07f38c6a2685fff4bfaf996ed14adc04188cc159 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 22:08:31 -0400 Subject: gnu: ghc-semigroupoids: Update to 5.2.2. * gnu/packages/haskell.scm (ghc-semigroupoids): Update to 5.2.2. [arguments]: Enable tests and update Cabal file to r4. [inputs]: Add ghc-hashable and ghc-unordered-containers. [native-inputs]: Add cabal-doctests and ghc-doctests. (ghc-semigroupoids-5.2.2): Remove variable. --- gnu/packages/haskell.scm | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5a6fbb2d95..87adbb1aab 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4932,7 +4932,7 @@ cross-site scripting (@dfn{XSS}) attacks.") (define-public ghc-semigroupoids (package (name "ghc-semigroupoids") - (version "5.1") + (version "5.2.2") (source (origin (method url-fetch) @@ -4942,9 +4942,11 @@ cross-site scripting (@dfn{XSS}) attacks.") ".tar.gz")) (sha256 (base32 - "0dgqc59p4xx5cl8qkpm6sn4wd3n59rq7l6din76hf10bnklqrb0n")))) + "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: doctest packagedb propagation problem. + (arguments + `(#:cabal-revision + ("4" "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"))) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-transformers-compat" ,ghc-transformers-compat) @@ -4952,8 +4954,13 @@ cross-site scripting (@dfn{XSS}) attacks.") ("ghc-comonad" ,ghc-comonad) ("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) + ("ghc-hashable" ,ghc-hashable) ("ghc-semigroups" ,ghc-semigroups) - ("ghc-tagged" ,ghc-tagged))) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest))) (home-page "https://github.com/ekmett/semigroupoids") (synopsis "Semigroupoids operations for Haskell") (description "This library provides a wide array of (semi)groupoids and @@ -10084,22 +10091,6 @@ system dependencies.") address string against RFC 5322.") (license license:bsd-3))) -(define-public ghc-semigroupoids-5.2.2 - (package - (inherit ghc-semigroupoids) - (name "ghc-semigroupoids") - (version "5.2.2") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "semigroupoids-" version "/semigroupoids-" - version ".tar.gz")) - (sha256 - (base32 - "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4")))) - (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) - ,@(package-inputs ghc-semigroupoids))))) - (define-public ghc-bytes (package (name "ghc-bytes") -- cgit v1.2.3 From 01a67f89d1ec6bd981b8c99ef24186ff5c1527c1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:51:09 -0400 Subject: gnu: ghc-shakespeare: Update to 2.0.15. * gnu/packages/haskell.scm (ghc-shakespeare): Update to 2.0.15. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 87adbb1aab..bb08f3f096 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9614,7 +9614,7 @@ code locations of messages.") (define-public ghc-shakespeare (package (name "ghc-shakespeare") - (version "2.0.14") + (version "2.0.15") (source (origin (method url-fetch) @@ -9623,7 +9623,7 @@ code locations of messages.") "shakespeare-" version ".tar.gz")) (sha256 (base32 - "0j5zx8ka7d7scvb9shm7k3376qzl3k4kpim9aqqfs6n86901zpl4")))) + "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23")))) (build-system haskell-build-system) (inputs `(("ghc-parsec" ,ghc-parsec) ("ghc-text" ,ghc-text) -- cgit v1.2.3 From aac78f6be3ae6dc3531ce198021fe58ff86f8528 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 4 Sep 2018 00:09:27 -0400 Subject: gnu: Add ghc-tls-session-manager. * gnu/packages/haskell-web.scm (ghc-tls-session-manager): New variable. --- gnu/packages/haskell-web.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 4c29964e67..5278cb9259 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -600,6 +600,32 @@ transfers.") based WAI (Web Application Interface in Haskell).") (license license:expat))) +(define-public ghc-tls-session-manager + (package + (name "ghc-tls-session-manager") + (version "0.0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "tls-session-manager/tls-session-manager-" + version ".tar.gz")) + (sha256 + (base32 + "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5")))) + (build-system haskell-build-system) + (inputs + `(("ghc-auto-update" ,ghc-auto-update) + ("ghc-clock" ,ghc-clock) + ("ghc-psqueues" ,ghc-psqueues) + ("ghc-tls" ,ghc-tls))) + (home-page "http://hackage.haskell.org/package/tls-session-manager") + (synopsis "In-memory TLS session manager") + (description "This Haskell library provides a TLS session manager with +limitation, automatic pruning, energy saving and replay resistance.") + (license license:bsd-3))) + (define-public ghc-warp-tls (package (name "ghc-warp-tls") -- cgit v1.2.3 From 3f135acc357871fabde46ea9eedcf2153b3f4244 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:54:11 -0400 Subject: gnu: ghc-xss-sanitize: Update to 0.3.6. * gnu/packages/haskell-web.scm (ghc-xss-sanitize): Update to 0.3.6. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 5278cb9259..ac7420c981 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -657,7 +657,7 @@ a WAI handler, via the native Haskell TLS implementation.") (define-public ghc-xss-sanitize (package (name "ghc-xss-sanitize") - (version "0.3.5.7") + (version "0.3.6") (source (origin (method url-fetch) @@ -666,7 +666,7 @@ a WAI handler, via the native Haskell TLS implementation.") version ".tar.gz")) (sha256 (base32 - "005cmhaw9xbzkcn42jmhvcvk63bzmg4lml368xwmqdvh7r0mcn4m")))) + "1d72s3a6520iwwc1wbn9v2znqgbw6a5wwzb23iq8ny9ccnjyx1dk")))) (build-system haskell-build-system) (inputs `(("ghc-tagsoup" ,ghc-tagsoup) -- cgit v1.2.3 From 2d67fe8936f6f71493d97f40654d7931ef3621c0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:10:02 -0400 Subject: gnu: raincat: Update to 1.2. * gnu/packages/games.scm (raincat): Update to 1.2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8155876313..1fab9fe34a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2122,7 +2122,7 @@ on the screen and keyboard to display letters.") (define-public raincat (package (name "raincat") - (version "1.1.1.3") + (version "1.2") (source (origin (method url-fetch) @@ -2132,7 +2132,7 @@ on the screen and keyboard to display letters.") ".tar.gz")) (sha256 (base32 - "1aalh68h6799mv4vyg30zpskl5jkn6x2j1jza7p4lrflyifxzar8")))) + "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk")))) (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) -- cgit v1.2.3 From 955738723bd55b470feb33633da58fc76bada068 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:54:58 -0400 Subject: gnu: ghc-free: Update to 5.0.2. * gnu/packages/haskell.scm (ghc-free): Update to 5.0.2. [inputs]: Add ghc-transformers-base and ghc-transformers-compat. --- gnu/packages/haskell.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bb08f3f096..e9dac65588 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5046,7 +5046,7 @@ semigroup.") (define-public ghc-free (package (name "ghc-free") - (version "4.12.4") + (version "5.0.2") (source (origin (method url-fetch) @@ -5056,7 +5056,7 @@ semigroup.") ".tar.gz")) (sha256 (base32 - "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9")))) + "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg")))) (build-system haskell-build-system) (inputs `(("ghc-prelude-extras" ,ghc-prelude-extras) @@ -5066,7 +5066,9 @@ semigroup.") ("ghc-comonad" ,ghc-comonad) ("ghc-distributive" ,ghc-distributive) ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-semigroups" ,ghc-semigroups))) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/free/") (synopsis "Unrestricted monads for Haskell") (description "This library provides free monads, which are useful for many -- cgit v1.2.3 From 89d44801696f6d0b5458d30e77412f72a637e61d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:55:31 -0400 Subject: gnu: ghc-http-client-tls: Update to 0.3.5.3. * gnu/packages/haskell-web.scm (ghc-http-client-tls): Update to 0.3.5.3. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index ac7420c981..ac8df3921c 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -229,7 +229,7 @@ for more user-friendly packages.") (define-public ghc-http-client-tls (package (name "ghc-http-client-tls") - (version "0.3.5.1") + (version "0.3.5.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -237,7 +237,7 @@ for more user-friendly packages.") version ".tar.gz")) (sha256 (base32 - "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1")))) + "0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7")))) (build-system haskell-build-system) ;; Tests require Internet access (arguments `(#:tests? #f)) -- cgit v1.2.3 From 8e06e15b7d5d890b2811a60973ce9e51fc80e606 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 22:41:31 -0400 Subject: gnu: Add ghc-invariant. * gnu/packages/haskell.scm (ghc-invariant): New variable. --- gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e9dac65588..32b3384c60 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4730,6 +4730,43 @@ Compatibility package for older packages.") given term should not exist.") (license license:bsd-3))) +(define-public ghc-invariant + (package + (name "ghc-invariant") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/invariant/invariant-" + version ".tar.gz")) + (sha256 + (base32 + "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-comonad" ,ghc-comonad) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-statevar" ,ghc-statevar) + ("ghc-stm" ,ghc-stm) + ("ghc-tagged" ,ghc-tagged) + ("ghc-th-abstraction" ,ghc-th-abstraction) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/nfrisby/invariant-functors") + (synopsis "Haskell98 invariant functors") + (description "Haskell98 invariant functors (also known as exponential +functors). For more information, see Edward Kmett's article +@uref{http://comonad.com/reader/2008/rotten-bananas/, Rotten Bananas}.") + (license license:bsd-2))) + (define-public ghc-kan-extensions (package (name "ghc-kan-extensions") -- cgit v1.2.3 From d8717c89b434ad887b8c4b66f9d6e229d547ebe2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:55:51 -0400 Subject: gnu: ghc-reducers: Update to 3.12.3. * gnu/packages/haskell.scm (ghc-reducers): Update to 3.12.3. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 32b3384c60..12fb9121b9 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3182,7 +3182,7 @@ this package makes them available back to GHC 7.2.") (define-public ghc-reducers (package (name "ghc-reducers") - (version "3.12.2") + (version "3.12.3") (source (origin (method url-fetch) @@ -3192,7 +3192,7 @@ this package makes them available back to GHC 7.2.") ".tar.gz")) (sha256 (base32 - "1gbaa5x4zbvnbklcb0d4q4m8hk6w0gz4s0c4m288czi1nw43dl65")))) + "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki")))) (build-system haskell-build-system) (inputs `(("ghc-fingertree" ,ghc-fingertree) -- cgit v1.2.3 From 61849d425f9b5351f06553419b23cfffaba7ee29 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 5 Sep 2018 14:28:18 -0400 Subject: gnu: ghc-skylighting: Update to 0.7.2. * gnu/packages/haskell.scm (ghc-skylighting-core): New variable. (ghc-skylighting): Simplify by inheriting from ghc-skylighting-core. --- gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 12fb9121b9..d8ceb0a755 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6494,17 +6494,18 @@ needs. It provides a very simple API to create sockets to a destination with the choice of SSL/TLS, and SOCKS.") (license license:bsd-3))) -(define-public ghc-skylighting +(define-public ghc-skylighting-core (package - (name "ghc-skylighting") - (version "0.5.1") + (name "ghc-skylighting-core") + (version "0.7.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/skylighting-" - version "/skylighting-" version ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/" + "skylighting-core/skylighting-core-" + version ".tar.gz")) (sha256 (base32 - "0l5lhhqqlfaq1fs7pn3n3b25kmazk8p4ahwvhagbrhcbm5hsigdg")))) + "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) @@ -6514,21 +6515,21 @@ the choice of SSL/TLS, and SOCKS.") ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-colour" ,ghc-colour) - ("ghc-diff" ,ghc-diff) ("ghc-hxt" ,ghc-hxt) - ("ghc-pretty-show" ,ghc-pretty-show) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-safe" ,ghc-safe) ("ghc-text" ,ghc-text) ("ghc-utf8-string" ,ghc-utf8-string))) (native-inputs - `(("ghc-hunit" ,ghc-hunit) + `(("ghc-diff" ,ghc-diff) + ("ghc-hunit" ,ghc-hunit) + ("ghc-pretty-show" ,ghc-pretty-show) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-golden" ,ghc-tasty-golden) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://hackage.haskell.org/package/skylighting") + (home-page "https://github.com/jgm/skylighting") (synopsis "Syntax highlighting library") (description "Skylighting is a syntax highlighting library with support for over one hundred languages. It derives its tokenizers from XML syntax @@ -6537,6 +6538,22 @@ supported by that framework can be added. An optional command-line program is provided. Skylighting is intended to be the successor to highlighting-kate.") (license license:gpl2))) +(define-public ghc-skylighting + (package + (inherit ghc-skylighting-core) + (name "ghc-skylighting") + (version "0.7.2") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/skylighting-" + version "/skylighting-" version ".tar.gz")) + (sha256 + (base32 + "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch")))) + (inputs + `(("ghc-skylighting-core" ,ghc-skylighting-core) + ,@(package-inputs ghc-skylighting-core))))) + (define-public ghc-skylighting-for-pandoc-1 (package (inherit ghc-skylighting) (version "0.1.1.5") -- cgit v1.2.3 From 128c4c40e48db02e313d782d7aeb705418bde035 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:18:28 -0400 Subject: gnu: ghc-vault: Update to 0.3.1.2. * gnu/packages/haskell.scm (ghc-vault): Update to 0.3.1.2. [inputs]: Add ghc-semigroupoids. --- gnu/packages/haskell.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d8ceb0a755..da48a64b0a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4102,7 +4102,7 @@ cursor, and changing the title.") (define-public ghc-vault (package (name "ghc-vault") - (version "0.3.0.6") + (version "0.3.1.2") (source (origin (method url-fetch) @@ -4112,11 +4112,12 @@ cursor, and changing the title.") ".tar.gz")) (sha256 (base32 - "0j7gcs440q7qlgzi2hn36crgp2c0w69k40g6vj9hxlm31zk3shqb")))) + "072mbrihsdsb8c6xvg6lvk0rqjgvxvi8qkg4n6wwym5hq0pfa04y")))) (build-system haskell-build-system) (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-hashable" ,ghc-hashable))) + ("ghc-hashable" ,ghc-hashable) + ("ghc-semigroupoids" ,ghc-semigroupoids))) (home-page "https://github.com/HeinrichApfelmus/vault") (synopsis "Persistent store for arbitrary values") -- cgit v1.2.3 From 38563d9140bdd35215d36cffae890d7db891d597 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:57:06 -0400 Subject: gnu: ghc-adjunctions: Update to 4.4. * gnu/packages/haskell.scm (ghc-adjunctions): Update to 4.4. [inputs] Add ghc-transformers-compat. [native-inputs]: Add ghc-generic-deriving, ghc-hspec, and hspec-discover. --- gnu/packages/haskell.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index da48a64b0a..394c541693 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5121,7 +5121,7 @@ definition of @code{Monad}.") (define-public ghc-adjunctions (package (name "ghc-adjunctions") - (version "4.3") + (version "4.4") (source (origin (method url-fetch) @@ -5131,7 +5131,7 @@ definition of @code{Monad}.") ".tar.gz")) (sha256 (base32 - "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r")))) + "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h")))) (build-system haskell-build-system) (inputs `(("ghc-profunctors" ,ghc-profunctors) @@ -5142,7 +5142,12 @@ definition of @code{Monad}.") ("ghc-tagged" ,ghc-tagged) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups) + ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-void" ,ghc-void))) + (native-inputs + `(("ghc-generic-deriving" ,ghc-generic-deriving) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/ekmett/adjunctions/") (synopsis "Adjunctions and representable functors") (description "This library provides adjunctions and representable functors -- cgit v1.2.3 From 751a8c0b43268aa5b33bae9fe5615c9dcf5abcfb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:57:23 -0400 Subject: gnu: ghc-either: Update to 5.0.1. * gnu/packages/haskell.scm (ghc-either): Update to 5.0.1. [native-inputs]: Add ghc-quickcheck, ghc-test-framework, and ghc-test-framework-quickcheck2. --- gnu/packages/haskell.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 394c541693..734dc2c2ca 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9119,7 +9119,7 @@ which consume random values.") (define-public ghc-either (package (name "ghc-either") - (version "4.4.1.1") + (version "5.0.1") (source (origin (method url-fetch) @@ -9128,7 +9128,7 @@ which consume random values.") "either-" version ".tar.gz")) (sha256 (base32 - "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh")))) + "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc")))) (build-system haskell-build-system) (inputs `(("ghc-bifunctors" ,ghc-bifunctors) ("ghc-exceptions" ,ghc-exceptions) @@ -9140,6 +9140,10 @@ which consume random values.") ("ghc-semigroups" ,ghc-semigroups) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-transformers-base" ,ghc-transformers-base))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (home-page "https://github.com/ekmett/either") (synopsis "Provides an either monad transformer for Haskell") (description "This Haskell package provides an either monad transformer.") -- cgit v1.2.3 From b587518960e560309ec69d480eef7fc6aa8abcd2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:22:32 -0400 Subject: gnu: ghc-fsnotify: Update to 0.3.0.1. * gnu/packages/haskell.scm (ghc-fsnotify): Update to 0.3.0.1. [inputs]: Remove ghc-temporary-rc; add ghc-temporary, ghc-random, and ghc-shelly. --- gnu/packages/haskell.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 734dc2c2ca..d1e7145d0b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8158,7 +8158,7 @@ accessed or modified.") (define-public ghc-fsnotify (package (name "ghc-fsnotify") - (version "0.2.1") + (version "0.3.0.1") (source (origin (method url-fetch) (uri (string-append @@ -8166,7 +8166,7 @@ accessed or modified.") "fsnotify-" version ".tar.gz")) (sha256 (base32 - "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb")))) + "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text) @@ -8175,7 +8175,9 @@ accessed or modified.") ("ghc-hinotify" ,ghc-hinotify) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-temporary-rc" ,ghc-temporary-rc))) + ("ghc-random" ,ghc-random) + ("ghc-shelly" ,ghc-shelly) + ("ghc-temporary" ,ghc-temporary))) (home-page "https://github.com/haskell-fswatch/hfsnotify") (synopsis "Cross platform library for file change notification.") (description "Cross platform library for file creation, modification, and -- cgit v1.2.3 From f752336c80fb221800d719001ea268039b5fcb29 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:59:18 -0400 Subject: gnu: ghc-tasty-rerun: Update to 1.1.12. * gnu/packages/haskell-check.scm (ghc-tasty-rerun): Update to 1.1.12. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index ce1030eef1..42b7fd167b 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -287,7 +287,7 @@ test-framework.") (define-public ghc-tasty-rerun (package (name "ghc-tasty-rerun") - (version "1.1.8") + (version "1.1.12") (source (origin (method url-fetch) (uri (string-append @@ -295,7 +295,7 @@ test-framework.") "tasty-rerun-" version ".tar.gz")) (sha256 (base32 - "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788")))) + "05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8")))) (build-system haskell-build-system) (inputs `(("ghc-optparse-applicative" ,ghc-optparse-applicative) -- cgit v1.2.3 From 19da4c3cd99b338333e0d13a05795cf9597393c7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:53:50 -0400 Subject: gnu: ghc-wai: Update to 3.2.1.2. * gnu/packages/haskell-web.scm (ghc-wai): Update to 3.2.1.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index ac8df3921c..a6df96fc46 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -385,7 +385,7 @@ which allow you to avoid direct usage of conduits.") (define-public ghc-wai (package (name "ghc-wai") - (version "3.2.1.1") + (version "3.2.1.2") (source (origin (method url-fetch) @@ -395,7 +395,7 @@ which allow you to avoid direct usage of conduits.") ".tar.gz")) (sha256 (base32 - "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x")))) + "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8")))) (build-system haskell-build-system) (inputs `(("ghc-bytestring-builder" ,ghc-bytestring-builder) -- cgit v1.2.3 From 8b1573b1e41452d2ddea503dd61bf6b84e542af9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:00:11 -0400 Subject: gnu: ghc-kan-extensions: Update to 5.2. * gnu/packages/haskell.scm (ghc-kan-extensions): Update to 5.2. [inputs]: Add ghc-invariant and ghc-transformers-compat. --- gnu/packages/haskell.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d1e7145d0b..6bc3e49823 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4771,7 +4771,7 @@ functors). For more information, see Edward Kmett's article (define-public ghc-kan-extensions (package (name "ghc-kan-extensions") - (version "5.0.1") + (version "5.2") (source (origin (method url-fetch) @@ -4781,7 +4781,7 @@ functors). For more information, see Edward Kmett's article ".tar.gz")) (sha256 (base32 - "1qm0kf4krmyjbjynn96ab0h3q117vwcia5nin7n2b8b4f3jrzph1")))) + "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb")))) (build-system haskell-build-system) (inputs `(("ghc-adjunctions" ,ghc-adjunctions) @@ -4789,8 +4789,10 @@ functors). For more information, see Edward Kmett's article ("ghc-contravariant" ,ghc-contravariant) ("ghc-distributive" ,ghc-distributive) ("ghc-free" ,ghc-free) + ("ghc-invariant" ,ghc-invariant) ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-tagged" ,ghc-tagged))) + ("ghc-tagged" ,ghc-tagged) + ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/kan-extensions/") (synopsis "Kan extensions library") (description "This library provides Kan extensions, Kan lifts, various -- cgit v1.2.3 From 6d2fd200f472d0f23d751991eb6093a1b3f816da Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:00:28 -0400 Subject: gnu: ghc-rebase: Update to 1.2.4. * gnu/packages/haskell.scm (ghc-rebase): Update to 1.2.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6bc3e49823..0bd4c9de20 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9284,7 +9284,7 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") (define-public ghc-rebase (package (name "ghc-rebase") - (version "1.1") + (version "1.2.4") (source (origin (method url-fetch) @@ -9293,7 +9293,7 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") "rebase-" version ".tar.gz")) (sha256 (base32 - "1qkhnpcc4g2vd6jmbf3b6psqkan6hyawqzrwzqdd931hsb02l6ia")))) + "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) ("ghc-hashable" ,ghc-hashable) -- cgit v1.2.3 From 7b19f0a8030b9f7d9606a9908bb59284aabeca3b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:56:47 -0400 Subject: gnu: ghc-wai-logger: Update to 2.3.2. * gnu/packages/haskell-web.scm (ghc-wai-logger): Update to 2.3.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a6df96fc46..5300a5701a 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -420,7 +420,7 @@ communication between web applications and web servers.") (define-public ghc-wai-logger (package (name "ghc-wai-logger") - (version "2.3.0") + (version "2.3.2") (source (origin (method url-fetch) @@ -430,7 +430,7 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch")))) + "0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find libraries exported ; by propagated-inputs. -- cgit v1.2.3 From 53812aa77f5c8a490191c069a13a927d365618c7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:36:30 -0400 Subject: gnu: idris: Update to 1.3.0. * gnu/packages/idris.scm (idris): Update to 1.3.0. [inputs]: Remove ghc-aeson-1.1.2.0, ghc-cheapskate-0.1.0.5, and ghc-trifecta-1.6.2.1; add ghc-aeson, ghc-cheapskate, and ghc-megaparsec. [arguments]: Add a phase that patches the Cabal file to allow newer versions of aeson. (ghc-aeson-1.1.2.0, ghc-cheapskate-0.1.0.5, ghc-trifecta-1.6.2.1): Remove. --- gnu/packages/idris.scm | 61 +++++++++----------------------------------------- 1 file changed, 10 insertions(+), 51 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 7f1af62c1f..f80d6b3894 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -31,56 +31,10 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) -(define ghc-aeson-1.1.2.0 - (package (inherit ghc-aeson) - (version "1.1.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/aeson/aeson-" - version - ".tar.gz")) - (sha256 - (base32 - "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p")))))) - -(define ghc-trifecta-1.6.2.1 - (package (inherit ghc-trifecta) - (version "1.6.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/trifecta/" - "trifecta-" version ".tar.gz")) - (sha256 - (base32 - "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs")))))) - -;; ghc-cheapskate appeared too new. This follows LTS Haskell. -(define ghc-cheapskate-0.1.0.5 - (package - (inherit ghc-cheapskate) - (version "0.1.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cheapskate/cheapskate-" - version - ".tar.gz")) - (sha256 - (base32 - "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs")))) - (arguments - ;; LTS Haskell says data-default >=0.5 && <0.8 - `(#:configure-flags (list "--allow-newer=data-default"))))) - (define-public idris (package (name "idris") - (version "1.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append @@ -88,12 +42,12 @@ "idris-" version "/idris-" version ".tar.gz")) (sha256 (base32 - "1srbz0cyvd0k1yqgbrwnfj94yg5y3z533q1kzac96z1h7v454s5h")))) + "1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48")))) (build-system haskell-build-system) (inputs `(("gmp" ,gmp) ("ncurses" ,ncurses) - ("ghc-aeson" ,ghc-aeson-1.1.2.0) + ("ghc-aeson" ,ghc-aeson) ("ghc-annotated-wl-pprint" ,ghc-annotated-wl-pprint) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) @@ -101,11 +55,12 @@ ("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-cheapskate" ,ghc-cheapskate-0.1.0.5) + ("ghc-cheapskate" ,ghc-cheapskate) ("ghc-code-page" ,ghc-code-page) ("ghc-fingertree" ,ghc-fingertree) ("ghc-fsnotify" ,ghc-fsnotify) ("ghc-ieee754" ,ghc-ieee754) + ("ghc-megaparsec" ,ghc-megaparsec) ("ghc-network" ,ghc-network) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-regex-tdfa" ,ghc-regex-tdfa) @@ -113,7 +68,6 @@ ("ghc-split" ,ghc-split) ("ghc-terminal-size" ,ghc-terminal-size) ("ghc-text" ,ghc-text) - ("ghc-trifecta" ,ghc-trifecta-1.6.2.1) ("ghc-uniplate" ,ghc-uniplate) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) @@ -131,6 +85,11 @@ (lambda _ (setenv "CC" "gcc") #t)) + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "idris.cabal" + (("aeson >= 0\\.6 && < 1\\.3") + "aeson >= 0.6 && < 1.4")))) (add-after 'install 'fix-libs-install-location (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 9516ef4f934e21fb059cff55d3e5047245178430 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 23:04:23 -0400 Subject: gnu: Add ghc-rerebase. * gnu/packages/haskell.scm (ghc-rerebase): New variable. --- gnu/packages/haskell.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0bd4c9de20..3423164dc1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9338,6 +9338,29 @@ The package is intended to rapidly evolve with the contribution from the community, with the missing features being added with pull-requests.") (license license:expat))) +(define-public ghc-rerebase + (package + (name "ghc-rerebase") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/rerebase/rerebase-" + version ".tar.gz")) + (sha256 + (base32 + "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks")))) + (build-system haskell-build-system) + (inputs + `(("ghc-rebase" ,ghc-rebase))) + (home-page "https://github.com/nikita-volkov/rerebase") + (synopsis "Reexports from ``base'' with many other standard libraries") + (description "A rich drop-in replacement for ``base''. For details and +documentation please visit @uref{https://github.com/nikita-volkov/rerebase, +the project's home page}.") + (license license:expat))) + (define-public ghc-vector-builder (package (name "ghc-vector-builder") -- cgit v1.2.3 From 6369346e5427ea506be15d1b3fa2fed4ac27659d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:59:53 -0400 Subject: gnu: ghc-wai-extra: Update to 3.0.24.2. * gnu/packages/haskell-web.scm (ghc-wai-extra): Update to 3.0.24.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 5300a5701a..10bcbd2899 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -453,7 +453,7 @@ communication between web applications and web servers.") (define-public ghc-wai-extra (package (name "ghc-wai-extra") - (version "3.0.18") + (version "3.0.24.2") (source (origin (method url-fetch) @@ -463,7 +463,7 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "0r079mqqdv14fp97w0rigdpwk6b88grpjlqsjc5y8bbc0skf5za2")))) + "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci")))) (build-system haskell-build-system) (inputs `(("ghc-ansi-terminal" ,ghc-ansi-terminal) -- cgit v1.2.3 From c237721ea5491dfd115151cad06dfb9faee71d36 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:00:52 -0400 Subject: gnu: ghc-vector-builder: Update to 0.3.6. * gnu/packages/haskell.scm (ghc-vector-builder): Update to 0.3.6. [native-inputs]: Add ghc-attoparsec and ghc-rerebase; remove ghc-rebase. --- gnu/packages/haskell.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3423164dc1..2272fd4d51 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9364,7 +9364,7 @@ the project's home page}.") (define-public ghc-vector-builder (package (name "ghc-vector-builder") - (version "0.3.1") + (version "0.3.6") (source (origin (method url-fetch) @@ -9373,17 +9373,18 @@ the project's home page}.") "vector-builder-" version ".tar.gz")) (sha256 (base32 - "1l6sfgd2s107zkp1qd1w6jdjcbznp31769qf99pxar087f697wvp")))) + "06d2pa1fb3ydrl7l6rjazqyxv5i73v65x2f5fp0ypjxfbm6jsmn8")))) (build-system haskell-build-system) (inputs `(("ghc-vector" ,ghc-vector) ("ghc-semigroups" ,ghc-semigroups) ("ghc-base-prelude" ,ghc-base-prelude))) - (native-inputs `(("ghc-tasty" ,ghc-tasty) + (native-inputs `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("ghc-rebase" ,ghc-rebase))) + ("ghc-rerebase" ,ghc-rerebase))) (home-page "https://github.com/nikita-volkov/vector-builder") (synopsis "Vector builder for Haskell") (description "This Haskell package provides an API for constructing vectors. -- cgit v1.2.3 From ca96ba99aecd825945590c35365cf6920e3f5e89 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:01:10 -0400 Subject: gnu: ghc-foldl: Update to 1.4.3. * gnu/packages/haskell.scm (ghc-foldl): Update to 1.4.3. [inputs]: Add ghc-semigroups and ghc-semigroupoids. --- gnu/packages/haskell.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2272fd4d51..ecd465d4da 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9399,7 +9399,7 @@ vector. ") (define-public ghc-foldl (package (name "ghc-foldl") - (version "1.3.5") + (version "1.4.3") (source (origin (method url-fetch) @@ -9408,7 +9408,7 @@ vector. ") "foldl-" version ".tar.gz")) (sha256 (base32 - "10qsp7dj2xsq4q2xm6x6b12y5pq32qf7my41hnkmdwwbccvhdxb2")))) + "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk")))) (build-system haskell-build-system) (inputs `(("ghc-mwc-randam" ,ghc-mwc-random) ("ghc-primitive" ,ghc-primitive) @@ -9417,7 +9417,9 @@ vector. ") ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-hashable" ,ghc-hashable) ("ghc-contravariant" ,ghc-contravariant) + ("ghc-semigroups" ,ghc-semigroups) ("ghc-profunctors" ,ghc-profunctors) + ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-comonad" ,ghc-comonad) ("ghc-vector-builder" ,ghc-vector-builder))) (home-page "https://github.com/Gabriel439/Haskell-Foldl-Library") -- cgit v1.2.3 From 24d919ffbdfed549b02f765e5854f54ada5bc5f7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:02:44 -0400 Subject: gnu: ghc-wai-conduit: Update to 3.0.0.4. * gnu/packages/haskell-web.scm (ghc-wai-conduit): Update to 3.0.0.4. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 10bcbd2899..ed1e02f4aa 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -502,7 +502,7 @@ functionality.") (define-public ghc-wai-conduit (package (name "ghc-wai-conduit") - (version "3.0.0.3") + (version "3.0.0.4") (source (origin (method url-fetch) @@ -511,7 +511,7 @@ functionality.") "wai-conduit-" version ".tar.gz")) (sha256 (base32 - "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4")))) + "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) -- cgit v1.2.3 From 1613ee19f60e22d793f2f93fe070ce6e17d78d2d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:05:02 -0400 Subject: gnu: ghc-yaml: Update to 0.8.32. * gnu/packages/haskell.scm (ghc-yaml): Update to 0.8.32. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ecd465d4da..e2666e132c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6148,14 +6148,14 @@ back-ends.") (define-public ghc-yaml (package (name "ghc-yaml") - (version "0.8.28") + (version "0.8.32") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "yaml/yaml-" version ".tar.gz")) (sha256 (base32 - "0swgkzkfrwj0ac7lssn8rnrdfmh3lcsdn5fbq2iwv55di6jbc0pp")))) + "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) -- cgit v1.2.3 From 6f7280b09083e1a174101804faff6576eb0dd422 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:10:55 -0400 Subject: gnu: ghc-monad-logger: Update to 0.3.29. * gnu/packages/haskell.scm (ghc-monad-logger): Update to 0.3.29. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e2666e132c..a109a5d19c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9673,7 +9673,7 @@ operators for looping.") (define-public ghc-monad-logger (package (name "ghc-monad-logger") - (version "0.3.25.1") + (version "0.3.29") (source (origin (method url-fetch) @@ -9682,7 +9682,7 @@ operators for looping.") "monad-logger-" version ".tar.gz")) (sha256 (base32 - "0yv4fsi566zrn30j2g5l901lyqgmflhvzy4hji7ikcbh5d45m920")))) + "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-text" ,ghc-text) -- cgit v1.2.3 From 23aa12fc092c69228c6a636897f17c535605b35e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:11:24 -0400 Subject: gnu: ghc-simple-sendfile: Update to 0.2.27. * gnu/packages/haskell.scm (ghc-simple-sendfile): Update to 0.2.27. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a109a5d19c..d3eae809e9 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8482,7 +8482,7 @@ advanced user's otherwise working script to fail under future circumstances. (define-public ghc-simple-sendfile (package (name "ghc-simple-sendfile") - (version "0.2.25") + (version "0.2.27") (source (origin (method url-fetch) @@ -8491,7 +8491,7 @@ advanced user's otherwise working script to fail under future circumstances. "simple-sendfile-" version ".tar.gz")) (sha256 (base32 - "0k99j9xfcf83c55jmn202hdinhjaa4yn3dal4rvjk2w2rlhqirha")))) + "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) -- cgit v1.2.3 From 478365e36a59355001d46ee136dc550fccfb9c16 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:12:16 -0400 Subject: gnu: hlint: Update to 2.1.10. * gnu/packages/haskell.scm (hlint): Update to 2.1.10. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d3eae809e9..85692c4689 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1319,7 +1319,7 @@ specify refactorings without depending on GHC.") (define-public hlint (package (name "hlint") - (version "2.1.1") + (version "2.1.10") (source (origin (method url-fetch) @@ -1328,7 +1328,7 @@ specify refactorings without depending on GHC.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "0mmfavd158l5ig5wb1b1zbhbraj8hhqvbk4mg85n6c8ndpr4grd4")))) + "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) -- cgit v1.2.3 From c4a68deaad5e32894f881035613c2cdaedf9f61a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:47:49 -0400 Subject: gnu: Add ghc-echo. * gnu/packages/haskell.scm (ghc-echo): New variable. --- gnu/packages/haskell.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 85692c4689..079d8561ce 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1852,6 +1852,32 @@ Writer monad), where list append quickly becomes too expensive.") versions of GHC (i.e., < 6.10).") (license license:bsd-3))) +(define-public ghc-echo + (package + (name "ghc-echo") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/echo/echo-" + version ".tar.gz")) + (sha256 + (base32 + "1vw5ykpwhr39wc0hhcgq3r8dh59zq6ib4zxbz1qd2wl21wqhfkvh")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0br8wfiybcw5hand4imiw0i5hacdmrax1dv8g95f35gazffbx42l"))) + (home-page "https://github.com/RyanGlScott/echo") + (synopsis "Echo terminal input portably") + (description "The @code{base} library exposes the @code{hGetEcho} and +@code{hSetEcho} functions for querying and setting echo status, but +unfortunately, neither function works with MinTTY consoles on Windows. +This library provides an alternative interface which works with both +MinTTY and other consoles.") + (license license:bsd-3))) + (define-public cabal-install (package (name "cabal-install") -- cgit v1.2.3 From bf7e5884321ee4f4c4f3c83a647b92817b511453 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:43:20 -0400 Subject: gnu: Add ghc-cryptohash-sha256. * gnu/packages/haskell-crypto.scm (ghc-cryptohash-sha256): New variable. --- gnu/packages/haskell-crypto.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index ff44970be0..0d9617e03d 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -253,6 +253,42 @@ pure API to the @uref{https://en.wikipedia.org/wiki/SHA-1, SHA-1 hash algorithm} including @uref{https://en.wikipedia.org/wiki/HMAC, HMAC support}, with performance close to the fastest implementations available in other languages. +The implementation is made in C with a haskell FFI wrapper that hides +the C implementation.") + (license license:bsd-3))) + +(define-public ghc-cryptohash-sha256 + (package + (name "ghc-cryptohash-sha256") + (version "0.11.101.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "cryptohash-sha256-" version "/" + "cryptohash-sha256-" version ".tar.gz")) + (sha256 + (base32 + "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3") + #:tests? #f)) ; tests require old version of ghc-hunit (0.9) + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring))) + (native-inputs + `(("ghc-sha" ,ghc-sha) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/hvr/cryptohash-sha1") + (synopsis "SHA-256 implementation for Haskell") + (description "This Haskell package provides an incremental and +one-pass, pure API to the @uref{https://en.wikipedia.org/wiki/SHA-2, +SHA-256 cryptographic hash algorithm}, with performance close to the +fastest implementations available in other languages. + The implementation is made in C with a haskell FFI wrapper that hides the C implementation.") (license license:bsd-3))) -- cgit v1.2.3 From 5a88cff239c238ba04b7ec45fae66aae077a0958 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:46:06 -0400 Subject: ghc: Add ghc-ed25519. * gnu/packages/haskell-crypto.scm (ghc-ed25519): New variable. --- gnu/packages/haskell-crypto.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 0d9617e03d..9bdcdb2f9e 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -701,3 +701,33 @@ percent. @item Monte Carlo value for Pi is 3.132465868 (error 0.29 percent). @end itemize") (license license:bsd-3))) + +(define-public ghc-ed25519 + (package + (name "ghc-ed25519") + (version "0.0.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/ed25519/ed25519-" + version ".tar.gz")) + (sha256 + (base32 + "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1cq6h3jqkb1kvd9fjfhsllg5gq78sdiyf2gy9862xhlbv6wil19f") + ;; We omit these test suites because they require old versions of + ;; packages and packages we do not have. + #:configure-flags + '("--flags=-test-hlint -test-doctests -test-properties"))) + (home-page "http://thoughtpolice.github.com/hs-ed25519") + (synopsis "Ed25519 cryptographic signatures") + (description "This package provides a simple, fast, self-contained +copy of the Ed25519 public-key signature system with a clean interface. +It also includes support for detached signatures, and thorough +documentation on the design and implementation, including usage +guidelines.") + (license license:expat))) -- cgit v1.2.3 From 45e421ff219caa89ed3ad13981e5cb7886ac9326 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:49:02 -0400 Subject: gnu: Add ghc-hackage-security. * gnu/packages/haskell.scm (ghc-hackage-security): New variable. --- gnu/packages/haskell.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 079d8561ce..2b256a0f5d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1878,6 +1878,52 @@ This library provides an alternative interface which works with both MinTTY and other consoles.") (license license:bsd-3))) +(define-public ghc-hackage-security + (package + (name "ghc-hackage-security") + (version "0.5.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hackage-security/hackage-security-" + version ".tar.gz")) + (sha256 + (base32 + "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v")))) + (build-system haskell-build-system) + (arguments + `(#:tests? #f)) ; Tests fail because of framework updates. + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256) + ("ghc-ed25519" ,ghc-ed25519) + ("ghc-network" ,ghc-network) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-parsec" ,ghc-parsec) + ("ghc-tar" ,ghc-tar) + ("ghc-zlib" ,ghc-zlib))) + (native-inputs + `(("ghc-network-uri" ,ghc-network-uri) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tar" ,ghc-tar) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-temporary" ,ghc-temporary) + ("ghc-zlib" ,ghc-zlib))) + (home-page "https://github.com/haskell/hackage-security") + (synopsis "Hackage security library") + (description "This Hackage security library provides both server and +client utilities for securing @uref{http://hackage.haskell.org/, the +Hackage package server}. It is based on +@uref{http://theupdateframework.com/, The Update Framework}, a set of +recommendations developed by security researchers at various universities +in the US as well as developers on the @uref{https://www.torproject.org/, +Tor project}.") + (license license:bsd-3))) + (define-public cabal-install (package (name "cabal-install") -- cgit v1.2.3 From 246cdfac2f551ef010ac98495c5ead1a688f37bb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 09:50:32 -0400 Subject: gnu: Add ghc-resolv. * gnu/packages/haskell.scm (ghc-resolv): New variable. --- gnu/packages/haskell.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2b256a0f5d..a1047abd86 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1924,6 +1924,35 @@ in the US as well as developers on the @uref{https://www.torproject.org/, Tor project}.") (license license:bsd-3))) +(define-public ghc-resolv + (package + (name "ghc-resolv") + (version "0.1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/resolv/resolv-" + version ".tar.gz")) + (sha256 + (base32 + "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma") + #:tests? #f)) ; The required test frameworks are too old. + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring))) + (home-page "https://github.com/haskell/hackage-security") + (synopsis "Domain Name Service (DNS) lookup via @code{libresolv}") + (description "This package implements an API for accessing the +@uref{https://tools.ietf.org/html/rfc1035, Domain Name Service (DNS)} +resolver service via the standard @code{libresolv} system library (whose +API is often available directly via the standard @code{libc} C library) on +Unix systems.") + (license license:gpl3))) + (define-public cabal-install (package (name "cabal-install") -- cgit v1.2.3 From f707db294ae088e297b3eef22632e26571320be4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:12:40 -0400 Subject: gnu: cabal-install: Update to 2.2.0.0. * gnu/packages/haskell.scm (cabal-install): Update to 2.2.0.0. [inputs] Add ghc-async, ghc-base16-bytestring, ghc-cryptohash-sha256, ghc-echo, ghc-edit-distance, ghc-hackage-security, ghc-hashable, ghc-resolv, and ghc-tar. --- gnu/packages/haskell.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a1047abd86..b23a61961c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1956,7 +1956,7 @@ Unix systems.") (define-public cabal-install (package (name "cabal-install") - (version "1.22.6.0") + (version "2.2.0.0") (source (origin (method url-fetch) @@ -1965,15 +1965,24 @@ Unix systems.") version ".tar.gz")) (sha256 - (base32 "1d5h7h2wjwc2s3dvsvzjgmmfrfl2312ym2h6kyjgm9wnaqw9w8wx")))) + (base32 "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8")))) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (build-system haskell-build-system) (inputs - `(("ghc-http" ,ghc-http) + `(("ghc-async" ,ghc-async) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256) + ("ghc-echo" ,ghc-echo) + ("ghc-edit-distance" ,ghc-edit-distance) + ("ghc-hackage-security" ,ghc-hackage-security) + ("ghc-hashable" ,ghc-hashable) + ("ghc-http" ,ghc-http) ("ghc-network-uri" ,ghc-network-uri) ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) + ("ghc-resolv" ,ghc-resolv) ("ghc-stm" ,ghc-stm) + ("ghc-tar" ,ghc-tar) ("ghc-zlib" ,ghc-zlib))) (home-page "https://www.haskell.org/cabal/") (synopsis "Command-line interface for Cabal and Hackage") -- cgit v1.2.3 From fbdf4031891fa1f0c5a82b9c7c773bcb64ea40b2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:54:31 -0400 Subject: gnu: ghc-feed: Update to 1.0.0.0. * gnu/packages/haskell.scm (ghc-feed): Update to 1.0.0.0. [arguments]: Update Cabal file to r4. [inputs]: Add ghc-base-compat, ghc-safe, ghc-text, ghc-xml-conduit, and ghc-xml-types; remove ghc-xml. --- gnu/packages/haskell.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b23a61961c..2347a4deb1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3465,7 +3465,7 @@ online}.") (define-public ghc-feed (package (name "ghc-feed") - (version "0.3.12.0") + (version "1.0.0.0") (source (origin (method url-fetch) @@ -3473,14 +3473,21 @@ online}.") "feed/feed-" version ".tar.gz")) (sha256 (base32 - "0hkrsinspg70bbm3hwqdrvivws6zya1hyk0a3awpaz82j4xnlbfc")))) + "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("4" "0baavcavm3ywykcr9cm07aqr7sna98jba2n68lyn3kany8ri214d"))) (inputs - `(("ghc-old-locale" ,ghc-old-locale) + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-old-locale" ,ghc-old-locale) ("ghc-old-time" ,ghc-old-time) + ("ghc-safe" ,ghc-safe) + ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-xml" ,ghc-xml))) + ("ghc-xml-conduit" ,ghc-xml-conduit) + ("ghc-xml-types" ,ghc-xml-types))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) -- cgit v1.2.3 From b9f67d10bcbd969884e3f579d1dd9ff585b2016a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:14:08 -0400 Subject: gnu: ghc-lens: Update to 4.16.1. * gnu/packages/haskell.scm (ghc-lens): Update to 4.16.1. [arguments]: Update Cabal file to r2. [inputs]: Remove ghc-doctest-0.13. [native-inputs]: Add ghc-doctest. --- gnu/packages/haskell.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2347a4deb1..351420c108 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4971,7 +4971,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (define-public ghc-lens (package (name "ghc-lens") - (version "4.15.4") + (version "4.16.1") (source (origin (method url-fetch) @@ -4979,12 +4979,14 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") version ".tar.gz")) (sha256 (base32 - "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl")))) + "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri"))) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-doctest" ,ghc-doctest-0.13) ("ghc-distributive" ,ghc-distributive) ("ghc-exceptions" ,ghc-exceptions) ("ghc-free" ,ghc-free) @@ -5010,6 +5012,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("hlint" ,hlint))) (native-inputs `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) -- cgit v1.2.3 From bc368781b6b3d81442a1dda44d93361b18eb987a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:14:48 -0400 Subject: gnu: ghc-persistent: Update to 2.8.2. * gnu/packages/haskell.scm (ghc-persistent): Update to 2.8.2. [inputs]: Add ghc-void. --- gnu/packages/haskell.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 351420c108..e07b3423fd 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10027,7 +10027,7 @@ Haskell data types to and from HTTP API data.") (define-public ghc-persistent (package (name "ghc-persistent") - (version "2.7.3.1") + (version "2.8.2") (source (origin (method url-fetch) @@ -10036,7 +10036,7 @@ Haskell data types to and from HTTP API data.") "persistent-" version ".tar.gz")) (sha256 (base32 - "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p")))) + "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) ("ghc-text" ,ghc-text) @@ -10061,7 +10061,8 @@ Haskell data types to and from HTTP API data.") ("ghc-silently" ,ghc-silently) ("ghc-fast-logger" ,ghc-fast-logger) ("ghc-scientific" ,ghc-scientific) - ("ghc-tagged" ,ghc-tagged))) + ("ghc-tagged" ,ghc-tagged) + ("ghc-void" ,ghc-void))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) (home-page "https://www.yesodweb.com/book/persistent") (synopsis "Type-safe, multi-backend data serialization for Haskell") -- cgit v1.2.3 From 47334ea099f3ed71cf0f9613d3f3e21d85834575 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:16:59 -0400 Subject: gnu: ghc-warp: Update to 3.2.23. * gnu/packages/haskell-web.scm (ghc-warp): Update to 3.2.23. [arguments]: Enable tests. [inputs]: Remove ghc-blaze-builder, ghc-bytestring-builder, and ghc-lifted-base; add ghc-bsb-http-chunked. [native-inputs]: Remove ghc-auto-update and ghc-http; add curl, ghc-lifted-base, and ghc-http-client. --- gnu/packages/haskell-web.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index ed1e02f4aa..cf57e8fd96 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -23,6 +23,7 @@ (define-module (gnu packages haskell-web) #:use-module (gnu packages) + #:use-module (gnu packages curl) #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) @@ -551,7 +552,7 @@ transfers.") (define-public ghc-warp (package (name "ghc-warp") - (version "3.2.11.1") + (version "3.2.23") (source (origin (method url-fetch) @@ -560,15 +561,12 @@ transfers.") ".tar.gz")) (sha256 (base32 - "1zp5cy0bbj508vdvms1n5z80z37m253kwsqc5a83cfc990n6fgw5")))) + "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0")))) (build-system haskell-build-system) - (arguments - `(#:tests? #f)) ; FIXME: Test-Suite `spec` fails. (inputs `(("ghc-async" ,ghc-async) ("ghc-auto-update" ,ghc-auto-update) - ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-bytestring-builder" ,ghc-bytestring-builder) + ("ghc-bsb-http-chunked" ,ghc-bsb-http-chunked) ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-hashable" ,ghc-hashable) ("ghc-http-types" ,ghc-http-types) @@ -581,18 +579,18 @@ transfers.") ("ghc-vault" ,ghc-vault) ("ghc-wai" ,ghc-wai) ("ghc-word8" ,ghc-word8) - ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-http-date" ,ghc-http-date) ("ghc-simple-sendfile" ,ghc-simple-sendfile) ("ghc-http2" ,ghc-http2))) (native-inputs - `(("ghc-silently" ,ghc-silently) + `(("curl" ,curl) + ("ghc-silently" ,ghc-silently) ("ghc-hspec" ,ghc-hspec) - ("ghc-auto-update" ,ghc-auto-update) ("ghc-doctest" ,ghc-doctest) + ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit) - ("ghc-http" ,ghc-http) + ("ghc-http-client" ,ghc-http-client) ("hspec-discover" ,hspec-discover))) (home-page "http://github.com/yesodweb/wai") (synopsis "HTTP server library for Haskell's WAI") -- cgit v1.2.3 From ccd4fd3f2a614996bff5436cc22e4715a7eb1f31 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:19:05 -0400 Subject: gnu: xmobar: Update to 0.28. * gnu/packages/wm.scm (xmobar): Update to 0.28. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index db345cd2fd..4ec465f875 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -504,14 +504,14 @@ tiled on several screens.") (define-public xmobar (package (name "xmobar") - (version "0.27") + (version "0.28") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmobar/" name "-" version ".tar.gz")) (sha256 (base32 - "0agx490q6sbmv3vfq33ys8dsrgwizj3bmha4i1pkxz5wp5q8cx3l")))) + "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) -- cgit v1.2.3 From 6dde5b8f974b306b7f60871877152224d82e3c2d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:20:38 -0400 Subject: gnu: ghc-chart: Update to 1.9. * gnu/packages/haskell.scm (ghc-chart): Update to 1.9. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e07b3423fd..50956f43ed 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10526,7 +10526,7 @@ tools are not needed to actually run Gtk2Hs programs.") (define-public ghc-chart (package (name "ghc-chart") - (version "1.8.3") + (version "1.9") (source (origin (method url-fetch) @@ -10534,7 +10534,7 @@ tools are not needed to actually run Gtk2Hs programs.") "Chart-" version ".tar.gz")) (sha256 (base32 - "13s64fhb2pmkdmx5bkgbgcn25qjihs364fvr47a1dw25f804kiy1")))) + "1f5azj17y8xsb3gjhf7gg1gnnlq12rxkmfjmgcly314d7vghs05z")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) -- cgit v1.2.3 From e4bc57c85bb3ec8bc8eef35f3ff0fd3d1cb4b267 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:23:48 -0400 Subject: gnu: ghc-persistent-template: Update to 2.5.4. * gnu/packages/haskell.scm (ghc-persistent-template): Update to 2.5.4. [arguments]: Update Cabal file to r2. --- gnu/packages/haskell.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 50956f43ed..7c1c4af8f2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10109,7 +10109,7 @@ ghc-aeson.") (define-public ghc-persistent-template (package (name "ghc-persistent-template") - (version "2.5.3.1") + (version "2.5.4") (source (origin (method url-fetch) @@ -10118,8 +10118,11 @@ ghc-aeson.") "persistent-template-" version ".tar.gz")) (sha256 (base32 - "0449piw3n02q7dag7k1pakfmzmf3ms4wk1qmnagczpm1ckajinwd")))) + "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6"))) (inputs `(("ghc-persistent" ,ghc-persistent) ("ghc-monad-control" ,ghc-monad-control) ("ghc-text" ,ghc-text) -- cgit v1.2.3 From dc676afb8cf4b0a9b44d630c917dfdb996e597ee Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:24:07 -0400 Subject: gnu: ghc-trifecta: Update to 2. * gnu/packages/haskell.scm (ghc-trifecta): Update to 2. [inputs]: Remove ghc-doctest-0.13, ghc-doctest, and ghc-quickcheck. [native-inputs]: Add ghc-doctest and ghc-quickcheck. --- gnu/packages/haskell.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7c1c4af8f2..aebe223193 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2944,7 +2944,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s (define-public ghc-trifecta (package (name "ghc-trifecta") - (version "1.7.1.1") + (version "2") (source (origin (method url-fetch) (uri (string-append @@ -2952,11 +2952,10 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s "trifecta-" version ".tar.gz")) (sha256 (base32 - "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31")))) + "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk")))) (build-system haskell-build-system) (inputs - `(("ghc-doctest" ,ghc-doctest-0.13) - ("ghc-reducers" ,ghc-reducers) + `(("ghc-reducers" ,ghc-reducers) ("ghc-semigroups" ,ghc-semigroups) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) ("ghc-ansi-terminal" ,ghc-ansi-terminal) @@ -2965,17 +2964,17 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-charset" ,ghc-charset) ("ghc-comonad" ,ghc-comonad) - ("ghc-doctest" ,ghc-doctest) ("ghc-fingertree" ,ghc-fingertree) ("ghc-hashable" ,ghc-hashable) ("ghc-lens" ,ghc-lens) ("ghc-parsers" ,ghc-parsers) ("ghc-profunctors" ,ghc-profunctors) - ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string))) (native-inputs - `(("cabal-doctest" ,cabal-doctest))) + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ekmett/trifecta/") (synopsis "Parser combinator library with convenient diagnostics") (description "Trifecta is a modern parser combinator library for Haskell, -- cgit v1.2.3 From 8401d3aad04d4ed256c92e5c525f7c4130930b6f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 31 Aug 2018 23:58:50 -0400 Subject: gnu: Remove old versions of ghc-doctest. * gnu/packages/haskell.scm (ghc-doctest-0.12, ghc-doctest-0.13): Remove. --- gnu/packages/haskell.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index aebe223193..30f764339e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5366,37 +5366,6 @@ It is modeled after doctest for Python, see @uref{https://docs.python.org/library/doctest.html, the Doctest website}.") (license license:expat))) -(define-public ghc-doctest-0.12 - (package (inherit ghc-doctest) - (name "ghc-doctest") - (version "0.12.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/doctest/doctest-" - version - ".tar.gz")) - (sha256 - (base32 - "13h549cpgcvb7c54c7wif28g5wak84dxc3ais0hlqhzk1q6la91a")))) - (inputs - `(("ghc-code-page" ,ghc-code-page) - ,@(package-inputs ghc-doctest))))) - -(define-public ghc-doctest-0.13 - (package (inherit ghc-doctest-0.12) - (name "ghc-doctest") - (version "0.13.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "doctest/doctest-" version ".tar.gz")) - (sha256 - (base32 - "08g3nmpqbnbkxc95d65hkhfabwax10qrq51vlynr342npn40mn2b")))))) - (define-public ghc-lifted-base (package (name "ghc-lifted-base") -- cgit v1.2.3 From 6ef07930743b1c2d81c9b3a026b5f66ce1b4f74b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:24:28 -0400 Subject: gnu: ghc-warp-tls: Update to 3.2.4.3. * gnu/packages/haskell-web.scm (ghc-warp-tls): Update to 3.2.4.3. [inputs]: Add ghc-tls-session-manager. --- gnu/packages/haskell-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index cf57e8fd96..9f96727a86 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -627,7 +627,7 @@ limitation, automatic pruning, energy saving and replay resistance.") (define-public ghc-warp-tls (package (name "ghc-warp-tls") - (version "3.2.3") + (version "3.2.4.3") (source (origin (method url-fetch) @@ -636,7 +636,7 @@ limitation, automatic pruning, energy saving and replay resistance.") "warp-tls-" version ".tar.gz")) (sha256 (base32 - "14m2bzk5ivz9gdpxlcj6qnh46f2lycm1ybdjnfkj2876zrqwii7m")))) + "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4")))) (build-system haskell-build-system) (inputs `(("ghc-cryptonite" ,ghc-cryptonite) @@ -644,6 +644,7 @@ limitation, automatic pruning, energy saving and replay resistance.") ("ghc-network" ,ghc-network) ("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-tls" ,ghc-tls) + ("ghc-tls-session-manager" ,ghc-tls-session-manager) ("ghc-wai" ,ghc-wai) ("ghc-warp" ,ghc-warp))) (home-page "http://github.com/yesodweb/wai") -- cgit v1.2.3 From 12ce5d31d19bd40f71b1f7b865fe32dbf5f0848f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 22 Sep 2018 11:08:31 -0400 Subject: gnu: Add ghc-rio. * gnu/packages/haskell.scm (ghc-rio): New variable. --- gnu/packages/haskell.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 30f764339e..a0ca08720f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10556,4 +10556,56 @@ widths to the Char type.") ("ghc-attoparsec" ,ghc-attoparsec-bootstrap))) (properties '(hidden? #t)))) +(define-public ghc-rio + (package + (name "ghc-rio") + (version "0.1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/rio/rio-" + version ".tar.gz")) + (sha256 + (base32 + "064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'add-setup-script + (lambda _ + ;; The usual "Setup.hs" script is missing from the source. + (with-output-to-file "Setup.hs" + (lambda () + (format #t "import Distribution.Simple~%") + (format #t "main = defaultMain~%")))))))) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-hashable" ,ghc-hashable) + ("ghc-microlens" ,ghc-microlens) + ("ghc-primitive" ,ghc-primitive) + ("ghc-text" ,ghc-text) + ("ghc-typed-process" ,ghc-typed-process) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/commercialhaskell/rio#readme") + (synopsis "A standard library for Haskell") + (description "This package works as a prelude replacement for Haskell, +providing more functionality and types out of the box than the standard +prelude (such as common data types like @code{ByteString} and +@code{Text}), as well as removing common ``gotchas'', like partial +functions and lazy I/O. The guiding principle here is: +@itemize +@item If something is safe to use in general and has no expected naming +conflicts, expose it. +@item If something should not always be used, or has naming conflicts, +expose it from another module in the hierarchy. +@end itemize") + (license license:expat))) + ;;; haskell.scm ends here -- cgit v1.2.3 From 0ea695f67754c18a85d384dd32602f0a998549e0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:24:48 -0400 Subject: gnu: ghc-yesod-core: Update to 1.6.6. * gnu/packages/haskell-web.scm (ghc-yesod-core): Update to 1.6.6. [inputs]: Add ghc-unliftio and ghc-rio. --- gnu/packages/haskell-web.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 9f96727a86..2271e1e982 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1069,7 +1069,7 @@ avoid any issues with characters.") (define-public ghc-yesod-core (package (name "ghc-yesod-core") - (version "1.4.37") + (version "1.6.6") (source (origin (method url-fetch) @@ -1078,7 +1078,7 @@ avoid any issues with characters.") "yesod-core-" version ".tar.gz")) (sha256 (base32 - "0ww8hl0cx2g58zrdx3j6d5m2xwhssbajdqws1xk6rzl7rpfm1b9j")))) + "0xahf6m5c7mkl74p0gimy4wb5w4s3lh92wwxmk517fbq666c92kb")))) (build-system haskell-build-system) (inputs `(("ghc-wai" ,ghc-wai) ("ghc-extra" ,ghc-extra) @@ -1089,6 +1089,7 @@ avoid any issues with characters.") ("ghc-random" ,ghc-random) ("ghc-cereal" ,ghc-cereal) ("ghc-old-locale" ,ghc-old-locale) + ("ghc-unliftio" ,ghc-unliftio) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-monad-control" ,ghc-monad-control) ("ghc-transformers-base" ,ghc-transformers-base) @@ -1103,6 +1104,7 @@ avoid any issues with characters.") ("ghc-monad-logger" ,ghc-monad-logger) ("ghc-conduit" ,ghc-conduit) ("ghc-resourcet" ,ghc-resourcet) + ("ghc-rio" ,ghc-rio) ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) -- cgit v1.2.3 From 7eee87e65d9e2da183887ade425a29de1a1f024d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:27:50 -0400 Subject: gnu: ghc-persistent-sqlite: Update to 2.8.2. * gnu/packages/haskell.scm (ghc-persistent-sqlite): Update to 2.8.2. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a0ca08720f..a373de8ea4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10217,7 +10217,7 @@ working with it.") (define-public ghc-persistent-sqlite (package (name "ghc-persistent-sqlite") - (version "2.6.4") + (version "2.8.2") (source (origin (method url-fetch) @@ -10226,7 +10226,7 @@ working with it.") "persistent-sqlite-" version ".tar.gz")) (sha256 (base32 - "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm")))) + "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6")))) (build-system haskell-build-system) (inputs `(("ghc-persistent" ,ghc-persistent) ("ghc-unliftio-core" ,ghc-unliftio-core) -- cgit v1.2.3 From c6cf0eb5fb7bd1a77164293b727d1bc0d678d64c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 00:18:38 -0400 Subject: gnu: Add ghc-tree-diff. * gnu/packages/haskell.scm (ghc-tree-diff): New variable. --- gnu/packages/haskell.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a373de8ea4..ed83ece155 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -872,6 +872,66 @@ and an alternative to newtype-th.") efficient memo functions using tries.") (license license:bsd-3))) +(define-public ghc-tree-diff + (package + (name "ghc-tree-diff") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/tree-diff/tree-diff-" + version + ".tar.gz")) + (sha256 + (base32 + "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("4" "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "tree-diff.cabal" + (("trifecta >=1\\.7\\.1\\.1 && <1\\.8") + "trifecta >=1.7.1.1 && <=2"))))))) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-base-compat" ,ghc-base-compat) + ("ghc-generics-sop" ,ghc-generics-sop) + ("ghc-hashable" ,ghc-hashable) + ("ghc-memotrie" ,ghc-memotrie) + ("ghc-parsec" ,ghc-parsec) + ("ghc-parsers" ,ghc-parsers) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-scientific" ,ghc-scientific) + ("ghc-tagged" ,ghc-tagged) + ("ghc-text" ,ghc-text) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-uuid-types" ,ghc-uuid-types) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-parsec" ,ghc-parsec) + ("ghc-trifecta" ,ghc-trifecta) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/phadej/tree-diff") + (synopsis "Compute difference between (expression) trees") + (description "This Haskell library provides a function for computing +the difference bewteen (expression) trees. It also provides a way to +compute the difference between arbitrary abstract datatypes (ADTs) using +@code{Generics}-derivable helpers.") + (license license:bsd-3))) + (define-public ghc-haddock-library (package (name "ghc-haddock-library") -- cgit v1.2.3 From 99daa2948810d6f738c8e133fec28f414c3e5db8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:30:54 -0400 Subject: gnu: ghc-aws: Update to 0.20. * gnu/packages/haskell.scm (ghc-aws): Update to 0.20. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index ed83ece155..94fa666b86 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9656,14 +9656,14 @@ as well as a convenient Conduit module.") (define-public ghc-aws (package (name "ghc-aws") - (version "0.18") + (version "0.20") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "aws-" version "/aws-" version ".tar.gz")) (sha256 (base32 - "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj")))) + "0pwpabmypi1w8rni9qfwabgn95jks4h8dyw6889mn8xzsrhdhyf0")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; Tests require AWS credentials. (inputs -- cgit v1.2.3 From 3b72e7e2d4bbdf024d3e6f5a083a0bfe54b65f37 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 23 Aug 2018 23:09:32 -0400 Subject: gnu: ghc-esqueleto: Update to commit b81e0d9. * gnu/packages/haskell.scm (ghc-esqueleto): Update to commit b81e0d9. [source]: Use git-fetch. [arguments]: Disable Haddock and add phase to remove MySQL and PostgreSQL test-suites. [inputs]: Add ghc-unliftio. [native-inputs]: Remove ghc-hunit, ghc-monad-control, and ghc-quickcheck. --- gnu/packages/haskell.scm | 91 +++++++++++++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 94fa666b86..5f9c2a4b6e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8555,42 +8555,69 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.") (license license:bsd-3))) (define-public ghc-esqueleto - (package - (name "ghc-esqueleto") - (version "2.5.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "esqueleto/esqueleto-" version ".tar.gz")) - (sha256 - (base32 - "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x")))) - (build-system haskell-build-system) - (inputs - `(("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-conduit" ,ghc-conduit) - ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-persistent" ,ghc-persistent) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-hunit" ,ghc-hunit) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-persistent-sqlite" ,ghc-persistent-sqlite) - ("ghc-persistent-template" ,ghc-persistent-template) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/bitemyapp/esqueleto") - (synopsis "Type-safe embedded domain specific language for SQL queries") - (description "This library provides a type-safe embedded domain specific + (let ((version "2.5.3") + (revision "1") + (commit "b81e0d951e510ebffca03c5a58658ad884cc6fbd")) + (package + (name "ghc-esqueleto") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bitemyapp/esqueleto") + (commit commit))) + (sha256 + (base32 + "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa")))) + (build-system haskell-build-system) + (arguments + `(#:haddock? #f ; Haddock reports an internal error. + #:phases + (modify-phases %standard-phases + ;; This package normally runs tests for the MySQL, PostgreSQL, and + ;; SQLite backends. Since we only have Haskell packages for + ;; SQLite, we remove the other two test suites. FIXME: Add the + ;; other backends and run all three test suites. + (add-before 'configure 'remove-non-sqlite-test-suites + (lambda _ + (use-modules (ice-9 rdelim)) + (with-atomic-file-replacement "esqueleto.cabal" + (lambda (in out) + (let loop ((line (read-line in 'concat)) (deleting? #f)) + (cond + ((eof-object? line) #t) + ((string-every char-set:whitespace line) + (unless deleting? (display line out)) + (loop (read-line in 'concat) #f)) + ((member line '("test-suite mysql\n" + "test-suite postgresql\n")) + (loop (read-line in 'concat) #t)) + (else + (unless deleting? (display line out)) + (loop (read-line in 'concat) deleting?))))))))))) + (inputs + `(("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-conduit" ,ghc-conduit) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-persistent" ,ghc-persistent) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-tagged" ,ghc-tagged) + ("ghc-text" ,ghc-text) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-persistent-sqlite" ,ghc-persistent-sqlite) + ("ghc-persistent-template" ,ghc-persistent-template))) + (home-page "https://github.com/bitemyapp/esqueleto") + (synopsis "Type-safe embedded domain specific language for SQL queries") + (description "This library provides a type-safe embedded domain specific language (EDSL) for SQL queries that works with SQL backends as provided by @code{ghc-persistent}. Its language closely resembles SQL, so you don't have to learn new concepts, just new syntax, and it's fairly easy to predict the generated SQL and optimize it for your backend.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public shellcheck (package -- cgit v1.2.3 From 082d9383d1475b772f104f1a6b363e4c80d91cf9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:06:20 -0400 Subject: gnu: ghc-haddock-library: Update to 1.5.0.1. * gnu/packages/patches/ghc-haddock-library-unbundle.patch: New file. * gnu/packages/haskell.scm (ghc-haddock-library): Update to 1.5.0.1. [source]: Add the patch; add a snippet to remove the bundled library. [arguments]: Add a phase to relax test suite dependency constraints and another to add a missing directory required for tests. [native-inputs]: Add ghc-base-compat, ghc-optparse-applicative, and ghc-tree-diff. --- gnu/packages/haskell.scm | 35 +++++++-- .../patches/ghc-haddock-library-unbundle.patch | 86 ++++++++++++++++++++++ 2 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/ghc-haddock-library-unbundle.patch (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 5f9c2a4b6e..0e061a6b40 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -935,7 +935,7 @@ compute the difference between arbitrary abstract datatypes (ADTs) using (define-public ghc-haddock-library (package (name "ghc-haddock-library") - (version "1.4.3") + (version "1.5.0.1") (source (origin (method url-fetch) @@ -945,14 +945,37 @@ compute the difference between arbitrary abstract datatypes (ADTs) using ".tar.gz")) (sha256 (base32 - "0ns4bpf6whmcfl0cm2gx2c73if416x4q3ac4l4qm8w84h0zpcr7p")))) + "1cmbg8l5xrwpliclwy3l057raypjqy0hsg1h1743ahaj8gq10b7z")) + (patches (search-patches + "ghc-haddock-library-unbundle.patch")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "vendor") + #t)))) (build-system haskell-build-system) - (inputs - `(("ghc-base-compat" ,ghc-base-compat))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'relax-test-suite-dependencies + (lambda _ + (substitute* "haddock-library.cabal" + (("base-compat\\s*\\^>= 0\\.9\\.3") "base-compat") + (("hspec\\s*\\^>= 2\\.4\\.4") "hspec")))) + ;; The release tarball does not contain the "fixtures/examples" + ;; directory, which is required for testing. In the upstream + ;; repository, the directory exists and is populated. Here, we + ;; create an empty directory to placate the tests. + (add-before 'check 'add-examples-directory + (lambda _ + (mkdir "fixtures/examples") + #t))))) (native-inputs - `(("hspec-discover" ,hspec-discover) + `(("ghc-base-compat" ,ghc-base-compat) ("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck))) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tree-diff" ,ghc-tree-diff) + ("hspec-discover" ,hspec-discover))) (home-page "https://www.haskell.org/haddock/") (synopsis "Library exposing some functionality of Haddock") (description diff --git a/gnu/packages/patches/ghc-haddock-library-unbundle.patch b/gnu/packages/patches/ghc-haddock-library-unbundle.patch new file mode 100644 index 0000000000..0e8b548956 --- /dev/null +++ b/gnu/packages/patches/ghc-haddock-library-unbundle.patch @@ -0,0 +1,86 @@ +This patch (inspired by Debian) allows ghc-haddock-library to use our +ghc-attoparsec package instead of using a bundled version. + +--- a/haddock-library.cabal 2018-09-01 01:22:18.676855884 -0400 ++++ b/haddock-library.cabal 2018-09-01 01:25:10.501150260 -0400 +@@ -10,7 +10,6 @@ + itself, see the ‘haddock’ package. + license: BSD3 + license-files: LICENSE +- vendor/attoparsec-0.13.1.0/LICENSE + maintainer: Alex Biehl , Simon Hengel , Mateusz Kowalczyk + homepage: http://www.haskell.org/haddock/ + bug-reports: https://github.com/haskell/haddock/issues +@@ -28,7 +27,6 @@ + , containers >= 0.4.2.1 && < 0.6 + , transformers >= 0.3.0 && < 0.6 + +- -- internal sub-lib + build-depends: attoparsec + + hs-source-dirs: src +@@ -49,42 +47,6 @@ + if impl(ghc >= 8.0) + ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances + +-library attoparsec +- default-language: Haskell2010 +- +- build-depends: +- base >= 4.5 && < 4.12 +- , bytestring >= 0.9.2.1 && < 0.11 +- , deepseq >= 1.3 && < 1.5 +- +- hs-source-dirs: vendor/attoparsec-0.13.1.0 +- +- -- NB: haddock-library needs only small part of lib:attoparsec +- -- internally, so we only bundle that subset here +- exposed-modules: +- Data.Attoparsec.ByteString +- Data.Attoparsec.ByteString.Char8 +- Data.Attoparsec.Combinator +- +- other-modules: +- Data.Attoparsec +- Data.Attoparsec.ByteString.Buffer +- Data.Attoparsec.ByteString.FastSet +- Data.Attoparsec.ByteString.Internal +- Data.Attoparsec.Internal +- Data.Attoparsec.Internal.Fhthagn +- Data.Attoparsec.Internal.Types +- Data.Attoparsec.Number +- +- ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2 +- +- ghc-options: -Wall +- if impl(ghc >= 8.0) +- ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances +- else +- build-depends: semigroups ^>= 0.18.3, fail ^>= 4.9.0.0 +- +- + test-suite spec + type: exitcode-stdio-1.0 + default-language: Haskell2010 +@@ -115,11 +77,10 @@ + , hspec ^>= 2.4.4 + , QuickCheck ^>= 2.11 + +- -- internal sub-lib + build-depends: attoparsec + + -- Versions for the dependencies below are transitively pinned by +- -- dependency on haddock-library:lib:attoparsec ++ -- dependency on attoparsec + build-depends: + base + , bytestring +@@ -146,7 +107,7 @@ + haddock-library + + -- Versions for the dependencies below are transitively pinned by +- -- dependency on haddock-library:lib:attoparsec ++ -- dependency on attoparsec + build-depends: + base + -- cgit v1.2.3 From 1689d39cd264c7794189eea243ed0b147896610f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:32:05 -0400 Subject: gnu: ghc-yesod-persistent: Update to 1.6.0. * gnu/packages/haskell-web.scm (ghc-yesod-persistent): Update to 1.6.0. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 2271e1e982..0b8f287024 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1140,7 +1140,7 @@ functions, widgets, etc.") (define-public ghc-yesod-persistent (package (name "ghc-yesod-persistent") - (version "1.4.3") + (version "1.6.0") (source (origin (method url-fetch) @@ -1149,7 +1149,7 @@ functions, widgets, etc.") "yesod-persistent-" version ".tar.gz")) (sha256 (base32 - "0kiksw46c8ww9yiwl28pkrppx8d6fhsasr0hvmsliqbrp16likj8")))) + "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH. (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From f548cd7254b696249a185972a55ff18dd0616b34 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:25:11 -0400 Subject: gnu: ghc-haddock-api: Update to 2.19.0.1. * gnu/packages/haskell.scm (ghc-haddock-api): Update to 2.19.0.1. [arguments]: Add a phase that patches the Cabal file to allow newer versions of Cabal and hspec. --- gnu/packages/haskell.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0e061a6b40..bcdb6fb609 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -989,8 +989,7 @@ the ‘haddock’ package.") (define-public ghc-haddock-api (package (name "ghc-haddock-api") - ;; This is the last version to be supported by Cabal < 2.0 - (version "2.17.4") + (version "2.19.0.1") (source (origin (method url-fetch) @@ -1000,8 +999,18 @@ the ‘haddock’ package.") ".tar.gz")) (sha256 (base32 - "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss")))) + "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "haddock-api.cabal" + (("Cabal \\^>= 2\\.0\\.0") + "Cabal ^>= 2.2.0") + (("hspec \\^>= 2\\.4\\.4") + "hspec >= 2.4.4 && < 2.6"))))))) (inputs `(("ghc-paths" ,ghc-paths) ("ghc-haddock-library" ,ghc-haddock-library))) -- cgit v1.2.3 From 6a006a11fde6be270b2d35a9570544c9c70bb967 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 1 Sep 2018 10:55:48 -0400 Subject: gnu: ghc-pandoc: Adjust tests and test dependency constraints. * gnu/packages/haskell.scm (ghc-pandoc)[arguments]: Add a phase to relax a test suite dependency constraint and another to skip some failing tests. --- gnu/packages/haskell.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bcdb6fb609..8b2c157a71 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6859,6 +6859,20 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (base32 "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "pandoc.cabal" + (("tasty >= 0\\.11 && < 1\\.1") + "tasty >= 0.11 && < 1.1.1")))) + (add-before 'configure 'patch-tests + (lambda _ + ;; These tests fail benignly and have been adjusted upstream: + ;; . + (substitute* "test/Tests/Old.hs" + (("lhsWriterTests \"html\"") "[]"))))))) (inputs `(("ghc-aeson" ,ghc-aeson) ("ghc-aeson-pretty" ,ghc-aeson-pretty) -- cgit v1.2.3 From 69054c92854075ffc2027ef9a6459540571ef1f2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:33:31 -0400 Subject: gnu: ghc-yesod-form: Update to 1.6.2. * gnu/packages/haskell-web.scm (ghc-yesod-form): Update to 1.6.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0b8f287024..85b88aa72e 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1173,7 +1173,7 @@ from Yesod.") (define-public ghc-yesod-form (package (name "ghc-yesod-form") - (version "1.4.16") + (version "1.6.2") (source (origin (method url-fetch) @@ -1183,7 +1183,7 @@ from Yesod.") ".tar.gz")) (sha256 (base32 - "0lij3m5vn8nvh6y88r1dhk03xmmjwmjzazm307nc2wvc5fmx9p2j")))) + "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057")))) (build-system haskell-build-system) (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From 1b29af3d16ef9f8636031c8136e50be8abeef5f0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:31:02 -0400 Subject: gnu: ghc-haddock: Update to 2.19.0.1. * gnu/packages/haskell.scm (ghc-haddock): Update to 2.19.0.1. [arguments]: Add a phase that deletes four test suites to avoid a dependency on haddock-test. [native-inputs]: Remove ghc-haddock-test. --- gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8b2c157a71..f153b48034 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1049,7 +1049,7 @@ documentation-generation tool for Haskell libraries.") (define-public ghc-haddock (package (name "ghc-haddock") - (version "2.17.4") + (version "2.19.0.1") (source (origin (method url-fetch) @@ -1059,16 +1059,37 @@ documentation-generation tool for Haskell libraries.") ".tar.gz")) (sha256 (base32 - "1z3h3v7w84dzsm47iavdppc2w899mr4c1agq9fzghgz902i0a655")))) + "1g1j9j0hf2yhyyh0gwz6bzbvfvliqz9x8a8hnkmwghm7w3xa6sb7")))) (build-system haskell-build-system) - ;; FIXME: Tests fail with this error: - ;; driver-test/Main.hs:4:1: error: - ;; Failed to load interface for ‘ResponseFileSpec’ - (arguments `(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; There are four test suites that require the ghc-haddock-test + ;; package, which no longer builds with GHC 8.4.3. This phase + ;; removes these four test suites from the Cabal file, so that we + ;; do not need ghc-haddock-test as an input. + (add-before 'configure 'remove-haddock-test-test-suites + (lambda _ + (use-modules (ice-9 rdelim)) + (with-atomic-file-replacement "haddock.cabal" + (lambda (in out) + (let loop ((line (read-line in 'concat)) (deleting? #f)) + (cond + ((eof-object? line) #t) + ((string-every char-set:whitespace line) + (unless deleting? (display line out)) + (loop (read-line in 'concat) #f)) + ((member line '("test-suite html-test\n" + "test-suite hypsrc-test\n" + "test-suite latex-test\n" + "test-suite hoogle-test\n")) + (loop (read-line in 'concat) #t)) + (else + (unless deleting? (display line out)) + (loop (read-line in 'concat) deleting?))))))))))) (inputs `(("ghc-haddock-api" ,ghc-haddock-api))) (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-haddock-test" ,ghc-haddock-test))) + `(("ghc-hspec" ,ghc-hspec))) (home-page "https://www.haskell.org/haddock/") (synopsis "Documentation-generation tool for Haskell libraries") -- cgit v1.2.3 From 003ec2c8f08265b9e605268981e331e4b4fff6b2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:23:22 -0400 Subject: gnu: ghc-pandoc-citeproc: Update to 0.14.3.1. * gnu/packages/haskell.scm (ghc-pandoc-citeproc): Update to 0.14.3.1. [arguments]: Add a phase to disable some failing YAML tests. --- gnu/packages/haskell.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f153b48034..170d3bdc5d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7207,6 +7207,13 @@ the @code{conduit} package.") (arguments `(#:phases (modify-phases %standard-phases + ;; Many YAML tests (44) are failing do to changes in ghc-yaml: + ;; . + (add-before 'configure 'patch-tests + (lambda _ + (substitute* "tests/test-pandoc-citeproc.hs" + (("let allTests = citeprocTests \\+\\+ biblio2yamlTests") + "let allTests = citeprocTests")))) ;; Tests need to be run after installation. (delete 'check) (add-after 'install 'post-install-check -- cgit v1.2.3 From 662fd1a868ef11479030a00f5e485308c707da91 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:35:00 -0400 Subject: gnu: ghc-yesod: Update to 1.6.0. * gnu/packages/haskell-web.scm (ghc-yesod): Update to 1.6.0. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 85b88aa72e..68dcd9e4b1 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1216,7 +1216,7 @@ providing richtext field using Nic editor. ") (define-public ghc-yesod (package (name "ghc-yesod") - (version "1.4.5") + (version "1.6.0") (source (origin (method url-fetch) @@ -1225,7 +1225,7 @@ providing richtext field using Nic editor. ") version ".tar.gz")) (sha256 (base32 - "1sg66nq8yaas2m5nqsdrxricvcizd1ik02zqk60sxh3wna08fz16")))) + "0wx77nbpzdh40p1bm527kimfj48vs9d2avpvvz2w42zi3pz2y94a")))) (build-system haskell-build-system) (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From 8fe9ab95793c85f391613c789ee71515663f1b79 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 4 Sep 2018 23:52:09 -0400 Subject: gnu: Remove ghc-pandoc@1. This old version of Pandoc no longer builds with GHC 8.4.3. * gnu/packages/haskell-web.scm (ghc-aeson-for-pandoc-1): Remove variable. * gnu/packages/haskell.scm (ghc-pandoc-types-for-pandoc-1, ghc-texmath-for-pandoc-1, ghc-yaml-for-pandoc-1, ghc-hslua-for-pandoc-1, ghc-skylighting-for-pandoc-1, ghc-doctemplates-for-pandoc-1, ghc-pandoc-1, ghc-pandoc-citeproc-with-pandoc-1): Remove variables. --- gnu/packages/haskell-web.scm | 12 --- gnu/packages/haskell.scm | 212 ------------------------------------------- 2 files changed, 224 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 68dcd9e4b1..eaa7e6a9ec 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -852,18 +852,6 @@ for Haskell, optimized for ease of use and high performance. (A note on naming: in Greek mythology, Aeson was the father of Jason.)") (license license:bsd-3))) -(define-public ghc-aeson-for-pandoc-1 - (package (inherit ghc-aeson) - (version "1.1.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/aeson/aeson-" - version ".tar.gz")) - (sha256 - (base32 - "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p")))))) - (define-public ghc-aeson-pretty (package (name "ghc-aeson-pretty") diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 170d3bdc5d..e39c5e0b81 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5757,25 +5757,6 @@ pandoc to represent structured documents. It also provides functions for building up, manipulating and serialising @code{Pandoc} structures.") (license license:bsd-3))) -(define-public ghc-pandoc-types-for-pandoc-1 - (package (inherit ghc-pandoc-types) - (version "1.17.0.5") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pandoc-types/pandoc-types-" - version ".tar.gz")) - (sha256 - (base32 - "1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8")))) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) - (inputs - `(("ghc-syb" ,ghc-syb) - ("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-string-qq" ,ghc-string-qq))))) - (define-public ghc-texmath (package (name "ghc-texmath") @@ -5808,26 +5789,6 @@ markup formats). The TeX reader supports basic LaTeX and AMS extensions, and it can parse and apply LaTeX macros.") (license license:gpl2+))) -(define-public ghc-texmath-for-pandoc-1 - (package (inherit ghc-texmath) - (version "0.9.4.4") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "texmath/texmath-" version ".tar.gz")) - (sha256 - (base32 - "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd")))) - (inputs - `(("ghc-network-uri" ,ghc-network-uri) - ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) - ("ghc-parsec" ,ghc-parsec) - ("ghc-split" ,ghc-split) - ("ghc-syb" ,ghc-syb) - ("ghc-temporary" ,ghc-temporary) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-xml" ,ghc-xml))))) - (define-public ghc-regex-pcre-builtin (package (name "ghc-regex-pcre-builtin") @@ -6382,12 +6343,6 @@ back-ends.") "This package provides a library to parse and render YAML documents.") (license license:bsd-3))) -(define-public ghc-yaml-for-pandoc-1 - (package (inherit ghc-yaml) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ,@(alist-delete "ghc-aeson" (package-inputs ghc-yaml)))))) - (define-public ghc-filemanip (package (name "ghc-filemanip") @@ -6489,27 +6444,6 @@ TIFF and GIF formats.") described in @url{https://www.lua.org/}.") (license license:expat))) -(define-public ghc-hslua-for-pandoc-1 - (package (inherit ghc-hslua) - (version "0.4.1") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslua/hslua-" version ".tar.gz")) - (sha256 - (base32 - "0gqp6qhp4v24kzv2j49kgk7bxqzw0w10x0zr0r2j9wkfavqb9wid")))) - (inputs - `(("lua" ,lua-5.1) - ("ghc-text" ,ghc-text))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("ghc-hspec" ,ghc-hspec) - ("ghc-hspec-contrib" ,ghc-hspec-contrib) - ("ghc-hunit" ,ghc-hunit) - ("hspec-discover" ,hspec-discover))))) - (define-public ghc-hslua-module-text (package (name "ghc-hslua-module-text") @@ -6763,56 +6697,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") `(("ghc-skylighting-core" ,ghc-skylighting-core) ,@(package-inputs ghc-skylighting-core))))) -(define-public ghc-skylighting-for-pandoc-1 - (package (inherit ghc-skylighting) - (version "0.1.1.5") - (source (origin - (method git-fetch) - ;; We take the sources from Github, because the tarball on - ;; hackage does not include the XML files. - (uri (git-reference - (url "https://github.com/jgm/skylighting.git") - (commit version))) - (file-name (string-append "ghc-skylighting-" version "-checkout")) - (sha256 - (base32 - "0z3yv8v2fqqgv6lsf0ff3ld0h2vkg97b2jiry9wn2f1rizwdqmzl")))) - (arguments - `(#:configure-flags '("-fbootstrap") - #:phases - (modify-phases %standard-phases - ;; After building the skylighting-extract tool we use it to generate - ;; syntax source files from the included XML files. These are then - ;; added to the skylighting.cabal file. - (add-after 'build 'extract-xml - (lambda _ - (make-file-writable "skylighting.cabal") - (apply invoke "./dist/build/skylighting-extract/skylighting-extract" - (find-files "xml" "\\.xml$")) - #t)) - ;; Reconfigure without bootstrap flag - (add-after 'extract-xml 'configure-again - (lambda* (#:key outputs inputs tests? #:allow-other-keys) - ((assoc-ref %standard-phases 'configure) - #:outputs outputs - #:inputs inputs - #:tests? tests? - #:configure-flags '("-f-bootstrap")))) - (add-after 'configure-again 'build-again - (assoc-ref %standard-phases 'build))))) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-diff" ,ghc-diff) - ("ghc-hxt" ,ghc-hxt) - ("ghc-pretty-show" ,ghc-pretty-show) - ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) - ("ghc-safe" ,ghc-safe) - ("ghc-text" ,ghc-text) - ("ghc-utf8-string" ,ghc-utf8-string))))) - (define-public ghc-doctemplates (package (name "ghc-doctemplates") @@ -6844,29 +6728,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") "This package provides a simple text templating system used by pandoc.") (license license:bsd-3))) -(define-public ghc-doctemplates-for-pandoc-1 - (package (inherit ghc-doctemplates) - (version "0.1.0.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "doctemplates/doctemplates-" - version ".tar.gz")) - (sha256 - (base32 - "0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp")))) - (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-text" ,ghc-text) - ("ghc-vector" ,ghc-vector) - ("ghc-parsec" ,ghc-parsec) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-scientific" ,ghc-scientific))))) - (define-public ghc-pandoc (package (name "ghc-pandoc") @@ -6956,66 +6817,6 @@ definition lists, tables, and other features. A compatibility mode is provided for those who need a drop-in replacement for Markdown.pl.") (license license:gpl2+))) -;; This is the last version of Pandoc 1.x, which is preferred for Rmarkdown. -(define-public ghc-pandoc-1 - (package (inherit ghc-pandoc) - (version "1.19.2.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" - version ".tar.gz")) - (sha256 - (base32 - "0mim429mpakrcnm50csxyqk3ljcx2l26r5grk6w9isnggwgqrq5v")))) - (arguments - `(#:configure-flags (list "--allow-newer=skylighting"))) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-cmark" ,ghc-cmark) - ("ghc-data-default" ,ghc-data-default) - ("ghc-deepseq-generics" ,ghc-deepseq-generics) - ("ghc-diff" ,ghc-diff) - ("ghc-doctemplates" ,ghc-doctemplates-for-pandoc-1) - ("ghc-executable-path" ,ghc-executable-path) - ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("ghc-filemanip" ,ghc-filemanip) - ("ghc-haddock-library" ,ghc-haddock-library) - ("ghc-hslua" ,ghc-hslua-for-pandoc-1) - ("ghc-http" ,ghc-http) - ("ghc-http-client" ,ghc-http-client) - ("ghc-http-client-tls" ,ghc-http-client-tls) - ("ghc-http-types" ,ghc-http-types) - ("ghc-juicypixels" ,ghc-juicypixels) - ("ghc-network" ,ghc-network) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-old-time" ,ghc-old-time) - ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) - ("ghc-parsec" ,ghc-parsec) - ("ghc-random" ,ghc-random) - ("ghc-scientific" ,ghc-scientific) - ("ghc-sha" ,ghc-sha) - ("ghc-skylighting" ,ghc-skylighting-for-pandoc-1) - ("ghc-syb" ,ghc-syb) - ("ghc-tagsoup" ,ghc-tagsoup) - ("ghc-temporary" ,ghc-temporary) - ("ghc-texmath" ,ghc-texmath-for-pandoc-1) - ("ghc-text" ,ghc-text) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-xml" ,ghc-xml) - ("ghc-yaml" ,ghc-yaml-for-pandoc-1) - ("ghc-zip-archive" ,ghc-zip-archive) - ("ghc-zlib" ,ghc-zlib))) - (native-inputs - `(("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))))) - (define-public ghc-hs-bibutils (package (name "ghc-hs-bibutils") @@ -7251,19 +7052,6 @@ and also has a mode for converting bibliographic databases a YAML format suitable for inclusion in pandoc YAML metadata.") (license license:bsd-3))) -(define-public ghc-pandoc-citeproc-with-pandoc-1 - (let ((for-pandoc-1 - (package-input-rewriting - `((,ghc-aeson . ,ghc-aeson-for-pandoc-1) - (,ghc-yaml . ,ghc-yaml-for-pandoc-1) - (,ghc-texmath . ,ghc-texmath-for-pandoc-1) - (,ghc-pandoc-types . ,ghc-pandoc-types-for-pandoc-1) - (,ghc-hslua . ,ghc-hslua-for-pandoc-1) - (,ghc-skylighting . ,ghc-skylighting-for-pandoc-1) - (,ghc-doctemplates . ,ghc-doctemplates-for-pandoc-1) - (,ghc-pandoc . ,ghc-pandoc-1))))) - (for-pandoc-1 ghc-pandoc-citeproc))) - (define-public ghc-union-find (package (name "ghc-union-find") -- cgit v1.2.3 From 88c337177fbe99e8422a91e633713b4453279fe6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 23:58:30 -0400 Subject: gnu: ghc-base-compat: Update to 0.10.4. * gnu/packages/haskell.scm (ghc-base-compat): Update to 0.10.4. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e39c5e0b81..bcf0b83a04 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4547,7 +4547,7 @@ system.") (define-public ghc-base-compat (package (name "ghc-base-compat") - (version "0.9.3") + (version "0.10.4") (source (origin (method url-fetch) @@ -4557,7 +4557,7 @@ system.") ".tar.gz")) (sha256 (base32 - "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x")))) + "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 576b7dd5083827dd83b45749a6e9b983a20512c9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 6 Sep 2018 23:59:34 -0400 Subject: gnu: ghc-tasty-golden: Update to 2.3.2. * gnu/packages/haskell-check.scm (ghc-tasty-golden): Update to 2.3.2. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 42b7fd167b..0d4501df86 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -124,7 +124,7 @@ Haskell test framework.") (define-public ghc-tasty-golden (package (name "ghc-tasty-golden") - (version "2.3.1.1") + (version "2.3.2") (source (origin (method url-fetch) @@ -134,7 +134,7 @@ Haskell test framework.") ".tar.gz")) (sha256 (base32 - "0pcf5hsyp5mmbqn7krdm49jxpkjm6rb4j83j28f76h7q55dzm1wy")))) + "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) -- cgit v1.2.3 From 1d13003aa9ea35f506546e66fd26383aef3211bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:30:19 +0200 Subject: gnu: Add ghc-weigh. * gnu/packages/haskell.scm (ghc-weigh): New variable. --- gnu/packages/haskell.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index bcf0b83a04..4be0290825 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10557,4 +10557,26 @@ expose it from another module in the hierarchy. @end itemize") (license license:expat))) +(define-public ghc-weigh + (package + (name "ghc-weigh") + (version "0.0.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/weigh/" + "weigh-" version ".tar.gz")) + (sha256 + (base32 + "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x")))) + (build-system haskell-build-system) + (inputs + `(("ghc-split" ,ghc-split) + ("ghc-temporary" ,ghc-temporary))) + (home-page "https://github.com/fpco/weigh#readme") + (synopsis "Measure allocations of a Haskell functions/values") + (description "This package provides tools to measure the memory usage of a +Haskell value or function.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From d459e043c885811495088fb9d73b45b68db154de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:30:42 +0200 Subject: gnu: Add ghc-linear. * gnu/packages/haskell.scm (ghc-linear): New variable. --- gnu/packages/haskell.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4be0290825..8076838309 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10579,4 +10579,47 @@ expose it from another module in the hierarchy. Haskell value or function.") (license license:bsd-3))) +(define-public ghc-linear + (package + (name "ghc-linear") + (version "1.20.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/linear/" + "linear-" version ".tar.gz")) + (sha256 + (base32 + "046vkvxlb0s286qr55s0c6db0rlwbm1cmlmwhrrkqbkzhfcipgay")))) + (build-system haskell-build-system) + (inputs + `(("ghc-adjunctions" ,ghc-adjunctions) + ("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-bytes" ,ghc-bytes) + ("ghc-cereal" ,ghc-cereal) + ("ghc-distributive" ,ghc-distributive) + ("ghc-hashable" ,ghc-hashable) + ("ghc-lens" ,ghc-lens) + ("ghc-reflection" ,ghc-reflection) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-tagged" ,ghc-tagged) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-void" ,ghc-void))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) + ("ghc-simple-reflect" ,ghc-simple-reflect) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-hunit" ,ghc-hunit))) + (home-page "http://github.com/ekmett/linear/") + (synopsis "Linear algebra library for Haskell") + (description + "This package provides types and combinators for linear algebra on free +vector spaces.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From 62dd7171d3fa3df964f34ebb1627704ea447cc21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:31:11 +0200 Subject: gnu: Add ghc-sdl2. * gnu/packages/sdl.scm (ghc-sdl2): New variable. --- gnu/packages/sdl.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 55ce45ce78..a50ed8cbcb 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -33,6 +33,7 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system haskell) #:use-module (guix build-system trivial) #:use-module (gnu packages audio) #:use-module (gnu packages fcitx) @@ -40,6 +41,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages guile) + #:use-module (gnu packages haskell) #:use-module (gnu packages ibus) #:use-module (gnu packages image) #:use-module (gnu packages linux) @@ -520,3 +522,40 @@ sound and device input (keyboards, joysticks, mice, etc.).") The bindings are written in pure Scheme using Guile's foreign function interface.") (license lgpl3+))) + +(define-public ghc-sdl2 + (package + (name "ghc-sdl2") + (version "2.4.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "sdl2/sdl2-" version ".tar.gz")) + (sha256 + (base32 + "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991")))) + (build-system haskell-build-system) + (arguments '(#:tests? #f)) ; tests require graphical environment + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-linear" ,ghc-linear) + ("ghc-statevar" ,ghc-statevar) + ("ghc-text" ,ghc-text) + ("ghc-vector" ,ghc-vector) + ("sdl2" ,sdl2))) + (native-inputs + `(("ghc-weigh" ,ghc-weigh) + ("pkg-config" ,pkg-config))) + (home-page "http://hackage.haskell.org/package/sdl2") + (synopsis "High- and low-level bindings to the SDL library") + (description + "This package contains bindings to the SDL 2 library, in both high- and +low-level forms. The @code{SDL} namespace contains high-level bindings, where +enumerations are split into sum types, and we perform automatic +error-checking. The @code{SDL.Raw} namespace contains an almost 1-1 +translation of the C API into Haskell FFI calls. As such, this does not +contain sum types nor error checking. Thus this namespace is suitable for +building your own abstraction over SDL, but is not recommended for day-to-day +programming.") + (license bsd-3))) -- cgit v1.2.3 From d975534e856dc6c8426d9f28af3b5d30ead31ac3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:31:25 +0200 Subject: gnu: Add ghc-sdl2-mixer. * gnu/packages/sdl.scm (ghc-sdl2-mixer): New variable. --- gnu/packages/sdl.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index a50ed8cbcb..06f419f900 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -559,3 +559,31 @@ contain sum types nor error checking. Thus this namespace is suitable for building your own abstraction over SDL, but is not recommended for day-to-day programming.") (license bsd-3))) + +(define-public ghc-sdl2-mixer + (package + (name "ghc-sdl2-mixer") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/sdl2-mixer/" + "sdl2-mixer-" version ".tar.gz")) + (sha256 + (base32 + "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-sdl2" ,ghc-sdl2) + ("ghc-vector" ,ghc-vector) + ("sdl2-mixer" ,sdl2-mixer))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://hackage.haskell.org/package/sdl2-mixer") + (synopsis "Bindings to SDL2 mixer") + (description "This package provides Haskell bindings to +@code{SDL2_mixer}.") + (license bsd-3))) -- cgit v1.2.3 From 21be24b74f1a0cac185637620d59a3764c539875 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 08:31:36 +0200 Subject: gnu: Add ghc-sdl2-image. * gnu/packages/sdl.scm (ghc-sdl2-image): New variable. --- gnu/packages/sdl.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 06f419f900..caa1d6d1c1 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -587,3 +587,28 @@ programming.") (description "This package provides Haskell bindings to @code{SDL2_mixer}.") (license bsd-3))) + +(define-public ghc-sdl2-image + (package + (name "ghc-sdl2-image") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/sdl2-image/" + "sdl2-image-" version ".tar.gz")) + (sha256 + (base32 + "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr")))) + (build-system haskell-build-system) + (inputs + `(("ghc-sdl2" ,ghc-sdl2) + ("ghc-text" ,ghc-text) + ("sdl2-image" ,sdl2-image))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://hackage.haskell.org/package/sdl2-image") + (synopsis "Bindings to SDL2_image") + (description "This package provides Haskell bindings to +@code{SDL2_image}.") + (license expat))) -- cgit v1.2.3 From 86eec9cf5c564f8782d78c0b992dbca07d5d5c8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Sep 2018 11:30:55 +0200 Subject: gnu: raincat: Update to 1.2.1. * gnu/packages/games.scm (raincat): Update to 1.2.1. [arguments]: Ensure raincat can find freeglut libraries at runtime. [inputs]: Replace ghc-sdl, ghc-sdl-image, and ghc-sdl-mixer with ghc-sdl2, ghc-sdl2-image, and ghc-sdl2-mixer, respectively. --- gnu/packages/games.scm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1fab9fe34a..86d6973a9a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2122,27 +2122,36 @@ on the screen and keyboard to display letters.") (define-public raincat (package (name "raincat") - (version "1.2") + (version "1.2.1") (source (origin (method url-fetch) - (uri (string-append - "http://hackage.haskell.org/package/Raincat/Raincat-" - version - ".tar.gz")) + (uri (string-append "http://hackage.haskell.org/package/Raincat/" + "Raincat-" version ".tar.gz")) (sha256 (base32 - "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk")))) + "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c")))) (build-system haskell-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"))) + (wrap-program (string-append out "/bin/raincat") + `("LD_LIBRARY_PATH" ":" = + (,(string-append (assoc-ref inputs "freeglut") + "/lib")))) + #t)))))) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-random" ,ghc-random) ("ghc-glut" ,ghc-glut) ("freeglut" ,freeglut) ("ghc-opengl" ,ghc-opengl) - ("ghc-sdl" ,ghc-sdl) - ("ghc-sdl-image" ,ghc-sdl-image) - ("ghc-sdl-mixer" ,ghc-sdl-mixer))) + ("ghc-sdl2" ,ghc-sdl2) + ("ghc-sdl2-image" ,ghc-sdl2-image) + ("ghc-sdl2-mixer" ,ghc-sdl2-mixer))) (home-page "http://www.bysusanlin.com/raincat/") (synopsis "Puzzle game with a cat in lead role") (description "Project Raincat is a game developed by Carnegie Mellon -- cgit v1.2.3 From 6306ce727186d2f8d2be5632a9b5d92982841e95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 10:49:00 +0200 Subject: gnu: git-annex: Update to 6.20180926. * gnu/packages/version-control.scm (git-annex): Update to 6.20180926. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8ad067ff1..cc892b9c62 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015 Kyle Meyer -;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Nils Gillmann ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -2103,7 +2103,7 @@ directory full of HOWTOs.") (define-public git-annex (package (name "git-annex") - (version "6.20180807") + (version "6.20180926") (source (origin (method url-fetch) @@ -2111,7 +2111,7 @@ directory full of HOWTOs.") "git-annex/git-annex-" version ".tar.gz")) (sha256 (base32 - "1wkqh1y58m0z1mf2j33qhndpxcjwv8mbv384kdk17vn0lp9zas1s")))) + "1251rj8h63y30sfqk0zh670yhz14p256y59n3590pg015pf3575d")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 787231e9570779892b2eb2e79563be4cfacc9b9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 12:23:59 +0200 Subject: gnu: agda: Fix build. * gnu/packages/agda.scm (agda)[inputs]: Remove ghc-monadplus; add ghc-filemanip. [arguments]: Replace configure phase. --- gnu/packages/agda.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 418025bc37..6bb38aac4d 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Alex ter Weele +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,13 +52,13 @@ ("ghc-edisoncore" ,ghc-edisoncore) ("ghc-edit-distance" ,ghc-edit-distance) ("ghc-equivalence" ,ghc-equivalence) + ("ghc-filemanip" ,ghc-filemanip) ("ghc-geniplate-mirror" ,ghc-geniplate-mirror) ("ghc-gitrev" ,ghc-gitrev) ("ghc-happy" ,ghc-happy) ("ghc-hashable" ,ghc-hashable) ("ghc-hashtables" ,ghc-hashtables) ("ghc-ieee754" ,ghc-ieee754) - ("ghc-monadplus" ,ghc-monadplus) ("ghc-murmur-hash" ,ghc-murmur-hash) ("ghc-uri-encode" ,ghc-uri-encode) ("ghc-parallel" ,ghc-parallel) @@ -70,9 +71,50 @@ (arguments `(#:modules ((guix build haskell-build-system) (guix build utils) - (srfi srfi-26)) + (srfi srfi-26) + (ice-9 match)) #:phases (modify-phases %standard-phases + ;; FIXME: This is a copy of the standard configure phase with a tiny + ;; difference: this package needs the -package-db flag to be passed + ;; to "runhaskell" in addition to the "configure" action, because + ;; Setup.hs depends on filemanip. Without this option the Setup.hs + ;; file cannot be evaluated. The haskell-build-system should be + ;; changed to pass "-package-db" to "runhaskell" in any case. + (replace 'configure + (lambda* (#:key outputs inputs tests? (configure-flags '()) + #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (input-dirs (match inputs + (((_ . dir) ...) + dir) + (_ '()))) + (ghc-path (getenv "GHC_PACKAGE_PATH")) + (params (append `(,(string-append "--prefix=" out)) + `(,(string-append "--libdir=" out "/lib")) + `(,(string-append "--bindir=" out "/bin")) + `(,(string-append + "--docdir=" out + "/share/doc/" ((@@ (guix build haskell-build-system) + package-name-version) out))) + '("--libsubdir=$compiler/$pkg-$version") + '("--package-db=../package.conf.d") + '("--global") + `(,@(map + (cut string-append "--extra-include-dirs=" <>) + (search-path-as-list '("include") input-dirs))) + `(,@(map + (cut string-append "--extra-lib-dirs=" <>) + (search-path-as-list '("lib") input-dirs))) + (if tests? + '("--enable-tests") + '()) + configure-flags))) + (unsetenv "GHC_PACKAGE_PATH") + (apply invoke "runhaskell" "-package-db=../package.conf.d" + "Setup.hs" "configure" params) + (setenv "GHC_PACKAGE_PATH" ghc-path) + #t))) (add-after 'compile 'agda-compile (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From c95908bb030bd80de47a0ef9fc7f1dde0b68d3a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 13:14:39 +0200 Subject: gnu: ghc-indents: Fix build. * gnu/packages/haskell.scm (ghc-indents)[arguments]: Disable tests. [native-inputs]: Add ghc-tasty and ghc-tasty-hunit. --- gnu/packages/haskell.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8076838309..0e2dfd8817 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2804,9 +2804,14 @@ isn't available, portable implementations are used.") (base32 "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n")))) (build-system haskell-build-system) + ;; This package needs an older version of tasty. + (arguments '(#:tests? #f)) (inputs `(("ghc-parsec" ,ghc-parsec) ("ghc-concatenative" ,ghc-concatenative))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "http://patch-tag.com/r/salazar/indents") (synopsis "Indentation sensitive parser-combinators for parsec") (description -- cgit v1.2.3 From f0bce3a758a6cc66552f326e570b571e0155814a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 30 Sep 2018 19:44:25 +0800 Subject: gnu: ghc-xmonad-contrib: Fix build. * gnu/packages/wm.scm (ghc-xmonad-contrib)[inputs]: Add ghc-semigroups. --- gnu/packages/wm.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4ec465f875..7c58770de7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -563,6 +563,7 @@ Haskell, no knowledge of the language is required to install and use it.") ("ghc-random" ,ghc-random) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) + ("ghc-semigroups", ghc-semigroups) ("ghc-x11" ,ghc-x11) ("ghc-x11-xft" ,ghc-x11-xft) ("xmonad" ,xmonad))) -- cgit v1.2.3 From eaa1f873e69c64e5d7f7535e95f6ae0be75c3ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 30 Sep 2018 20:05:55 +0800 Subject: gnu: shellcheck: Update to 0.5.0. * gnu/packages/haskell.scm (shellcheck): Update to 0.5.0. [source]: Use tarball from hackage. [inputs]: Add ghc-aeson. Remove ghc-json. --- gnu/packages/haskell.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0e2dfd8817..df0190d591 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8489,20 +8489,21 @@ generated SQL and optimize it for your backend.") (define-public shellcheck (package (name "shellcheck") - (version "0.4.6") + (version "0.5.0") (source (origin (method url-fetch) - (uri (string-append "https://github.com/koalaman/shellcheck/archive/" - "v" version ".tar.gz")) + (uri (string-append + "https://hackage.haskell.org/package/ShellCheck/ShellCheck-" + version ".tar.gz")) (sha256 (base32 - "1qkd69lc34n3l23ss9rq1azvx49bfq4hi4bmaj76rgxybscxhg0w")) + "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b")) (file-name (string-append name "-" version ".tar.gz")))) (build-system haskell-build-system) (inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-json" ,ghc-json) + `(("ghc-aeson" ,ghc-aeson) + ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-parsec" ,ghc-parsec) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "https://github.com/koalaman/shellcheck") -- cgit v1.2.3 From 70fa5899af8a2270c29e40035e6258865a4f4461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 30 Sep 2018 20:33:46 +0800 Subject: gnu: ghc-wave: Fix build. * gnu/packages/haskell.scm (ghc-wave)[arguments]: Add a phase to relax dependency constraints. --- gnu/packages/haskell.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index df0190d591..4a915142c1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8338,6 +8338,14 @@ Rust syntax. It is intended to be useful for two different purposes: (base32 "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5")))) (build-system haskell-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "wave.cabal" + (("temporary.* < 1\\.3") + "temporary >= 1.1 && < 1.4"))))))) (inputs `(("ghc-cereal" ,ghc-cereal) ("ghc-data-default-class" -- cgit v1.2.3 From 1abdefe573d4928ce495d0dbd877d68df776df9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 30 Sep 2018 20:52:07 +0800 Subject: gnu: ghc-gnuplot: Fix build. * gnu/packages/haskell.scm (ghc-gnuplot)[inputs]: Add ghc-semigroups. --- gnu/packages/haskell.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4a915142c1..2dff323fce 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8134,6 +8134,7 @@ helper functions for Lists, Maybes, Tuples, Functions.") ("ghc-utility-ht" ,ghc-utility-ht) ("ghc-data-accessor-transformers" ,ghc-data-accessor-transformers) ("ghc-data-accessor" ,ghc-data-accessor) + ("ghc-semigroups" ,ghc-semigroups) ("gnuplot" ,gnuplot))) (arguments `(#:phases -- cgit v1.2.3 From 456d76eaf6583e2439ff6df19427779a2d62848c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 23:10:27 +0200 Subject: gnu: ghc-aws: Fix build. * gnu/packages/haskell.scm (ghc-aws)[inputs]: Add ghc-lifted-base. --- gnu/packages/haskell.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2dff323fce..205d2348d4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9585,6 +9585,7 @@ as well as a convenient Conduit module.") ("ghc-data-default" ,ghc-data-default) ("ghc-http-conduit" ,ghc-http-conduit) ("ghc-http-types" ,ghc-http-types) + ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-monad-control" ,ghc-monad-control) ("ghc-network" ,ghc-network) ("ghc-old-locale" ,ghc-old-locale) -- cgit v1.2.3 From 52891580e1c83235c2bf3a8297b05662c3bc14e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 30 Sep 2018 23:18:09 +0200 Subject: gnu: ghc-statistics: Fix build. * gnu/packages/haskell.scm (ghc-statistics)[arguments]: Add cabal revision. --- gnu/packages/haskell.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 205d2348d4..a140985eba 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8999,6 +8999,11 @@ that are much lighter weight than IO-threads.") (base32 "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l")))) (build-system haskell-build-system) + (arguments + '(#:cabal-revision + ("2" "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3") + ;; Two tests fail: "Discrete CDF is OK" and "Quantile is CDF inverse". + #:tests? #f)) (inputs `(("ghc-aeson" ,ghc-aeson) ("ghc-base-orphans" ,ghc-base-orphans) @@ -9018,8 +9023,6 @@ that are much lighter weight than IO-threads.") ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (arguments - `(#:tests? #f)) ; FIXME: Test-Suite `spec` fails. (home-page "https://github.com/bos/mwc-random") (synopsis "Haskell library of statistical types, data, and functions") (description "This library provides a number of common functions -- cgit v1.2.3 From b2bf43b22aad83c3d64391339f7c5f66c6d58789 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:30:14 -0400 Subject: gnu: Add r-pscl. * gnu/packages/cran.scm (r-pscl): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 58e9ad09c7..deb81f2430 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5895,3 +5895,29 @@ hemoglobin to reticulocytes (OFF-score), as well as example data.") based on entropy estimates from k-nearest neighbors distances and algorithms for the reconstruction of gene regulatory networks.") (license license:agpl3+))) + +(define-public r-pscl + (package + (name "r-pscl") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "pscl" version)) + (sha256 + (base32 "1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass))) + (home-page "https://github.com/atahk/pscl/") + (synopsis "Political science computational laboratory") + (description + "The @code{pscl} is an R package providing classes and methods for: +@enumerate +@item Bayesian analysis of roll call data (item-response models); +@item elementary Bayesian statistics; +@item maximum likelihood estimation of zero-inflated and hurdle models for count +data; +@item utility functions. +@end enumerate") + (license license:gpl2))) -- cgit v1.2.3 From e710d1a4ffe0131d9a59eba1d1ad615f8448f50d Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:30:37 -0400 Subject: gnu: Add r-accelmissing. * gnu/packages/cran.scm (r-accelmissing): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index deb81f2430..a38c907cd5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5921,3 +5921,28 @@ data; @item utility functions. @end enumerate") (license license:gpl2))) + +(define-public r-accelmissing + (package + (name "r-accelmissing") + (version "1.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "accelmissing" version)) + (sha256 + (base32 "1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mice" ,r-mice) + ("r-pscl" ,r-pscl))) + (home-page "https://cran.r-project.org/web/packages/accelmissing/") + (synopsis "Missing value imputation for accelerometer data") + (description + "This package provides a statistical method to impute the missing values in +accelerometer data. The methodology includes both parametric and +semi-parametric multiple imputations under the zero-inflated Poisson lognormal +model. It also provides multiple functions to preprocess the accelerometer data +previous to the missing data imputation. These include detecting the wearing +and the non-wearing time, selecting valid days and subjects, and creating plots.") + (license license:gpl2+))) -- cgit v1.2.3 From 5ec20676d75a25c9163c6067d2e3eece84d08c2b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 1 Oct 2018 14:54:46 +0200 Subject: gnu: wine-staging: Update to 3.17. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.17. * gnu/packages/wine.scm (wine-staging): Update to 3.17. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 782776606d..68839038b7 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.16") + (version "3.17") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "0c1bs9qpxlvld6jkwjri2v8jaixxn1r5b0m9r5hnkfrnpl7z7cfv")))) + "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0g55l41apiwgblfk9ihzd96003gd32w5ng79f96hmiwhyzwbqhxd")))) + "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From f359b115c74c9c5fdf482528a0480ed40f5a2446 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:49:21 -0400 Subject: gnu: Add r-mhsmm. * gnu/packages/cran.scm (r-mhsmm): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a38c907cd5..82984548a2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5946,3 +5946,26 @@ model. It also provides multiple functions to preprocess the accelerometer data previous to the missing data imputation. These include detecting the wearing and the non-wearing time, selecting valid days and subjects, and creating plots.") (license license:gpl2+))) + +(define-public r-mhsmm + (package + (name "r-mhsmm") + (version "0.4.16") + (source + (origin + (method url-fetch) + (uri (cran-uri "mhsmm" version)) + (sha256 + (base32 "009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs")))) + (build-system r-build-system) + (propagated-inputs `(("r-mvtnorm" ,r-mvtnorm))) + (home-page "https://github.com/jaredo/mhsmm/") + (synopsis "Inference for hidden Markov and semi-Markov models") + (description + "The @code{r-mhsmm} package implements estimation and prediction methods for +hidden Markov and semi-Markov models for multiple observation sequences. Such +techniques are of interest when observed data is thought to be dependent on some +unobserved (or hidden) state. Also, this package is suitable for equidistant +time series data, with multivariate and/or missing data. Allows user defined +emission distributions.") + (license license:gpl2+))) -- cgit v1.2.3 From 16c5285af40f66614cccfe3f916cfe78e49bae16 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:52:01 -0400 Subject: gnu: Add r-nleqslv. * gnu/packages/cran.scm (r-nleqslv): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 82984548a2..b06d22bd51 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5969,3 +5969,25 @@ unobserved (or hidden) state. Also, this package is suitable for equidistant time series data, with multivariate and/or missing data. Allows user defined emission distributions.") (license license:gpl2+))) + +(define-public r-nleqslv + (package + (name "r-nleqslv") + (version "3.3.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "nleqslv" version)) + (sha256 + (base32 "1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm")))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/nleqslv/") + (synopsis "Solve systems of nonlinear equations") + (description + "The @code{r-nleqslv} package solves a system of nonlinear equations using a +Broyden or a Newton method with a choice of global strategies such as line +search and trust region. There are options for using a numerical or user +supplied Jacobian, for specifying a banded numerical Jacobian and for allowing a +singular or ill-conditioned Jacobian.") + (license license:gpl2+))) -- cgit v1.2.3 From 63ec2c505a29ee8c7c6a7633b054edc41dbc95fa Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:52:34 -0400 Subject: gnu: Add r-physicalactivity. * gnu/packages/cran.scm (r-physicalactivity): New variable. --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b06d22bd51..932d7cb414 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5991,3 +5991,36 @@ search and trust region. There are options for using a numerical or user supplied Jacobian, for specifying a banded numerical Jacobian and for allowing a singular or ill-conditioned Jacobian.") (license license:gpl2+))) + +(define-public r-physicalactivity + (package + (name "r-physicalactivity") + (version "0.2-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "PhysicalActivity" version)) + (sha256 + (base32 "14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln")))) + (properties + `((upstream-name . "PhysicalActivity"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/PhysicalActivity/") + (synopsis "Procesing accelerometer data for physical activity measurement") + (description + "This @code{r-physicalactivity} package provides a function @code{wearingMarking} +for classification of monitor wear and nonwear time intervals in accelerometer +data collected to assess physical activity. The package also contains functions +for making plots of accelerometer data and obtaining the summary of various +information including daily monitor wear time and the mean monitor wear time +during valid days. The revised package version 0.2-1 improved the functions +regarding speed, robustness and add better support for time zones and daylight +saving. In addition, several functions were added: +@enumerate +@item the @code{markDelivery} can classify days for ActiGraph delivery by mail; +@item the @code{markPAI} can categorize physical activity intensity level based +on user-defined cut-points of accelerometer counts. +@end enumerate + It also supports importing ActiGraph (AGD) files with @code{readActigraph} and +@code{queryActigraph} functions.") + (license license:gpl3+))) -- cgit v1.2.3 From f95d45425152bda85950d2b8f9ead50bdce2e2cc Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 1 Oct 2018 08:53:00 -0400 Subject: gnu: Add r-acc. * gnu/packages/cran.scm (r-acc): New variable. --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 932d7cb414..186a52a1f1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6024,3 +6024,36 @@ on user-defined cut-points of accelerometer counts. It also supports importing ActiGraph (AGD) files with @code{readActigraph} and @code{queryActigraph} functions.") (license license:gpl3+))) + +(define-public r-acc + (package + (name "r-acc") + (version "1.3.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "acc" version)) + (sha256 + (base32 "1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m")))) + (build-system r-build-system) + (propagated-inputs + `(("r-circlize" ,r-circlize) + ("r-dbi" ,r-dbi) + ("r-ggplot2" ,r-ggplot2) + ("r-iterators" ,r-iterators) + ("r-mhsmm" ,r-mhsmm) + ("r-nleqslv" ,r-nleqslv) + ("r-physicalactivity" ,r-physicalactivity) + ("r-plyr" ,r-plyr) + ("r-r-utils" ,r-r-utils) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rsqlite" ,r-rsqlite) + ("r-zoo" ,r-zoo))) + (home-page "https://cran.r-project.org/web/packages/acc/") + (synopsis "Exploring accelerometer data") + (description + "This package processes accelerometer data from uni-axial and tri-axial devices +and generates data summaries. Also, includes functions to plot, analyze, and +simulate accelerometer data.") + (license license:gpl2+))) -- cgit v1.2.3 From 08cbd4f3b9ce0bc6aa052b22795a3a9b9f09b04c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 22:58:19 +0200 Subject: gnu: recode: Update to 3.7.1. * gnu/packages/textutils.scm (recode): Update to 3.7.1. --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index ce34423713..7e26bdcf63 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -84,7 +84,7 @@ to DOS format and vice versa.") (define-public recode (package (name "recode") - (version "3.7") + (version "3.7.1") (source (origin (method url-fetch) @@ -92,7 +92,7 @@ to DOS format and vice versa.") "download/v" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0r4yhf7i7zp2nl2apyzz7r3i2in12n385hmr8zcfr18ly0ly530q")) + "0215hfj0rhlh0grg91qfx75pp6z09bpv8211qdxqihniw7y9a4fs")) (modules '((guix build utils))) (snippet '(begin (delete-file "tests/Recode.c") -- cgit v1.2.3 From 538b71a967ed056e39318839f5c36ff201bd9320 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 22:12:45 +0200 Subject: gnu: perl-socket6: Update to 0.29. * gnu/packages/networking.scm (perl-socket6): Update to 0.29. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0d6de040e5..e3486ffadc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -927,7 +927,7 @@ private (reserved).") (define-public perl-socket6 (package (name "perl-socket6") - (version "0.28") + (version "0.29") (source (origin (method url-fetch) @@ -937,7 +937,7 @@ private (reserved).") ".tar.gz")) (sha256 (base32 - "11j5jzqbzmwlws9zals43ry2f1nw9qy6im7yhn9ck5rikywrmm5z")))) + "054izici8klfxs8hr5rljib28plijpsfymy99xbzdp047bx1b2a6")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6c6c03fa00db33703002fa8845716f50f649d201 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 22:08:46 +0200 Subject: gnu: re2c: Update to 1.1.1. * gnu/packages/re2c.scm (re2c): Update to 1.1.1. --- gnu/packages/re2c.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/re2c.scm b/gnu/packages/re2c.scm index 2a35aa0cdb..e9668cba26 100644 --- a/gnu/packages/re2c.scm +++ b/gnu/packages/re2c.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Sergei Trofimovich +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +26,7 @@ (define-public re2c (package (name "re2c") - (version "1.0.3") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/skvadrik/" name @@ -33,7 +34,7 @@ name "-" version ".tar.gz")) (sha256 (base32 - "0lnbj15hhgi3r40ipskmg178m18d8n5nph78sci6lprk7zgf0mng")))) + "1ksifjn18v6nra935dpqllmvkqgcdsggfjgmj77282x0gqrrfrc5")))) (build-system gnu-build-system) (home-page "http://re2c.org/") (synopsis "Lexer generator for C/C++") -- cgit v1.2.3 From f8e710684e5c3f866413dff825ba17bdffceac5d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 13 Jul 2018 20:39:46 +0100 Subject: services: Add Gitolite. * gnu/services/version-control.scm (, ): New record types. (gitolite-accounts, gitolite-activation): New procedures. (gitolite-service-type): New variables. * gnu/tests/version-control.scm (%gitolite-test-admin-keypair, %gitolite-os, %test-gitolite): New variables. (run-gitolite-test): New procedure. * doc/guix.texi (Version Control): Document the gitolite service. --- gnu/services/version-control.scm | 180 ++++++++++++++++++++++++++++++++++++++- gnu/tests/version-control.scm | 114 ++++++++++++++++++++++++- 2 files changed, 292 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 58274c8bee..13669925ab 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (guix store) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:export (git-daemon-service git-daemon-service-type @@ -40,7 +42,23 @@ git-http-configuration git-http-configuration? - git-http-nginx-location-configuration)) + git-http-nginx-location-configuration + + + gitolite-configuration + gitolite-configuration-package + gitolite-configuration-user + gitolite-configuration-rc-file + gitolite-configuration-admin-pubkey + + + gitolite-rc-file + gitolite-rc-file-umask + gitolite-rc-file-git-config-keys + gitolite-rc-file-roles + gitolite-rc-file-enable + + gitolite-service-type)) ;;; Commentary: ;;; @@ -197,3 +215,163 @@ access to exported repositories under @file{/srv/git}." "") (list "fastcgi_param GIT_PROJECT_ROOT " git-root ";") "fastcgi_param PATH_INFO $1;")))))) + + +;;; +;;; Gitolite +;;; + +(define-record-type* + gitolite-rc-file make-gitolite-rc-file + gitolite-rc-file? + (umask gitolite-rc-file-umask + (default #o0077)) + (git-config-keys gitolite-rc-file-git-config-keys + (default "")) + (roles gitolite-rc-file-roles + (default '(("READERS" . 1) + ("WRITERS" . 1)))) + (enable gitolite-rc-file-enable + (default '("help" + "desc" + "info" + "perms" + "writable" + "ssh-authkeys" + "git-config" + "daemon" + "gitweb")))) + +(define-gexp-compiler (gitolite-rc-file-compiler + (file ) system target) + (match file + (($ umask git-config-keys roles enable) + (apply text-file* "gitolite.rc" + `("%RC = (\n" + " UMASK => " ,(format #f "~4,'0o" umask) ",\n" + " GIT_CONFIG_KEYS => '" ,git-config-keys "',\n" + " ROLES => {\n" + ,@(map (match-lambda + ((role . value) + (simple-format #f " ~A => ~A,\n" role value))) + roles) + " },\n" + "\n" + " ENABLE => [\n" + ,@(map (lambda (value) + (simple-format #f " '~A',\n" value)) + enable) + " ],\n" + ");\n" + "\n" + "1;\n"))))) + +(define-record-type* + gitolite-configuration make-gitolite-configuration + gitolite-configuration? + (package gitolite-configuration-package + (default gitolite)) + (user gitolite-configuration-user + (default "git")) + (group gitolite-configuration-group + (default "git")) + (home-directory gitolite-configuration-home-directory + (default "/var/lib/gitolite")) + (rc-file gitolite-configuration-rc-file + (default (gitolite-rc-file))) + (admin-pubkey gitolite-configuration-admin-pubkey)) + +(define gitolite-accounts + (match-lambda + (($ package user group home-directory + rc-file admin-pubkey) + ;; User group and account to run Gitolite. + (list (user-group (name user) (system? #t)) + (user-account + (name user) + (group group) + (system? #t) + (comment "Gitolite user") + (home-directory home-directory)))))) + +(define gitolite-activation + (match-lambda + (($ package user group home + rc-file admin-pubkey) + #~(begin + (use-modules (ice-9 match) + (guix build utils)) + + (let* ((user-info (getpwnam #$user)) + (admin-pubkey #$admin-pubkey) + (pubkey-file (string-append + #$home "/" + (basename + (strip-store-file-name admin-pubkey))))) + + (simple-format #t "guix: gitolite: installing ~A\n" #$rc-file) + (copy-file #$rc-file #$(string-append home "/.gitolite.rc")) + + ;; The key must be writable, so copy it from the store + (copy-file admin-pubkey pubkey-file) + + (chmod pubkey-file #o500) + (chown pubkey-file + (passwd:uid user-info) + (passwd:gid user-info)) + + ;; Set the git configuration, to avoid gitolite trying to use + ;; the hostname command, as the network might not be up yet + (with-output-to-file #$(string-append home "/.gitconfig") + (lambda () + (display "[user] + name = GNU Guix + email = guix@localhost +"))) + ;; Run Gitolite setup, as this updates the hooks and include the + ;; admin pubkey if specified. The admin pubkey is required for + ;; initial setup, and will replace the previous key if run after + ;; initial setup + (match (primitive-fork) + (0 + ;; Exit with a non-zero status code if an exception is thrown. + (dynamic-wind + (const #t) + (lambda () + (setenv "HOME" (passwd:dir user-info)) + (setenv "USER" #$user) + (setgid (passwd:gid user-info)) + (setuid (passwd:uid user-info)) + (primitive-exit + (system* #$(file-append package "/bin/gitolite") + "setup" + "-m" "gitolite setup by GNU Guix" + "-pk" pubkey-file))) + (lambda () + (primitive-exit 1)))) + (pid (waitpid pid))) + + (when (file-exists? pubkey-file) + (delete-file pubkey-file))))))) + +(define gitolite-service-type + (service-type + (name 'gitolite) + (extensions + (list (service-extension activation-service-type + gitolite-activation) + (service-extension account-service-type + gitolite-accounts) + (service-extension profile-service-type + ;; The Gitolite package in Guix uses + ;; gitolite-shell in the authorized_keys file, so + ;; gitolite-shell needs to be on the PATH for + ;; gitolite to work. + (lambda (config) + (list + (gitolite-configuration-package config)))))) + (description + "Setup @command{gitolite}, a Git hosting tool providing access over SSH.. +By default, the @code{git} user is used, but this is configurable. +Additionally, Gitolite can integrate with with tools like gitweb or cgit to +provide a web interface to view selected repositories."))) diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 3b935a1b48..4409b8a12b 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018 Oleg Pykhalov ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2017, 2018 Clément Lassieur +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +28,17 @@ #:use-module (gnu services) #:use-module (gnu services version-control) #:use-module (gnu services cgit) + #:use-module (gnu services ssh) #:use-module (gnu services web) #:use-module (gnu services networking) #:use-module (gnu packages version-control) + #:use-module (gnu packages ssh) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix modules) #:export (%test-cgit - %test-git-http)) + %test-git-http + %test-gitolite)) (define README-contents "Hello! This is what goes inside the 'README' file.") @@ -300,3 +304,111 @@ HTTP-PORT." (name "git-http") (description "Connect to a running Git HTTP server.") (value (run-git-http-test)))) + + +;;; +;;; Gitolite. +;;; + +(define %gitolite-test-admin-keypair + (computed-file + "gitolite-test-admin-keypair" + (with-imported-modules (source-module-closure + '((guix build utils))) + #~(begin + (use-modules (ice-9 match) (srfi srfi-26) + (guix build utils)) + + (mkdir #$output) + (invoke #$(file-append openssh "/bin/ssh-keygen") + "-f" (string-append #$output "/test-admin") + "-t" "rsa" + "-q" + "-N" ""))))) + +(define %gitolite-os + (simple-operating-system + (dhcp-client-service) + (service openssh-service-type) + (service gitolite-service-type + (gitolite-configuration + (admin-pubkey + (file-append %gitolite-test-admin-keypair "/test-admin.pub")))))) + +(define (run-gitolite-test) + (define os + (marionette-operating-system + %gitolite-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((2222 . 22))))) + + (define test + (with-imported-modules '((gnu build marionette) + (guix build utils)) + #~(begin + (use-modules (srfi srfi-64) + (rnrs io ports) + (gnu build marionette) + (guix build utils)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "gitolite") + + ;; Wait for sshd to be up and running. + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'ssh-daemon)) + marionette)) + + (display #$%gitolite-test-admin-keypair) + + (setenv "GIT_SSH_VARIANT" "ssh") + (setenv "GIT_SSH_COMMAND" + (string-join + '(#$(file-append openssh "/bin/ssh") + "-i" #$(file-append %gitolite-test-admin-keypair + "/test-admin") + "-o" "UserKnownHostsFile=/dev/null" + "-o" "StrictHostKeyChecking=no"))) + + (test-assert "cloning the admin repository" + (invoke #$(file-append git "/bin/git") + "clone" "-v" + "ssh://git@localhost:2222/gitolite-admin" + "/tmp/clone")) + + (test-assert "admin key exists" + (file-exists? "/tmp/clone/keydir/test-admin.pub")) + + (with-directory-excursion "/tmp/clone" + (invoke #$(file-append git "/bin/git") + "-c" "user.name=Guix" "-c" "user.email=guix" + "commit" + "-m" "Test commit" + "--allow-empty") + + (test-assert "pushing, and the associated hooks" + (invoke #$(file-append git "/bin/git") "push"))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "gitolite" test)) + +(define %test-gitolite + (system-test + (name "gitolite") + (description "Clone the Gitolite admin repository.") + (value (run-gitolite-test)))) -- cgit v1.2.3 From 75bb6e46eac90c95e910986ad8ae32927e879052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 2 Oct 2018 13:19:44 +0200 Subject: gnu: cuirass: Update to fe2b73c. * gnu/packages/ci.scm (cuirass): Update to fe2b73c. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 067a288004..1cac8b9fb4 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -186,8 +186,8 @@ their dependencies.") (license l:gpl3+)))) (define-public cuirass - (let ((commit "8d40c49170971ad7bbf8b97336934dbb3d949fc1") - (revision "19")) + (let ((commit "fe2b73c2353d106431ed0659345391f14ed64600") + (revision "20")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -199,7 +199,7 @@ their dependencies.") (file-name (string-append name "-" version)) (sha256 (base32 - "0xxcapf9ag3zx6131v128vhin5m2j3w2gjbjbpdwr0qkaysh0gvf")))) + "00ldbig2p14qpwrl2i2hnhb9idgbbf0kqnlh4n79rmz96blm7463")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 1df4abc7dcf03f0655fc2fa26de7a6c91bac8b4e Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Mon, 1 Oct 2018 18:10:35 +0200 Subject: gnu: enlightenment: Fix keyboard switching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/enlightenment.scm (enlightenment)[inputs]: Add 'setxkbmap' [arguments]: Set absolute file name to 'setxkbmap' Signed-off-by: Ludovic Courtès --- gnu/packages/enlightenment.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index c7812e8874..c0335016f8 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -269,6 +269,7 @@ Libraries with some extra bells and whistles.") (add-before 'configure 'set-system-actions (lambda* (#:key inputs #:allow-other-keys) (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) + (setxkbmap (assoc-ref inputs "setxkbmap")) (utils (assoc-ref inputs "util-linux")) (libc (assoc-ref inputs "libc"))) ;; We need to patch the path to 'base.lst' to be able @@ -278,6 +279,9 @@ Libraries with some extra bells and whistles.") (("/usr/share/X11/xkb/rules/xorg.lst") (string-append xkeyboard "/share/X11/xkb/rules/base.lst"))) + (substitute* "src/bin/e_xkb.c" + (("\"setxkbmap \"") + (string-append "\"" setxkbmap "/bin/setxkbmap \""))) (substitute* (list "src/bin/e_intl.c" "src/modules/conf_intl/e_int_config_intl.c" "src/modules/wizard/page_010.c") @@ -305,6 +309,7 @@ Libraries with some extra bells and whistles.") ("libxcb" ,libxcb) ("libxext" ,libxext) ("linux-pam" ,linux-pam) + ("setxkbmap" ,setxkbmap) ("xcb-util-keysyms" ,xcb-util-keysyms) ("xkeyboard-config" ,xkeyboard-config))) (home-page "https://www.enlightenment.org/about-enlightenment") -- cgit v1.2.3 From b0f43001195c69f730b49b0bf9de516edd53baed Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 30 Sep 2018 12:59:01 -0400 Subject: gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper. * gnu/packages/audio.scm (audacity)[build-system]: Use glib-or-gtk-build-system. [arguments]: Remove the 'wrap-program' phase. Set #:out-of-source #f. --- gnu/packages/audio.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4465872732..8f100ce7a3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -321,7 +321,7 @@ engineers, musicians, soundtrack editors and composers.") ;; "sbsms" )) #t)))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (inputs `(("wxwidgets" ,wxwidgets) ("gtk+" ,gtk+) @@ -410,16 +410,12 @@ engineers, musicians, soundtrack editors and composers.") (("../lib-src/portmidi/porttime/porttime.h") "porttime.h")) (substitute* "src/prefs/MidiIOPrefs.cpp" (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")) - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/audacity") - ;; For GtkFileChooserDialog. - `("GSETTINGS_SCHEMA_DIR" = - (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas")))) #t))) + ;; The translation Makefile generation is performed improperly for + ;; out-of-tree builds. + ;; XXX This can be removed if the glib-or-gkt-build-system + ;; switches to #:out-of-source? #t. See . + #:out-of-source? #f ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See ;; . -- cgit v1.2.3 From 994bccd9443032141accede0e403cbfb62f6c63e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 28 Sep 2018 23:30:55 -0400 Subject: gnu: LibreOffice: Fix "File > Open" crash on foreign distros. Fixes . * gnu/packages/libreoffice.scm (libreoffice)[build-system]: Use glib-or-gtk-build-system. [arguments]: Set '#:out-of-source #f'. --- gnu/packages/libreoffice.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 68b4e265f3..881cf2008d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -28,6 +28,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libreoffice) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -939,7 +940,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) ("cppunit" ,cppunit-1.14) @@ -1017,6 +1018,9 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (arguments `(#:tests? #f ; Building the tests already fails. #:make-flags '("build-nocheck") ; Do not build unit tests, which fails. + ;; XXX Remove this if glib-or-gtk-build-system changes to in-source-tree + ;; builds by default. + #:out-of-source? #f #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-src -- cgit v1.2.3 From 712d01bbe9de285bb3007511c94957b13b74118e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 17:19:26 -0400 Subject: gnu: Add gopkg.in/asn1-ber.v1. * gnu/packages/syncthing.scm (go-gopkg.in-asn1-ber.v1): New variable. --- gnu/packages/syncthing.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 29caaaf02e..61b45e111f 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1366,3 +1366,25 @@ Prometheus HTTP API.") (description "This is a union of Go Prometheus libraries") (home-page (package-home-page go-github-com-client-golang-prometheus)) (license (package-license go-github-com-client-golang-prometheus)))) + +(define-public go-gopkg.in-asn1-ber.v1 + (package + (name "go-gopkg.in-asn1-ber.v1") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gopkg.in/asn1-ber.v1") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx")))) + (build-system go-build-system) + (arguments + '(#:import-path "gopkg.in/asn1-ber.v1")) + (synopsis "ASN.1 BER encoding and decoding in Go") + (description "This package provides ASN.1 BER encoding and decoding in the +Go language.") + (home-page "https://gopkg.in/asn1-ber.v1") + (license expat))) -- cgit v1.2.3 From 4cb2112d8f4aac799c756241bf27aaa99ff5a714 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 17:19:58 -0400 Subject: gnu: Add gopkg.in/ldap.v2. * gnu/packages/syncthing.scm (go-gopkg.in-ldap.v2): New variable. --- gnu/packages/syncthing.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 61b45e111f..cfcfb74aae 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1388,3 +1388,28 @@ Prometheus HTTP API.") Go language.") (home-page "https://gopkg.in/asn1-ber.v1") (license expat))) + +(define-public go-gopkg.in-ldap.v2 + (package + (name "go-gopkg.in-ldap.v2") + (version "2.5.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gopkg.in/ldap.v2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h")))) + (build-system go-build-system) + (arguments + '(#:import-path "gopkg.in/ldap.v2" + #:tests? #f)) ; the test suite requires network access + (propagated-inputs + `(("go-gopkg.in-asn1-ber.v1" ,go-gopkg.in-asn1-ber.v1))) + (synopsis "LDAP v3 functionality for Go") + (description "This package provides basic LDAP v3 functionality in the Go +language.") + (home-page "https://gopkg.in/ldap.v2") + (license expat))) -- cgit v1.2.3 From 5149857651299be32ee8dedd813b184ff1964099 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 17:20:31 -0400 Subject: gnu: go-github-com-thejerf-suture: Update to 3.0.0-0.bf6ee6a. * gnu/packages/syncthing.scm (go-github-com-thejerf-suture): Update to 3.0.0-0.bf6ee6a. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index cfcfb74aae..bd7ff74b43 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -678,11 +678,11 @@ database in Go.") (license bsd-2)))) (define-public go-github-com-thejerf-suture - (let ((commit "3f1fb62fe0a3cc6429122d7dc45588a8b59c5bb6") + (let ((commit "bf6ee6a0b047ebbe9ae07d847f750dd18c6a9276") (revision "0")) (package (name "go-github-com-thejerf-suture") - (version (git-version "2.0.3" revision commit)) + (version (git-version "3.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -691,7 +691,7 @@ database in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "0mp7gz6bp6xhggkgmbl33vpmrq3a6n2dkgcxbkb7csnpv4r4d59k")))) + "0rzx9k408vaglwnnpgpcs6y7ff7p65915nbg33rvbaz13hxwkz3y")))) (build-system go-build-system) (arguments `(#:import-path "github.com/thejerf/suture")) -- cgit v1.2.3 From 7d15490cd247c35aeac170e2cf002d1fd93b775a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 29 Sep 2018 17:21:20 -0400 Subject: gnu: Syncthing: Update to 0.14.51. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.51. [arguments]: Adjust the 'increase-test-timeout' phase. [inputs]: Add go-gopkg.in-ldap.v2. --- gnu/packages/syncthing.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index bd7ff74b43..2e936eef7d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "0.14.50") + (version "0.14.51") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0yjj6zzivzw289bhwqjb4xcv8p39n5mcwwr5w6xf5ykzljc5pk55")) + "17phn8l2afhgzh0q9ambi28awj2m905sr1bicq2wc7ghypk5vgqh")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -59,7 +59,7 @@ (add-before 'build 'increase-test-timeout (lambda _ (substitute* "src/github.com/syncthing/syncthing/build.go" - (("60s") "999s")) + (("120s") "999s")) #t)) (replace 'build @@ -138,6 +138,7 @@ ("go-github-com-pkg-errors" ,go-github-com-pkg-errors) ("go-github-com-rcrowley-go-metrics" ,go-github-com-rcrowley-go-metrics) ("go-github-com-sasha-s-go-deadlock" ,go-github-com-sasha-s-go-deadlock) + ("go-github-com-syncthing-notify" ,go-github-com-syncthing-notify) ("go-github-com-syndtr-goleveldb" ,go-github-com-syndtr-goleveldb) ("go-github-com-thejerf-suture" ,go-github-com-thejerf-suture) ("go-github-com-vitrun-qart" ,(go-github-com-vitrun-qart-union)) @@ -145,7 +146,7 @@ ("go-golang-org-x-net-union" ,(go-golang-org-x-net-union)) ("go-golang-org-x-text" ,(go-golang-org-x-text-union)) ("go-golang-org-x-time-rate" ,go-golang-org-x-time-rate) - ("go-github-com-syncthing-notify" ,go-github-com-syncthing-notify) + ("go-gopkg.in-ldap.v2" ,go-gopkg.in-ldap.v2) ;; For tests ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff))) (synopsis "Decentralized continuous file system synchronization") -- cgit v1.2.3 From f6890c08912c7b2a2b7f6c1cdeda412ff73e0b1d Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 11 Sep 2018 15:18:25 +0200 Subject: gnu: Add r-rbenchmark. gnu/packages/cran.scm (r-rbenchmark): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 186a52a1f1..76c9c734f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6057,3 +6057,28 @@ on user-defined cut-points of accelerometer counts. and generates data summaries. Also, includes functions to plot, analyze, and simulate accelerometer data.") (license license:gpl2+))) + +(define-public r-rbenchmark + (package + (name "r-rbenchmark") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "rbenchmark" version)) + (sha256 + (base32 "010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/rbenchmark/") + (synopsis "Benchmarking routine for R") + (description + "This @code{r-rbenchmark} package is inspired by the Perl module Benchmark, +and is intended to facilitate benchmarking of arbitrary R code. The library +consists of just one function, benchmark, which is a simple wrapper around +system.time. Given a specification of the benchmarking process (counts of +replications, evaluation environment) and an arbitrary number of expressions, +benchmark evaluates each of the expressions in the specified environment, +replicating the evaluation as many times as specified, and returning the results +conveniently wrapped into a data frame.") + (license license:gpl2+))) + -- cgit v1.2.3 From 7af2dd38268e8d043352a6f5845cce1ee8f2fe4f Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 11 Sep 2018 15:18:26 +0200 Subject: gnu: Add r-dvmisc. gnu/packages/cran.scm (r-dvmisc): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 76c9c734f2..2db310b636 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6082,3 +6082,28 @@ replicating the evaluation as many times as specified, and returning the results conveniently wrapped into a data frame.") (license license:gpl2+))) +(define-public r-dvmisc + (package + (name "r-dvmisc") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "dvmisc" version)) + (sha256 + (base32 "1dy0yykskwhkql19bhzmbwsgv028afc8jh9yqwbczj6f3vpv31zh")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-rbenchmark" ,r-rbenchmark) + ("r-rcpp" ,r-rcpp))) + (home-page "https://cran.r-project.org/web/packages/dvmisc/") + (synopsis "Faster computation of common statistics and miscellaneous functions") + (description + "This package implements faster versions of base R functions (e.g. mean, standard +deviation, covariance, weighted mean), mostly written in C++, along with +miscellaneous functions for various purposes (e.g. create the histogram with +fitted probability density function or probability mass function curve, create +the body mass index groups, assess the linearity assumption in logistic +regression).") + (license license:gpl2))) -- cgit v1.2.3 From d8d8844ec12c017480e83cd541e98b55e18a17f4 Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 11 Sep 2018 15:18:27 +0200 Subject: gnu: Add r-accelerometry. gnu/packages/cran.scm (r-accelerometry): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2db310b636..b567fdc0ce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6107,3 +6107,27 @@ fitted probability density function or probability mass function curve, create the body mass index groups, assess the linearity assumption in logistic regression).") (license license:gpl2))) + +(define-public r-accelerometry + (package + (name "r-accelerometry") + (version "3.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "accelerometry" version)) + (sha256 + (base32 "13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip")))) + (build-system r-build-system) + (propagated-inputs + `(("r-dvmisc" ,r-dvmisc) + ("r-rcpp" ,r-rcpp))) + (home-page "https://cran.r-project.org/web/packages/accelerometry/") + (synopsis "Functions for processing accelerometer data") + (description + "This package provides a collection of functions that perform operations on +time-series accelerometer data, such as identify the non-wear time, flag minutes +that are part of an activity bout, and find the maximum 10-minute average count +value. The functions are generally very flexible, allowing for a variety of +algorithms to be implemented.") + (license license:gpl3))) -- cgit v1.2.3 From 3f0f49d70877df6c829b443830de99e0e1e1f6bc Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:03:59 -0400 Subject: gnu: Add poretools. * gnu/packages/bioinformatics.scm (poretools): New variable. --- gnu/packages/bioinformatics.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b84498d042..172832d148 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13899,3 +13899,42 @@ adapters, even at low sequence identity. Porechop also supports demultiplexing of Nanopore reads that were barcoded with the Native Barcoding Kit, PCR Barcoding Kit or Rapid Barcoding Kit.") (license license:gpl3+)))) + +(define-public poretools + ;; The latest release was in 2016 and the latest commit is from 2017 + ;; the recommended way to install is to clone the git repository + ;; https://poretools.readthedocs.io/en/latest/content/installation.html + (let ((commit "e426b1f09e86ac259a00c261c79df91510777407") + (revision "1")) + (package + (name "poretools") + (version (git-version "0.6.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arq5x/poretools.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am")))) + (build-system python-build-system) + ;; requires python >=2.7, <3.0, and the same for python dependencies + (arguments `(#:python ,python-2)) + (inputs + `(("hdf5" ,hdf5))) + (propagated-inputs + `(("python-dateutil" ,python2-dateutil) + ("python-h5py" ,python2-h5py) + ("python-matplotlib" ,python2-matplotlib) + ("python-pandas" ,python2-pandas) + ("python-seaborn" ,python2-seaborn))) + (home-page "https://poretools.readthedocs.io") + (synopsis "Toolkit for working with nanopore sequencing data") + (description + "The MinION from Oxford Nanopore Technologies is a nanopore sequencer. +This @code{poretools} package is a flexible toolkit for exploring datasets +generated by nanopore sequencing devices for the purposes of quality control and +downstream analysis. Poretools operates directly on the native FAST5, a variant +of the Hierarchical Data Format (HDF5) standard.") + (license license:expat)))) -- cgit v1.2.3 From 1ddb2b5c1ca1e18924cbb969c974a0e8d8e54010 Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:16:45 -0400 Subject: gnu: Add r-absim. * gnu/packages/cran.scm (r-absim): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b567fdc0ce..4da1664c67 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6131,3 +6131,31 @@ that are part of an activity bout, and find the maximum 10-minute average count value. The functions are generally very flexible, allowing for a variety of algorithms to be implemented.") (license license:gpl3))) + +(define-public r-absim + (package + (name "r-absim") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "AbSim" version)) + (sha256 + (base32 "16ddjk8b6xw80ch4jis1y751i9561wdxh0gifbf15qiz3vjckq8m")))) + (properties `((upstream-name . "AbSim"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ape" ,r-ape) + ("r-powerlaw" ,r-powerlaw))) + (home-page "https://cran.r-project.org/web/packages/AbSim/") + (synopsis "Time resolved simulations of antibody repertoires") + (description + "This package provides simulation methods for the evolution of antibody repertoires. + The heavy and light chain variable region of both human and C57BL/6 mice can +be simulated in a time-dependent fashion. Both single lineages using one set of +V-, D-, and J-genes or full repertoires can be simulated. The algorithm begins +with an initial V-D-J recombination event, starting the first phylogenetic tree. + Upon completion, the main loop of the algorithm begins, with each iteration +representing one simulated time step. Various mutation events are possible at +each time step, contributing to a diverse final repertoire.") + (license license:gpl2))) -- cgit v1.2.3 From 0f1622220a39a620854b0a268793e262746d460a Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:23:12 -0400 Subject: gnu: Add r-absfiltergsea. * gnu/packages/bioinformatics.scm (r-absfiltergsea): New variable. --- gnu/packages/bioinformatics.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 172832d148..b657bf6771 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13938,3 +13938,30 @@ generated by nanopore sequencing devices for the purposes of quality control and downstream analysis. Poretools operates directly on the native FAST5, a variant of the Hierarchical Data Format (HDF5) standard.") (license license:expat)))) + +(define-public r-absfiltergsea + (package + (name "r-absfiltergsea") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "AbsFilterGSEA" version)) + (sha256 + (base32 "15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w")))) + (properties `((upstream-name . "AbsFilterGSEA"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-deseq" ,r-deseq) + ("r-limma" ,r-limma) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo))) + (home-page "https://cran.r-project.org/web/packages/AbsFilterGSEA/") + (synopsis "Improved false positive control of gene-permuting with absolute filtering") + (description + "This package provides a function that performs gene-permuting of a gene-set +enrichment analysis (GSEA) calculation with or without the absolute filtering. + Without filtering, users can perform (original) two-tailed or one-tailed +absolute GSEA.") + (license license:gpl2))) -- cgit v1.2.3 From c2ffc4fb53a23c4db975a52f85686ed4b194cfcf Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:26:10 -0400 Subject: gnu: Add r-ac3net. * gnu/packages/cran.scm (r-ac3net): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4da1664c67..2486a48673 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6159,3 +6159,24 @@ with an initial V-D-J recombination event, starting the first phylogenetic tree. representing one simulated time step. Various mutation events are possible at each time step, contributing to a diverse final repertoire.") (license license:gpl2))) + +(define-public r-ac3net + (package + (name "r-ac3net") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "Ac3net" version)) + (sha256 + (base32 "1ns4n0xxz6p34c11bj0k7nzgmyqr9mis2b0g5nfz37dbikndyqyz")))) + (properties `((upstream-name . "Ac3net"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table))) + (home-page "https://cran.r-project.org/web/packages/Ac3net/") + (synopsis "Inferring directional conservative causal core gene networks") + (description "This package infers directional Conservative causal core +(gene) networks (C3NET). This is a version of the algorithm C3NET with +directional network.") + (license license:gpl3+))) -- cgit v1.2.3 From da33385959502a3f897a2a6a1bf92dc5f02b3b9a Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:27:12 -0400 Subject: gnu: Add r-aca. * gnu/packages/cran.scm (r-aca): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2486a48673..26b3b0377b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6180,3 +6180,23 @@ each time step, contributing to a diverse final repertoire.") (gene) networks (C3NET). This is a version of the algorithm C3NET with directional network.") (license license:gpl3+))) + +(define-public r-aca + (package + (name "r-aca") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ACA" version)) + (sha256 + (base32 "1i3hm27nvnkvc39xlh0d1blq8q0q02czmvgi3cazmjx3jvxay0vq")))) + (properties `((upstream-name . "ACA"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/ACA/") + (synopsis "Abrupt change-point or aberration detection in point series") + (description + "This package offers an interactive function for the detection of breakpoints in +series.") + ;; Any version of the GPL + (license (list license:gpl2+ license:gpl3+)))) -- cgit v1.2.3 From 9c1c2108a5523015fd83e599b263dfb1ad348324 Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 2 Oct 2018 16:28:42 -0400 Subject: gnu: Add r-acceptancesampling. * gnu/packages/cran.scm (r-acceptancesampling): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 26b3b0377b..52b3d52bac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6200,3 +6200,31 @@ directional network.") series.") ;; Any version of the GPL (license (list license:gpl2+ license:gpl3+)))) + +(define-public r-acceptancesampling + (package + (name "r-acceptancesampling") + (version "1.0-5") + (source + (origin + (method url-fetch) + (uri (cran-uri "AcceptanceSampling" version)) + (sha256 + (base32 "18krmmyn8pn11aqd81kbvka68lnd36mnpdh7p3pz9r4m4vjj007x")))) + (properties + `((upstream-name . "AcceptanceSampling"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/AcceptanceSampling/") + (synopsis "Creation and evaluation of acceptance sampling plans") + (description + "This @code{r-acceptancesampling} provides functionality for creating and evaluating +acceptance sampling plans. Acceptance sampling is a methodology commonly used +in quality control and improvement. International standards of acceptance +sampling provide sampling plans for specific circumstances. The aim of this +package is to provide an easy-to-use interface to visualize single, double or +multiple sampling plans. In addition, methods have been provided to enable the +user to assess sampling plans against pre-specified levels of performance, as +measured by the probability of acceptance for a given level of quality in the +lot.") + (license license:gpl3+))) + -- cgit v1.2.3 From 63781c5748b108db5ceab02ce2d201e901ff10a4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 2 Oct 2018 16:29:25 -0400 Subject: gnu: Add r-acclma. * gnu/packages/cran.scm (r-acclma): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 52b3d52bac..a1bf750da6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6228,3 +6228,31 @@ measured by the probability of acceptance for a given level of quality in the lot.") (license license:gpl3+))) +(define-public r-acclma + (package + (name "r-acclma") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ACCLMA" version)) + (sha256 + (base32 "1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v")))) + (properties `((upstream-name . "ACCLMA"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/ACCLMA/") + (synopsis "ACC & LMA graph plotting") + (description + "This package contains a function that imports data from a @acronym{Comma-Separated +Values, @acronym{CSV}} file, or uses manually entered data from the format (x, +y, weight) and plots the appropriate @acronym{Absolute Concentration Curve, +@acronym{ACC}} vs @acronym{Line of Independence, @acronym{LOI}} graph and +@acronym{@acronym{LOI} Minus @acronym{ACC}, @acronym{LMA}} graph. The main +function is plotLMA (source file, header) that takes a data set and plots the +appropriate @acronym{LMA} and @acronym{ACC} graphs. If no source file (a +string) was passed, a manual data entry window is opened. The header parameter +indicates by TRUE/FALSE (false by default) if the source @acronym{CSV} file has +a header row or not. The dataset should contain only one independent variable +(x) and one dependent variable (y) and can contain a weight for each +observation.") + (license license:gpl2))) -- cgit v1.2.3 From 2bc8b2af8947502d147fb3b67a0a40a5565c3707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 2 Oct 2018 16:18:30 +0200 Subject: gnu: guile-cairo: Update to 1.10.0. * gnu/packages/gtk.scm (guile-cairo): Update to 1.10.0. [source]: Add 'snippet'. [arguments]: Remove. --- gnu/packages/gtk.scm | 58 ++++++++++++++-------------------------------------- 1 file changed, 15 insertions(+), 43 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 76e64b36bc..8c25922c9e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -777,54 +777,26 @@ application suites.") (define-public guile-cairo (package (name "guile-cairo") - (version "1.4.1") + (version "1.10.0") (source (origin (method url-fetch) - (uri (string-append - "http://download.gna.org/guile-cairo/guile-cairo-" - version - ".tar.gz")) + (uri (string-append "mirror://savannah/guile-cairo/guile-cairo-" + version ".tar.gz")) (sha256 (base32 - "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x")))) + "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf")) + (modules '((guix build utils))) + (snippet + (begin + '(begin + ;; Install Scheme files in …/guile/site/X.Y. + (substitute* (find-files "." "^Makefile\\.in$") + (("^(.*)dir = (.*)/guile/site(.*)" _ name prefix suffix) + (string-append name "dir = " prefix + "/guile/site/@GUILE_EFFECTIVE_VERSION@" + suffix))) + #t))))) (build-system gnu-build-system) - (arguments - '(#:modules ((guix build utils) - (guix build gnu-build-system) - (ice-9 popen) - (ice-9 rdelim)) - - #:phases (modify-phases %standard-phases - (add-before 'configure 'set-module-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install modules under $out/share/guile/site/2.0. - (let ((out (assoc-ref outputs "out")) - (effective - (read-line - (open-pipe* OPEN_READ "guile" "-c" - "(display (effective-version))")))) - (substitute* "Makefile.in" - (("scmdir = ([[:graph:]]+).*" _ value) - (string-append "scmdir = " value "/" effective "\n"))) - (substitute* "cairo/Makefile.in" - (("moduledir = ([[:graph:]]+).*" _ value) - (string-append "moduledir = " - "$(prefix)/share/guile/site/" - effective "/cairo\n'"))) - #t))) - (add-after 'install 'install-missing-file - (lambda* (#:key outputs #:allow-other-keys) - ;; By default 'vector-types.scm' is not installed, so do - ;; it here. - (let ((out (assoc-ref outputs "out")) - (effective - (read-line - (open-pipe* OPEN_READ "guile" "-c" - "(display (effective-version))")))) - (install-file "cairo/vector-types.scm" - (string-append out "/share/guile/site/" - effective "/cairo")) - #t)))))) (inputs `(("guile-lib" ,guile-lib) ("expat" ,expat) -- cgit v1.2.3 From 000b540791f082b8a8398dc2ed51fd1526d8357d Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Thu, 27 Sep 2018 21:01:25 +0200 Subject: gnu: grammalecte: Update source hash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The zip file was modified in-place by the maintainers to push fixes to the "server-side code", as discussed at . * gnu/packages/dictionaries.scm (grammalecte): Update source hash. Signed-off-by: Ludovic Courtès --- gnu/packages/dictionaries.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 9f63223453..ce7ef1cf75 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -219,7 +220,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.") "Grammalecte-fr-v" version ".zip")) (sha256 (base32 - "1flsahqw2r0cmg0bixpl5w0acricmdh2cf4lf9zr66ydgmjnmv2s")))) + "11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0")))) (build-system python-build-system) (home-page "https://www.dicollecte.org") (synopsis "French spelling and grammar checker") -- cgit v1.2.3 From 68faa20e2d4511b43062f8279cc407aee735b275 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 2 Oct 2018 13:53:13 -0500 Subject: quilt: Upgrade to 0.65. * gnu/packages/patches/quilt-test-fix-regex.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/patchutils.scm (quilt)[version]: Upgrade to 0.65. [source]: Use patch. [arguments]: Adjust 'patch-tests' phase for new tests. Re-enable "mail" test. --- gnu/local.mk | 1 + gnu/packages/patches/quilt-test-fix-regex.patch | 41 +++++++++++++++++++++++++ gnu/packages/patchutils.scm | 19 +++++++++--- 3 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/quilt-test-fix-regex.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 244c79d221..b2fda4ac69 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1101,6 +1101,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ + %D%/packages/patches/quilt-test-fix-regex.patch \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ diff --git a/gnu/packages/patches/quilt-test-fix-regex.patch b/gnu/packages/patches/quilt-test-fix-regex.patch new file mode 100644 index 0000000000..2e249ac55b --- /dev/null +++ b/gnu/packages/patches/quilt-test-fix-regex.patch @@ -0,0 +1,41 @@ +From 5193b137b5a9034ce79946edd40760df2f63a82a Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Tue, 25 Apr 2017 15:17:53 +0200 +Subject: test: Escape curly braces in regex + +Curly braces in perl regex are supposed to be escaped, recent +versions of perl complain when they aren't: + +Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE (\w+)}/ at ./run line 114. +Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE \?}/ at ./run line 290. + +Signed-off-by: Jean Delvare +--- + test/run | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/run b/test/run +index 942014e..03afc7a 100755 +--- a/test/run ++++ b/test/run +@@ -112,7 +112,7 @@ sub flush_output() + sub substitute_vars($) + { + my ($line) = @_; +- $line =~ s[%{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg; ++ $line =~ s[%\{(\w+)\}][defined $ENV{$1} ? $ENV{$1} : ""]eg; + return $line; + } + +@@ -288,7 +288,7 @@ while (defined(my $line = )) { + # Parse the next command + if ($line =~ s/^\s*\$ ?//) { + # Substitute %{?} with the last command's status +- $line =~ s[%{\?}][$last_status]eg; ++ $line =~ s[%\{\?\}][$last_status]eg; + + chomp($prog = substitute_vars($line)); + $prog_line = $lineno; +-- +cgit v1.0-41-gc330 + diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index a68e369912..0cf111ac47 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2015, 2018 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -92,7 +92,7 @@ listing the files modified by a patch.") (define-public quilt (package (name "quilt") - (version "0.61") + (version "0.65") (source (origin (method url-fetch) @@ -100,7 +100,8 @@ listing the files modified by a patch.") name "-" version ".tar.gz")) (sha256 (base32 - "1hwz58djkq9cv46sjwxbp2v5m8yjr41kd0nm1zm1xm6418khmv0y")))) + "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn")) + (patches (search-patches "quilt-test-fix-regex.patch")))) (build-system gnu-build-system) (inputs `(("perl" ,perl) ("less" ,less) @@ -116,8 +117,16 @@ listing the files modified by a patch.") '("test/run" "test/edit.test") (("/bin/sh") (which "sh"))) - ;; TODO: Run the mail tests once the mail feature can be supported. - (delete-file "test/mail.test") + (substitute* "test/create-delete.test" + ;; We'd rather use quilt's compat/getopt than declare a + ;; dependency on util-linux, but this test fails because of + ;; compat/getopt's handling of "---" in this test, so remove it + ;; for now. + ((" ---") "")) + (substitute* '("test/empty-files.test" "test/faildiff.test") + ;; compat/getopt seems not to handle splitting of short opts + ;; from its arguments. + (("-pab") "-p ab")) #t)) (add-after 'install 'wrap-program ;; quilt's configure checks for the absolute path to the utilities it -- cgit v1.2.3 From 24a80064ca7faf504563af33217e07372285fb2f Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 2 Oct 2018 14:01:55 -0500 Subject: quilt: Install translations. * gnu/packages/patchutils.scm (quilt)[native-inputs]: New field. --- gnu/packages/patchutils.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 0cf111ac47..767799768c 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages file) #:use-module (gnu packages gawk) + #:use-module (gnu packages gettext) #:use-module (gnu packages less) #:use-module (gnu packages mail) #:use-module (gnu packages ncurses) @@ -103,6 +104,8 @@ listing the files modified by a patch.") "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn")) (patches (search-patches "quilt-test-fix-regex.patch")))) (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gnu-gettext))) (inputs `(("perl" ,perl) ("less" ,less) ("file" ,file) -- cgit v1.2.3 From d7d1fc821091de98d66dac71ceed390d82434e40 Mon Sep 17 00:00:00 2001 From: Eric Bavier <<bavier@cray.com>> Date: Tue, 2 Oct 2018 14:50:45 -0500 Subject: quilt: Add diffstat input. * gnu/packages/patchutils.scm (quilt)[inputs]: Add diffstat. [arguments]: Add it to wrapper. --- gnu/packages/patchutils.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 767799768c..da20ae1c3f 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages version-control) #:use-module (gnu packages xml)) (define-public patchutils @@ -109,7 +110,8 @@ listing the files modified by a patch.") (inputs `(("perl" ,perl) ("less" ,less) ("file" ,file) - ("ed" ,ed))) + ("ed" ,ed) + ("diffstat" ,diffstat))) (arguments '(#:parallel-tests? #f #:phases @@ -140,6 +142,7 @@ listing the files modified by a patch.") (coreutils (assoc-ref inputs "coreutils")) (diffutils (assoc-ref inputs "diffutils")) (findutils (assoc-ref inputs "findutils")) + (diffstat (assoc-ref inputs "diffstat")) (less (assoc-ref inputs "less")) (file (assoc-ref inputs "file")) (ed (assoc-ref inputs "ed")) @@ -151,7 +154,8 @@ listing the files modified by a patch.") ,(map (lambda (dir) (string-append dir "/bin")) (list coreutils diffutils findutils - less file ed sed bash grep))))) + less file ed sed bash grep + diffstat))))) #t))))) (home-page "https://savannah.nongnu.org/projects/quilt/") (synopsis "Script for managing patches to software") -- cgit v1.2.3 From d1022d68c25ab95ba789e02164326af47fd18a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 3 Oct 2018 21:32:49 +0800 Subject: gnu: guile-chickadee: Update to 0.3.0. * gnu/packages/game-development.scm (guile-chickadee): Update to 0.3.0. [arguments]: Add 'patch-godir' phase. --- gnu/packages/game-development.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 86f2877f82..6bd72879c2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1256,17 +1256,24 @@ a 2D editor view.") (define-public guile-chickadee (package (name "guile-chickadee") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/chickadee/" "chickadee-" version ".tar.gz")) (sha256 (base32 - "10qx0ha5gsayybd186r1my7vc7rf5fbzp9jvmc4xg9a8wz8rqhah")))) + "0jl223dybsj5gvs7z4q60gnafj1b7kgi5mx0kj58m5knrp8qwg5h")))) (build-system gnu-build-system) (arguments - '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) + '(#:make-flags '("GUILE_AUTO_COMPILE=0") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-godir + (lambda _ + ;; Install compiled '.go' files into the site directory. + (substitute* "Makefile.in" + (("/ccache") "/site-ccache"))))))) (propagated-inputs `(("guile-opengl" ,guile-opengl) ("guile-sdl2" ,guile-sdl2))) -- cgit v1.2.3 From 477dde6192bc795732be8643d66c98f89458fd68 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Tue, 25 Sep 2018 21:09:32 -0400 Subject: gnu: emacs-racket-mode: Update to commit b977873. * gnu/packages/emacs.scm (emacs-racket-mode): Update to commit b977873. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8da5add886..c10a80258e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10410,8 +10410,8 @@ perform regression test for packages that provide font-lock rules.") (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "92c33487f6c707880ac3f6169e7ea65ddffd1463") - (revision "1")) + (let ((commit "b977873e6128f8399432dcd60cc39f6a6f803d9c") + (revision "2")) (package (name "emacs-racket-mode") (version (string-append "0.0.2" "-" revision "." @@ -10425,7 +10425,7 @@ perform regression test for packages that provide font-lock rules.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "19q6ym10gj2xdzzcgh3wdbq1xv8cv7nlrhv2b0bjvvdjzhiki472")))) + "0vp4bbbplqvmnhjpl6ajrlydmrhqzil56cfbs18m5c5fddx0zlh7")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) -- cgit v1.2.3 From 227ce488d7b899636e8e8635cbd2d08fb21c56a2 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Oct 2018 16:38:52 -0500 Subject: gnu: Go 1.11: Update to 1.11.1 * gnu/packages/golang.scm (go-1.11): Update to 1.11.1. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index bba03e77f2..7a049e39e1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -504,7 +504,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.10) (name "go") - (version "1.11") + (version "1.11.1") (source (origin (method url-fetch) @@ -512,7 +512,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") name version ".src.tar.gz")) (sha256 (base32 - "1ysj04jzds6xa8kdflkdsgyv3mg9fdn90zdf78g4g6p4bwpy3hdg")))) + "05qivf2f59pv4bfrmdr4m0xvswkmvvl9c5a2h5dy45g2k8b8r3sm")))) (arguments (substitute-keyword-arguments (package-arguments go-1.10) ((#:phases phases) -- cgit v1.2.3 From 43eb42ef017aa4752503fb2913781bb446716c1e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 3 Oct 2018 10:23:51 -0500 Subject: quilt: Remove test workarounds. * gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch, gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/patchutils.scm (quilt)[source]: Use them. [arguments]: Remove workarounds in 'patch-tests' phase. --- gnu/local.mk | 2 + ...pat-getopt-fix-option-with-nondigit-param.patch | 45 +++++++++++++++++ .../quilt-compat-getopt-fix-second-separator.patch | 58 ++++++++++++++++++++++ gnu/packages/patchutils.scm | 14 ++---- 4 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch create mode 100644 gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b2fda4ac69..61e5913a01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1102,6 +1102,8 @@ dist_patch_DATA = \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/quilt-test-fix-regex.patch \ + %D%/packages/patches/quilt-compat-getopt-fix-second-separator.patch \ + %D%/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ diff --git a/gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch b/gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch new file mode 100644 index 0000000000..6bbec67e75 --- /dev/null +++ b/gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch @@ -0,0 +1,45 @@ +From: Jean Delvare +Subject: compat/getopt: Allow non-digit parameter embedded in short option + +The compatibility getopt script allows only digit parameters to be +embedded in short options. Util-linux's getopt implementation does +not have such a restriction and allows any parameter to be embedded +in short options. As a consequence, using the compatibility getopt +script would choke for example on "-pab", which is a legal option +of the "quilt refresh" command. + +Remove the limitation on digits so that the compatibility getopt +script allows what util-linux allows. This fixes the second half +of bug #54772: +https://savannah.nongnu.org/bugs/index.php?54772 + +As a side note, this feature of the compatibility script was broken +anyway, as it would output the digits in reverse order. + +Signed-off-by: Jean Delvare +--- + compat/getopt.in | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +--- quilt.orig/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200 ++++ quilt/compat/getopt.in 2018-10-03 16:12:17.624841732 +0200 +@@ -108,15 +108,10 @@ foreach my $word (@words) { + if (scalar(@letters) == 0) { + $need_param = $letter; + } else { +- # short options can have numerical args +- # embedded in the short option list: -UO +- die "unexpected character after option $letter" +- if ($letters[$#letters] !~ /[0-9]/); +- my @digits; +- while (scalar(@letters) && ($letters[$#letters] =~ /[0-9]/)) { +- push @digits, pop @letters; +- } +- push @options, quote_word(join('', reverse @digits)); ++ # short options can have args ++ # embedded in the short option list ++ push @options, quote_word(join('', reverse @letters)); ++ @letters = (); + } + } + } diff --git a/gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch b/gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch new file mode 100644 index 0000000000..cde2c8d41c --- /dev/null +++ b/gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch @@ -0,0 +1,58 @@ +From: Jean Delvare +Subject: compat/getopt: Handle a second separator + +getopt can be passed 2 '--' separators. The first one tells that +getopt options are over and target program options start. The second +one tells that the target program's options are over and following +arguments should be treated as non-options even if they look like +options. + +This second separator was not handled, causing the compatibility +getopt script to treat the following arguments as options, eventually +failing one way or another. + +Properly detect and handle the second separator. This fixes the first +half of bug #54772: +https://savannah.nongnu.org/bugs/index.php?54772 + +Signed-off-by: Jean Delvare +--- + compat/getopt.in | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +--- quilt.orig/compat/getopt.in 2018-10-03 15:23:21.147620172 +0200 ++++ quilt/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200 +@@ -8,12 +8,12 @@ + + use strict; + +-my $opts; ++my $opts = ''; + my @words; + my $found_sep = 0; + + foreach my $arg (@ARGV) { +- if ($arg eq '--') { ++ if (!$found_sep && $arg eq '--') { + $found_sep = 1; + } + else { +@@ -62,10 +62,17 @@ sub quote_word + return "'$word'"; + } + ++# there can be a second separator, to inhibit processing following arguments ++# as options ++$found_sep = 0; + foreach my $word (@words) { ++ if ($word eq '--') { ++ $found_sep = 1; ++ next; ++ } + + # allow '-' to be an option value +- if (!$need_param && $word !~ /^-./) { ++ if ($found_sep || (!$need_param && $word !~ /^-./)) { + push @barewords, quote_word($word); + next; + } diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index da20ae1c3f..688e62cdc8 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -103,7 +103,9 @@ listing the files modified by a patch.") (sha256 (base32 "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn")) - (patches (search-patches "quilt-test-fix-regex.patch")))) + (patches (search-patches "quilt-test-fix-regex.patch" + "quilt-compat-getopt-fix-second-separator.patch" + "quilt-compat-getopt-fix-option-with-nondigit-param.patch")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gnu-gettext))) @@ -122,16 +124,6 @@ listing the files modified by a patch.") '("test/run" "test/edit.test") (("/bin/sh") (which "sh"))) - (substitute* "test/create-delete.test" - ;; We'd rather use quilt's compat/getopt than declare a - ;; dependency on util-linux, but this test fails because of - ;; compat/getopt's handling of "---" in this test, so remove it - ;; for now. - ((" ---") "")) - (substitute* '("test/empty-files.test" "test/faildiff.test") - ;; compat/getopt seems not to handle splitting of short opts - ;; from its arguments. - (("-pab") "-p ab")) #t)) (add-after 'install 'wrap-program ;; quilt's configure checks for the absolute path to the utilities it -- cgit v1.2.3 From 6f2a2bd66d5f7e5e8d7d2fd6f6cfdf3e5006b567 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 26 Sep 2018 23:15:59 +0200 Subject: gnu: Add emacs-all-the-icons. * gnu/packages/emacs.scm (emacs-all-the-icons): New variable. --- gnu/packages/emacs.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c10a80258e..b25358718c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12262,3 +12262,42 @@ execute its commands and resize images.") (description "Synosaurus is a thesaurus fontend for Emacs with pluggable backends, including the @command{wordnet} offline backend.") (license license:gpl3+)))) + +(define-public emacs-all-the-icons + (package + (name "emacs-all-the-icons") + (version "3.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/domtronn/all-the-icons.el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn")))) + (build-system emacs-build-system) + (arguments + `(#:include '("\\.el$" "^data/" "^fonts/") + ;; Compiling "test/" fails with "Symbol’s value as variable is void: + ;; all-the-icons--root-code". Ignoring tests. + #:exclude '("^test/") + #:tests? #f)) + (propagated-inputs + `(("f" ,emacs-f) + ("memoize" ,emacs-memoize))) + (home-page "https://github.com/domtronn/all-the-icons.el") + (synopsis "Collect icon fonts and propertize them within Emacs") + (description "All-the-icons is a utility package to collect various icon +fonts and propertize them within Emacs. Icon fonts allow you to propertize +and format icons the same way you would normal text. This enables things such +as better scaling of and anti aliasing of the icons.") + ;; Package is released under Expat license. Elisp files are licensed + ;; under GPL3+. Fonts come with various licenses: Expat for + ;; "all-the-icons.ttf" and "file-icons.ttf", Apache License 2.0 for + ;; "material-design-icons.ttf", and SIL OFL 1.1 for "fontawesome.ttf", + ;; "ocitcons.ttf" and "weathericons.ttf". + (license + (list license:expat license:gpl3+ license:silofl1.1 license:asl2.0)))) + -- cgit v1.2.3 From d406dcc046b140de616d3ea83a7591865c7eb5be Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 26 Sep 2018 23:25:24 +0200 Subject: gnu: Add emacs-powerline. * gnu/packages/emacs.scm (emacs-powerline): New variable. --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b25358718c..b9f3d678e0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12301,3 +12301,25 @@ as better scaling of and anti aliasing of the icons.") (license (list license:expat license:gpl3+ license:silofl1.1 license:asl2.0)))) +(define-public emacs-powerline + (package + (name "emacs-powerline") + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/milkypostman/powerline.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hp3xp18943n0rlggz55150020ivw8gvi1vyxkr4z8xhpwq4gaar")))) + (build-system emacs-build-system) + (home-page "https://github.com/milkypostman/powerline/") + (synopsis "Mode-line plugin for Emacs") + (description "Powerline is a utility plugin which allows you to create +a better-looking, more functional Emacs mode-line. A collection of predefined +themes comes with the package.") + (license license:gpl3+))) + -- cgit v1.2.3 From 0c1fd6f8ade5c30e12985f7bd29ea4bf49559741 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 26 Sep 2018 23:27:06 +0200 Subject: gnu: Add emacs-spaceline. * gnu/packages/emacs.scm (emacs-spaceline): New variable. --- gnu/packages/emacs.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b9f3d678e0..1df3456e4a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12323,3 +12323,35 @@ a better-looking, more functional Emacs mode-line. A collection of predefined themes comes with the package.") (license license:gpl3+))) +(define-public emacs-spaceline + (package + (name "emacs-spaceline") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TheBB/spaceline.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q8r95zfrh0vxna5ml2pq9b9f66clfqcl4d2qy2aizkvzyxg6skl")))) + (build-system emacs-build-system) + (propagated-inputs + `(("dash" ,emacs-dash) + ("powerline" ,emacs-powerline) + ("s" ,emacs-s))) + (home-page "https://github.com/TheBB/spaceline") + (synopsis "Powerline theme from Spacemacs") + (description "Spaceline provides Spacemacs' mode-line theme. +This package provides features for three kinds of users. + +@itemize +@item You just want to use the Spacemacs mode-line theme and forget about it. +@item You want to use something similar to the Spacemacs mode-line theme, but +with a handful of easy tweaks. +@item You want an easy-to-use library for building your own mode-line from +scratch, and you think the Spacemacs theme looks good. +@end itemize") + (license license:gpl3+))) -- cgit v1.2.3 From 7d99f015acb2611bca9f42f2d04cae68ef52aba3 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 3 Oct 2018 14:28:11 -0400 Subject: gnu: tiled: Update to 1.2.0. * gnu/packages/game-development.scm (tiled): Update to 1.2.0. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6bd72879c2..bfebcc433e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -397,7 +397,7 @@ support.") (define-public tiled (package (name "tiled") - (version "1.1.6") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/bjorn/tiled/archive/v" @@ -405,7 +405,7 @@ support.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "194ciw8688mikndvxivzb8ql5vm405pkwnn4srzm7ymwfc4xygb0")))) + "13dlf5kzvhhjkhy19118x3diakmraz4m9kxrsdam8dms6xivb6lp")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From ef1f9acf470e1871395daf18ce5d1c58d87f2ab0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 3 Oct 2018 23:04:32 +0200 Subject: gnu: azr3: Fix build. Fixes . * gnu/packages/audio.scm (azr3)[arguments]: Add build phase to reset timestamp of man page source. --- gnu/packages/audio.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8f100ce7a3..95cc2ed68c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -449,7 +449,14 @@ tools.") "CXXFLAGS=-std=gnu++11" "CFLAGS=-std=gnu++11" (string-append "prefix=" %output) - (string-append "pkgdatadir=" %output "/share/azr3-jack")))) + (string-append "pkgdatadir=" %output "/share/azr3-jack")) + #:phases + (modify-phases %standard-phases + (add-before 'install 'fix-timestamp + (lambda _ + (let ((early-1980 315619200)) ; 1980-01-02 UTC + (utime "azr3.1" early-1980 early-1980)) + #t))))) (inputs `(("gtkmm" ,gtkmm-2) ("lvtk" ,lvtk) -- cgit v1.2.3 From 46f9022c9919e647e62a39e0dacf51e31457e6f8 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 3 Oct 2018 23:56:44 +0200 Subject: gnu: Add java-commons-exec. * gnu/packages/java.scm (java-commons-exec-1.1): New variable. (java-commons-exec): New variable. --- gnu/packages/java.scm | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d2f4c9d05b..5207c6cc64 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4288,6 +4288,85 @@ setter and getter method.") file filters and endian classes.") (license license:asl2.0))) +(define-public java-commons-exec-1.1 + (package + (name "java-commons-exec") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/exec/source/" + "commons-exec-" version "-src.tar.gz")) + (sha256 + (base32 + "025dk8xgj10lxwwwqp0hng2rn7fr4vcirxzydqzx9k4dim667alk")))) + (build-system ant-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "-Dmaven.junit.jar=" + (assoc-ref %build-inputs "java-junit") + "/share/java/junit.jar")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-network-tests + (lambda _ + (delete-file "src/test/java/org/apache/commons/exec/DefaultExecutorTest.java") + (substitute* "src/test/java/org/apache/commons/exec/TestRunner.java" + (("suite\\.addTestSuite\\(DefaultExecutorTest\\.class\\);") "")) + #t)) + ;; The "build" phase automatically tests. + (delete 'check) + (replace 'install (install-jars "target"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/proper/commons-exec/") + (synopsis "Common program execution related classes") + (description "Commons-Exec simplifies executing external processes.") + (license license:asl2.0))) + +(define-public java-commons-exec + (package + (inherit java-commons-exec-1.1) + (version "1.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/exec/source/" + "commons-exec-" version "-src.tar.gz")) + (sha256 + (base32 + "17yb4h6f8l49c5iyyvda4z2nmw0bxrx857nrwmsr7mmpb7x441yv")))) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "-Dmaven.junit.jar=" + (assoc-ref %build-inputs "java-junit") + "/share/java/junit.jar") + "-Dmaven.compiler.source=1.7" + "-Dmaven.compiler.target=1.7") + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-network-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; This test hangs indefinitely. + (delete-file "src/test/java/org/apache/commons/exec/issues/Exec60Test.java") + (substitute* "src/test/java/org/apache/commons/exec/issues/Exec41Test.java" + (("ping -c 10 127.0.0.1") "sleep 10")) + (substitute* "src/test/java/org/apache/commons/exec/issues/Exec49Test.java" + (("/bin/ls") "ls")) + (call-with-output-file "src/test/scripts/ping.sh" + (lambda (port) + (format port "#!~a/bin/sh\nsleep $1\n" + (assoc-ref inputs "bash")))) + #t)) + ;; The "build" phase automatically tests. + (delete 'check) + (replace 'install (install-jars "target"))))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))))) + (define-public java-commons-lang (package (name "java-commons-lang") -- cgit v1.2.3 From 615a7eec567f313e1e421ee081c502201932fcd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 2 Oct 2018 16:32:03 +0200 Subject: gnu: Add stlink. * gnu/packages/embedded.scm (stlink): New variable. --- gnu/packages/embedded.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 0174224616..38c76cd737 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (guix svn-download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build utils) @@ -1104,3 +1106,40 @@ and displaying decoded target responses. @end enumerate") (home-page "https://www.freecalypso.org/") (license license:public-domain))) + +(define-public stlink + (package + (name "stlink") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/texane/stlink/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01z1cz1a5xbbhd163qrqcgp4bi1k145pb80jmwdz50g7sfzmy570")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no tests + #:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (etc (in-vicinity out "etc")) + (modprobe (in-vicinity etc "modprobe.d")) + (udev-rules (in-vicinity etc "udev/rules.d"))) + (list (string-append "-DSTLINK_UDEV_RULES_DIR=" udev-rules) + (string-append "-DSTLINK_MODPROBED_DIR=" modprobe))))) + (inputs + `(("libusb" ,libusb))) + (synopsis "Programmer for STM32 Discovery boards") + (description "This package provides a firmware programmer for the STM32 +Discovery boards. It supports two versions of the chip: ST-LINK/V1 (on +STM32VL discovery kits) and ST-LINK/V2 (on STM32L discovery and later kits). +Two different transport layers are used: ST-LINK/V1 uses SCSI passthru +commands over USB, and ST-LINK/V2 and ST-LINK/V2-1 (seen on Nucleo boards) use +raw USB commands.") + (home-page "https://github.com/texane/stlink") + ;; The flashloaders/stm32l0x.s and flashloaders/stm32lx.s source files are + ;; licensed under the GPLv2+. + (license (list license:bsd-3 license:gpl2+)))) -- cgit v1.2.3 From 5165fb40f4a730b36cddeab6ae894d360e727639 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 4 Oct 2018 03:02:30 +0200 Subject: gnu: Add java-fasterxml-jackson-modules-base-mrbean. * gnu/packages/java.scm (java-fasterxml-jackson-modules-base-mrbean): New variable. --- gnu/packages/java.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5207c6cc64..96da495c29 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7664,6 +7664,55 @@ configuration.") (description "This package is the jaxb annotations module for jackson.") (license license:asl2.0))); found on wiki.fasterxml.com/JacksonLicensing +(define-public java-fasterxml-jackson-modules-base-mrbean + (package + (name "java-fasterxml-jackson-modules-base-mrbean") + (version "2.9.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/FasterXML/" + "jackson-modules-base/archive/" + "jackson-modules-base-" version ".tar.gz")) + (sha256 + (base32 + "1wws95xi8sppp6b0k2vvjdjyynl20r1a4dwrhai08lzlria6blp5")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jackson-modules-base-mrbean.jar" + #:source-dir "mrbean/src/main/java" + #:test-dir "mrbean/src/test" + #:test-exclude + ;; Base class for tests + (list "**/BaseTest.java") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'generate-PackageVersion.java + (lambda _ + (let* ((out (string-append "mrbean/src/main/java/com/fasterxml/" + "jackson/module/mrbean/PackageVersion.java")) + (in (string-append out ".in"))) + (copy-file in out) + (substitute* out + (("@package@") "com.fasterxml.jackson.module.mrbean") + (("@projectversion@") ,version) + (("@projectgroupid@") "com.fasterxml.jackson.module.mrbean") + (("@projectartifactid@") "jackson-module-mrbean"))) + #t))))) + (inputs + `(("java-asm" ,java-asm) + ("java-fasterxml-jackson-annotations" + ,java-fasterxml-jackson-annotations) + ("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core) + ("java-fasterxml-jackson-databind" ,java-fasterxml-jackson-databind))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/FasterXML/jackson-modules-base") + (synopsis "POJO type materialization for Java") + (description "This package implements POJO type materialization. +Databinders can construct implementation classes for Java interfaces as part +of deserialization.") + (license license:asl2.0))) + (define-public java-snakeyaml (package (name "java-snakeyaml") -- cgit v1.2.3 From 84ae0e29fd4fea418db450aa42b611b6d90d962e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Oct 2018 22:31:03 +0200 Subject: gnu: rtags: Don't use unstable tarball. * gnu/packages/code.scm (rtags)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/code.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 4264e292bd..98a86b763f 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -403,13 +403,13 @@ functionality such as HTML output.") (package (name "rtags") (version "2.18") - (home-page "https://github.com/Andersbakken/rtags") (source (origin - (method url-fetch) - (uri - (string-append home-page "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Andersbakken/rtags.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (patches (search-patches "rtags-separate-rct.patch")) (modules '((guix build utils))) (snippet @@ -424,7 +424,7 @@ functionality such as HTML output.") #t))) (sha256 (base32 - "0scjbp1z201q8njvrxqz7lk2m9b6k2rxd5q1shrng6532r7ndif2")))) + "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0")))) (build-system cmake-build-system) (arguments '(#:build-type "RelWithDebInfo" @@ -442,6 +442,7 @@ functionality such as HTML output.") ("lua" ,lua) ("rct" ,rct) ("selene" ,selene))) + (home-page "https://github.com/Andersbakken/rtags") (synopsis "Indexer for the C language family with Emacs integration") (description "RTags is a client/server application that indexes C/C++ code and keeps a -- cgit v1.2.3 From 5eff43804eaed5744967f83edbaeb7ffdb77aec1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 12:36:50 +0200 Subject: gnu: Add memtest86+. * gnu/packages/hardware.scm (memtest86+): New public variable. --- gnu/packages/hardware.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index f77336e504..62f6316bca 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -18,6 +18,7 @@ (define-module (gnu packages hardware) #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) @@ -74,6 +75,66 @@ calibrated, and restored when the calibration is applied.") (license (list license:bsd-3 ; FindDDCUtil.cmake license:gpl2+)))) ; everything else +;; Distinct from memtest86, which is obsolete. +(define-public memtest86+ + (package + (name "memtest86+") + ;; Update the description when/if UEFI support is released. + (version "5.01") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.memtest.org/download/5.01/memtest86+-" + version ".tar.gz")) + (sha256 + (base32 "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l")))) + (build-system gnu-build-system) + (arguments + `(#:system "i686-linux" ; the result runs outside of any OS + #:tests? #f ; no way to test this + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'build + ;; The default 'make all' does wonderful things, like scp(1) a file to + ;; 192.168.0.12. Build the bootable images and nothing more. + (lambda _ + (invoke "make" + "memtest" ; ELF executable + "memtest.bin"))) ; DOS/MBR boot sector + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/memtest86+")) + (doc (string-append out "/share/doc/memtest86+-" ,version))) + (for-each + (lambda (file) + (install-file file lib)) + (list "memtest" + "memtest.bin")) + (for-each + (lambda (file) + (install-file file doc)) + (list "FAQ" + "README")))))))) + (native-inputs + ;; Newer GCCs fail with a deluge of "multiple definition of `__foo'" errors. + `(("gcc" ,gcc-4.9))) + (supported-systems (list "i686-linux" "x86_64-linux")) + (home-page "https://www.memtest.org/") + (synopsis "Thorough real-mode memory tester") + (description + "Memtest86+ is a thorough, stand-alone memory test for x86 systems. It +repeatedly writes different patterns to all memory locations, reads them back +again, and verifies whether the result is the same as what was written. This +can help debug even intermittent and non-deterministic errors. + +It runs independently of any operating system, at computer boot-up, so that it +can scan as much of your RAM as possible for hardware defects. + +Memtest86+ cannot currently be used on computers booted with UEFI.") + (license license:gpl2))) + (define-public msr-tools (package (name "msr-tools") -- cgit v1.2.3 From fb5412511479c19b3e4c884e9cc65e652ea923e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 16:11:22 +0200 Subject: gnu: Add memtester. * gnu/packages/hardware.scm (memtester): New public variable. --- gnu/packages/hardware.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 62f6316bca..02ab9e2e00 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -116,7 +116,8 @@ calibrated, and restored when the calibration is applied.") (lambda (file) (install-file file doc)) (list "FAQ" - "README")))))))) + "README")) + #t)))))) (native-inputs ;; Newer GCCs fail with a deluge of "multiple definition of `__foo'" errors. `(("gcc" ,gcc-4.9))) @@ -135,6 +136,54 @@ can scan as much of your RAM as possible for hardware defects. Memtest86+ cannot currently be used on computers booted with UEFI.") (license license:gpl2))) +(define-public memtester + (package + (name "memtester") + (version "4.3.0") + (source + (origin + (method url-fetch) + ;; Even the latest release is available under 'old-versions/'. + (uri (string-append "http://pyropus.ca/software/memtester/old-versions/" + "memtester-" version ".tar.gz")) + (sha256 + (base32 "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; This is a home-brewed configuration system where the cc/ld command + ;; lines are stored in one-line files. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (list "conf-cc" "conf-ld") + (("^cc") "gcc")) + (substitute* "Makefile" + (("(INSTALLPATH.*=).*" _ assignment) + (string-append assignment out))) + #t))) + (replace 'check + ;; There is no test suite. Test some RAM for a single iteration. + (lambda _ + (invoke "./memtester" "64K" "1")))))) + (home-page "http://pyropus.ca/software/memtester/") + (synopsis "User-space memory subsystem tester") + (description + "Memtester stress-tests the memory subsystem of your operating system and +computer. It repeatedly writes different patterns to all memory locations, +reads them back again, and verifies whether the result is the same as what was +written. This can help debug even intermittent and non-deterministic errors. + +Memtester runs entirely in user space. This means that you don't need to reboot +to test your memory, but also that it's not possible to test all of the RAM +installed in the system. + +It can also be told to test memory starting at a particular physical address.") + (license license:gpl2))) + (define-public msr-tools (package (name "msr-tools") -- cgit v1.2.3 From 20377e4a99d7855685f29433059d53fca2761ce9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Oct 2018 02:48:01 +0200 Subject: gnu: rubberband: Use HTTPS home page. * gnu/packages/audio.scm (rubberband)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 95cc2ed68c..c92b5056d1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2245,7 +2245,7 @@ aimed at audio/musical applications.") ("vamp" ,vamp))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://breakfastquay.com/rubberband/") + (home-page "https://breakfastquay.com/rubberband/") (synopsis "Audio time-stretching and pitch-shifting library") (description "Rubber Band is a library and utility program that permits changing the -- cgit v1.2.3 From 8d54e7ff221f2679cd2677bf483bdfb057b0a35e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 00:14:21 +0200 Subject: gnu: wpa-supplicant-gui: Remove redundant code. * gnu/packages/admin.scm (wpa-supplicant-gui)[arguments]: Remove substitution already handled by the build system. --- gnu/packages/admin.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a0ab431ddd..fa60cadd01 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1194,9 +1194,6 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (qt '("qtbase" "qtsvg"))) - (substitute* "wpa_gui.desktop" - (("Exec=wpa_gui") - (string-append "Exec=" out "/bin/wpa_gui"))) (install-file "wpa_gui" (string-append out "/bin")) (install-file "wpa_gui.desktop" (string-append out "/share/applications")) -- cgit v1.2.3 From 18995af2cdb8101af099ff8e62c185425096ec7a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 20:32:07 +0200 Subject: gnu: Add freedroidrpg. * gnu/packages/games.scm (freedroidrpg): New public variable. --- gnu/packages/games.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 86d6973a9a..ec92f508bc 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -364,6 +364,59 @@ played. Freedoom complements the Doom engine with free levels, artwork, sound effects and music to make a completely free game.") (license license:bsd-3))) +(define-public freedroidrpg + (package + (name "freedroidrpg") + (version "0.16.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://ftp.osuosl.org/pub/freedroid/" + "freedroidRPG-" (version-major+minor version) "/" + "freedroidRPG-" version ".tar.gz")) + (sha256 + (base32 "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + (string-append "CFLAGS=" + "-I" (assoc-ref %build-inputs "sdl-gfx") "/include/SDL " + "-I" (assoc-ref %build-inputs "sdl-image") "/include/SDL " + "-I" (assoc-ref %build-inputs "sdl-mixer") "/include/SDL") + "--enable-opengl") + ;; FIXME: the test suite fails with the following error output: + ;; 4586 Segmentation fault env SDL_VIDEODRIVER=dummy \ + ;; SDL_AUDIODRIVER=dummy ./src/freedroidRPG -nb text + #:tests? #f)) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("glu" ,glu) + ("libjpeg" ,libjpeg) + ("libogg" ,libogg) + ("libpng" ,libpng) + ("libvorbis" ,libvorbis) + ("mesa" ,mesa) + ("python" ,python-wrapper) + ("sdl" ,sdl) + ("sdl-gfx" ,sdl-gfx) + ("sdl-image" ,sdl-image) + ("sdl-mixer" ,sdl-mixer) + ("zlib" ,zlib))) + (home-page "http://www.freedroid.org/") + (synopsis "Isometric role-playing game against killer robots") + (description + "Freedroid RPG is an @dfn{RPG} (Role-Playing Game) with isometric graphics. +The game tells the story of a world destroyed by a conflict between robots and +their human masters. To restore peace to humankind, the player must complete +numerous quests while fighting off rebelling robots---either by taking control +of them, or by simply blasting them to pieces with melee and ranged weapons in +real-time combat.") + (license (list license:expat ; lua/ + license:gpl3 ; src/gen_savestruct.py + license:gpl2+)))) ; the rest + (define-public golly (package (name "golly") -- cgit v1.2.3 From 99f97a775244d932e55e0546ee90d43a8110c4b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 23:19:45 +0200 Subject: gnu: packagekit: Update to 1.1.11. * gnu/packages/freedesktop.scm (packagekit): Update to 1.1.11. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 626d883648..5cc2699ad8 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -349,7 +349,7 @@ of a the system to know what users are logged in, and where.") (define-public packagekit (package (name "packagekit") - (version "1.1.10") + (version "1.1.11") (source (origin (method url-fetch) (uri (string-append @@ -358,7 +358,7 @@ of a the system to know what users are logged in, and where.") "PackageKit-" version ".tar.xz")) (sha256 (base32 - "1msfmb22cm4s3l6vsbr86b8s0v897sy6gcga3qg87z7640a0di2b")))) + "0fi6wn54y03zh5sn92nmmxkh4cd8yn44cyk0l8phw60ivfwmkh1q")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 7f12d8134e43eda122d47e11ef9c5d6879ebb32d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 23:22:11 +0200 Subject: gnu: disorderfs: Update to 0.5.4. * gnu/packages/file-systems.scm (disorderfs): Update to 0.5.4. --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 3c9d7d49c1..b195019866 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -107,7 +107,7 @@ single file can be mounted.") (define-public disorderfs (package (name "disorderfs") - (version "0.5.3") + (version "0.5.4") (source (origin (method git-fetch) @@ -117,7 +117,7 @@ single file can be mounted.") (file-name (git-file-name name version)) (sha256 (base32 - "1nmhfvxpvz3xsfxl9wqnh6r2l5m7hjq6n0vpblsl5xdcvwaqcf50")))) + "1mw4ix9h17ikki8p2rxdvzp87rcm1c7by5lvfn5gxlxr7hlj9f8g")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a926109d623b0faa0f09855e7647a629a45f979a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 23:29:04 +0200 Subject: gnu: ndctl: Return #t from phases. * gnu/packages/disk (ndctl)[arguments]: Rename inaccurately named 'autogen' phase to 'patch-FHS-file-names'. Explicitly return #t. --- gnu/packages/disk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 58c867d765..fa3a0431a5 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -630,14 +630,15 @@ passphrases.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen + (add-after 'unpack 'patch-FHS-file-names (lambda _ (substitute* "autogen.sh" (("/bin/sh") (which "sh"))) (substitute* "git-version-gen" (("/bin/sh") (which "sh"))) (substitute* "git-version" - (("/bin/bash") (which "bash")))))) + (("/bin/bash") (which "bash"))) + #t))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "BASH_COMPLETION_DIR=" out -- cgit v1.2.3 From 9e783d0bf22a7ff965105eb45f6c179a832bbabf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Oct 2018 23:11:08 +0200 Subject: gnu: ddcutil: Update to 0.9.2. * gnu/packages/hardware.scm (ddcutil): Update to 0.9.2. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 02ab9e2e00..52bc3d0527 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -36,14 +36,14 @@ (define-public ddcutil (package (name "ddcutil") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (string-append "https://www.ddcutil.com/tarballs/" name "-" version ".tar.gz")) (sha256 - (base32 "1b4bm3zhk5vnad6fxf0mn8nrlj3fngifl7nzxgxw0n56hlv7ccv0")))) + (base32 "0nhi261vf2n3jpi0a0n6659911kxi3lj7a4h7cmv0ip6sbb8rk88")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 1f2cf5d9db2d9991822064cf1a3c3a7082bab5da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 06:12:18 +0200 Subject: gnu: nickle: Update to 2.82. * gnu/packages/nickle.scm (nickle): Update to 2.82. --- gnu/packages/nickle.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nickle.scm b/gnu/packages/nickle.scm index 860c111f43..c8179419bb 100644 --- a/gnu/packages/nickle.scm +++ b/gnu/packages/nickle.scm @@ -28,14 +28,14 @@ (define-public nickle (package (name "nickle") - (version "2.81") + (version "2.82") (source (origin (method url-fetch) (uri (string-append "https://nickle.org/release/nickle-" version ".tar.gz")) (sha256 (base32 - "1daqsflnqqgfkq6w6dknbm42avz70f5qxn7qidvgp472i4a37acr")))) + "0jy96z01qbrnmsrywn5mfa14615qdix6b8520qd65c6yjyrk8gs0")))) (build-system gnu-build-system) (native-inputs `(("readline" ,readline))) -- cgit v1.2.3 From b1d30f46c10123fc5e38ac6aff8a1b2b3773b72a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 06:04:02 +0200 Subject: gnu: imapfilter: Don't use unstable tarball. * gnu/packages/mail.scm (imapfilter)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/mail.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 5435f89c42..048218cc57 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2559,14 +2559,13 @@ PGP handling, multiple servers, and secure connections.") (version "2.6.11") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/lefcha/imapfilter/archive/" - "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lefcha/imapfilter.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1yslvwr3w5fnl06gfrp0lim8zdlasx3cvgd2fsqi0695xnb9bsms")))) + (base32 "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 88abd73eeb81a6b77069345252a7138583a1fda4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 06:05:31 +0200 Subject: gnu: imapfilter: Update to 2.6.12. * gnu/packages/mail.scm (imapfilter): Update to 2.6.12. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 048218cc57..7348719ede 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2556,7 +2556,7 @@ PGP handling, multiple servers, and secure connections.") (define-public imapfilter (package (name "imapfilter") - (version "2.6.11") + (version "2.6.12") (source (origin (method git-fetch) @@ -2565,7 +2565,7 @@ PGP handling, multiple servers, and secure connections.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps")))) + (base32 "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 91a3c8005d5d28afa7821db2f942fede9b9cf99e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 06:25:53 +0200 Subject: gnu: rpm: Update to 4.14.2. * gnu/packages/package-management.scm (rpm): Update to 4.14.2. [arguments]: Rename 'set-nspr-search-path' phase to 'set-nss-library-path' and remove CPATH work-around. Remove obsolete 'fix-rpm-symlinks' phase. [home-page]: Drop www. --- gnu/packages/package-management.scm | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 69788c9463..42172d8242 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -495,7 +495,7 @@ symlinks to the files in a common directory such as /usr/local.") (define-public rpm (package (name "rpm") - (version "4.13.0.2") + (version "4.14.2") (source (origin (method url-fetch) (uri (string-append "http://ftp.rpm.org/releases/rpm-" @@ -503,40 +503,20 @@ symlinks to the files in a common directory such as /usr/local.") version ".tar.bz2")) (sha256 (base32 - "1521y4ghjns449kzpwkjn9cksh686383xnfx0linzlalqc3jqgig")))) + "0armd7dqr8bl0isx8l4xlylm7dikasmxhhcbz336fkp2x30w5jw0")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-external-db" ;use the system's bdb "--enable-python" "--without-lua") #:phases (modify-phases %standard-phases - (add-before 'configure 'set-nspr-search-path + (add-before 'configure 'set-nss-library-path (lambda* (#:key inputs #:allow-other-keys) - ;; nspr.pc contains the right -I flag pointing to - ;; 'include/nspr', but unfortunately 'configure' doesn't - ;; use 'pkg-config'. Thus, augment CPATH. - ;; Likewise for NSS. - (let ((nspr (assoc-ref inputs "nspr")) - (nss (assoc-ref inputs "nss"))) - (setenv "CPATH" - (string-append (getenv "C_INCLUDE_PATH") ":" - nspr "/include/nspr:" - nss "/include/nss")) + (let ((nss (assoc-ref inputs "nss"))) (setenv "LIBRARY_PATH" (string-append (getenv "LIBRARY_PATH") ":" nss "/lib/nss")) - #t))) - (add-after 'install 'fix-rpm-symlinks - (lambda* (#:key outputs #:allow-other-keys) - ;; 'make install' gets these symlinks wrong. Fix them. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (with-directory-excursion bin - (for-each (lambda (file) - (delete-file file) - (symlink "rpm" file)) - '("rpmquery" "rpmverify")) - #t))))))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -552,7 +532,7 @@ symlinks to the files in a common directory such as /usr/local.") ("bzip2" ,bzip2) ("zlib" ,zlib) ("cpio" ,cpio))) - (home-page "http://www.rpm.org/") + (home-page "http://rpm.org/") (synopsis "The RPM Package Manager") (description "The RPM Package Manager (RPM) is a command-line driven package -- cgit v1.2.3 From 104f475f9b95953a67640a82127ade689931a6e7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:58:52 +0200 Subject: gnu: perl-string-copyright: Update to 0.003006. * gnu/packages/license.scm (perl-string-copyright): Update to 0.003006. --- gnu/packages/license.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index 44c7a1bb2a..e50ce831b1 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -61,7 +61,7 @@ Regexp::Pattern is a convention for organizing reusable regex patterns.") (define-public perl-string-copyright (package (name "perl-string-copyright") - (version "0.003005") + (version "0.003006") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ Regexp::Pattern is a convention for organizing reusable regex patterns.") version ".tar.gz")) (sha256 (base32 - "12c6x4c10gr46ryc3dpwgfi6wggmgy4a1ls2hwhcpdm3wvzy5619")))) + "0fzymv065nn3glwnw34nkyadzw2dh4rcz8avmki4zrnk4k45m01a")))) (build-system perl-build-system) (native-inputs `(("perl-number-range" ,perl-number-range))) -- cgit v1.2.3 From fe30eb6d24dd750a124cb0c1f6300fc3d5518d7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:50:49 +0200 Subject: gnu: ephoto: Fix typos in description. * gnu/packages/enlightenment.scm (ephoto)[description]: Fix typos. Wrap at 80 columns. --- gnu/packages/enlightenment.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index c0335016f8..1a0ebba304 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -464,19 +464,22 @@ and in creating applications based on the Enlightenment Foundation Library suite (home-page "http://smhouston.us/ephoto/") (synopsis "EFL image viewer/editor/manipulator/slideshow creator") (description "Ephoto is an image viewer and editor written using the -@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and ease -of use, while taking advantage of the speed and small footprint the EFL provide. +@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and +ease of use, while taking advantage of the speed and small footprint the EFL +provide. Ephoto’s features include: @enumerate -@item Browsing the filesystem and displaying images in an easy to use grid view. +@item Browsing the file system and displaying images in an easy-to-use grid view. @item Browsing images in a single image view format. @item Viewing images in a slideshow. @item Editing your image with features such as cropping, auto enhance, blurring, sharpening, brightness/contrast/gamma adjustments, hue/saturation/value adjustments, and color level adjustment. -@item Applying artistic filters to your image such as black and white and old photo. -@item Drag And Drop along with file operations to easy maintain your photo directories. +@item Applying artistic filters to your image such as black and white and old +photo. +@item Drag And Drop along with file operations to easily maintain your photo +directories. @end enumerate\n") (license (list license:bsd-2 ; Ephoto's thumbnailing code -- cgit v1.2.3 From 1fc346de4eb6881c087eae2c603a761b510e28f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:45:02 +0200 Subject: gnu: retroarch: Don't use unstable tarball. * gnu/packages/emulators.scm (retroarch)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/emulators.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 443137f141..a07ce29243 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1058,12 +1058,13 @@ emulation community. It provides highly accurate emulation.") (version "1.7.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libretro/RetroArch/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libretro/RetroArch.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w")))) + (base32 "1gagdwydj6kl3gzi9z1rjgrbjvi325f8159fdaryzf5gjj8avp8m")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 689ca9ba23e8c5003cba5163235e9c5fb1206f16 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 05:56:12 +0200 Subject: gnu: retroarch: Update to 1.7.5. * gnu/packages/emulators.scm (retroarch): Update to 1.7.5. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index a07ce29243..438e9df1fc 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1055,7 +1055,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.7.4") + (version "1.7.5") (source (origin (method git-fetch) @@ -1064,7 +1064,7 @@ emulation community. It provides highly accurate emulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gagdwydj6kl3gzi9z1rjgrbjvi325f8159fdaryzf5gjj8avp8m")))) + (base32 "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From cd81c9e2a76f825534b1c48e722926d5c70fca8f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 4 Oct 2018 08:12:39 +0200 Subject: gnu: mpv: Update to 0.29.1. * gnu/packages/video.scm (mpv): Update to 0.29.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 54ffef86de..2f6a89e14d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1121,7 +1121,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.29.0") + (version "0.29.1") (source (origin (method url-fetch) (uri (string-append @@ -1129,7 +1129,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ".tar.gz")) (sha256 (base32 - "06bk8836brzik1qmq8kycwg5n35r438sd2176k6msjg5rrwghakp")) + "08x63hlpj6s8xixmdbx6raff5p5mih7cnk0bcql9f3wrs5hx9ygr")) (file-name (string-append name "-" version ".tar.gz")))) (build-system waf-build-system) (native-inputs -- cgit v1.2.3 From 89fdd9ee0cc8817283449b33a8c1a2604c575c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 3 Oct 2018 22:44:11 +0200 Subject: services: rottlog: Use command strings in the mcron jobs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/admin.scm (default-jobs): Remove the lambda around "/…/bin/rottlog" to make "herd schedule mcron" more transparent (otherwise it just says "Lambda function"). --- gnu/services/admin.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index f08c896334..d7bda61ed7 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -125,11 +125,9 @@ for ROTATION." (define (default-jobs rottlog) (list #~(job '(next-hour '(0)) ;midnight - (lambda () - (system* #$(file-append rottlog "/sbin/rottlog")))) + #$(file-append rottlog "/sbin/rottlog")) #~(job '(next-hour '(12)) ;noon - (lambda () - (system* #$(file-append rottlog "/sbin/rottlog")))))) + #$(file-append rottlog "/sbin/rottlog")))) (define-record-type* rottlog-configuration make-rottlog-configuration -- cgit v1.2.3 From 666fb2884ab487ae69ed3541c4adaf0b4fb6ef41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 4 Oct 2018 09:46:43 +0200 Subject: gnu: r-acclma: Fix uses of @acronym in description. * gnu/packages/cran.scm (r-acclma)[description]: Fix order of arguments to @acronym. The wrong order was causing 'stexi->shtml' to fail (match error). --- gnu/packages/cran.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a1bf750da6..efcc2dccb5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6243,12 +6243,12 @@ lot.") (home-page "https://cran.r-project.org/web/packages/ACCLMA/") (synopsis "ACC & LMA graph plotting") (description - "This package contains a function that imports data from a @acronym{Comma-Separated -Values, @acronym{CSV}} file, or uses manually entered data from the format (x, -y, weight) and plots the appropriate @acronym{Absolute Concentration Curve, -@acronym{ACC}} vs @acronym{Line of Independence, @acronym{LOI}} graph and -@acronym{@acronym{LOI} Minus @acronym{ACC}, @acronym{LMA}} graph. The main -function is plotLMA (source file, header) that takes a data set and plots the + "This package contains a function that imports data from a @acronym{CSV, +Comma-Separated Values} file, or uses manually entered data from the format (x, +y, weight) and plots the appropriate @acronym{ACC, Absolute Concentration +Curve} vs @acronym{LOI, Line of Independence} graph and +@acronym{LMA, @acronym{LOI} Minus @acronym{ACC}} graph. The main +function is @code{plotLMA} (source file, header) that takes a data set and plots the appropriate @acronym{LMA} and @acronym{ACC} graphs. If no source file (a string) was passed, a manual data entry window is opened. The header parameter indicates by TRUE/FALSE (false by default) if the source @acronym{CSV} file has -- cgit v1.2.3 From 63856931dbe1e72311b472347331ce1c16b0de0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Wed, 3 Oct 2018 22:28:19 +0200 Subject: gnu: opencv: Update to 3.4.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [[PGP Signed Part:Good signature from BF286CB6593E5FFD Björn Höfling (trust undefined) created at 2018-10-03T22:28:20+0200 using DSA]] * gnu/packages/image-processing.scm (opencv): Update to 3.4.3. Signed-off-by: Ludovic Courtès --- gnu/packages/image-processing.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 8f80b75af4..0901dc429f 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -200,7 +200,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") (define-public opencv (package (name "opencv") - (version "3.4.1") + (version "3.4.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/opencv/opencv/archive/" @@ -208,7 +208,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "1g8pvnlkzzp50amd89149hqsbvsc2hq3vk1d6a9fksdcx8ra9g94")) + "0pycx1pz8lj794q32mlalyc3ijqxwsyin65r26nh4yc0p71xiirp")) (modules '((guix build utils))) (snippet '(begin @@ -345,7 +345,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") "opencv/opencv_extra/zip/" version)) (file-name (string-append "opencv-extra-" version ".zip")) (sha256 - (base32 "0wfh3pvfxqydf7hsccp50npcsg37sf6fqi6cd3zkc4qil9zhpbps")))) + (base32 "0yd1vidzbg6himxyh4yzivywijg8548kfmcn421khabnipm7l74y")))) ("opencv-contrib" ,(origin (method url-fetch) @@ -353,7 +353,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") "opencv/opencv_contrib/zip/" version)) (file-name (string-append "opencv-contrib-" version ".zip")) (sha256 - (base32 "18zm0qmjcdvg90c33gzv0ws0xdaid1xpqzz2xa9l2x12qkr6zj3p")))))) + (base32 "0j0ci6ia1qwklp9hq07ypl0vkngj1wrgh6n98n657m5d0pyp4m0g")))))) (inputs `(("libjpeg" ,libjpeg) ("libpng" ,libpng) ("jasper" ,jasper) -- cgit v1.2.3 From ff30bb010bdce50f92eea0ad64280c9701a2687d Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Wed, 3 Oct 2018 22:39:34 +0200 Subject: gnu: escpr: Update to 1.6.30. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cups.scm (escpr): Update to 1.6.30. Signed-off-by: Ludovic Courtès --- gnu/packages/cups.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 986280f4cb..81e442eef1 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -656,7 +656,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (define-public escpr (package (name "escpr") - (version "1.6.20") + (version "1.6.30") ;; XXX: This currently works. But it will break as soon as a newer ;; version is available since the URLs for older versions are not ;; preserved. An alternative source will be added as soon as @@ -664,12 +664,12 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (source (origin (method url-fetch) ;; The uri has to be chopped up in order to satisfy guix lint. - (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/07/16/23/" - "804253d188a31ae6a0f2722648248ef952afedfb/" - "epson-inkjet-printer-escpr-1.6.20-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/08/18/20/" + "e94de600e28e510c1cfa158929d8b2c0aadc8aa0/" + "epson-inkjet-printer-escpr-1.6.30-1lsb3.2.tar.gz")) (sha256 (base32 - "19800pl7kbbgdzbsy9ijmd7dm3ly4kr2h1dxypqpd075g6n0i770")))) + "0m8pyfkixisp0vclwxj340isn15zzisal0v2xvv66kxfd68dzf12")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ca91d3522540851a327f0be22dc33cce1749e8d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 4 Oct 2018 11:21:37 +0200 Subject: gnu: guix: Update to 1d0be47. * gnu/packages/package-management.scm (guix): Update to 1d0be47. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 42172d8242..500abd5125 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -101,8 +101,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.15.0") - (commit "7fed9353ece5974ff431fa666a530da237a12085") - (revision 4)) + (commit "1d0be47ab680db938ac8da1ee65e1de91e198f67") + (revision 5)) (package (name "guix") @@ -118,7 +118,7 @@ (commit commit))) (sha256 (base32 - "11j13xszjcrf3barf38bixx3hbrfj5w81fskjp8gn6m42knx1yal")) + "19cn4ndmr9cqd7qh6w3nchbmdpaawdl9kc6g0v6g680vzcja417k")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From ddf72f505939e34dc2a287170174e7e4cfe4f829 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 15:54:57 +0200 Subject: gnu: perl-xml-feed: Update to 0.54. * gnu/packages/xml.scm (perl-xml-feed): Update to 0.54. --- gnu/packages/xml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 2bf5ea3569..b5f44a4258 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -770,17 +770,17 @@ server, collect the answer, and finally decoding the XML to Perl.") (define-public perl-xml-feed (package (name "perl-xml-feed") - (version "0.53") + (version "0.54") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAVECROSS/" "XML-Feed-" version ".tar.gz")) (sha256 (base32 - "07b165g6wk8kqwpl49r3n0kag6p2nrkyp3ch0h8qyxb6nrnkkq7c")))) + "0ydyi7wdhv8325h7j27vrlwiqxll56sn8zy5nbzhpma3nrf61bci")))) (build-system perl-build-system) (arguments - `(#:tests? #f)) ; Tests require internet connection + `(#:tests? #f)) ; tests require internet connection (native-inputs `(("perl-module-build" ,perl-module-build) ("perl-uri" ,perl-uri) -- cgit v1.2.3 From 4fab0da09651344959803015edf01adc2473354e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 15:46:01 +0200 Subject: gnu: html-xml-utils: Update to 7.7. * gnu/packages/xml.scm (html-xml-utils): Update to 7.7. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b5f44a4258..e14524a684 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1120,7 +1120,7 @@ XSLT and EXSLT.") (define-public html-xml-utils (package (name "html-xml-utils") - (version "7.6") + (version "7.7") (source (origin (method url-fetch) @@ -1129,7 +1129,7 @@ XSLT and EXSLT.") version ".tar.gz")) (sha256 (base32 - "0l97ps089byy62838wf2jwvvc465iw29z9r5kwmwcq7f3bn11y3m")))) + "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr")))) (build-system gnu-build-system) (home-page "https://www.w3.org/Tools/HTML-XML-utils/") (synopsis "Command line utilities to manipulate HTML and XML files") -- cgit v1.2.3 From 0136fbd167c38ef476baf1fea9354da5248c4a69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 15:42:03 +0200 Subject: gnu: hexedit: Update to 1.4.2. * gnu/packages/hexedit.scm (hexedit): Update to 1.4.2. [source]: Use the author's more up-to-date git repository. [native-inputs]: Add autoconf and automake. --- gnu/packages/hexedit.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm index 88dbfb234d..9aea8e8700 100644 --- a/gnu/packages/hexedit.scm +++ b/gnu/packages/hexedit.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Gábor Boskovits +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,25 +22,33 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages ncurses) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu)) (define-public hexedit (package (name "hexedit") - (version "1.2.13") + (version "1.4.2") (source (origin - (method url-fetch) - (uri (string-append "http://rigaux.org/" - name "-" version ".src.tgz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pixel/hexedit.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka")))) + "1xsxa5mip892jkvz9jshj73y6c7j3mgp8y393ciihqlyf2nmfs67")))) (build-system gnu-build-system) - (arguments '(#:tests? #f)) ; no check target - (inputs `(("ncurses" ,ncurses))) + (arguments '(#:tests? #f)) ; no check target + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("ncurses" ,ncurses))) (synopsis "View and edit files or devices in hexadecimal or ASCII") (description "hexedit shows a file both in ASCII and in hexadecimal. The file can be a device as the file is read a piece at a time. You can modify -- cgit v1.2.3 From 68c0a6260fde80a5b11e286e1c964fe8eccb1d41 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 4 Oct 2018 19:59:35 +0530 Subject: gnu: geos: Update to 3.7.0. * gnu/packages/geo.scm (geos): Update to 3.7.0. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4275476e34..4481e21ddf 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -62,7 +62,7 @@ (define-public geos (package (name "geos") - (version "3.6.2") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "http://download.osgeo.org/geos/geos-" @@ -70,7 +70,7 @@ ".tar.bz2")) (sha256 (base32 - "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4")))) + "1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 38a9bf805d7ea476dce2a271bd93c36afb6ba3ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 16:09:53 +0200 Subject: gnu: mbedtls-apache: Update to 2.13.0 [security fixes]. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.13.0. [native-inputs]: Add python. --- gnu/packages/tls.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index bf462981ee..f92a36b6e2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -842,7 +842,7 @@ then ported to the GNU / Linux environment.") (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.7.6") + (version "2.13.0") (source (origin (method url-fetch) @@ -852,13 +852,14 @@ then ported to the GNU / Linux environment.") version "-apache.tgz")) (sha256 (base32 - "0fl2nrxvlgx9ja7yy3kd1zadpr98fxbvn3f6fl2mj87gryhkfqlk")))) + "1nh6xfyxs3mnnpgc6pancvdhv6ihz9lhsxdlg90gqa8n5r6lwfsr")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DUSE_SHARED_MBEDTLS_LIBRARY=ON"))) (native-inputs - `(("perl" ,perl))) + `(("perl" ,perl) + ("python" ,python))) (synopsis "Small TLS library") (description "@code{mbed TLS}, formerly known as PolarSSL, makes it trivially easy -- cgit v1.2.3 From 8e87aa04979dae66a1e45b54c0f92da07745e1e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 17:26:57 +0200 Subject: gnu: hiawatha: Update to 10.8.3. * gnu/packages/web.scm (hiawatha): Update to 10.8.3. [source]: Also delete bundled copy of nghttp2. [inputs]: Use mbedtls-for-hiawatha instead of vanilla mbedtls-apache. * gnu/packages/tls.scm (mbedtls-for-hiawatha): New public variable. --- gnu/packages/tls.scm | 18 ++++++++++++++++++ gnu/packages/web.scm | 15 ++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f92a36b6e2..715148c432 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -869,6 +869,24 @@ coding footprint.") (home-page "https://tls.mbed.org") (license license:asl2.0))) +;; The Hiawatha Web server requires some specific features to be enabled. +(define-public mbedtls-for-hiawatha + (hidden-package + (package + (inherit mbedtls-apache) + (arguments + (substitute-keyword-arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'configure 'configure-extra-features + (lambda _ + (for-each (lambda (feature) + (invoke "scripts/config.pl" "set" feature)) + (list "MBEDTLS_THREADING_C" + "MBEDTLS_THREADING_PTHREAD")) + #t))) + ,@(package-arguments mbedtls-apache))))))) + (define-public ghc-tls (package (name "ghc-tls") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8e776258b3..401711928d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5173,7 +5173,7 @@ functions of Tidy.") (define-public hiawatha (package (name "hiawatha") - (version "10.7") + (version "10.8.3") (source (origin (method url-fetch) @@ -5181,15 +5181,16 @@ functions of Tidy.") "hiawatha-" version ".tar.gz")) (modules '((guix build utils))) (snippet '(begin - ;; We use our packaged mbedtls, so delete the included copy. - (delete-file-recursively "mbedtls") + ;; We use packaged libraries, so delete the bundled copies. + (for-each delete-file-recursively + (list "nghttp2" "mbedtls")) #t)) (sha256 (base32 - "0x2zfc8kc6c7rl4gwymwmg13w1c60biv6c6c9fvzpnl59bc9jgin")))) + "0w7047pwijhsbvvv1qjynp7gvn0nil56w82f7ax0gabrg7ddzk6s")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No tests included + `(#:tests? #f ; no tests included #:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on") (string-append "-DENABLE_TOMAHAWK=on") (string-append "-DWEBROOT_DIR=" @@ -5212,8 +5213,8 @@ functions of Tidy.") (wrap-program (string-append sbin "/hiawatha") `("PATH" ":" prefix (,mbed))))))))) (inputs - ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha" - `(("mbedtls-apache" ,mbedtls-apache) ;Hiawatha includes this version. + ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha". + `(("mbedtls-apache" ,mbedtls-for-hiawatha) ("zlib" ,zlib) ("libxslt" ,libxslt) ("libxml2" ,libxml2))) -- cgit v1.2.3 From aff91b0d0bc4c4459625558dc547af3567b6e5f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 19:04:37 +0200 Subject: gnu: hiawatha: Support HTTP/2. * gnu/packages/web.sck (hiawatha)[arguments]: USE_SYSTEM_NGHTTP2 to ENABLE_HTTP2. [inputs]: Add nghttp2:lib. --- gnu/packages/web.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 401711928d..01db03e79d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5192,6 +5192,8 @@ functions of Tidy.") (arguments `(#:tests? #f ; no tests included #:configure-flags (list (string-append "-DUSE_SYSTEM_MBEDTLS=on") + (string-append "-DENABLE_HTTP2=on") + (string-append "-DUSE_SYSTEM_NGHTTP2=on") (string-append "-DENABLE_TOMAHAWK=on") (string-append "-DWEBROOT_DIR=" (assoc-ref %outputs "out") @@ -5214,10 +5216,11 @@ functions of Tidy.") `("PATH" ":" prefix (,mbed))))))))) (inputs ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha". - `(("mbedtls-apache" ,mbedtls-for-hiawatha) - ("zlib" ,zlib) - ("libxslt" ,libxslt) - ("libxml2" ,libxml2))) + `(("libxslt" ,libxslt) + ("libxml2" ,libxml2) + ("mbedtls-apache" ,mbedtls-for-hiawatha) + ("nghttp2" ,nghttp2 "lib") + ("zlib" ,zlib))) (home-page "https://www.hiawatha-webserver.org") (synopsis "Webserver with focus on security") (description -- cgit v1.2.3 From e14b3067e324f05a852d216aec5432cc285dfcec Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 4 Oct 2018 11:05:06 -0400 Subject: gnu: guile-next: Add the correct native search paths. * gnu/packages/guile.scm (guile-next): Add native search paths for version 3.0. --- gnu/packages/guile.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6d8ab71c78..04625827c5 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -355,7 +355,15 @@ without requiring the source code to be rewritten.") (lambda _ ;; Remove this test that's bound to fail. (delete-file "test-suite/tests/version.test") - #t))))))))) + #t)))))) + (native-search-paths + (list (search-path-specification + (variable "GUILE_LOAD_PATH") + (files '("share/guile/site/3.0"))) + (search-path-specification + (variable "GUILE_LOAD_COMPILED_PATH") + (files '("lib/guile/3.0/site-ccache" + "share/guile/site/3.0")))))))) (define (make-guile-readline guile) (package -- cgit v1.2.3 From 55b616fd15769c0d2f90eb8b1d0a1af6a9474a48 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 4 Oct 2018 12:09:55 -0400 Subject: gnu: guile-next: Update to commit 6f3357b0df64c4be17e72079864c09a542f1c779. * gnu/packages/guile.scm (guile-next): Update to commit 6f3357b0df64c4be17e72079864c09a542f1c779. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 04625827c5..1d330668a7 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -318,8 +318,8 @@ without requiring the source code to be rewritten.") (define-public guile-next ;; This is the upcoming Guile 3.0, with JIT support. - (let ((commit "a74b4a45fab1a78e34954bce5f031e8a9765f827") - (revision "0")) + (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779") + (revision "1")) (package (inherit guile-2.2) (name "guile-next") @@ -331,7 +331,7 @@ without requiring the source code to be rewritten.") (commit commit))) (sha256 (base32 - "0kq6mabv7j4gdlwmpz3iaddv98sc7awkl2358sg8j50sg10yw8nx")) + "1c2xy5cflg0hws48914rz3z8mdmf8w3lblfic0kxnymcmdv9cbhv")) (file-name (git-file-name name version)))) (native-inputs `(("autoconf", autoconf) -- cgit v1.2.3 From 7382ecd81859de878b22a6510b8262abe69d38bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Mar 2018 16:54:43 +0100 Subject: gnu: Add nsd. * gnu/packages/dns.scm (nsd): New public variable. --- gnu/packages/dns.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 4fc1c25229..ad1a8638bc 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -289,6 +289,77 @@ asynchronous fashion.") (license:non-copyleft "file://LICENSE") ; includes.h license:openssl)))) +(define-public nsd + (package + (name "nsd") + (version "4.1.25") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" + version ".tar.gz")) + (sha256 + (base32 + "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-pie" ; fully benefit from ASLR + "--enable-ratelimit" + "--enable-recvmmsg" + "--enable-relro-now" ; protect GOT and .dtor areas + "--disable-radix-tree" + (string-append "--with-libevent=" + (assoc-ref %build-inputs "libevent")) + (string-append "--with-ssl=" + (assoc-ref %build-inputs "openssl")) + "--with-configdir=/etc" + "--with-nsd_conf_file=/etc/nsd/nsd.conf" + "--with-logfile=/var/log/nsd.log" + "--with-pidfile=/var/db/nsd/nsd.pid" + "--with-dbfile=/var/db/nsd/nsd.db" + "--with-zonesdir=/etc/nsd" + "--with-xfrdfile=/var/db/nsd/xfrd.state" + "--with-zonelistfile=/var/db/nsd/zone.list") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-installation-paths + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + ;; The ‘make install’ target tries to create the parent + ;; directories of run-time things like ‘pidfile’ above, and + ;; useless empty directories like 'configdir'. Remove such + ;; '$(INSTALL)' lines and install the example configuration file + ;; in an appropriate location. + (substitute* "Makefile.in" + ((".*INSTALL.*\\$\\((config|pid|xfr|db)dir" command) + (string-append "#" command)) + (("\\$\\(nsdconfigfile\\)\\.sample" file-name) + (string-append doc "/examples/" file-name))) + #t)))) + #:tests? #f)) ; no tests + (inputs + `(("libevent" ,libevent) + ("openssl" ,openssl))) + (home-page "https://www.nlnetlabs.nl/projects/nsd/about/") + (synopsis "Authoritative DNS name server") + (description "@dfn{NSD}, short for Name Server Daemon, is an authoritative +name server for the Domain Name System (@dfn{DNS}). It aims to be a fast and +RFC-compliant nameserver. + +NSD uses zone information compiled via @command{zonec} into a binary database +file (@file{nsd.db}). This allows fast startup of the name service daemon and +allows syntax-structural errors in zone files to be flagged at compile time, +before being made available to NSD service itself. However, most traditional +BIND-style zone files can be directly imported into NSD without modification. + +The collection of programs and processes that make up NSD are designed so that +the daemon itself runs as a non-privileged user and can be easily configured to +run in a @code{chroot} jail, thus making any security flaws in NSD less likely +to result in system-wide compromise.") + (license (list license:bsd-3)))) + (define-public unbound (package (name "unbound") -- cgit v1.2.3 From b9b53fb4ffa188a2dad2b3062a552877f1124750 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 21:26:38 +0200 Subject: gnu: hwloc: Update to 2.0.2. * gnu/packages/mpi.scm (hwloc): Update to 2.0.2. --- gnu/packages/mpi.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 7dfec16fc7..fc8aadef29 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Dave Love ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,7 +126,7 @@ bind processes, and much more.") ;; Note: 2.0 isn't the default yet, see above. (package (inherit hwloc) - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (string-append "https://www.open-mpi.org/software/hwloc/v" @@ -133,7 +134,7 @@ bind processes, and much more.") "/downloads/hwloc-" version ".tar.bz2")) (sha256 (base32 - "0jf0krj1h95flmb784ifv9vnkdnajjz00p4zbhmja7vm4v67axdr")))) + "1phc863d5b2fvwpyyq4mlh4rkjdslh6h0h197zmyk3prwrq7si8l")))) ;; libnuma is no longer needed. (inputs (alist-delete "numactl" (package-inputs hwloc))) -- cgit v1.2.3 From d8b042326dda505c8e65789572e3dd65311ba8e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Oct 2018 19:52:03 +0200 Subject: gnu: hiawatha: Set sane run-time directory defaults. * gnu/packages/web.scm (hiawatha)[arguments]: Set sane default directories. Replace the 'remove-empty-dirs' phase with a 'install-no-empty-directories' one. --- gnu/packages/web.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 01db03e79d..c3b06b05bc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5195,17 +5195,20 @@ functions of Tidy.") (string-append "-DENABLE_HTTP2=on") (string-append "-DUSE_SYSTEM_NGHTTP2=on") (string-append "-DENABLE_TOMAHAWK=on") + (string-append "-DLOG_DIR=/var/log/hiawatha") + (string-append "-DPID_DIR=/run") (string-append "-DWEBROOT_DIR=" (assoc-ref %outputs "out") - "/share/hiawatha/html")) + "/share/hiawatha/html") + (string-append "-DWORK_DIR=/var/lib/hiawatha")) #:phases (modify-phases %standard-phases - (add-after 'install 'remove-empty-dirs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - ;; The directories in "var" are empty, remove them. - (delete-file-recursively (string-append out "/var")) - #t))) + (add-after 'unpack 'install-no-empty-directories + (lambda _ + (substitute* "CMakeLists.txt" + (("install\\(DIRECTORY DESTINATION" match) + (string-append "#" match))) + #t)) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make sure 'hiawatha' finds 'mbedtls'. -- cgit v1.2.3 From 9e2aa70bad8c06cdf9a44065a31f12b3205e92e0 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 26 Sep 2018 12:59:54 +0100 Subject: gnu: petsc-openmpi: Configure with support for MUMPS solver. * gnu/packages/maths.scm (petsc-openmpi)[inputs]: Add metis, mumps-openmpi, scalapack and pt-scotch. [arguments]: Add "--with-PACKAGENAME=1" flags. Move 'mpi-setup' phase ahead of 'configure' phase. Signed-off-by: Leo Famulari --- gnu/packages/maths.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b7d669ccea..766c6e920f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1702,13 +1702,21 @@ scientific applications modeled by partial differential equations.") (package (inherit petsc) (name "petsc-openmpi") (inputs - `(("openmpi" ,openmpi) - ("hdf5" ,hdf5-parallel-openmpi) + `(("hdf5" ,hdf5-parallel-openmpi) + ("metis" ,metis) + ("mumps" ,mumps-openmpi) + ("openmpi" ,openmpi) + ("scalapack" ,scalapack) + ("scotch" ,pt-scotch) ,@(package-inputs petsc))) (arguments (substitute-keyword-arguments (package-arguments petsc) ((#:configure-flags cf) ``("--with-mpiexec=mpirun" + "--with-metis=1" + "--with-mumps=1" + "--with-scalapack=1" + "--with-ptscotch=1" ,(string-append "--with-mpi-dir=" (assoc-ref %build-inputs "openmpi")) ,(string-append "--with-hdf5-include=" @@ -1718,9 +1726,9 @@ scientific applications modeled by partial differential equations.") ,@(delete "--with-mpi=0" ,cf))) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'mpi-setup + (add-before 'configure 'mpi-setup ,%openmpi-setup))))) - (synopsis "Library to solve PDEs (with MPI support)"))) + (synopsis "Library to solve PDEs (with MUMPS and MPI support)"))) (define-public petsc-complex-openmpi (package (inherit petsc-complex) @@ -1737,7 +1745,6 @@ scientific applications modeled by partial differential equations.") ,@(delete "--with-mpi=0" ,cf))))) (synopsis "Library to solve PDEs (with complex scalars and MPI support)"))) - (define-public python-kiwisolver (package (name "python-kiwisolver") -- cgit v1.2.3 From 45f4ddd7c017ebfc8096f702c72a1fdac67787ed Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Oct 2018 20:34:08 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.131. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.131. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ec2520cdff..2b36d8b93c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.130" - "1l3ra1pbgz0wbpp1ci90sj9x9iamvagx1vdbdfbmpjsgh1cfnpmq" + (make-linux-libre "4.9.131" + "11pxwl7dmisbf2szg9qzkvhlpk68clh5l478n7b62q7hd8j3hxlv" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 2195636cc185b38aa66abc5a4de2b7965c18fa02 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Oct 2018 20:34:50 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.74. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.74. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2b36d8b93c..2a7e1d846f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.73") -(define %linux-libre-4.14-hash "0s2aphqgasx0lnprb2hzaqgbcd5i9774gfyhz5a6sqj6dygr00xy") +(define %linux-libre-4.14-version "4.14.74") +(define %linux-libre-4.14-hash "0cxyx2yinnc8q0hmhb0swjgdz3s0ry7wxzyqss9f2i74xjjz4rm0") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 2e073dc23c27e9fc2e255ee47d2025d044df7c8e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Oct 2018 20:35:38 -0400 Subject: gnu: linux-libre: Update to 4.18.12. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.12. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2a7e1d846f..d52e8d7d19 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.11") -(define %linux-libre-hash "1r4yf7gr7rf8igkg5jv781wa8vn6ii7fsdnffyshin1slnxbd79k") +(define %linux-libre-version "4.18.12") +(define %linux-libre-hash "1mcnb1mm7m6i9s591c3kx0f1vbzhbl3w92w137swcm9zifqpci5r") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 4a5e2a90d8595885ecda1e577df4a6a0d294d643 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Oct 2018 19:24:39 -0400 Subject: gnu: icecat: Add fixes from mozilla-esr60 [security fixes]. Includes fixes for CVE-2018-12386 and CVE-2018-12387. * gnu/packages/gnuzilla.scm (icecat)[source]: Add selected fixes from the upstream mozilla-esr60 repository. --- gnu/packages/gnuzilla.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ea3b61c231..d2110f3290 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -502,7 +502,23 @@ security standards.") (search-patch "icecat-use-system-media-libs.patch") (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") (search-patch "icecat-CVE-2018-12383.patch") - (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) + (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51") + (mozilla-patch "icecat-CVE-2018-12386.patch" "4808fcb2e6ca" "05sc881l7sh8bag8whd2ggdn198lskqcxq8f41scfpqscw6xs5d5") + (mozilla-patch "icecat-CVE-2018-12387.patch" "b8f5c37486e1" "0lvmbh126m695kgdbasy1y5xh9n1j08cwdhn071mgvj6yn8cns5z") + (mozilla-patch "icecat-bug-1464751.patch" "d5d00faf0465" "1mj7dbb06brwrk0mvap0z4lfl2hwz1cj6dwjvdrisxm046pdw98i") + (mozilla-patch "icecat-bug-1472538.patch" "11462f2b98f2" "1nxgh0plzilylx8r73r7d74pv66qwjqxmd7nqii33p0snl2jjfzs") + (mozilla-patch "icecat-bug-1478685.patch" "098585dc86fc" "1b0x4qdh6isvffmibvc8ad8z62m3iky9q6jq0z6gyvn8q252cqal") + (mozilla-patch "icecat-bug-1486080.patch" "3f8d57d936ea" "0pz2c18wcgj44v0j8my9xbm90m4bsjcvzmavj569fi8bh6s6zz8p") + (mozilla-patch "icecat-bug-1423278.patch" "878ceaee5634" "0i47s5nvrx9vqbnj6s9y9f4ffww20p8nviqa6frg676y1188xlyl") + (mozilla-patch "icecat-bug-1442010.patch" "87be1b98ec9a" "15f4l18c7hz9aqn89gg3dwmdidfwgn10dywgpzydm8mps45amx7j") + (mozilla-patch "icecat-bug-1484559.patch" "99e58b5307ce" "02fdgbliwzi2r2376wg6k1rky1isfka0smac4ii2cll01jhpfrn6") + (mozilla-patch "icecat-bug-1487098.patch" "f25ce451a492" "18nzg39iyxza1686180qk9cc88l5j2hf1h35d62lrqmdgd9vcj33") + (mozilla-patch "icecat-bug-1484905.patch" "35c26bc231df" "0qh8d4z6y03h5xh7djci26a01l6zq667lg2k11f6zzg7z2j0h67x") + (mozilla-patch "icecat-bug-1488061.patch" "050d0cfa8e3d" "05ql798ynbyz5pvyri4b95j4ixmgnny3zl7sd2ckfrrbm9mxh627") + (mozilla-patch "icecat-bug-1434963-pt1.patch" "1e6dad87efed" "1v00a6cmgswjk54041jyv1ib129fxshpzwk6mn6lr0v5hylk3bx9") + (mozilla-patch "icecat-bug-1434963-pt2.patch" "6558c46df9ea" "0vdy9dm9w5k1flhcfxwvvff0aa415b5mgmmq5r37i83686768xfb") + (mozilla-patch "icecat-bug-1434963-pt3.patch" "686fcfa8abd6" "0ihqr11aq4b0y7mx7bwn8yzn25mv3k2gdphm951mj1g85qg35ann") + (mozilla-patch "icecat-bug-1491132.patch" "14120e0c74d6" "188c5fbhqqhmlk88p70l6d97skh7xy4jhqdby1ri3h9ix967515j"))) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From bd5f5eece9fc208de01190cd25dce9c281acddd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:14:43 +0200 Subject: gnu: htslib: Update to 1.9. * gnu/packages/bioinformatics.scm (htslib): Update to 1.9. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b657bf6771..64d7e1c869 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3512,7 +3512,7 @@ performance.") (define-public htslib (package (name "htslib") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (string-append @@ -3520,7 +3520,7 @@ performance.") version "/htslib-" version ".tar.bz2")) (sha256 (base32 - "18bw0mn9pj5wgarnlaxmf1bb8pdqgl1zd6czirqcr62ajpn1xvy0")))) + "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) -- cgit v1.2.3 From 4ae4a15232bff0e93cbfc5d48e49a29a23a73cd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:15:47 +0200 Subject: gnu: samtools: Update to 1.9. * gnu/packages/bioinformatics.scm (samtools): Update to 1.9. [origin]: Remove bundled htslib sources. [arguments]: Remove obsolete make-flags. --- gnu/packages/bioinformatics.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 64d7e1c869..996e3731f3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4997,7 +4997,7 @@ to the user's query of interest.") (define-public samtools (package (name "samtools") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) @@ -5006,15 +5006,19 @@ to the user's query of interest.") version "/samtools-" version ".tar.bz2")) (sha256 (base32 - "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9")))) + "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8")) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete bundled htslib. + (delete-file-recursively "htslib-1.9") + #t)))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) (ice-9 regex) (guix build gnu-build-system) (guix build utils)) - #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) - #:configure-flags (list "--with-ncurses" "--with-htslib=system") + #:configure-flags (list "--with-ncurses") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-tests -- cgit v1.2.3 From f79b59e3114af8fcd598427655f3ab9512d58164 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:18:34 +0200 Subject: gnu: bcftools: Update to 1.9. * gnu/packages/bioinformatics.scm (bcftools): Update to 1.9. [arguments]: Remove obsolete make flags. --- gnu/packages/bioinformatics.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 996e3731f3..8a79f66823 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -288,34 +288,25 @@ BAM files.") (define-public bcftools (package (name "bcftools") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/samtools/bcftools/releases/download/" - version "/bcftools-" version ".tar.bz2")) + (uri (string-append "https://github.com/samtools/bcftools/" + "releases/download/" + version "/bcftools-" version ".tar.bz2")) (sha256 (base32 - "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa")) + "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled htslib. - (delete-file-recursively "htslib-1.8") + (delete-file-recursively "htslib-1.9") #t)))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - #:configure-flags (list "--with-htslib=system") - #:make-flags - (list - "USE_GPL=1" - "LIBS=-lgsl -lgslcblas" - (string-append "prefix=" (assoc-ref %outputs "out")) - (string-append "HTSDIR=" (assoc-ref %build-inputs "htslib") "/include") - (string-append "HTSLIB=" (assoc-ref %build-inputs "htslib") "/lib/libhts.so") - (string-append "BGZIP=" (assoc-ref %build-inputs "htslib") "/bin/bgzip") - (string-append "TABIX=" (assoc-ref %build-inputs "htslib") "/bin/tabix") - (string-append "PACKAGE_VERSION=" ,version)) + `(#:configure-flags + (list "--enable-libgsl") + #:test-target "test" #:phases (modify-phases %standard-phases (add-before 'check 'patch-tests -- cgit v1.2.3 From 1a28b9ab55b36f420ed24acd4c957b7fc0fe33b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:31:24 +0200 Subject: gnu: python-plotly: Add python-pandas to inputs. * gnu/packages/graph.scm (python-plotly)[propagated-inputs]: Add python-pandas. --- gnu/packages/graph.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 245ee8f956..cb314719b7 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -224,6 +224,7 @@ lines.") (propagated-inputs `(("python-decorator" ,python-decorator) ("python-nbformat" ,python-nbformat) + ("python-pandas" ,python-pandas) ("python-pytz" ,python-pytz) ("python-requests" ,python-requests) ("python-six" ,python-six))) -- cgit v1.2.3 From 939882f73430ae7644b3c7913cb389cf00c234e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:32:06 +0200 Subject: gnu: python-pysam: Update to 0.15.1. * gnu/packages/bioinformatics.scm (python-pysam): Update to 0.15.1. [source]: Fetch from git. [arguments]: Delete tests requiring internet access; use "invoke". [inputs]: Add curl. --- gnu/packages/bioinformatics.scm | 55 ++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8a79f66823..4c1739f1b1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1436,17 +1436,17 @@ multiple sequence alignments.") (define-public python-pysam (package (name "python-pysam") - (version "0.13.0") + (version "0.15.1") (source (origin - (method url-fetch) + (method git-fetch) ;; Test data is missing on PyPi. - (uri (string-append - "https://github.com/pysam-developers/pysam/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/pysam-developers/pysam.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0dzap2axin9cbbl0d825w294bpn00zagfm1sigamm4v2pm5bj9lp")) + "1vj367w6xbn9bpmksm162l1aipf7cj97h1q83y7jcpm33ihwpf7x")) (modules '((guix build utils))) (snippet '(begin ;; Drop bundled htslib. TODO: Also remove samtools @@ -1473,6 +1473,11 @@ multiple sequence alignments.") #t)) (replace 'check (lambda* (#:key inputs outputs #:allow-other-keys) + ;; This file contains tests that require a connection to the + ;; internet. + (delete-file "tests/tabix_test.py") + ;; FIXME: This test fails + (delete-file "tests/AlignmentFile_test.py") ;; Add first subdirectory of "build" directory to PYTHONPATH. (setenv "PYTHONPATH" (string-append @@ -1483,28 +1488,26 @@ multiple sequence alignments.") ;; Step out of source dir so python does not import from CWD. (with-directory-excursion "tests" (setenv "HOME" "/tmp") - (and (zero? (system* "make" "-C" "pysam_data")) - (zero? (system* "make" "-C" "cbcf_data")) - ;; Running nosetests without explicitly asking for a - ;; single process leads to a crash. Running with multiple - ;; processes fails because the tests are not designed to - ;; run in parallel. - - ;; FIXME: tests keep timing out on some systems. - ;; (zero? (system* "nosetests" "-v" - ;; "--processes" "1")) - ))))))) - (propagated-inputs - `(("htslib" ,htslib))) ; Included from installed header files. + (invoke "make" "-C" "pysam_data") + (invoke "make" "-C" "cbcf_data") + ;; Running nosetests without explicitly asking for a single + ;; process leads to a crash. Running with multiple processes + ;; fails because the tests are not designed to run in parallel. + + ;; FIXME: tests keep timing out on some systems. + (invoke "nosetests" "-v" "--processes" "1"))))))) + (propagated-inputs + `(("htslib" ,htslib))) ; Included from installed header files. (inputs - `(("ncurses" ,ncurses) - ("zlib" ,zlib))) + `(("ncurses" ,ncurses) + ("curl" ,curl) + ("zlib" ,zlib))) (native-inputs - `(("python-cython" ,python-cython) + `(("python-cython" ,python-cython) ;; Dependencies below are are for tests only. - ("samtools" ,samtools) - ("bcftools" ,bcftools) - ("python-nose" ,python-nose))) + ("samtools" ,samtools) + ("bcftools" ,bcftools) + ("python-nose" ,python-nose))) (home-page "https://github.com/pysam-developers/pysam") (synopsis "Python bindings to the SAMtools C API") (description -- cgit v1.2.3 From 8e72f0f3190443935c03264037c83099ed68445f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 21:34:16 +0200 Subject: gnu: deeptools: Update to 3.1.2. * gnu/packages/bioinformatics.scm (deeptools): Update to 3.1.2. [source]: Fetch from git. [arguments]: Delete reset-gzip-timestamps phase. [inputs]: Add python-plotly. --- gnu/packages/bioinformatics.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4c1739f1b1..39c84bf4c8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2006,18 +2006,25 @@ with Python.") (define-public deeptools (package (name "deeptools") - (version "2.5.1") + (version "3.1.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/deeptools/deepTools/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/deeptools/deepTools.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1q8i12l2gvk4n2s8lhyzwhh9g4qbc8lrk5l7maz00yvd5g6z5540")))) + "06fdpp6cg3xiwryxjhixvfysl4z0ps1crjgia587qa9ikqpsa7fd")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; This phase fails, but it's not needed. + (delete 'reset-gzip-timestamps)))) (inputs - `(("python-scipy" ,python-scipy) + `(("python-plotly" ,python-plotly) + ("python-scipy" ,python-scipy) ("python-numpy" ,python-numpy) ("python-numpydoc" ,python-numpydoc) ("python-matplotlib" ,python-matplotlib) -- cgit v1.2.3 From a6798218bea0d6b2df598042d1ced29f74bb4250 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Oct 2018 22:49:49 +0200 Subject: gnu: samtools-0.1: Adjust to match changes in samtools. * gnu/packages/bioinformatics.scm (samtools-0.1)[arguments]: Override make flags. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 39c84bf4c8..d48f484e03 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5073,9 +5073,9 @@ viewer.") (base32 "1m33xsfwz0s8qi45lylagfllqg7fphf4dr0780rsvw75av9wk06h")))) (arguments `(#:tests? #f ;no "check" target + #:make-flags + (list "LIBCURSES=-lncurses") ,@(substitute-keyword-arguments (package-arguments samtools) - ((#:make-flags flags) - `(cons "LIBCURSES=-lncurses" ,flags)) ((#:phases phases) `(modify-phases ,phases (replace 'install -- cgit v1.2.3