From 4535eb91c399cf6b3d151751be170ca3b3df122f Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 12 Nov 2019 17:11:49 -0600 Subject: gnu: tomb: Update to 2.7. * gnu/packages/patches/tomb-fix-errors-on-open.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/crypto.scm (tomb): Update to 2.7. [source]: Use the patch. --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 5 +++-- gnu/packages/patches/tomb-fix-errors-on-open.patch | 25 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/tomb-fix-errors-on-open.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4e6fb7c1d8..0bc23b92ee 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1386,6 +1386,7 @@ dist_patch_DATA = \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ + %D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/totem-meson-compat.patch \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 2ae867f45b..4a9e45e819 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -339,14 +339,15 @@ no man page, refer to the home page for usage details.") (define-public tomb (package (name "tomb") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (string-append "https://files.dyne.org/tomb/" "Tomb-" version ".tar.gz")) (sha256 (base32 - "1sr3jcn96mciyn8xd0amd1jzamxxzpybakf8an7laf26gjim1dh2")))) + "0x3al02796vx1cvy6y6h685c367qx70dwv471g0hmks2gr10f0cn")) + (patches (search-patches "tomb-fix-errors-on-open.patch")))) (build-system gnu-build-system) (native-inputs `(("sudo" ,sudo))) ;presence needed for 'check' phase (inputs diff --git a/gnu/packages/patches/tomb-fix-errors-on-open.patch b/gnu/packages/patches/tomb-fix-errors-on-open.patch new file mode 100644 index 0000000000..5f41c9ee8f --- /dev/null +++ b/gnu/packages/patches/tomb-fix-errors-on-open.patch @@ -0,0 +1,25 @@ +Description: Avoid error messages when opening a new tomb + Make sure control file exists and has user ownership before user writes to it. +Author: Sven Geuer +Bug: https://github.com/dyne/Tomb/issues/369 +Last-Update: 2019-11-04 +--- a/tomb ++++ b/tomb +@@ -2197,14 +2197,15 @@ + # {{{ Open + + _update_control_file() { +- # replaces a control file with new contents and gives it user ownership ++ # make sure a control file exists, gives it user ownership ++ # and replaces it with new contents + # stdin = contents + # $1 = path to control file + # $2 = contents + [[ "$2" = "" ]] && return 1 + _sudo touch "$1" +- print "$2" > "$1" + _sudo chown ${_UID}:${_GID} "$1" ++ print "$2" > "$1" + _verbose "updated control file $1 = $2" + } + -- cgit 1.4.1 From 417df5bb579b96a003c20d1b8961fd92abae1a31 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 12 Nov 2019 22:04:40 -0600 Subject: gnu: tomb: Add lsof input for "ps" and "slam". * gnu/packages/crypto.scm (tomb)[inputs]: Add lsof. [arguments]: Add it to the wrapper PATH. --- gnu/packages/crypto.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 4a9e45e819..ebd1821156 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages libbsd) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages lsof) #:use-module (gnu packages nettle) #:use-module (gnu packages password-utils) #:use-module (gnu packages perl) @@ -356,6 +357,7 @@ no man page, refer to the home page for usage details.") ("cryptsetup" ,cryptsetup) ("e2fsprogs" ,e2fsprogs) ;for mkfs.ext4 ("gettext" ,gettext-minimal) ;used at runtime + ("lsof" ,lsof) ("mlocate" ,mlocate) ("pinentry" ,pinentry) ("qrencode" ,qrencode) @@ -382,7 +384,7 @@ no man page, refer to the home page for usage details.") (or (and=> (which program) dirname) (error "program not found:" program))) '("seq" "mkfs.ext4" "pinentry" "sudo" - "gpg" "cryptsetup" "gettext" + "gpg" "cryptsetup" "gettext" "lsof" "qrencode" "steghide" "findmnt"))))) #t))) (delete 'check) -- cgit 1.4.1 From 257e63044f59915b45aefb323792c6d14e9a8786 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 15 Nov 2019 11:02:13 -0600 Subject: gnu: tomb: Use system's sudo. * gnu/packages/crypto.scm (tomb)[arguments]: Disallow references to the "sudo" input. Remove it's path from the wrapper. --- gnu/packages/crypto.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ebd1821156..559a3c051a 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -365,6 +365,10 @@ no man page, refer to the home page for usage details.") ("util-linux" ,util-linux))) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + ;; The "sudo" input is needed only to satisfy dependency checks in the + ;; 'check' phase. The "sudo" used at runtime should come from the + ;; system's setuid-programs, so ensure no reference is kept. + #:disallowed-references (,sudo) ;; TODO: Build and install gtk and qt trays #:phases (modify-phases %standard-phases @@ -383,7 +387,7 @@ no man page, refer to the home page for usage details.") ,@(map (lambda (program) (or (and=> (which program) dirname) (error "program not found:" program))) - '("seq" "mkfs.ext4" "pinentry" "sudo" + '("seq" "mkfs.ext4" "pinentry" "gpg" "cryptsetup" "gettext" "lsof" "qrencode" "steghide" "findmnt"))))) #t))) -- cgit 1.4.1 From 96a469f1cdac9c3a1022eca3e7a3cb408b7464eb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 Nov 2019 22:56:43 +0100 Subject: gnu: openmpi: Fix typo. * gnu/packages/mpi.scm (openmpi)[inputs]: For UCX, check the supported systems of UCX, not PSM2. --- gnu/packages/mpi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 5fde6efae4..30169f76d4 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -192,7 +192,7 @@ bind processes, and much more.") `(("psm2" ,psm2)) '()) ,@(if (and (not (%current-target-system)) - (member (%current-system) (package-supported-systems psm2))) + (member (%current-system) (package-supported-systems ucx))) `(("ucx" ,ucx)) '()) ("rdma-core" ,rdma-core) -- cgit 1.4.1 From 6f160c5c3809c9fd7af7da3f215ca0222e24ccce Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 Nov 2019 23:22:53 +0100 Subject: Revert "gnu: openmpi: Pass explicit "--with-*" configure flags." This reverts commit eaa52b5baa8fbb26a79890561d0c40344d1e1bf3, which would lead to build failures on systems other than x86_64-linux. --- gnu/packages/mpi.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 30169f76d4..41655a4a5c 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -210,12 +210,6 @@ bind processes, and much more.") "--with-hwloc=external" "--with-libevent" - ;; Make sure ./configure fails if one of these is - ;; missing. - "--with-ucx" - "--with-psm" - "--with-psm2" - ;; InfiniBand support "--enable-openib-control-hdr-padding" "--enable-openib-dynamic-sl" -- cgit 1.4.1 From 8459cf5756c8cfaa6adb40b3f0b77f018179efa7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 16 Nov 2019 11:38:37 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.202. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.202. (linux-libre-4.4-pristine-source): 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 1962b961e7..47577451c9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -384,10 +384,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.201") +(define-public linux-libre-4.4-version "4.4.202") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "120kci4kmc48zcw16lhxmh71kaxm9ac5qxik36q3a20czg28b2m7"))) + (hash (base32 "0adrmps7izfqy0yn4440isxvigslwzk1a375r9kh86idwbmcxb7x"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From bd7df85ea445bc9081c76f65623b697c03cd90bf Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 16 Nov 2019 11:39:42 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.202. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.202. (linux-libre-4.9-pristine-source): 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 47577451c9..8097cf29c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -376,10 +376,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.201") +(define-public linux-libre-4.9-version "4.9.202") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "125xmh5h1zmfniidpjljny53qkl4phpxaali69i66lajscxx8grq"))) + (hash (base32 "1gsfbvsswpwj6r56ynb6mmx7dc8hp9yhi7sfr0hhii0gs4ffq241"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From 2401806bdbc362e5c6ff03a2a3dd33a5d4cdf96e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 16 Nov 2019 17:15:14 +0100 Subject: gnu: ucx: Avoid relying on /sys/class/net. This fixes test failures of packages that use Open MPI, whereby UCX would error out due to /sys/class/net being unavailable in the build chroot that the daemon sets up. * gnu/packages/patches/ucx-tcp-iface-ioctl.patch: New file. * gnu/packages/fabric-management.scm (ucx)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/fabric-management.scm | 3 +- gnu/packages/patches/ucx-tcp-iface-ioctl.patch | 109 +++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ucx-tcp-iface-ioctl.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0bc23b92ee..8a52e98d3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1392,6 +1392,7 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/txr-shell.patch \ %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch \ + %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index becf877f08..c31ee6e217 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -190,7 +190,8 @@ testing InfiniBand networks.") (file-name (git-file-name name version)) (sha256 (base32 - "0x3clvy716i7va4m4adgx6ihjsfnzrkdizhxz5v52944dkglpc8n")))) + "0x3clvy716i7va4m4adgx6ihjsfnzrkdizhxz5v52944dkglpc8n")) + (patches (search-patches "ucx-tcp-iface-ioctl.patch")))) (build-system gnu-build-system) (arguments '( ;; These are some of the flags found in 'contrib/configure-release'. diff --git a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch new file mode 100644 index 0000000000..d5df7047bc --- /dev/null +++ b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch @@ -0,0 +1,109 @@ +Since /sys is unavailable in build environments, the list of available +TCP network interfaces cannot be obtained via /sys/class/net. This patch +provides alternative code that uses the SIOCGIFCONF ioctl to get the +names of the available TCP network interfaces. + +diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c +index 81ad459..10024a6 100644 +--- a/src/uct/tcp/tcp_iface.c ++++ b/src/uct/tcp/tcp_iface.c +@@ -12,6 +12,8 @@ + #include + #include + #include ++#include ++#include + + static ucs_config_field_t uct_tcp_iface_config_table[] = { + {"", "MAX_SHORT=8k", NULL, +@@ -483,6 +485,70 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h, + uct_worker_h, const uct_iface_params_t*, + const uct_iface_config_t*); + ++/* Fetch information about available network devices through an ioctl. */ ++static ucs_status_t query_devices_ioctl(uct_md_h md, ++ uct_tl_resource_desc_t **resource_p, ++ unsigned *num_resources_p) ++{ ++ int sock, err, i; ++ uct_tl_resource_desc_t *resources, *tmp; ++ unsigned num_resources; ++ ucs_status_t status; ++ struct ifconf conf; ++ struct ifreq reqs[10]; ++ ++ conf.ifc_len = sizeof reqs; ++ conf.ifc_req = reqs; ++ ++ sock = socket(SOCK_STREAM, AF_INET, 0); ++ if (sock < 0) { ++ ucs_error("socket(2) failed: %m"); ++ status = UCS_ERR_IO_ERROR; ++ goto out; ++ } ++ ++ err = ioctl(sock, SIOCGIFCONF, &conf); ++ if (err < 0) { ++ ucs_error("SIOCGIFCONF ioctl failed: %m"); ++ status = UCS_ERR_IO_ERROR; ++ goto out; ++ } ++ ++ resources = NULL; ++ num_resources = 0; ++ for (i = 0; i < conf.ifc_len / sizeof(struct ifreq); i++) { ++ const char *name = reqs[i].ifr_name; ++ ++ if (!ucs_netif_is_active(name)) { ++ continue; ++ } ++ ++ tmp = ucs_realloc(resources, sizeof(*resources) * (num_resources + 1), ++ "tcp resources"); ++ if (tmp == NULL) { ++ ucs_free(resources); ++ status = UCS_ERR_NO_MEMORY; ++ goto out; ++ } ++ resources = tmp; ++ ++ ucs_snprintf_zero(resources[i].tl_name, sizeof(resources[i].tl_name), ++ "%s", UCT_TCP_NAME); ++ ucs_snprintf_zero(resources[i].dev_name, sizeof(resources[i].dev_name), ++ "%s", name); ++ resources[i].dev_type = UCT_DEVICE_TYPE_NET; ++ ++num_resources; ++ } ++ ++ *num_resources_p = num_resources; ++ *resource_p = resources; ++ status = UCS_OK; ++ ++out: ++ if (sock >= 0) close(sock); ++ return status; ++} ++ + static ucs_status_t uct_tcp_query_tl_resources(uct_md_h md, + uct_tl_resource_desc_t **resource_p, + unsigned *num_resources_p) +@@ -496,9 +562,9 @@ static ucs_status_t uct_tcp_query_tl_resources(uct_md_h md, + + dir = opendir(netdev_dir); + if (dir == NULL) { +- ucs_error("opendir(%s) failed: %m", netdev_dir); +- status = UCS_ERR_IO_ERROR; +- goto out; ++ /* When /sys is unavailable, as can be the case in a container, ++ * resort to a good old 'ioctl'. */ ++ return query_devices_ioctl(md, resource_p, num_resources_p); + } + + resources = NULL; +@@ -543,6 +609,5 @@ static ucs_status_t uct_tcp_query_tl_resources(uct_md_h md, + + out_closedir: + closedir(dir); +-out: + return status; + } -- cgit 1.4.1 From b1077c2234c47902990a6d27f471fd6b23a2df06 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 16 Nov 2019 17:19:17 +0100 Subject: gnu: openmpi: Silence UCX warnings when running tests. * gnu/packages/mpi.scm (%openmpi-setup): Set "UCX_LOG_LEVEL". --- gnu/packages/mpi.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 41655a4a5c..f51e03a4d7 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -342,6 +342,15 @@ only provides @code{MPI_THREAD_FUNNELED}."))) ;; Allow oversubscription in case there are less physical cores available ;; in the build environment than the package wants while testing. (setenv "OMPI_MCA_rmaps_base_mapping_policy" "core:OVERSUBSCRIBE") + + ;; UCX sometimes outputs uninteresting warnings such as: + ;; + ;; mpool.c:38 UCX WARN object 0x7ffff44fffc0 was not returned to mpool ucp_am_bufs + ;; + ;; These in turn leads to failures of test suites that capture and + ;; compare stdout, such as that of 'hdf5-parallel-openmpi'. Thus, tell + ;; UCX to not emit those warnings. + (setenv "UCX_LOG_LEVEL" "error") #t)) (define-public intel-mpi-benchmarks -- cgit 1.4.1 From 2148e68d333f0dbd3c455bc1ced4ffa4361ede3d Mon Sep 17 00:00:00 2001 From: Oskar Köök Date: Thu, 24 Oct 2019 23:37:38 +0300 Subject: gnu: elixir: Update to 1.9.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/elixir.scm (elixir): Update to 1.9.2. Signed-off-by: Ludovic Courtès --- gnu/packages/elixir.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 88ada71aea..144a8cc4e7 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -33,7 +33,7 @@ (define-public elixir (package (name "elixir") - (version "1.8.2") + (version "1.9.2") (source (origin (method git-fetch) @@ -42,7 +42,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq")) + (base32 "19yn6nx6r627f5zbyc7ckgr96d6b45sgwx95n2gp2imqwqvpj8wc")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments @@ -63,9 +63,21 @@ "lib/mix/lib/mix/scm/git.ex") (("(cmd\\(['\"])git" _ prefix) (string-append prefix (which "git")))) + (substitute* '("lib/mix/lib/mix/release.ex" + "lib/mix/lib/mix/tasks/release.init.ex") + (("#!/bin/sh") + (string-append "#!" (which "sh")))) (substitute* "bin/elixir" - (("ERL_EXEC=\"erl\"") - (string-append "ERL_EXEC=" (which "erl")))) + (("ERTS_BIN=") + (string-append + "ERTS_BIN=" + ;; Elixir Releases will prepend to ERTS_BIN the path of a copy of erl. + ;; We detect if a release is being generated by checking the initial ERTS_BIN + ;; value: if it's empty, we are not in release mode and can point to the actual + ;; erl binary in Guix store. + "\nif [ -z \"$ERTS_BIN\" ]; then ERTS_BIN=" + (string-drop-right (which "erl") 3) + "; fi"))) (substitute* "bin/mix" (("#!/usr/bin/env elixir") (string-append "#!" out "/bin/elixir")))) -- cgit 1.4.1 From 264a63d6435fe832169eedda3f03c334ea573001 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Wed, 30 Oct 2019 13:08:36 +0000 Subject: gnu: Add redshift-wayland MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (redshift-wayland): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xdisorg.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8c24ff92ec..4376c64108 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1108,6 +1108,49 @@ night to daytime temperature to allow your eyes to slowly adapt. At night the color temperature should be set to match the lamps in your room.") (license license:gpl3+))) +(define-public redshift-wayland + (let ((commit "7da875d34854a6a34612d5ce4bd8718c32bec804") + (revision "1")) + (package + (name "redshift-wayland") + (version (string-append "1.12-" + revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minus7/redshift.git") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0nbkcw3avmzjg1jr1g9yfpm80kzisy55idl09b6wvzv2sz27n957")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs + `(("libdrm" ,libdrm) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxxf86vm" ,libxxf86vm) + ("glib" ,glib) ; for Geoclue2 support + ("wayland" ,wayland))) + (home-page "https://github.com/minus7/redshift") + (synopsis "Adjust the color temperature of your screen (with Wayland support)") + (description + "Redshift adjusts the color temperature according to the position of the +sun. A different color temperature is set during night and daytime. During +twilight and early morning, the color temperature transitions smoothly from +night to daytime temperature to allow your eyes to slowly adapt. At night the +color temperature should be set to match the lamps in your room. + +This is a fork with added support for Wayland using the wlr-gamma-control +protocol.") + (license license:gpl3+)))) + (define-public xscreensaver (package (name "xscreensaver") -- cgit 1.4.1 From a9b15d4c7f7bb8e830ed1112a6cabfb2cb9d2077 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 10 Nov 2019 22:36:34 +0100 Subject: gnu: libzip: Add more inputs. This enables encryption. * gnu/packages/compression.scm (libzip)[inputs]: Add gnutls, openssl. --- gnu/packages/compression.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 6279c929de..5583c8a461 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1652,7 +1652,9 @@ recreates the stored directory structure by default.") (native-inputs `(("perl" ,perl))) (inputs - `(("zlib" ,zlib))) + `(("gnutls" ,gnutls) + ("openssl" ,openssl) + ("zlib" ,zlib))) (build-system cmake-build-system) (home-page "https://libzip.org") (synopsis "C library for reading, creating, and modifying zip archives") -- cgit 1.4.1 From 30502f1dd6969a187abf98dd59fa84ee40284cef Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 10 Nov 2019 22:19:09 +0100 Subject: php: Enable more extentions. * gnu/packages/php.scm (php)[arguments]: Use libzip instead of zip for the "--with-libzip" argument, enable intl and zip. [inputs]: Add icu4c, libzip. Remove zip. --- gnu/packages/php.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index b144a6b26a..bc60539fb4 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) @@ -101,7 +102,7 @@ (with "--with-jpeg-dir" "libjpeg") (with "--with-ldap" "openldap") (with "--with-ldap-sasl" "cyrus-sasl") - (with "--with-libzip" "zip") + (with "--with-libzip" "libzip") (with "--with-libxml-dir" "libxml2") (with "--with-onig" "oniguruma") (with "--with-pcre-dir" "pcre") @@ -136,9 +137,11 @@ "--enable-fpm" "--enable-ftp" "--enable-inifile" + "--enable-intl" "--enable-mbstring" "--enable-pcntl" - "--enable-sockets")) + "--enable-sockets" + "--enable-zip")) #:phases (modify-phases %standard-phases (add-after 'unpack 'do-not-record-build-flags @@ -356,6 +359,7 @@ ("glibc" ,glibc) ("gmp" ,gmp) ("gnutls" ,gnutls) + ("icu4c" ,icu4c) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg) ("libpng" ,libpng) @@ -364,6 +368,7 @@ ("libxpm" ,libxpm) ("libxslt" ,libxslt) ("libx11" ,libx11) + ("libzip" ,libzip) ("oniguruma" ,oniguruma) ("openldap" ,openldap) ("openssl" ,openssl) @@ -372,7 +377,6 @@ ("readline" ,readline) ("sqlite" ,sqlite) ("tidy" ,tidy) - ("zip" ,zip) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From 81d7cd592e9eeab23046c63c7d6de313f12685f4 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Nov 2019 11:55:47 -0500 Subject: gnu: hyperrogue: Update to 11.2d. * gnu/packages/games.scm (hyperrogue): Update to 11.2d. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 07bef94c51..b24e8b03d4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3943,7 +3943,7 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "10.5d") + (version "11.2d") ;; When updating this package, be sure to update the "hyperrogue-data" ;; origin in native-inputs. (source (origin @@ -3954,7 +3954,7 @@ throwing people around in pseudo-randomly generated buildings.") "-src.tgz")) (sha256 (base32 - "1ls055v4pv2xmn2a8lav7wl370zn0wsd91q41bk0amxd168kcndy")))) + "1b532s94zv1jsni7bvh848m42arxcclsr0x3n7c689iamwqzrxmn")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -4032,7 +4032,7 @@ throwing people around in pseudo-randomly generated buildings.") "-win.zip")) (sha256 (base32 - "13n9hcvf9yv7kjghm5jhjpwq1kh94i4bgvcczky9kvdvw1y9278n")))) + "0vq4l1xaqpjj3hmxn1vn2b3bbkn1hrag42ck9f30blinv347bwhf")))) ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) -- cgit 1.4.1 From 4edc4f57bdd29566fd0780353f3b247bb38a266f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 15 Nov 2019 16:07:31 +0200 Subject: gnu: keepassxc: Update to 2.5.1. * gnu/packages/password-utils.scm (keepassxc): Update to 2.5.1. --- gnu/packages/password-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index dd4eeba0ac..b3195f8f6b 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -114,7 +114,7 @@ human.") (define-public keepassxc (package (name "keepassxc") - (version "2.5.0") + (version "2.5.1") (source (origin (method url-fetch) @@ -123,7 +123,7 @@ human.") version "-src.tar.xz")) (sha256 (base32 - "10bq2934xqpjpr99wbjg2vwmi73fcq0419cb3v78n2kj5fbwwnb3")))) + "0c5g5hn2cr2m00xgpxg884ihy8gnn09kc487y1m9jywshn5jaczg")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DWITH_XC_ALL=YES" -- cgit 1.4.1 From 191a9a26b5d1204c32f906a4dd0b6fd4e1b38130 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 16 Nov 2019 18:14:31 +0100 Subject: gnu: linux-libre: Remove cross-libc from CROSS_CPATH. * gnu/packages/linux.scm (make-linux-libre*)[arguments]: Do not unset CROSS_CPATH completely, instead remove cross-libc from CROSS_CPATH in the same way that libc is removed from CPATH. --- gnu/packages/linux.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8097cf29c5..a5b0ce455f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -679,23 +679,26 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) - ;; Unset CROSS_CPATH to make sure that cross-libc is not - ;; found. Otherwise, some of its header would conflict with the - ;; one from linux (stdint.h and linux/types.h) - ,@(if (%current-target-system) - '((unsetenv "CROSS_CPATH")) - '()) - - ;; On AArch64 (at least), we need to remove glibc headers from CPATH - ;; (they are still available as "system headers"), so that the kernel - ;; can override uint64_t. See . - (setenv "CPATH" - (string-join - (remove (cut string-prefix? (assoc-ref inputs "libc") <>) - (string-split (getenv "CPATH") #\:)) - ":")) - (format #t "environment variable `CPATH' changed to `~a'~%" - (getenv "CPATH")) + ;; On AArch64 (at least), we need to remove glibc headers from + ;; CPATH (they are still available as "system headers"), so that + ;; the kernel can override uint64_t. See + ;; . This is also true when + ;; cross-compiling, except in that case, cross-libc must be + ;; removed from CROSS_CPATH. + (let ((var ,(if (%current-target-system) + "CROSS_CPATH" + "CPATH")) + (libc ,(if (%current-target-system) + "cross-libc" + "libc"))) + (setenv var + (string-join + (remove + (cut string-prefix? (assoc-ref inputs libc) <>) + (string-split (getenv var) #\:)) + ":")) + (format #t "environment variable `~a' changed to `~a'~%" + var (getenv var))) ;; Avoid introducing timestamps (setenv "KCONFIG_NOTIMESTAMP" "1") -- cgit 1.4.1 From bf5dea3aa403aeadfa463cd6cf4cb5619a86ba02 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Fri, 15 Nov 2019 07:18:49 -0800 Subject: gnu: emacs-desktop-environment: Update to 0.3.0. * gnu/packages/emacs-xyz.scm (emacs-desktop-environment): Update to 0.3.0. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7cb949eb84..f733068758 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14860,7 +14860,7 @@ autosuggestions with: (define-public emacs-desktop-environment (package (name "emacs-desktop-environment") - (version "0.2.2") + (version "0.3.0") (source (origin (method git-fetch) @@ -14870,7 +14870,7 @@ autosuggestions with: (file-name (git-file-name name version)) (sha256 (base32 - "14ija2rrz3zjhjbzxg84j5fq6xph4ah7w9bkqnq37by040cydvhw")))) + "195n99xvxyh4cfxjpfa1h1maalqrxf7nyi0bh3lqa1z6z5bdb6x2")))) (build-system emacs-build-system) (home-page "https://gitlab.petton.fr/DamienCassou/desktop-environment") (synopsis "Control your GNU/Linux desktop environment from Emacs") -- cgit 1.4.1 From 38df1a5bcdd6de4cc8948df12355877d2e439260 Mon Sep 17 00:00:00 2001 From: Oskar Köök Date: Sat, 16 Nov 2019 21:18:30 +0100 Subject: gnu: elixir: Update to 1.9.4. * gnu/packages/elixir.scm (elixir): Update to 1.9.4. Signed-off-by: Efraim Flashner --- gnu/packages/elixir.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 144a8cc4e7..7420bc4963 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -33,7 +33,7 @@ (define-public elixir (package (name "elixir") - (version "1.9.2") + (version "1.9.4") (source (origin (method git-fetch) @@ -42,7 +42,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19yn6nx6r627f5zbyc7ckgr96d6b45sgwx95n2gp2imqwqvpj8wc")) + (base32 "1l4318g35y4h0vi2w07ayc3jizw1xc3s7hdb47w6j3iw33y06g6b")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From fbdc87a7cb058be54f55c451c2339c7ad0dcaad7 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 16 Nov 2019 17:22:57 -0500 Subject: gnu: crispy-doom: Update to 5.6.3. * gnu/packages/games.scm (crispy-doom): Update to 5.6.3. --- 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 b24e8b03d4..833c19317e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5793,7 +5793,7 @@ affect gameplay).") (package (inherit chocolate-doom) (name "crispy-doom") - (version "5.5.2") + (version "5.6.3") (source (origin (method git-fetch) (uri (git-reference @@ -5801,7 +5801,7 @@ affect gameplay).") (commit (string-append "crispy-doom-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a60ns0blhvml6gzj9qx18c18pbf02rq7vypaajd6nqy5h4fz3cn")))) + (base32 "0f319979wqfgm4pvsa6y5clg30p55l441kmrr8db0p5smyv3x2s4")))) (native-inputs (append (package-native-inputs chocolate-doom) -- cgit 1.4.1 From 2484e0b3e481e2b1fcb6761d0dbf80da98089de4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 16 Nov 2019 17:40:06 -0500 Subject: gnu: linux-libre: Update deblob scripts. * gnu/packages/linux.scm (deblob-scripts-5.3): Update to 5.3.11. (deblob-scripts-5.19): Update to 4.19.84. (deblob-scripts-4.14): Update to 4.14.154. (deblob-scripts-4.9): Update to 4.9.201. (deblob-scripts-4.4): Update to 4.4.201. --- gnu/packages/linux.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a5b0ce455f..a95280c011 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -184,31 +184,31 @@ defconfig. Return the appropriate make target if applicable, otherwise return (define deblob-scripts-5.3 (linux-libre-deblob-scripts - "5.3.6" + "5.3.11" (base32 "15n09zq38d69y1wl28s3nasf3377qp2yil5b887zpqrm00dif7i4") - (base32 "0nrimraf46nf6y1hwkg29fyl0a83wnj0mwq54ggxvffn9gk5h9pa"))) + (base32 "1xk3gzgnl9m29avka32zkggl36sdxyvps40hr12hjy42l1ysfshm"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.79" + "4.19.84" (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") - (base32 "1fyacg28aym6virxyn7wk99qil2fjbks3iwm7p3hxy51pccn34za"))) + (base32 "1s89hmy4ihd65by2p1xxkxj476f6c9s5g9r9yvqncb50xlhilk50"))) (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.149" + "4.14.154" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") - (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n"))) + (base32 "1pcsfzpcv3bs30iyhwpk1x64r0gyv7wi22spnq6avzj1ayva10kw"))) (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.196" + "4.9.201" (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") (base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w"))) (define deblob-scripts-4.4 (linux-libre-deblob-scripts - "4.4.196" + "4.4.201" (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") (base32 "12ac4g3ky8yma8sylmxvvysqvd4hnaqjiwmxrxb6wlxggfd7zkbx"))) -- cgit 1.4.1 From b3820edc995b504eedee171164e79fc935980615 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Nov 2019 09:23:41 +0200 Subject: gnu: librsvg-next: Don't use name variable in source uri. * gnu/packages/gnome.scm (librsvg-next)[source]: Hardcode name. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f51d366f44..87f19a0908 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1409,9 +1409,9 @@ library.") (version "2.46.0") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/librsvg/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "librsvg-" version ".tar.xz")) (sha256 (base32 "1la3az2af2ccm6rp86b6wh0kq7kxzl4n8pli5qxhyic1rd91xj4n")))) -- cgit 1.4.1 From cf9dad6c87bab87bc25e80b321158b0328db0d8a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Nov 2019 09:24:23 +0200 Subject: gnu: librsvg-next: Update to 2.46.3. * gnu/packages/gnome.scm (librsvg-next): Update to 2.46.3. [license]: Update to lgpl2.1+. --- 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 87f19a0908..f9126d18e1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1406,7 +1406,7 @@ library.") (define-public librsvg-next (package (name "librsvg") - (version "2.46.0") + (version "2.46.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -1414,7 +1414,7 @@ library.") "librsvg-" version ".tar.xz")) (sha256 (base32 - "1la3az2af2ccm6rp86b6wh0kq7kxzl4n8pli5qxhyic1rd91xj4n")))) + "1s3a96i7f4pynjwxxvhysp4b6r7kyi8nasdxfyi62hc7gm34d3kn")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1492,7 +1492,7 @@ library.") (description "Librsvg is a C library to render SVG files using the Cairo 2D graphics library.") - (license license:lgpl2.0+))) + (license license:lgpl2.1+))) (define-public libidl (package -- cgit 1.4.1 From 496bbeee7a0afbf1c7cbcc0de8c33c2111cb661f Mon Sep 17 00:00:00 2001 From: David Truby Date: Wed, 13 Nov 2019 16:56:04 +0000 Subject: gnu: clang-from-llvm: Fix libstdc++ header location search. Make clang use libstdc++ from gcc package. In the future, the build of clang could be parametrized to build clang with libstdc++ support or with libcxx support. * gnu/packages/llvm.scm (clang-from-llvm)[arguments]: Make clang look for libstdc++ in the right location, which is gcc c++ includes directory. Signed-off-by: Mathieu Othacehe --- gnu/packages/llvm.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 33fb53d65e..d1b1981ad6 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Rutger Helling +;;; Copyright © 2019 David Truby ;;; ;;; This file is part of GNU Guix. ;;; @@ -202,6 +203,7 @@ compiler. In LLVM this library is called \"compiler-rt\".") (lambda* (#:key inputs #:allow-other-keys) (let ((libc (assoc-ref inputs "libc")) (compiler-rt (assoc-ref inputs "clang-runtime")) + (gcc (assoc-ref inputs "gcc")) (version (string->number ,(version-major (package-version clang-runtime))))) @@ -218,6 +220,12 @@ compiler. In LLVM this library is called \"compiler-rt\".") (("(^[[:blank:]]+LibDir = ).*" _ declaration) (string-append declaration "\"" libc "/lib\";\n")) + ;; Make clang look for libstdc++ in the right + ;; location. + (("LibStdCXXIncludePathCandidates\\[\\] = \\{") + (string-append + "LibStdCXXIncludePathCandidates[] = { \"" gcc "/include/c++\",")) + ;; Make sure libc's libdir is on the search path, to ;; allow crt1.o & co. to be found. (("@GLIBC_LIBDIR@") -- cgit 1.4.1 From 57c7bfec62eb791aadd81916ab8a29ae19b30c69 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 14 Nov 2019 13:25:00 +0100 Subject: gnu: Add clang-toolchain. In the same spirit that gcc-toolchain provides a complete gcc toolchain suitable for user profile installation, add a make-clang-toolchain function and use it to create clang-toolchain, clang-toolchain-7 and clang-toolchain-6 packages. * gnu/packages/llvm.scm (make-clang-toolchain): New method. (clang-toolchain): New public variable defined using previous method, (clang-toolchain-7): ditto, (clang-toolchain-6): ditto. --- gnu/packages/llvm.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d1b1981ad6..a5170a4f10 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 David Truby +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,7 +39,9 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (guix build-system python) + #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages gcc) #:use-module (gnu packages bootstrap) ;glibc-dynamic-linker #:use-module (gnu packages compression) @@ -298,6 +301,51 @@ project includes the Clang front end, the Clang static analyzer, and several code analysis tools.") (license license:ncsa))) +(define (make-clang-toolchain clang) + (package + (name (string-append (package-name clang) "-toolchain")) + (version (package-version clang)) + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build union)) + #:builder (begin + (use-modules (ice-9 match) + (srfi srfi-26) + (guix build union)) + + (let ((out (assoc-ref %outputs "out"))) + + (match %build-inputs + (((names . directories) ...) + (union-build out directories))) + + (union-build (assoc-ref %outputs "debug") + (list (assoc-ref %build-inputs + "libc-debug"))) + (union-build (assoc-ref %outputs "static") + (list (assoc-ref %build-inputs + "libc-static"))) + #t)))) + + (native-search-paths (package-native-search-paths clang)) + (search-paths (package-search-paths clang)) + + (license (package-license clang)) + (home-page "https://clang.llvm.org") + (synopsis "Complete Clang toolchain for C/C++ development") + (description "This package provides a complete Clang toolchain for C/C++ +development to be installed in user profiles. This includes Clang, as well as +libc (headers and binaries, plus debugging symbols in the @code{debug} +output), and Binutils.") + (outputs '("out" "debug" "static")) + (inputs `(("clang" ,clang) + ("ld-wrapper" ,(car (assoc-ref (%final-inputs) "ld-wrapper"))) + ("binutils" ,binutils) + ("libc" ,glibc) + ("libc-debug" ,glibc "debug") + ("libc-static" ,glibc "static"))))) + (define-public libcxx (package (name "libcxx") @@ -407,6 +455,9 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08" #:patches '("clang-7.0-libc-search-path.patch"))) +(define-public clang-toolchain + (make-clang-toolchain clang)) + (define-public llvm-7 (package (inherit llvm) @@ -429,6 +480,9 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") "067lwggnbg0w1dfrps790r5l6k8n5zwhlsw7zb6zvmfpwpfn4nx4" #:patches '("clang-7.0-libc-search-path.patch"))) +(define-public clang-toolchain-7 + (make-clang-toolchain clang-7)) + (define-public llvm-6 (package (inherit llvm) @@ -451,6 +505,9 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w" #:patches '("clang-6.0-libc-search-path.patch"))) +(define-public clang-toolchain-6 + (make-clang-toolchain clang-6)) + ;; Libcxx files specifically used by PySide2. (define-public libcxx-6 (package -- cgit 1.4.1 From ea042113585d09bb9c12598f287a5a586a93a8cf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 17 Nov 2019 23:12:54 +0100 Subject: gnu: hedgewars: Update to 1.0.0. * gnu/packages/games.scm (hedgewars): Update to 1.0.0. [arguments]: Remove unnecessary phases. --- gnu/packages/games.scm | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 833c19317e..be44151023 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7337,14 +7337,14 @@ play with up to four players simultaneously. It has network support.") (define-public hedgewars (package (name "hedgewars") - (version "0.9.25") + (version "1.0.0") (source (origin (method url-fetch) (uri (string-append "https://www.hedgewars.org/download/releases/" "hedgewars-src-" version ".tar.bz2")) (sha256 (base32 - "08x7fqpy0hpnbfq2k06g522xayi7s53bca819zfhalvqnqs76pdk")))) + "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1")))) (build-system cmake-build-system) (arguments ;; XXX: Engine is built as Pascal source code, requiring Free Pascal @@ -7353,32 +7353,8 @@ play with up to four players simultaneously. It has network support.") `(#:configure-flags (list "-DBUILD_ENGINE_C=ON") #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-failing-test - ;; XXX: Remove single failing test. Note: it is marked - ;; a "non-critical" test. - (lambda _ - (delete-file-recursively "tests/lua_noncritical") - #t)) - (add-after 'unpack 'fix-compiler - ;; XXX: Flag BUILD_ENGINE_C, as set above, implies using Clang to - ;; compile files. However, using `clang' globally leads to the - ;; error: qtbase-5.11.3/include/qt5/QtCore/qglobal.h:45:12: fatal - ;; error: 'type_traits' file not found. - ;; - ;; Therefore, we make sure to use `c++' everywhere but in the - ;; engine. - (lambda _ - (substitute* "project_files/hwc/CMakeLists.txt" - (("find_package\\(SDL2_ttf 2 REQUIRED\\)" all) - (string-append all "\n" - "set(CMAKE_C_COMPILER ${CLANG_EXECUTABLE})\n" - "set(CMAKE_CXX_COMPILER ${CLANG_EXECUTABLE})"))) - (substitute* "CMakeLists.txt" - (("set\\(CMAKE_C(XX)?_COMPILER" all) (string-append "#" all))) - #t)) (replace 'check - (lambda _ - (invoke "ctest")))))) + (lambda _ (invoke "ctest")))))) (inputs `(("ffmpeg" ,ffmpeg) ("freeglut" ,freeglut) -- cgit 1.4.1 From 6ba6a1c103ea94f2c9a984db466c3b2829e8f175 Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Sat, 16 Nov 2019 18:33:05 -0700 Subject: gnu: python-hy: Set HOME to /tmp before install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/python-xyz.scm (python-hy)[arguments]: Add custom 'set-HOME phase before the 'install phase. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d2786e4826..5b8b33b87f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8745,6 +8745,9 @@ with a new public API, and RPython support.") (arguments '(#:phases (modify-phases %standard-phases + (add-before 'install 'set-HOME + (lambda _ + (setenv "HOME" "/tmp"))) (replace 'check (lambda _ ;; Tests require write access to HOME. -- cgit 1.4.1 From bead6dcb58f8e3f907ae4421e42b9e5e26bb2c24 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 17 Nov 2019 22:31:42 +0100 Subject: gnu: slurm: Allow builds on 32-bit platforms. Fixes a regression introduced in 7c96befa52ba127f68a066162258e600afbc73fb whereby ./configure would fail on 32-bit platforms due to 32-bit support being "deprecated". * gnu/packages/parallel.scm (slurm)[arguments]: Pass "--enable-deprecated" configure flag unless 'target-64bit?' returns true. --- gnu/packages/parallel.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 4fc2c9afb4..98721fe1ff 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -32,6 +32,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix utils) #:select (target-64bit?)) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -158,7 +159,11 @@ and they are executed on lists of files, hosts, users or other items.") (string-append "--with-freeipmi=" (assoc-ref %build-inputs "freeipmi")) (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc")) (string-append "--with-json=" (assoc-ref %build-inputs "json-c")) - (string-append "--with-munge=" (assoc-ref %build-inputs "munge"))) + (string-append "--with-munge=" (assoc-ref %build-inputs "munge")) + + ;; 32-bit support is marked as deprecated and needs to be + ;; explicitly enabled. + ,@(if (target-64bit?) '() '("--enable-deprecated"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'autoconf -- cgit 1.4.1 From 65209ffabd9245fac78eeb2caf5bcca3e4963937 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 17 Nov 2019 22:34:30 +0100 Subject: gnu: gsettings-desktop-schemas: Fix file name of default background. Reported by Alexandros Theodotou at . * gnu/packages/gnome.scm (gsettings-desktop-schemas)[arguments]: New field. [inputs]: Add GNOME-BACKGROUNDS. --- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f9126d18e1..d8545eaa58 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -861,8 +861,21 @@ on the GNOME Desktop with a single simple application.") (base32 "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq")))) (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'set-adwaita-theme-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Provide the correct file name of the default GNOME + ;; background, 'adwaita-timed.xml'. + (let ((theme (assoc-ref inputs "gnome-backgrounds"))) + (substitute* (find-files "schemas" + "\\.gschema\\.xml\\.in$") + (("@datadir@/backgrounds/gnome") + (string-append theme "/share/backgrounds/gnome"))) + #t)))))) (inputs - `(("glib" ,glib))) + `(("glib" ,glib) + ("gnome-backgrounds" ,gnome-backgrounds))) (native-inputs `(("intltool" ,intltool) ("glib" ,glib "bin") ; glib-compile-schemas, etc. -- cgit 1.4.1 From 1a034f043e12e0c61accc38d276df9b0a1b00408 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Nov 2019 06:44:13 +0900 Subject: tests: install: Fix typo. * gnu/tests/install.scm (run-install): Fix typo in docstring. --- gnu/tests/install.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 22c9554705..bce4c4b9d4 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -267,7 +267,7 @@ packages defined in installation-os." (define* (qemu-command/writable-image image #:key (memory-size 256)) "Return as a monadic value the command to run QEMU on a writable copy of -IMAGE, a disk image. The QEMU VM is has access to MEMORY-SIZE MiB of RAM." +IMAGE, a disk image. The QEMU VM has access to MEMORY-SIZE MiB of RAM." (mlet %store-monad ((system (current-system))) (return #~(let ((image #$image)) ;; First we need a writable copy of the image. -- cgit 1.4.1 From d2ae8a25db24f677af36f5e05ff930d43f8a71c4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Sep 2019 22:49:57 +0900 Subject: file-systems: Fix docstring. * gnu/build/file-systems.scm (mount-file-system): Clean the documentation from the no longer existing parameters (these are now encapsulated within a record). --- gnu/build/file-systems.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 8bb10d574d..cb90fa0907 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -581,11 +581,7 @@ corresponds to the symbols listed in FLAGS." 0)))) (define* (mount-file-system fs #:key (root "/root")) - "Mount the file system described by FS, a object, under ROOT. - -DEVICE, MOUNT-POINT, and TYPE must be strings; OPTIONS can be a string or #f; -FLAGS must be a list of symbols. CHECK? is a Boolean indicating whether to -run a file system check." + "Mount the file system described by FS, a object, under ROOT." (define (mount-nfs source mount-point type flags options) (let* ((idx (string-rindex source #\:)) -- cgit 1.4.1 From c09903acae89983931f7c9bc2b60653228288f05 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Nov 2019 08:50:08 +0900 Subject: linux-boot: Fix indentation. * gnu/build/linux-boot.scm (boot-system): Re-indent. --- gnu/build/linux-boot.scm | 148 +++++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 74 deletions(-) (limited to 'gnu') diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 84a5447977..d902cc416f 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -476,79 +476,79 @@ upon error." (display "Use '--repl' for an initrd REPL.\n\n") (call-with-error-handling - (lambda () - (mount-essential-file-systems) - (let* ((args (linux-command-line)) - (to-load (find-long-option "--load" args)) - (root (find-long-option "--root" args))) - - (when (member "--repl" args) - (start-repl)) - - (display "loading kernel modules...\n") - (load-linux-modules-from-directory linux-modules - linux-module-directory) - - (when keymap-file - (let ((status (system* "loadkeys" keymap-file))) - (unless (zero? status) - ;; Emit a warning rather than abort when we cannot load - ;; KEYMAP-FILE. - (format (current-error-port) - "warning: 'loadkeys' exited with status ~a~%" - status)))) - - (when qemu-guest-networking? - (unless (configure-qemu-networking) - (display "network interface is DOWN\n"))) - - ;; Prepare the real root file system under /root. - (unless (file-exists? "/root") - (mkdir "/root")) - - (when (procedure? pre-mount) - ;; Do whatever actions are needed before mounting the root file - ;; system--e.g., installing device mappings. Error out when the - ;; return value is false. - (unless (pre-mount) - (error "pre-mount actions failed"))) - - (setenv "EXT2FS_NO_MTAB_OK" "1") - - (if root - ;; The "--root=SPEC" kernel command-line option always provides a - ;; string, but the string can represent a device, a UUID, or a - ;; label. So check for all three. - (let ((root (cond ((string-prefix? "/" root) root) - ((uuid root) => identity) - (else (file-system-label root))))) - (mount-root-file-system (canonicalize-device-spec root) - root-fs-type - #:volatile-root? volatile-root?)) - (mount "none" "/root" "tmpfs")) - - ;; Mount the specified file systems. - (for-each mount-file-system - (remove root-mount-point? mounts)) - - (setenv "EXT2FS_NO_MTAB_OK" #f) - - (if to-load - (begin - (switch-root "/root") - (format #t "loading '~a'...\n" to-load) - - (primitive-load to-load) - - (format (current-error-port) - "boot program '~a' terminated, rebooting~%" - to-load) - (sleep 2) - (reboot)) - (begin - (display "no boot file passed via '--load'\n") - (display "entering a warm and cozy REPL\n") - (start-repl))))) - #:on-error on-error)) + (lambda () + (mount-essential-file-systems) + (let* ((args (linux-command-line)) + (to-load (find-long-option "--load" args)) + (root (find-long-option "--root" args))) + + (when (member "--repl" args) + (start-repl)) + + (display "loading kernel modules...\n") + (load-linux-modules-from-directory linux-modules + linux-module-directory) + + (when keymap-file + (let ((status (system* "loadkeys" keymap-file))) + (unless (zero? status) + ;; Emit a warning rather than abort when we cannot load + ;; KEYMAP-FILE. + (format (current-error-port) + "warning: 'loadkeys' exited with status ~a~%" + status)))) + + (when qemu-guest-networking? + (unless (configure-qemu-networking) + (display "network interface is DOWN\n"))) + + ;; Prepare the real root file system under /root. + (unless (file-exists? "/root") + (mkdir "/root")) + + (when (procedure? pre-mount) + ;; Do whatever actions are needed before mounting the root file + ;; system--e.g., installing device mappings. Error out when the + ;; return value is false. + (unless (pre-mount) + (error "pre-mount actions failed"))) + + (setenv "EXT2FS_NO_MTAB_OK" "1") + + (if root + ;; The "--root=SPEC" kernel command-line option always provides a + ;; string, but the string can represent a device, a UUID, or a + ;; label. So check for all three. + (let ((root (cond ((string-prefix? "/" root) root) + ((uuid root) => identity) + (else (file-system-label root))))) + (mount-root-file-system (canonicalize-device-spec root) + root-fs-type + #:volatile-root? volatile-root?)) + (mount "none" "/root" "tmpfs")) + + ;; Mount the specified file systems. + (for-each mount-file-system + (remove root-mount-point? mounts)) + + (setenv "EXT2FS_NO_MTAB_OK" #f) + + (if to-load + (begin + (switch-root "/root") + (format #t "loading '~a'...\n" to-load) + + (primitive-load to-load) + + (format (current-error-port) + "boot program '~a' terminated, rebooting~%" + to-load) + (sleep 2) + (reboot)) + (begin + (display "no boot file passed via '--load'\n") + (display "entering a warm and cozy REPL\n") + (start-repl))))) + #:on-error on-error)) ;;; linux-initrd.scm ends here -- cgit 1.4.1 From 67ed5442127e5baf2a7caba7a112c9639feecee3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Nov 2019 13:54:32 +0900 Subject: vm: Honor the VOLATILE? parameter when producing a system disk image. * gnu/system/vm.scm (system-disk-image): Honor the VOLATILE? parameter instead of hard coding its value to #t. Reported-by: Jelle Licht --- gnu/system/vm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index ac6e4ded92..3fa9fd4ba5 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -678,7 +678,7 @@ to USB sticks meant to be read-only." (initrd (lambda (file-systems . rest) (apply (operating-system-initrd os) file-systems - #:volatile-root? #t + #:volatile-root? volatile? rest))) (bootloader (if (string=? "iso9660" file-system-type) -- cgit 1.4.1 From 215a45d9b8e00cfcc3bf613de61c5d8ee304b512 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 3 Jun 2017 12:56:36 -0700 Subject: gnu: emacs: Locate Elisp libraries via EMACSLOADPATH. * gnu/packages/emacs.scm (emacs): Add a search path specification for EMACSLOADPATH. --- gnu/packages/emacs.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6c6f0e4567..16f9af0a0a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017 Maxim Cournoyer +;;; Copyright © 2017, 2019 Maxim Cournoyer ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Jan Nieuwenhuizen @@ -185,6 +185,13 @@ (native-search-paths (list (search-path-specification + (variable "EMACSLOADPATH") + ;; The versioned entries are for the Emacs' builtin libraries. + (files (list (string-append "share/emacs/" version "/site-lisp") + (string-append "share/emacs/" version "/lisp") + "share/emacs/site-lisp")) + (file-pattern ".*")) ;recursively add any sub directory + (search-path-specification (variable "INFOPATH") (files '("share/info"))))) -- cgit 1.4.1 From 47b3b4c2aa49e21f4cc32c97ff7bbbd069bb849c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 29 Oct 2019 22:07:55 -0400 Subject: gnu: emacs: Adapt the autoloads auxiliary code to use EMACSLOADPATH. The Elisp directories to scan for autoloads are now taken from EMACSLOADPATH instead of from the user profile, environment profile or system profile. Manually adding the Elisp directories to the `load-path' is no longer necessary, as this is covered by Emacs when they are in EMACSLOADPATH. The caching logic is also removed, as this code is not typically run often and the gain is marginal (loading autoloads files is cheap). * gnu/packages/aux-files/emacs/guix-emacs.el (guix-emacs-directory) (guix-emacs-subdirs, guix-emacs-directories): Remove procedures. (guix-emacs-find-autoloads): Filter the directory entries by passing the regexp to `directory-files' directly, which is ten times faster. Remove deduplication. (guix-emacs-autoloads-regexp): Remove the group, which used to filter out the file extension; it no longer works this way due to passing the regexp to the `directory-files' procedure directly, which doesn't care about groups. (guix-emacs-autoload-packages): Update doc. Search package directories from EMACSLOADPATH. Do not populate the load-path. Remove cache. --- gnu/packages/aux-files/emacs/guix-emacs.el | 98 ++++++++---------------------- 1 file changed, 24 insertions(+), 74 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el index 9a49e8861c..46ee557f20 100644 --- a/gnu/packages/aux-files/emacs/guix-emacs.el +++ b/gnu/packages/aux-files/emacs/guix-emacs.el @@ -2,6 +2,7 @@ ;; Copyright © 2014, 2015, 2016, 2017 Alex Kost ;; Copyright © 2017 Kyle Meyer +;; Copyright © 2019 Maxim Cournoyer ;; This file is part of GNU Guix. @@ -24,91 +25,40 @@ ;; installed with Guix. ;;; Code: - -(require 'cl-lib) - -(defvar guix-user-profile (expand-file-name "~/.guix-profile")) - -(defvar guix-emacs-autoloads nil - "List of the last loaded Emacs autoloads.") +(require 'seq) (defvar guix-emacs-autoloads-regexp - (rx (group (* any) "-autoloads") - ".el" (zero-or-one "c") string-end) + (rx (* any) "-autoloads.el" (zero-or-one "c") string-end) "Regexp to match Emacs 'autoloads' file.") -(defun guix-emacs-directory (&optional profile) - "Return directory with Emacs packages installed in PROFILE. -If PROFILE is nil, use `guix-user-profile'." - (expand-file-name "share/emacs/site-lisp" - (or profile guix-user-profile))) - (defun guix-emacs-find-autoloads (directory) "Return a list of Emacs 'autoloads' files in DIRECTORY. The files in the list do not have extensions (.el, .elc)." - (cl-remove-duplicates - (delq nil - (mapcar (lambda (file) - (when (string-match guix-emacs-autoloads-regexp file) - (match-string 1 file))) - (directory-files directory 'full-name nil 'no-sort))) - :test #'string=)) - -(defun guix-emacs-subdirs (directory) - "Return list of DIRECTORY subdirectories." - (cl-remove-if (lambda (file) - (or (string-match-p (rx "/." string-end) file) - (string-match-p (rx "/.." string-end) file) - (not (file-directory-p file)))) - (directory-files directory 'full-name nil 'no-sort))) - -(defun guix-emacs-directories (&optional profile) - "Return the list of directories under PROFILE that contain Emacs packages. -This includes both `share/emacs/site-lisp/guix.d/PACKAGE' -sub-directories and `share/emacs/site-lisp' itself. - -If PROFILE is nil, use `guix-user-profile'. -Return nil, if Emacs packages are not installed in PROFILE." - (let ((root-dir (guix-emacs-directory (or profile guix-user-profile)))) - (when (file-directory-p root-dir) - (let* ((pkgs-dir (expand-file-name "guix.d" root-dir)) - (pkgs-dirs (when (file-directory-p pkgs-dir) - (guix-emacs-subdirs pkgs-dir)))) - (cons root-dir pkgs-dirs))))) + ;; `directory-files' doesn't honor group in regexp. + (mapcar #'file-name-sans-extension + (directory-files directory 'full-name guix-emacs-autoloads-regexp))) ;;;###autoload -(defun guix-emacs-autoload-packages (&rest profiles) - "Autoload Emacs packages installed in PROFILES. -If PROFILES are not specified, use a default user and system -profiles. +(defun guix-emacs-autoload-packages () + "Autoload Emacs packages found in EMACSLOADPATH. -'Autoload' means add directories with Emacs packages to -`load-path' and load 'autoloads' files matching +'Autoload' means to load the 'autoloads' files matching `guix-emacs-autoloads-regexp'." - (interactive (list (if (fboundp 'guix-read-package-profile) - (funcall 'guix-read-package-profile) - guix-user-profile))) - (let* ((env (getenv "GUIX_ENVIRONMENT")) - (profiles (or profiles - (append (list "/run/current-system/profile" - guix-user-profile) - (and env (list env)))))) - (dolist (profile profiles) - (let ((dirs (guix-emacs-directories profile))) - (when dirs - (let* ((autoloads (cl-mapcan #'guix-emacs-find-autoloads - dirs)) - (new-autoloads (cl-nset-difference autoloads - guix-emacs-autoloads - :test #'string=))) - (dolist (dir dirs) - (cl-pushnew (directory-file-name dir) - load-path - :test #'string=)) - (dolist (file new-autoloads) - (load file 'noerror)) - (setq guix-emacs-autoloads - (append new-autoloads guix-emacs-autoloads)))))))) + ;; FIXME: The autoloads generated by the emacs-build-system are not byte + ;; compiled. + (interactive) + (let* ((emacs-load-path (getenv "EMACSLOADPATH")) + (emacs-non-core-load-path-directories + ;; Filter out core Elisp directories, which are already autoloaded + ;; by Emacs. + (seq-filter (lambda (dir) + (string-match-p "/share/emacs/site-lisp" dir)) + (split-string emacs-load-path ":"))) + (autoloads (mapcan #'guix-emacs-find-autoloads + emacs-non-core-load-path-directories))) + (mapc (lambda (f) + (load f 'noerror)) + autoloads))) (provide 'guix-emacs) -- cgit 1.4.1 From 4de11dda72c4606fbf25be7bbde453d2a59bcf51 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 18 Nov 2019 08:51:47 +0100 Subject: gnu: emacs-ccls: Propagate ccls. * gnu/packages/emacs-xyz.scm (emacs-ccls)[propagated-inputs]: Add ccls. --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f733068758..347ef078fa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15823,7 +15823,8 @@ Pandoc, the document-conversion tool.") "1qgfxc5d1hb32ks1fxpx7agpw7dvnkz99wydlflc9fqq75g8v142")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-dash" ,emacs-dash) + `(("ccls" ,ccls) + ("emacs-dash" ,emacs-dash) ("emacs-projectile" ,emacs-projectile) ("emacs-lsp-mode" ,emacs-lsp-mode))) (home-page "https://github.com/MaskRay/emacs-ccls") -- cgit 1.4.1 From 5544f1e3ea9a98f7d277b7ac76734b84b03df7f6 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Sun, 17 Nov 2019 06:55:03 -0800 Subject: gnu: emacs-eshell-z: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-eshell-z): Update to 0.4. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 347ef078fa..4e68e9369b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14808,7 +14808,7 @@ appropriate directory if no @code{eshell} session is active.") (define-public emacs-eshell-z (package (name "emacs-eshell-z") - (version "0.3.2") + (version "0.4") (source (origin (method git-fetch) @@ -14818,7 +14818,7 @@ appropriate directory if no @code{eshell} session is active.") (file-name (git-file-name name version)) (sha256 (base32 - "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc")))) + "13dwaq8q23rwmrkpy3gvf7aswrkk6b9ak5221xl7n0bld4wdhq3j")))) (build-system emacs-build-system) (home-page "https://github.com/xuchunyang/eshell-z") (synopsis "Quick navigation to frequently visited directories") -- cgit 1.4.1 From 900ef20b1da66ad71145082c883dc12f31fafa54 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 17 Nov 2019 14:15:21 +0100 Subject: linux-boot: Don't ignore options when mounting root file system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/build/linux-boot.scm (mount-root-file-system): Add the 'options' keyword argument and use it when mounting the root file system. (boot-system): Pass the root file system options to 'mount-root-file-system'. Signed-off-by: Ludovic Courtès --- gnu/build/linux-boot.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index d902cc416f..950a3507f2 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -357,15 +358,16 @@ the last argument of `mknod'." (filter-map string->number (scandir "/proc"))))) (define* (mount-root-file-system root type - #:key volatile-root?) + #:key volatile-root? options) "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is true, mount ROOT read-only and make it an overlay with a writable tmpfs -using the kernel built-in overlayfs." +using the kernel built-in overlayfs. OPTIONS indicates the options to use +to mount ROOT." (if volatile-root? (begin (mkdir-p "/real-root") - (mount root "/real-root" type MS_RDONLY) + (mount root "/real-root" type MS_RDONLY options) (mkdir-p "/rw-root") (mount "none" "/rw-root" "tmpfs") @@ -382,7 +384,7 @@ using the kernel built-in overlayfs." "lowerdir=/real-root,upperdir=/rw-root/upper,workdir=/rw-root/work")) (begin (check-file-system root type) - (mount root "/root" type))) + (mount root "/root" type 0 options))) ;; Make sure /root/etc/mtab is a symlink to /proc/self/mounts. (false-if-exception @@ -472,6 +474,12 @@ upon error." mounts) "ext4")) + (define root-fs-options + (any (lambda (fs) + (and (root-mount-point? fs) + (file-system-options fs))) + mounts)) + (display "Welcome, this is GNU's early boot Guile.\n") (display "Use '--repl' for an initrd REPL.\n\n") @@ -524,7 +532,8 @@ upon error." (else (file-system-label root))))) (mount-root-file-system (canonicalize-device-spec root) root-fs-type - #:volatile-root? volatile-root?)) + #:volatile-root? volatile-root? + #:options root-fs-options)) (mount "none" "/root" "tmpfs")) ;; Mount the specified file systems. -- cgit 1.4.1 From e26867f74b629c4a981e45332ce94637cf4230eb Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 19 Nov 2019 00:07:40 +0300 Subject: gnu: tome4: Update to 1.6.1. * gnu/packages/games.scm (tome4): Update to 1.6.1. --- 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 be44151023..28314f519c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5136,7 +5136,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as (define-public tome4 (package (name "tome4") - (version "1.6.0") + (version "1.6.1") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source (origin @@ -5145,7 +5145,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as version ".tar.bz2")) (sha256 (base32 - "1z1w4ycgl5wbm0sv7577vcdfwwf4k7vaf2njzyb21rvqjizpbkwr")) + "0c5a2bdyfccwkqnb6yqvzggyi2nk032v01kfc00zlgpdfzljcb9i")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From b44357d02a995153ce8f021b2b67c9e430311620 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Nov 2019 12:07:32 +0900 Subject: gnu: emacs-forge: Fix build. This is a follow up commit to e1d31e6457. * gnu/packages/emacs-xyz.scm (emacs-forge): Fix build. --- gnu/packages/emacs-xyz.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4e68e9369b..23673036d5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17821,9 +17821,7 @@ a suffix) we prefer to call it just a \"transient\".") (lambda _ (substitute* "./Makefile" (("lisp docs") "lisp")))) - (add-after 'delete-doc-targets 'emacs-set-emacs-load-path - (assoc-ref emacs:%standard-phases 'set-emacs-load-path)) - (add-after 'emacs-set-emacs-load-path 'chdir-lisp + (add-after 'delete-doc-targets 'chdir-lisp (lambda _ (chdir "lisp"))) (add-after 'chdir-lisp 'emacs-install -- cgit 1.4.1 From c51d4c7746fe99e60b32d7e9ee0da2b847174253 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Nov 2019 12:37:17 +0900 Subject: gnu: emacs-pdf-tools: Fix build. This is a follow up commit to e1d31e6457. * gnu/packages/emacs-xyz.scm (emacs-pdf-tools): Fix build. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 23673036d5..451bb7850c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1974,8 +1974,8 @@ filters, new key bindings and faces. It can be enabled by ;; upgrading" that pdf-tools tries to perform. (emacs-substitute-variables "pdf-tools.el" ("pdf-tools-handle-upgrades" '())))) - (add-after 'emacs-patch-variables 'emacs-set-emacs-load-path - (assoc-ref emacs:%standard-phases 'set-emacs-load-path)) + (add-after 'emacs-patch-variables 'emacs-add-source-to-load-path + (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) (add-after 'emacs-set-emacs-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) (add-after 'emacs-install 'emacs-build -- cgit 1.4.1 From 1bb39982f185c54059e9d20f85b26691002c2578 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Nov 2019 12:44:00 +0900 Subject: gnu: emacs-realgud: Fix build. This is a follow up commit to e1d31e6457. * gnu/packages/emacs-xyz.scm (emacs-realgud): Fix build. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 451bb7850c..85797b2aa2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5225,7 +5225,7 @@ after buffer changes.") `(#:tests? #t #:phases (modify-phases %standard-phases - (add-after 'set-emacs-load-path 'fix-autogen-script + (add-after 'unpack 'fix-autogen-script (lambda _ (substitute* "autogen.sh" (("./configure") "sh configure")))) -- cgit 1.4.1 From 418febb54fb4857eeaaa759fb9804f7fe73a0d63 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Nov 2019 12:55:04 +0900 Subject: gnu: emacs-scel: Fix build. This is a follow up commit to e1d31e6457. * gnu/packages/emacs-xyz.scm (emacs-scel): Fix build. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 85797b2aa2..df5c3d5055 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4096,7 +4096,7 @@ to a key in your preferred mode.") ((assoc-ref cmake:%standard-phases 'configure) #:outputs outputs #:configure-flags '("-DSC_EL_BYTECOMPILE=OFF")))) - (add-after 'set-emacs-load-path 'add-el-dir-to-emacs-load-path + (add-after 'add-source-to-load-path 'add-el-dir-to-emacs-load-path (lambda _ (setenv "EMACSLOADPATH" (string-append (getcwd) "/el:" (getenv "EMACSLOADPATH"))) -- cgit 1.4.1 From ed94123667db1add7ce705b9aefa79d8c74cd73f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Nov 2019 12:55:40 +0900 Subject: gnu: emacs-pdf-tools: Adapt phase name. Follow up commit to c51d4c7746fe99e60b32d7e9ee0da2b847174253. * gnu/packages/emacs-xyz.scm (emacs-pdf-tools): Add the emacs-install phase after the emacs-add-source-to-load-path instead of after the emacs-set-emacs-load-path phase. Reported-by: Brett Gilio --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index df5c3d5055..e8f13a737a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1976,7 +1976,7 @@ filters, new key bindings and faces. It can be enabled by ("pdf-tools-handle-upgrades" '())))) (add-after 'emacs-patch-variables 'emacs-add-source-to-load-path (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) - (add-after 'emacs-set-emacs-load-path 'emacs-install + (add-after 'emacs-add-source-to-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) (add-after 'emacs-install 'emacs-build (assoc-ref emacs:%standard-phases 'build)) -- cgit 1.4.1 From ffb23165488c67d8034146ff8a10d86e238d60f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Nov 2019 13:07:06 +0900 Subject: gnu: emacs-erlang: Rename the set-emacs-load-path phase. This is a follow up commit to e1d31e6457. * gnu/packages/erlang.scm (emacs-erlang): Add the change-working-directory phase before the add-source-to-load-path phase instead of before the set-emacs-load-path phase. --- gnu/packages/erlang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 4fba7ee0c8..4e12bb4813 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -223,7 +223,7 @@ built-in support for concurrency, distribution and fault tolerance.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'set-emacs-load-path 'change-working-directory + (add-before 'add-source-to-load-path 'change-working-directory (lambda _ (chdir "lib/tools/emacs") #t))))) (home-page "https://www.erlang.org/") (synopsis "Erlang major mode for Emacs") -- cgit 1.4.1 From 63edbb65e4d16ebbd4c3977e93c3ebcbf0495c46 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Nov 2019 13:11:16 +0900 Subject: gnu: emacs-protobuf-mode: Rename the set-emacs-load-path phase. This is a follow up commit to e1d31e6457. * gnu/packages/protobuf.scm (emacs-protobuf-mode): Add the change-working-directory phase before the add-source-to-load-path phase instead of before the set-emacs-load-path phase. --- gnu/packages/protobuf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index d00057934d..5c22072132 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -246,7 +246,7 @@ mechanism for serializing structured data.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'set-emacs-load-path 'change-working-directory + (add-before 'add-source-to-load-path 'change-working-directory (lambda _ (chdir "editors") #t))))) (home-page "https://github.com/protocolbuffers/protobuf") (synopsis "Protocol buffers major mode for Emacs") -- cgit 1.4.1 From 10e73bbc5e2a3f62dc07c5c94309c5105c435dc6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 09:25:12 +0200 Subject: gnu: spice-gtk: Build with vala support. * gnu/packges/spice.scm (spice-gtk)[native-inputs]: Add vala. [arguments]: Add '--enable-vala' to configure-flags. --- gnu/packages/spice.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 4787f107f0..edc6135fbd 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -157,12 +157,14 @@ which allows users to view a desktop computing environment.") (native-inputs `(("glib:bin" ,glib "bin") ("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (arguments `(#:configure-flags '("--enable-gstaudio" "--enable-gstvideo" "--enable-pulse" + "--enable-vala" "--enable-introspection") #:phases (modify-phases %standard-phases -- cgit 1.4.1 From 8ec7ca22d363b80b173ce87c5f39d5ca9686d248 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 19 Nov 2019 10:28:22 +0100 Subject: gnu: hwloc: Default to 2.x. * gnu/packages/mpi.scm (hwloc): Rename to... (hwloc-1): ... this. (hwloc-2): Adjust 'inherit' clause accordingly. (hwloc): New variable. --- gnu/packages/mpi.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index f51e03a4d7..116fa1ebb0 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -52,7 +52,7 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match)) -(define-public hwloc +(define-public hwloc-1 ;; Note: For now we keep 1.x as the default because many packages have yet ;; to migrate to 2.0. (package @@ -134,7 +134,7 @@ bind processes, and much more.") (define-public hwloc-2 ;; Note: 2.0 isn't the default yet, see above. (package - (inherit hwloc) + (inherit hwloc-1) (version "2.1.0") (source (origin (method url-fetch) @@ -163,6 +163,10 @@ bind processes, and much more.") (define-deprecated hwloc-2.0 'hwloc-2 hwloc-2) +(define-public hwloc + ;; The latest stable series of hwloc. + hwloc-2) + (define-public openmpi (package (name "openmpi") -- cgit 1.4.1 From e30bb63c2905f5548a1c66d076ef7e18338d9bc8 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 19 Nov 2019 08:42:48 +0000 Subject: gnu: Add emacs-ample-theme. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-ample-theme): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e8f13a737a..39c366f0c7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1005,6 +1005,30 @@ skip set strings, which are arguments to @code{skip-chars-forward} and and reused.") (license license:gpl3+)))) +(define-public emacs-ample-theme + (let ((commit "536966adf882446165a1f756830028faa792c7a9") + (revision "1")) + (package + (name "emacs-ample-theme") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jordonbiondo/ample-theme") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07bpv8dag40qjnm5000pgzpazj4whfxf93x2vprz26sg3mjfx0nf")))) + (build-system emacs-build-system) + (home-page "https://github.com/jordonbiondo/ample-theme") + (synopsis "Theme for Emacs providing dark, light, and flat versions") + (description "Ample themes is a collection of three themes sharing a +similar pallet with a light, dark and flat versions with a focus on being easy +on the eyes during night and day. They only support GUI and 256 colour +terminals.") + (license license:gpl3+)))) + (define-public emacs-reformatter (package (name "emacs-reformatter") -- cgit 1.4.1 From 600f680dca7f1755d47df4394b794b4c7fee3aa5 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sun, 10 Nov 2019 01:25:28 +0000 Subject: gnu: Add font-dseg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-dseg): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/fonts.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index bb6dc45d94..83c97444bf 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Baptiste Strazzulla ;;; Copyright © 2019 Alva +;;; Copyright © 2019 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -1524,3 +1525,43 @@ Symbols stand out from common text. Dots and commas are easily seen, and operators are clear even when not surrounded by spaces. Similar characters have been designed to be very distinguishable from each other.") (license license:silofl1.1))) + +(define-public font-dseg + (package + (name "font-dseg") + (version "0.45") + (source + (origin + (method url-fetch/zipbomb) + (uri + (string-append "https://github.com/keshikan/DSEG/" + "releases/download/v" version + "/fonts-DSEG_v" + (string-concatenate (string-split version #\.)) + ".zip")) + (sha256 + (base32 + "0v8sghh4vl286faf8pvi74znz07pyf0qii8z4wjllisqwc35sx72")))) + (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (font-dir (string-append out "/share/fonts")) + (truetype-dir (string-append font-dir "/truetype"))) + (with-directory-excursion + (string-append "fonts-DSEG_v" + (apply string-append (string-split ,version + #\.))) + (for-each (lambda (f) (install-file f truetype-dir)) + (find-files "." "\\.ttf$")) + #t))))))) + (home-page "https://www.keshikan.net/fonts-e.html") + (synopsis "DSEG: 7-segment and 14-segment fonts") + (description + "DSEG is a font family that imitates seven- and fourteen-segment LCD +displays (7SEG, 14SEG). DSEG includes the roman alphabet and symbol glyphs. +This package provides the TrueType fonts.") + (license license:silofl1.1))) -- cgit 1.4.1 From 0d8a8234b5adbed898b37ea7187ab6ab505f83ee Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 19 Nov 2019 11:31:41 +0100 Subject: gnu: hwloc: Adjust references to 'hwloc'. This is a followup to 8ec7ca22d363b80b173ce87c5f39d5ca9686d248, which led to a stack overflow (cyclic graph) when attempting to build HWLOC-2. * gnu/packages/mpi.scm (hwloc-2): Refer to HWLOC-1 instead of HWLOC. --- gnu/packages/mpi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 116fa1ebb0..9f6597c6b3 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -146,9 +146,9 @@ bind processes, and much more.") "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr")))) ;; libnuma is no longer needed. - (inputs (alist-delete "numactl" (package-inputs hwloc))) + (inputs (alist-delete "numactl" (package-inputs hwloc-1))) (arguments - (substitute-keyword-arguments (package-arguments hwloc) + (substitute-keyword-arguments (package-arguments hwloc-1) ((#:phases phases) `(modify-phases ,phases (replace 'skip-linux-libnuma-test -- cgit 1.4.1 From 85cfb0e9e6ccd57715ca6e6bfadfd2b161c08e4d Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 19 Nov 2019 16:09:00 +0100 Subject: gnu: Add python-intelhex. * gnu/packages/python-xyz.scm (python-intelhex): New variable. --- gnu/packages/python-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5b8b33b87f..c3999d9cec 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -53,7 +53,7 @@ ;;; Copyright © 2016, 2018 Tomáš Čech ;;; Copyright © 2018, 2019 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian @@ -16887,3 +16887,27 @@ qvarious formats: PDF, PostScript, PNG and even SVG.") (description "Pyphen is a pure Python module to hyphenate text using existing Hunspell hyphenation dictionaries.") (license (list license:gpl2 license:lgpl2.1 license:mpl1.1)))) + +(define-public python-intelhex + (package + (name "python-intelhex") + (version "2.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "intelhex" version)) + (sha256 + (base32 + "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ;issue with version + (home-page "https://pypi.org/project/IntelHex/") + (synopsis "Python library for Intel HEX files manipulations") + (description "The Intel HEX file format is widely used in microprocessors +and microcontrollers area (embedded systems etc.) as the de facto standard for +representation of code to be programmed into microelectronic devices. This +package provides an intelhex Python library to read, write, create from +scratch and manipulate data from Intel HEX file format. It also includes +several convenience Python scripts, including \"classic\" hex2bin and bin2hex +converters and more, those based on the library itself.") + (license license:bsd-3))) -- cgit 1.4.1 From 1f15cbc80cfbea5561b79d251724f7c5b908cdd4 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 19 Nov 2019 16:09:13 +0100 Subject: gnu: Add python-mcuboot-imgtool. * gnu/packages/python-crypto.scm (python-mcuboot-imgtool): New variable. --- gnu/packages/python-crypto.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 11c23aebfc..2b1543bbc0 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2018 Nam Nguyen ;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -1090,3 +1091,41 @@ with state-tracking and configuration abstractions.") that leverages the infrastructure provided by the Linux kernel for safely storing and retrieving sensitive information in your programs.") (license license:asl2.0))) + +(define-public python-mcuboot-imgtool + (package + (name "python-mcuboot-imgtool") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuulLabs-OSS/mcuboot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m1csyvzq4jx81zg635ssy1n7sc0z539z0myh872ll3nwqx7wa0q")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-broken-test + (lambda _ + (substitute* "scripts/imgtool/keys/ed25519_test.py" + (("raw_sign") "sign_digest")) + #t)) + (add-before 'build 'change-directory + (lambda _ + (chdir "scripts") + #t))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-intelhex" ,python-intelhex) + ("python-cryptography" ,python-cryptography))) + (home-page "https://mcuboot.com") + (synopsis "Tool to securely sign firmware images for booting by MCUboot") + (description "MCUboot is a secure bootloader for 32-bit MCUs. This +package provides a tool to securely sign firmware images for booting by +MCUboot.") + (license license:expat))) -- cgit 1.4.1 From 5dea5cbc62547f50a793ce905cdd4d1a62be60e1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 19 Nov 2019 16:20:40 +0100 Subject: gnu: llvm: Change copyright holder. * gnu/packages/llvm.scm: Change David Truby to Arm Ltd as copyright holder as requested here: https://issues.guix.gnu.org/issue/32773#18. --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index a5170a4f10..863d43d7d6 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Rutger Helling -;;; Copyright © 2019 David Truby +;;; Copyright © 2019 Arm Ltd ;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. -- cgit 1.4.1 From 3b7828cc7f938fcb369976cbe75d9c85f22583a1 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Sat, 16 Nov 2019 16:18:43 +0100 Subject: gnu: Add minisat. * gnu/packages/patches/minisat-friend-declaration.patch: New file. * gnu/packages/patches/minisat-install.patch: New file. * gnu/local.mk (dist_patch_DATA): Add both files above. * gnu/packages/maths.scm (minisat): New exported variable. Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 2 ++ gnu/packages/maths.scm | 40 ++++++++++++++++++++++ .../patches/minisat-friend-declaration.patch | 25 ++++++++++++++ gnu/packages/patches/minisat-install.patch | 19 ++++++++++ 4 files changed, 86 insertions(+) create mode 100644 gnu/packages/patches/minisat-friend-declaration.patch create mode 100644 gnu/packages/patches/minisat-install.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8a52e98d3e..bb4dcbb17d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1131,6 +1131,8 @@ dist_patch_DATA = \ %D%/packages/patches/metabat-fix-compilation.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ + %D%/packages/patches/minisat-friend-declaration.patch \ + %D%/packages/patches/minisat-install.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/monero-use-system-miniupnpc.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 16a9d97a47..32608ea2ff 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2018 Amin Bandali ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang +;;; Copyright © 2019 Robert Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -5242,3 +5243,42 @@ fields of knowledge.") (home-page "http://speedcrunch.org/") (license license:gpl2+))) +(define-public minisat + ;; This is the last commit which is available upstream, no + ;; release happened since 2010. + (let ((commit "37dc6c67e2af26379d88ce349eb9c4c6160e8543") + (revision "1")) + (package + (name "minisat") + (version (string-append "2.2.0-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/niklasso/minisat.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "091hf3qkm197s5r7xcr3m07xsdwyz2rqk1hc9kj0hn13imz09irq")) + (patches + (search-patches "minisat-friend-declaration.patch" + "minisat-install.patch")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags (list (string-append "prefix=" %output)) + #:tests? #f ;no check target + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("zlib:static" ,zlib "static") + ("zlib" ,zlib))) + (synopsis + "Small, yet efficient, SAT solver") + (description + "MiniSat is a minimalistic, open-source SAT solver, developed to help +researchers and developers alike to get started on SAT.") + (home-page + "http://minisat.se/MiniSat.html") + (license license:expat)))) diff --git a/gnu/packages/patches/minisat-friend-declaration.patch b/gnu/packages/patches/minisat-friend-declaration.patch new file mode 100644 index 0000000000..14a886ae2f --- /dev/null +++ b/gnu/packages/patches/minisat-friend-declaration.patch @@ -0,0 +1,25 @@ +See https://groups.google.com/forum/#!topic/minisat/FCocZsC8oMQ +This seems to only be a problem with newer versions of g++, and +upstream development seems to have stopped in 2013. + +diff -rupN minisat-2.2.0/core/SolverTypes.h minisat-2.2.0.patched/core/SolverTypes.h +--- a/minisat/core/SolverTypes.h 2010-07-10 17:07:36.000000000 +0100 ++++ b/minisat/core/SolverTypes.h 2014-03-29 11:57:49.000000000 +0000 +@@ -47,7 +47,7 @@ struct Lit { + int x; + + // Use this as a constructor: +- friend Lit mkLit(Var var, bool sign = false); ++ //friend Lit mkLit(Var var, bool sign = false); + + bool operator == (Lit p) const { return x == p.x; } + bool operator != (Lit p) const { return x != p.x; } +@@ -55,7 +55,7 @@ struct Lit { + }; + + +-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } ++inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } + inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } + inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } + inline bool sign (Lit p) { return p.x & 1; } diff --git a/gnu/packages/patches/minisat-install.patch b/gnu/packages/patches/minisat-install.patch new file mode 100644 index 0000000000..23cde89bec --- /dev/null +++ b/gnu/packages/patches/minisat-install.patch @@ -0,0 +1,19 @@ +Avoid the default dynamic executable, which depends on minisat.so +Instead install the release version, which is statically linked. + +diff --git a/Makefile b/Makefile +index ceb9d77..7b91906 100644 +--- a/Makefile ++++ b/Makefile +@@ -191,9 +191,9 @@ install-lib: $(BUILD_DIR)/release/lib/$(MINISAT_SLIB) $(BUILD_DIR)/dynamic/lib/$ + ln -sf $(MINISAT_DLIB).$(SOMAJOR) $(DESTDIR)$(libdir)/$(MINISAT_DLIB) + $(INSTALL) -m 644 $(BUILD_DIR)/release/lib/$(MINISAT_SLIB) $(DESTDIR)$(libdir) + +-install-bin: $(BUILD_DIR)/dynamic/bin/$(MINISAT) ++install-bin: $(BUILD_DIR)/release/bin/$(MINISAT) + $(INSTALL) -d $(DESTDIR)$(bindir) +- $(INSTALL) -m 755 $(BUILD_DIR)/dynamic/bin/$(MINISAT) $(DESTDIR)$(bindir) ++ $(INSTALL) -m 755 $(BUILD_DIR)/release/bin/$(MINISAT) $(DESTDIR)$(bindir) + + clean: + rm -f $(foreach t, release debug profile dynamic, $(foreach o, $(SRCS:.cc=.o), $(BUILD_DIR)/$t/$o)) \ -- cgit 1.4.1 From af6a9fc27622ea8a342fe18c8604f2fe64a04e68 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Tue, 19 Nov 2019 09:50:51 +0100 Subject: gnu: Add python-3.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-3.8): New public variable. [source]: Add patches to skip four tests. * gnu/packages/patches/python-3.8-search-paths.patch: New file. * gnu/packages/patches/python-3.8-fix-tests.patch: New file. Signed-off-by: Marius Bakke --- gnu/packages/patches/python-3.8-fix-tests.patch | 42 ++++++++++++++++++++++ gnu/packages/patches/python-3.8-search-paths.patch | 17 +++++++++ gnu/packages/python.scm | 26 ++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 gnu/packages/patches/python-3.8-fix-tests.patch create mode 100644 gnu/packages/patches/python-3.8-search-paths.patch (limited to 'gnu') diff --git a/gnu/packages/patches/python-3.8-fix-tests.patch b/gnu/packages/patches/python-3.8-fix-tests.patch new file mode 100644 index 0000000000..4fbdd444c7 --- /dev/null +++ b/gnu/packages/patches/python-3.8-fix-tests.patch @@ -0,0 +1,42 @@ +diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py +index 1474624..887f8ee 100644 +--- a/Lib/test/_test_multiprocessing.py ++++ b/Lib/test/_test_multiprocessing.py +@@ -3801,6 +3801,7 @@ class _TestSharedMemory(BaseTestCase): + sms.close() + + @unittest.skipIf(os.name != "posix", "not feasible in non-posix platforms") ++ @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device") + def test_shared_memory_SharedMemoryServer_ignores_sigint(self): + # bpo-36368: protect SharedMemoryManager server process from + # KeyboardInterrupt signals. +diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py +index d41e94b..a1c15e7 100644 +--- a/Lib/test/test_signal.py ++++ b/Lib/test/test_signal.py +@@ -78,6 +78,7 @@ class PosixTests(unittest.TestCase): + self.assertLess(len(s), signal.NSIG) + + @unittest.skipUnless(sys.executable, "sys.executable required.") ++ @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device") + def test_keyboard_interrupt_exit_code(self): + """KeyboardInterrupt triggers exit via SIGINT.""" + process = subprocess.run( +@@ -128,6 +129,7 @@ class WindowsSignalTests(unittest.TestCase): + signal.signal(7, handler) + + @unittest.skipUnless(sys.executable, "sys.executable required.") ++ @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device") + def test_keyboard_interrupt_exit_code(self): + """KeyboardInterrupt triggers an exit using STATUS_CONTROL_C_EXIT.""" + # We don't test via os.kill(os.getpid(), signal.CTRL_C_EVENT) here +@@ -1245,6 +1247,7 @@ class StressTest(unittest.TestCase): + + class RaiseSignalTest(unittest.TestCase): + ++ @unittest.skipUnless(sys.stdin.isatty(), "KeyboardInterrupts require a TTY device") + def test_sigint(self): + with self.assertRaises(KeyboardInterrupt): + signal.raise_signal(signal.SIGINT) +-- +2.23.0 diff --git a/gnu/packages/patches/python-3.8-search-paths.patch b/gnu/packages/patches/python-3.8-search-paths.patch new file mode 100644 index 0000000000..88f19850bf --- /dev/null +++ b/gnu/packages/patches/python-3.8-search-paths.patch @@ -0,0 +1,17 @@ +diff --git a/setup.py b/setup.py +index 20d7f35..5751083 100644 +--- a/setup.py ++++ b/setup.py +@@ -676,8 +676,8 @@ class PyBuildExt(build_ext): + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. + if not CROSS_COMPILING: +- self.lib_dirs = self.compiler.library_dirs + system_lib_dirs +- self.inc_dirs = self.compiler.include_dirs + system_include_dirs ++ self.lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) ++ self.inc_dirs = os.getenv('CPATH', '').split(os.pathsep) + else: + # Add the sysroot paths. 'sysroot' is a compiler option used to + # set the logical path of the standard system headers and +-- +2.23.0 diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 644c9d7666..048941e8a9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian +;;; Copyright © 2019 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. ;;; @@ -408,6 +409,31 @@ data types.") (version-major+minor version) "/site-packages")))))))) +(define-public python-3.8 + (package + (inherit python-3.7) + (name "python-next") + (version "3.8.0") + (source + (origin + (inherit (package-source python-3.7)) + (uri (string-append "https://www.python.org/ftp/python/" + version "/Python-" version ".tar.xz")) + (sha256 (base32 "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk")) + (patches (search-patches + "python-3.8-search-paths.patch" + "python-3-fix-tests.patch" + "python-3.8-fix-tests.patch" + "python-3-deterministic-build-info.patch")) + (snippet + '(begin + ;; Delete the bundled copy of libexpat. + (delete-file-recursively "Modules/expat") + (substitute* "Modules/Setup" + ;; Link Expat instead of embedding the bundled one. + (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) + #t)))))) + ;; Current 3.x version. (define-public python-3 python-3.7) -- cgit 1.4.1 From 711e8bf75fdacc8218b3957bbd7cb367da6392b5 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 19 Nov 2019 10:44:15 +0100 Subject: gnu: brlaser: Update to 6. * gnu/packages/printers.scm (brlaser): Update to 6. Signed-off-by: Marius Bakke --- gnu/packages/printers.scm | 84 +++++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 35 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index 2d608bf3cb..7b2c2429dd 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -75,52 +75,66 @@ with Graphtec and Sihouette plotting cutters using an SVG file as its input.") (license license:gpl3+))) (define-public brlaser - (let ((commit "779f71e80fcc583f4537c844de141cf8e6a738fe") - (revision "1")) - (package - (name "brlaser") - (version (git-version "4" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pdewacht/brlaser.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0yrz9706660hdfi2y0ndp254r0vw9y665hwmxbbzfnz4ai13vj50")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - (list (string-append "-DCUPS_DATA_DIR=" - (assoc-ref %outputs "out") - "/share/cups") - (string-append "-DCUPS_SERVER_BIN=" - (assoc-ref %outputs "out") - "/lib/cups")))) - (inputs - `(("ghostscript" ,ghostscript) - ("cups" ,cups) - ("zlib" ,zlib))) - (home-page "https://github.com/pdewacht/brlaser") - (synopsis "Brother laser printer driver") - (description "Brlaser is a CUPS driver for Brother laser printers. This + (package + (name "brlaser") + (version "6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pdewacht/brlaser.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1995s69ksq1fz0vb34v0ndiqncrinbrlpmp70rkl6az7kag99s80")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list (string-append "-DCUPS_DATA_DIR=" + (assoc-ref %outputs "out") + "/share/cups") + (string-append "-DCUPS_SERVER_BIN=" + (assoc-ref %outputs "out") + "/lib/cups")))) + (inputs + `(("ghostscript" ,ghostscript) + ("cups" ,cups) + ("zlib" ,zlib))) + (home-page "https://github.com/pdewacht/brlaser") + (synopsis "Brother laser printer driver") + (description "Brlaser is a CUPS driver for Brother laser printers. This driver is known to work with these printers: @enumerate -@item Brother DCP-1510 +@item Brother DCP-1510 series +@item Brother DCP-1600 series @item Brother DCP-7030 @item Brother DCP-7040 @item Brother DCP-7055 @item Brother DCP-7055W +@item Brother DCP-7060D @item Brother DCP-7065DN @item Brother DCP-7080 +@item Brother DCP-L2500D series +@item Brother DCP-L2520D series +@item Brother DCP-L2540DW series +@item Brother HL-1110 series @item Brother HL-1200 series +@item Brother HL-2030 series +@item Brother HL-2140 series +@item Brother HL-2220 series +@item Brother HL-2270DW series +@item Brother HL-5030 series +@item Brother HL-L2300D series @item Brother HL-L2320D series +@item Brother HL-L2340D series @item Brother HL-L2360D series +@item Brother MFC-1910W @item Brother MFC-7240 @item Brother MFC-7360N -@end enumerate - -It partially works with printers from the Brother HL-L2300D series.") - (license license:gpl2+)))) +@item Brother MFC-7365DN +@item Brother MFC-7840W +@item Brother MFC-L2710DW series +@item Lenovo M7605D +@end enumerate") + (license license:gpl2+))) -- cgit 1.4.1 From caa1f6a8ae6d60e2a79cd151e86fb1270893e670 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 8 Nov 2019 23:56:58 +0000 Subject: gnu: Add carla. * gnu/packages/audio.scm (carla): New variable. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d59b4eb87e..e10af39950 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3811,3 +3811,59 @@ therefore satisfying any requirements they may have to be self contained, as is the case with audio plugins.") (home-page "https://gitlab.com/geontime/redkite") (license license:gpl3+))) + +(define-public carla + (package + (name "carla") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/falkTX/Carla.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fqgncqlr86n38yy7pa118mswfacmfczj7w9xx6c6k0jav3wk29k")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no "check" target + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-CC-variable-and-show-features + (lambda _ + (setenv "CC" "gcc") + (invoke "make" "features"))) + (delete 'configure)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("ffmpeg" ,ffmpeg) + ("fluidsynth" ,fluidsynth) + ("file" ,file) + ("liblo" ,liblo) + ("libsndfile" ,libsndfile) + ("gtk+" ,gtk+) + ("python-pyliblo" ,python-pyliblo) + ("python-pyqt" ,python-pyqt) + ("python-rdflib" ,python-rdflib) + ;; python-pyqt shows the following error without python-wrapper: + ;; Error while finding module specification for 'PyQt5.uic.pyuic' + ;; (ModuleNotFoundError: No module named 'PyQt5') + ("python-wrapper" ,python-wrapper) + ("libx11" ,libx11) + ("qtbase" ,qtbase) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://kx.studio/Applications:Carla") + (synopsis "Audio plugin host") + (description "Carla is a modular audio plugin host, with features like +transport control, automation of parameters via MIDI CC and remote control +over OSC. Carla currently supports LADSPA (including LRDF), DSSI, LV2, VST2, +and VST3 plugin formats, plus SF2 and SFZ file support. It uses JACK as the +default and preferred audio driver but also supports native drivers like ALSA.") + (license license:gpl2+))) -- cgit 1.4.1 From 7afb97fdb5d92d30eebc9e9d6f18b83e98b5c813 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 17:12:54 +0200 Subject: gnu: cowsay: Don't use unstable tarball. * gnu/packages/games.scm (cowsay)[source]: Download using git-fetch. --- gnu/packages/games.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 28314f519c..893fb7eae4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -463,13 +463,14 @@ want what you have.") (name "cowsay") (version "3.04") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/tnalpgge/" - "rank-amateur-cowsay/archive/" - "cowsay-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tnalpgge/rank-amateur-cowsay.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "12w7apbf6a9qffk92r32b16w22na2fjcqbl32rn0n7zw5hrp3f6q")))) + "06455kq37hvq1xb7adyiwrx0djs50arsxvjgixyxks16lm1rlc7n")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 02191009a5e2070f1cb9c21f619ef782e18dfebd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 17:19:54 +0200 Subject: gnu: teensy-loader-cli: Don't use unstable tarball. * gnu/packages/flashing-tools.scm (teensy-loader-cli)[version]: Use git-version. [source]: Download using git-fetch. --- gnu/packages/flashing-tools.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 7d5c1cf723..51a0e0d9b9 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -211,14 +211,15 @@ firmware from it.") (let ((commit "f289b7a2e5627464044249f0e5742830e052e360")) (package (name "teensy-loader-cli") - (version (string-append "2.1-1." (string-take commit 7))) + (version (git-version "2.1" "1" commit)) (source (origin - (method url-fetch) - (uri (string-append "https://github.com/PaulStoffregen/" - "teensy_loader_cli/archive/" commit ".tar.gz")) - (sha256 (base32 "17wqc2q4fa473cy7f5m2yiyb9nq0qw7xal2kzrxzaikgm9rabsw8")) - (file-name (string-append "teensy-loader-cli-" version ".tar.gz" )) + (method git-fetch) + (uri (git-reference + (url "https://github.com/PaulStoffregen/teensy_loader_cli.git") + (commit commit))) + (sha256 (base32 "0sssim56pwsxp5cp5dlf6mi9h5fx2592m6j1g7abnm0s09b0lpdx")) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet `(begin -- cgit 1.4.1 From e9e836261167c375486bffce32a59bd06eeb3a0f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 17:24:18 +0200 Subject: gnu: heimdall: Don't use unstable tarball. * gnu/packages/flashing-tools.scm (heimdall)[source]: Download using git-fetch. [home-page]: Use https. --- gnu/packages/flashing-tools.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 51a0e0d9b9..7aa8c63183 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -295,13 +295,14 @@ RK3036, RK3066, RK312X, RK3168, RK3188, RK3288, RK3368.") (name "heimdall") (version "1.4.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Benjamin-Dobell/Heimdall" - "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Benjamin-Dobell/Heimdall.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1y7gwg3lipyp2zcysm2vid1qg5nwin9bxbvgzs28lz2rya4fz6sq")))) + "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz")))) (build-system cmake-build-system) (arguments `(#:build-type "Release" @@ -328,7 +329,7 @@ RK3036, RK3066, RK312X, RK3168, RK3188, RK3288, RK3368.") `(("libusb" ,libusb) ("qtbase" ,qtbase) ("zlib" ,zlib))) - (home-page "http://glassechidna.com.au/heimdall/") + (home-page "https://glassechidna.com.au/heimdall/") (synopsis "Flash firmware onto Samsung mobile devices") (description "@command{heimdall} is a tool suite used to flash firmware (aka ROMs) onto Samsung mobile devices. Heimdall connects to a mobile device over -- cgit 1.4.1 From 8d449c25b68faf5163efa2f438ee16ba9ab3d566 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 17:25:21 +0200 Subject: gnu: heimdall: Download from new upstream source. * gnu/packages/flashing-tools.scm (heimdall)[source]: Download from new upstream source. --- gnu/packages/flashing-tools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 7aa8c63183..60418d2783 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -297,7 +297,7 @@ RK3036, RK3066, RK312X, RK3168, RK3188, RK3288, RK3368.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Benjamin-Dobell/Heimdall.git") + (url "https://gitlab.com/BenjaminDobell/Heimdall.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 -- cgit 1.4.1 From db9b61bf611f58a2f700e14b519d3554326fbff2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 17:27:32 +0200 Subject: gnu: me-cleaner: Don't use unstable tarball. * gnu/packages/flashing-tools.scm (me-cleaner)[source]: Download using git-fetch. --- gnu/packages/flashing-tools.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 60418d2783..82a30f04ca 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -417,13 +417,14 @@ Management Engine (ME). You need to @code{sudo rmmod mei_me} and (name "me-cleaner") (version "1.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/corna/me_cleaner/" - "archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/corna/me_cleaner.git") + (commit (string-append "v" version)))) (sha256 (base32 - "0hdnay1ai0r6l69z63jkiz6yfwdsqc2mrfyj77hgadv7xxxqm6na")) - (file-name (string-append name "-" version ".tar.gz")))) + "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4")) + (file-name (git-file-name name version)))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From 1f4021b03aa569f3f8d04a78ba16a9244d15cd14 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 17:31:01 +0200 Subject: gnu: uefitool: Don't use unstable tarball. * gnu/packages/flashing-tools.scm (uefitool)[source]: Download using git-fetch. --- gnu/packages/flashing-tools.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 82a30f04ca..5c3c31348e 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -449,13 +449,14 @@ ME as far as possible (it only edits ME firmware image files).") (name "uefitool") (version "0.22.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/LongSoft/UEFITool/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/LongSoft/UEFITool.git") + (commit version))) (sha256 (base32 - "05jmhv7jpq08kqbd1477y1lgyjvcic3njrd0bmzdy7v7b7lnhl82")) - (file-name (string-append name "-" version ".tar.gz")))) + "13q1lw6k4spqw7a4w392vr9c76q1l75lm08plzvj04xhcb38sgv6")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 27a3c836e7848bba225c002525fc9b773ed4fef7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 19:10:38 +0200 Subject: gnu: uefitool: Update to 0.26.0. * gnu/packages/flashing-tools.scm (uefitool): Update to 0.26.0. --- gnu/packages/flashing-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 5c3c31348e..eb92ae40f5 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -447,7 +447,7 @@ ME as far as possible (it only edits ME firmware image files).") (define-public uefitool (package (name "uefitool") - (version "0.22.4") + (version "0.26.0") (source (origin (method git-fetch) (uri (git-reference @@ -455,7 +455,7 @@ ME as far as possible (it only edits ME firmware image files).") (commit version))) (sha256 (base32 - "13q1lw6k4spqw7a4w392vr9c76q1l75lm08plzvj04xhcb38sgv6")) + "1ka7i12swm9r5bmyz5vjr82abd2f3lj8p35f4208byalfbx51yq7")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From d71af69d1b02a304a8c5467bbd5a04e23e16fed0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 22:47:15 +0200 Subject: gnu: hoedown: Don't use unstable tarball. * gnu/packages/markup.scm (hoedown)[source]: Download using git-fetch. --- gnu/packages/markup.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 6f1f9f6f68..911d929e97 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015 David Thompson -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; @@ -40,13 +40,14 @@ (name "hoedown") (version "3.0.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/hoedown/hoedown/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/hoedown/hoedown.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0859dc2xjasd6kgkshi8mb20kbyw5sql1ln0hw3bfaf33qdh5dh1")))) + "1kr3hxjg2dgmwy9738qgj3sh3f5cygx0zxskkfhrg7x19bq9yd26")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) -- cgit 1.4.1 From 2c24b96b1013f4dddd97df68b4af8aa68181e8e8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 22:50:59 +0200 Subject: gnu: cmark: Don't use unstable tarball. * gnu/packages/markup.scm (cmark)[source]: Download using git-fetch. --- gnu/packages/markup.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 911d929e97..216f01456d 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -198,13 +198,14 @@ implementation. (name "cmark") (version "0.28.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jgm/cmark/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jgm/cmark.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1z71pacl3ni1286c206pl8lazbcd32ackivsg3zibdf1sf2qdjdc")))) + "1lal6n6q7l84njgdcq1xbfxan56qlvr8xaw9m2jbd0jk4y2wkczg")))) (build-system cmake-build-system) (arguments '(#:test-target "test")) -- cgit 1.4.1 From 8840971767b9cfa78e204a607addcff2292a5026 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 22:53:44 +0200 Subject: gnu: cmark: Update to 0.29.0. * gnu/packages/markup.scm (cmark): Update to 0.29.0. --- gnu/packages/markup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 216f01456d..c1fc71b0a2 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -196,7 +196,7 @@ implementation. (define-public cmark (package (name "cmark") - (version "0.28.3") + (version "0.29.0") (source (origin (method git-fetch) (uri (git-reference @@ -205,7 +205,7 @@ implementation. (file-name (git-file-name name version)) (sha256 (base32 - "1lal6n6q7l84njgdcq1xbfxan56qlvr8xaw9m2jbd0jk4y2wkczg")))) + "0r7jpqhgnssq444i8pwji2g36058vfzwkl70wbiwj13h4w5rfc8f")))) (build-system cmake-build-system) (arguments '(#:test-target "test")) -- cgit 1.4.1 From 6484b09141ee543174a7d11da23c43b58b3f3aaf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 23:01:09 +0200 Subject: gnu: laby: Don't use unstable tarball. * gnu/packages/games.scm (laby)[source]: Download using git-fetch. --- gnu/packages/games.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 893fb7eae4..efe8a6af0c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3788,13 +3788,14 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.") (name "laby") (version "0.6.4") (source - (origin (method url-fetch) - (uri (string-append - "https://github.com/sgimenez/laby/archive/" - "laby-" version ".tar.gz")) + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/sgimenez/laby.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0gyrfa95l1qka7gbjf7l6mk7mbfvph00l0c995ia272qdw7rjhyf")) + "12fq9hhrxpzgfinmj9ra9ckss9yficwdlrmgjvvsq7agvh3sgyl1")) (patches (search-patches "laby-make-install.patch")))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From 089c6b0096967ad698fcbb0c89ef9dac1e161a9f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Nov 2019 23:08:23 +0200 Subject: gnu: the-butterfly-effect: Don't use unstable tarball. * gnu/packages/games.scm (the-butterfly-effect)[source]: Download using git-fetch. --- gnu/packages/games.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index efe8a6af0c..e2507961bd 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5444,14 +5444,14 @@ making Yamagi Quake II one of the most solid Quake II implementations available. (version "0.9.3.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/the-butterfly-effect/tbe/archive/" - "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/the-butterfly-effect/tbe.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "18qkp7fgdvyl3haqqa693mgyic7afsznsxgz98z9wn4csaqxsnby")))) + "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 8c7453cee79186ee6df429149e2914b96e6d8a9e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 20 Nov 2019 10:06:06 +0200 Subject: gnu: Register python-3.8 patches. This is a follow-up to af6a9fc27622ea8a342fe18c8604f2fe64a04e68. * gnu/local.mk (dist_patch_DATA): Register python-3.8-search-paths.patch, python-3.8-fix-tests.patch. --- gnu/local.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index bb4dcbb17d..47618993bf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1267,6 +1267,8 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ + %D%/packages/patches/python-3.8-search-paths.patch \ + %D%/packages/patches/python-3.8-fix-tests.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ -- cgit 1.4.1 From 30ebff69a75fe90a1694ef35cf6e749ec376b67e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 20 Nov 2019 10:17:38 +0200 Subject: gnu: mcron: Update to 1.1.3. * gnu/packages/guile-xyz.scm (mcron): Update to 1.1.3. [arguments]: Add phase to allow building with guile-2.2. [native-inputs]: Remove autoconf, automake, help2man, texinfo. --- gnu/packages/guile-xyz.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 49ef5f2892..1e676566ac 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1921,17 +1921,22 @@ is no support for parsing block and inline level HTML.") (define-public mcron (package (name "mcron") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mcron/mcron-" version ".tar.gz")) (sha256 (base32 - "069m3ri7nc8lgy3h9ka7gj3v3anqj69x9jw4l3cfq65nqkxsch4g")))) + "00kv7fgllzjpis0g1m9csycp4f6l11774m09dqy255cvmim2g743")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-finding-guile + (lambda _ + (substitute* "configure" + (("2\\.0") "2.2 2.0")) + #t)) (add-before 'check 'adjust-tests (lambda _ (substitute* "tests/job-specifier.scm" @@ -1948,11 +1953,7 @@ is no support for parsing block and inline level HTML.") (("\\(test-equal \"next-year\"" all) (string-append "(test-skip 4)\n" all))) #t))))) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("help2man" ,help2man) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo) + (native-inputs `(("pkg-config" ,pkg-config) ("tzdata" ,tzdata-for-tests))) (inputs `(("guile" ,guile-2.2))) (home-page "https://www.gnu.org/software/mcron/") -- cgit 1.4.1 From 96d5a206074c126bc42e463d9b17d49dd2e49e7c Mon Sep 17 00:00:00 2001 From: David Truby Date: Tue, 19 Nov 2019 17:15:42 +0000 Subject: gnu: Add llvm-9, clang-9 and clang-toolchain-9. * gnu/packages/llvm.scm (llvm-9): New variable. (clang-runtime-9): New variable. (clang-9): New variable. (clang-toolchain-9): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/llvm.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 863d43d7d6..082e6e96ca 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -458,6 +458,31 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") (define-public clang-toolchain (make-clang-toolchain clang)) +(define-public llvm-9 + (package + (inherit llvm) + (version "9.0.0") + (source (origin + (method url-fetch) + (uri (string-append "https://llvm.org/releases/" + version "/llvm-" version ".src.tar.xz")) + (sha256 + (base32 + "117ymdz1by2nkfq1c2p9m4050dp848kbjbiv6nsfj8hzy9f5d86n")))) + (license license:asl2.0))) + +(define-public clang-runtime-9 + (clang-runtime-from-llvm + llvm-9 + "03ni43lbkp63lr3p6sc94dphqmvnz5av5mml0xmk930xvnbcvr2n")) + +(define-public clang-9 + (clang-from-llvm llvm-9 clang-runtime-9 + "0426ma80i41qsgzm1qdz81mjskck426diygxi2k5vji2gkpixa3v")) + +(define-public clang-toolchain-9 + (make-clang-toolchain clang-9)) + (define-public llvm-7 (package (inherit llvm) -- cgit 1.4.1 From 77ed06a8bf049827c45e6208475ac9527eb423ea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 16 Nov 2019 23:33:31 +0200 Subject: services: sysctl: Make service one-shot. * gnu/services/sysctl.scm (sysctl-shepherd-service): Adjust shepherd service to use the 'one-shot?' keyword. Remove 'stop' command. Remove 'respawn' option. --- gnu/services/sysctl.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/sysctl.scm b/gnu/services/sysctl.scm index 5e9e6f0661..eb7a61b2a9 100644 --- a/gnu/services/sysctl.scm +++ b/gnu/services/sysctl.scm @@ -59,8 +59,7 @@ (provision '(sysctl)) (start #~(lambda _ (zero? (system* #$sysctl "--load" #$sysctl.conf)))) - (stop #~(const #t)) - (respawn? #f)))))) + (one-shot? #t)))))) (define sysctl-service-type (service-type -- cgit 1.4.1 From 8a309c28c0649f33f5f2b4685b04adb6bf8bbe18 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Nov 2019 21:12:44 +0100 Subject: gnu: bind: Update to 9.14.8 [fixes CVE-2019-6477]. * gnu/packages/dns.scm (isc-bind): Update to 9.14.8. --- 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 8b3c180ebe..03777cd4d8 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -114,7 +114,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.14.7") + (version "9.14.8") (source (origin (method url-fetch) (uri (string-append @@ -122,7 +122,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.gz")) (sha256 (base32 - "07998nx0yv3xy8c62b1ira9qygsgvpljwcgb47ypzxq8b57gb86f")))) + "0xm0xrpgxq6gk6r6aa2w0lygnq02y1p614dmyjdmlsfnrrsslig5")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit 1.4.1 From 56dab1274e454b7fda89a6b373387975bb6f5fc3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Nov 2019 20:25:58 -0500 Subject: gnu: isc-dhcp: Update bundled BIND to 9.11.13 [fixes CVE-2019-6477]. * gnu/packages/admin.scm (isc-dhcp)[bind-patch-version]: Update to 13. [inputs]: Update hash of bind-source-tarball. --- 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 c4723c5a9d..761b26a8d6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -689,7 +689,7 @@ connection alive.") (define-public isc-dhcp (let* ((bind-major-version "9") (bind-minor-version "11") - (bind-patch-version "11") + (bind-patch-version "13") (bind-release-type "") ; for patch release, use "-P" (bind-release-version "") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version @@ -830,7 +830,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "0swavslyli3vcrkcm2ip11s6p58g3k7r4gjs2b899r25cqrk0lk1")))) + "0z8g81xinqx8j3y2fclxa31dq7zsi9cj9srmvd9agnpwzk4kqgzx")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. -- cgit 1.4.1 From 9ad4d9f8a234de06f63513b98221287d67825c42 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Nov 2019 20:38:36 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.155. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.155. (linux-libre-4.14-pristine-source): 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 a95280c011..1a2530bd52 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,10 +368,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.154") +(define-public linux-libre-4.14-version "4.14.155") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "00q662s8mgnzqfgk5gkzqfv9ws3vryf28blbq1zxcy4s6wj4mpl6"))) + (hash (base32 "10g4493ldc398qza304z5yz8qdp93w7a2bs5h5dwk0bbamwikmkp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From e9f755f0b860282d6c909d5981e79872d96d278b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Nov 2019 20:39:31 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.85. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.85. (linux-libre-4.19-pristine-source): 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 1a2530bd52..a778ca7384 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -360,10 +360,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.3))) -(define-public linux-libre-4.19-version "4.19.84") +(define-public linux-libre-4.19-version "4.19.85") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0q06mhz170x1lkx6c6qdh82rcnsj03q6f2m28aqhmc4wc694m2w6"))) + (hash (base32 "1dsgbys73jga5h0a9icgif6qbi31g84315zlcdid9bzf1abkbx3v"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 477246878b766edb30a780190b2cead0c4b29156 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Nov 2019 20:40:14 -0500 Subject: gnu: linux-libre: Update to 5.3.12. * gnu/packages/linux.scm (linux-libre-5.3-version): Update to 5.3.12. (linux-libre-5.3-pristine-source): 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 a778ca7384..8e094ad021 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,10 +352,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.3-version "5.3.11") +(define-public linux-libre-5.3-version "5.3.12") (define-public linux-libre-5.3-pristine-source (let ((version linux-libre-5.3-version) - (hash (base32 "1dxfh0l4inpjd17pyxfsskjsphs43r8lg6nhhr3y4whxdna5cwbf"))) + (hash (base32 "184pmjyqh4bkrc3vj65zn6xnljzv9d1x7c1z0hlgj6fakpwgdgsk"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.3))) -- cgit 1.4.1 From 064a967ba0480d35d706f96e8aa5bb86f0947b4d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 30 Oct 2019 22:22:30 -0400 Subject: gnu: Use GHC 8.6.5 as the main Haskell compiler. * gnu/package/haskell.scm (ghc-8): Change to 'ghc-8.6'. * guix/import/hackage.scm (ghc-standard-libraries): Add 'ghc-heap' and 'libiserv'. --- gnu/packages/haskell.scm | 2 +- guix/import/hackage.scm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d86daa52c5..8db650e6ae 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -604,7 +604,7 @@ interactive environment for the functional language Haskell.") (file-pattern ".*\\.conf\\.d$") (file-type 'directory)))))) -(define-public ghc-8 ghc-8.4) +(define-public ghc-8 ghc-8.6) (define-public ghc ghc-8) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 5fe3d85a7f..9cf07c9504 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -52,8 +52,8 @@ hackage-package?)) (define ghc-standard-libraries - ;; List of libraries distributed with ghc (8.4.3). - ;; Contents of ...-ghc-8.4.3/lib/ghc-8.4.3. + ;; List of libraries distributed with ghc (8.6.5). + ;; Contents of ...-ghc-8.6.5/lib/ghc-8.6.5. '("ghc" "cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but ;; hackage-name->package-name takes this into account. @@ -70,11 +70,13 @@ "ghc-boot" "ghc-boot-th" "ghc-compact" + "ghc-heap" "ghc-prim" "ghci" "haskeline" "hpc" "integer-gmp" + "libiserv" "mtl" "parsec" "pretty" -- cgit 1.4.1 From ff25ccf4294ba61a011ded6542cfb93f2c3301c6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:23:07 -0400 Subject: gnu: cabal-doctest: Update to 1.0.8. * gnu/packages/haskell-check.scm (cabal-doctest): Update to 1.0.8. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-check.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index e0951d489c..ac41fb7518 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -841,7 +841,7 @@ To get started quickly, see the examples: (define-public cabal-doctest (package (name "cabal-doctest") - (version "1.0.6") + (version "1.0.8") (source (origin (method url-fetch) @@ -850,11 +850,8 @@ To get started quickly, see the examples: version ".tar.gz")) (sha256 (base32 - "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny")))) + "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0")))) (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 1.4.1 From 6dcca515c942e20df41b8be9542cbae0414ae19e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:25:31 -0400 Subject: gnu: ghc-data-accessor: Update to 0.2.2.8. * gnu/packages/haskell-xyz.scm (ghc-data-accessor): Update to 0.2.2.8. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 37b9b262fc..59944002e5 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2289,7 +2289,7 @@ function performs the conversion you desire.") (define-public ghc-data-accessor (package (name "ghc-data-accessor") - (version "0.2.2.7") + (version "0.2.2.8") (source (origin (method url-fetch) @@ -2297,7 +2297,7 @@ function performs the conversion you desire.") "mirror://hackage/package/data-accessor/data-accessor-" version ".tar.gz")) (sha256 - (base32 "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l")))) + (base32 "1fq4gygxbz0bd0mzgvc1sl3m4gjnsv8nbgpnmdpa29zj5lb9agxc")))) (build-system haskell-build-system) (home-page "https://www.haskell.org/haskellwiki/Record_access") (synopsis -- cgit 1.4.1 From 13ac8a7faaaa8b58f1c22f4a733f9d616079f8e9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:31:21 -0400 Subject: gnu: ghc-bytestring-builder: Update to 0.10.8.2.0. * gnu/packages/haskell-xyz.scm (ghc-bytestring-builder): Update to 0.10.8.2.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 59944002e5..30d1bada08 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1012,7 +1012,7 @@ serialization code.") (define-public ghc-bytestring-builder (package (name "ghc-bytestring-builder") - (version "0.10.8.1.0") + (version "0.10.8.2.0") (source (origin (method url-fetch) @@ -1021,7 +1021,7 @@ serialization code.") "/bytestring-builder-" version ".tar.gz")) (sha256 (base32 - "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d")))) + "0grcrgwwwcvwrs9az7l4d3kf0lsqfa9qpmjzf6iyanvwn9nyzyi7")))) (build-system haskell-build-system) (arguments `(#:haddock? #f)) ; Package contains no documentation. (home-page "https://hackage.haskell.org/package/bytestring-builder") -- cgit 1.4.1 From 90e7b0e4c940236600ee66702a0567d01024ae5e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:38:48 -0400 Subject: gnu: ghc-happy: Update to 1.19.12. * gnu/packages/haskell-xyz.scm (ghc-happy): Update to 1.19.12. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 30d1bada08..de1a588d95 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4299,7 +4299,7 @@ computation library for Haskell.") (define-public ghc-happy (package (name "ghc-happy") - (version "1.19.9") + (version "1.19.12") (source (origin (method url-fetch) @@ -4309,7 +4309,7 @@ computation library for Haskell.") ".tar.gz")) (sha256 (base32 - "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y")))) + "03xlmq6qmdx4zvzw8bp33kd9g7yvcq5cz4wg50xilw812kj276pv")))) (build-system haskell-build-system) (arguments `(#:phases -- cgit 1.4.1 From b5920d5040d272d6bb925207fff002619ece7d1b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:40:49 -0400 Subject: gnu: ghc-file-embed: Update to 0.0.11. * gnu/packages/haskell-xyz.scm (ghc-file-embed): Update to 0.0.11. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index de1a588d95..9011da4fb7 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3469,7 +3469,7 @@ for generating graph-like data structures.") (define-public ghc-file-embed (package (name "ghc-file-embed") - (version "0.0.10.1") + (version "0.0.11") (source (origin (method url-fetch) @@ -3477,7 +3477,7 @@ for generating graph-like data structures.") "file-embed-" version ".tar.gz")) (sha256 (base32 - "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k")))) + "0l6dkwccbzzyx8rcav03lya2334dgi3vfwk96h7l93l0fc4x19gf")))) (build-system haskell-build-system) (home-page "https://github.com/snoyberg/file-embed") (synopsis "Use Template Haskell to embed file contents directly") -- cgit 1.4.1 From bc82e9f56fe7d2e54728abb5dd8d2c6061ae4d2f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:41:22 -0400 Subject: gnu: ghc-unix-compat: Update to 0.5.2. * gnu/packages/haskell-xyz.scm (ghc-unix-compat): Update to 0.5.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9011da4fb7..fe4bf14bd6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10792,7 +10792,7 @@ work, but is substantially simpler and faster.") (define-public ghc-unix-compat (package (name "ghc-unix-compat") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) @@ -10802,7 +10802,7 @@ work, but is substantially simpler and faster.") ".tar.gz")) (sha256 (base32 - "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3")))) + "1a8brv9fax76b1fymslzyghwa6ma8yijiyyhn12msl3i5x24x6k5")))) (build-system haskell-build-system) (home-page "https://github.com/jystic/unix-compat") -- cgit 1.4.1 From 1188eabb1548789ff5efcd4c176feef50f327813 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:41:36 -0400 Subject: gnu: ghc-th-abstraction: Update to 0.3.1.0. * gnu/packages/haskell-xyz.scm (ghc-th-abstraction): Update to 0.3.1.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fe4bf14bd6..2da10eb68e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10217,7 +10217,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") (define-public ghc-th-abstraction (package (name "ghc-th-abstraction") - (version "0.2.8.0") + (version "0.3.1.0") (source (origin (method url-fetch) @@ -10226,7 +10226,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") version ".tar.gz")) (sha256 (base32 - "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya")))) + "1f81w0gshvc816cf9qz0f19jsrzh6wpzmmy317xrgn63dv61p7jb")))) (build-system haskell-build-system) (home-page "https://github.com/glguy/th-abstraction") (synopsis "Nicer interface for reified information about data types") -- cgit 1.4.1 From 82478c586a79da4232263223ab416695ce68691d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:41:50 -0400 Subject: gnu: ghc-microlens: Update to 0.4.10. * gnu/packages/haskell-xyz.scm (ghc-microlens): Update to 0.4.10. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2da10eb68e..df5c2886b5 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6168,7 +6168,7 @@ efficient memo functions using tries.") (define-public ghc-microlens (package (name "ghc-microlens") - (version "0.4.9.1") + (version "0.4.10") (source (origin (method url-fetch) @@ -6177,7 +6177,7 @@ efficient memo functions using tries.") "microlens-" version ".tar.gz")) (sha256 (base32 - "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51")))) + "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw")))) (build-system haskell-build-system) (home-page "https://github.com/aelve/microlens") -- cgit 1.4.1 From 9822b9ca2aeb1cb7a280f8d078ce682589ac5414 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:46:18 -0400 Subject: gnu: ghc-polyparse: Update to 1.12.1. * gnu/packages/haskell-xyz.scm (ghc-polyparse): Update to 1.12.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index df5c2886b5..6593d2dd6c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7716,7 +7716,7 @@ functions for the ghc-persistent package.") (define-public ghc-polyparse (package (name "ghc-polyparse") - (version "1.12") + (version "1.12.1") (source (origin (method url-fetch) @@ -7726,7 +7726,7 @@ functions for the ghc-persistent package.") ".tar.gz")) (sha256 (base32 - "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m")))) + "19fs18g7fvfdkm9zy28cgighjcxfa6mcpqgyp6whmsjkb3h393fx")))) (build-system haskell-build-system) (home-page "http://code.haskell.org/~malcolm/polyparse/") -- cgit 1.4.1 From 2f17316097310b8e87b0d103caae59ef22215e61 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:49:26 -0400 Subject: gnu: ghc-parser-combinators: Update to 1.1.0. * gnu/packages/haskell-xyz.scm (ghc-parser-combinators): Update to 1.1.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 6593d2dd6c..4f936dffe6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7399,7 +7399,7 @@ building up, manipulating and serialising @code{Pandoc} structures.") (define-public ghc-parser-combinators (package (name "ghc-parser-combinators") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) @@ -7408,7 +7408,7 @@ building up, manipulating and serialising @code{Pandoc} structures.") version ".tar.gz")) (sha256 (base32 - "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75")))) + "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc")))) (build-system haskell-build-system) (home-page "https://github.com/mrkkrp/parser-combinators") (synopsis "Commonly useful parser combinators") -- cgit 1.4.1 From fe9b83a60277ed0eeaa800b826efba6ed157c5b5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:49:57 -0400 Subject: gnu: ghc-fmlist: Update to 0.9.3. * gnu/packages/haskell-xyz.scm (ghc-fmlist): Update to 0.9.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 4f936dffe6..1b550ac2ed 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3584,7 +3584,7 @@ arithmetic.") (define-public ghc-fmlist (package (name "ghc-fmlist") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) @@ -3594,7 +3594,7 @@ arithmetic.") version ".tar.gz")) (sha256 (base32 - "02868865hqm189h5wjd916abvqwkhbrx5b0119s1dwp70ifvbi4g")))) + "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf")))) (build-system haskell-build-system) (home-page "https://github.com/sjoerdvisscher/fmlist") (synopsis "FoldMap lists") -- cgit 1.4.1 From 2ae4261887917514bb4f0cc670d17a814e4ab9bd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:50:25 -0400 Subject: gnu: ghc-unliftio-core: Update to 0.1.2.0. * gnu/packages/haskell-xyz.scm (ghc-unliftio-core): Update to 0.1.2.0. [arguments]: Set Cabal file to r2. --- gnu/packages/haskell-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1b550ac2ed..0f4316dc7c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10871,7 +10871,7 @@ working with it.") (define-public ghc-unliftio-core (package (name "ghc-unliftio-core") - (version "0.1.1.0") + (version "0.1.2.0") (source (origin (method url-fetch) @@ -10880,11 +10880,11 @@ working with it.") "unliftio-core-" version ".tar.gz")) (sha256 (base32 - "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m")))) + "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4")))) (build-system haskell-build-system) (arguments `(#:cabal-revision - ("1" "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"))) + ("2" "0jqrjjbgicx48wzcjxs1xmih48ay79rhmrz6081dldlfxynli6vz"))) (home-page "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme") (synopsis "The MonadUnliftIO typeclass for unlifting monads to IO") -- cgit 1.4.1 From ec42ab7c448dc3c33c886b2e1fd9bc3af5b1c066 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:50:42 -0400 Subject: gnu: ghc-rfc5051: Update to 0.1.0.4. * gnu/packages/haskell-xyz.scm (ghc-rfc5051): Update to 0.1.0.4. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0f4316dc7c..73da9e178b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8544,7 +8544,7 @@ code where you can safely allocate resources.") (define-public ghc-rfc5051 (package (name "ghc-rfc5051") - (version "0.1.0.3") + (version "0.1.0.4") (source (origin (method url-fetch) @@ -8552,7 +8552,7 @@ code where you can safely allocate resources.") "rfc5051-" version ".tar.gz")) (sha256 (base32 - "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3")))) + "1lxkq414ni986ciml4gbvf463fn55z299knky7pq3ixb1qislpb1")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/rfc5051") (synopsis "Simple unicode collation as per RFC5051") -- cgit 1.4.1 From bc9d1af993dd6d3efc3fdf45d40193d0248af068 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 00:54:24 -0400 Subject: gnu: ghc-colour: Update to 2.3.5. * gnu/packages/haskell-xyz.scm (ghc-colour): Update to 2.3.5. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 73da9e178b..f7b86bb088 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1788,7 +1788,7 @@ nothing.") (define-public ghc-colour (package (name "ghc-colour") - (version "2.3.4") + (version "2.3.5") (source (origin (method url-fetch) @@ -1797,7 +1797,7 @@ nothing.") version ".tar.gz")) (sha256 (base32 - "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg")))) + "1rq4l46jx4lpdppy71wf7m1n7pw2jwy788rm35ycwzb1g4clg39v")))) (arguments ;; The tests for this package have the following dependency cycle: ;; ghc-test-framework -> ghc-ansi-terminal -> ghc-colour. -- cgit 1.4.1 From 544bb369f186eef48280c1aaa667c0d651163c1d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:17:19 -0400 Subject: gnu: ghc-silently: Update to 1.2.5.1. * gnu/packages/haskell-xyz.scm (ghc-silently): Update to 1.2.5.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f7b86bb088..59e4dd12ee 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9184,7 +9184,7 @@ spirit to POSIX shells. Shelly is originally forked from the Shellish package. (define-public ghc-silently (package (name "ghc-silently") - (version "1.2.5") + (version "1.2.5.1") (source (origin (method url-fetch) @@ -9194,7 +9194,7 @@ spirit to POSIX shells. Shelly is originally forked from the Shellish package. ".tar.gz")) (sha256 (base32 - "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf")))) + "1lgs1gsr5dp0x21diqn4l03fxgai2kgdmj85gqp0iz3zykvbmjbz")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ;; circular dependency with nanospec ;; (inputs -- cgit 1.4.1 From 9a8adeb1a6961b6d2895059091a46b4038cab83c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:17:49 -0400 Subject: gnu: ghc-paths: Update to 0.1.0.12. * gnu/packages/haskell-xyz.scm (ghc-paths): Update to 0.1.0.12. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 59e4dd12ee..93f53071d3 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7527,7 +7527,7 @@ files/directories, and more.") (define-public ghc-paths (package (name "ghc-paths") - (version "0.1.0.9") + (version "0.1.0.12") (outputs '("out" "doc")) (source (origin @@ -7538,7 +7538,7 @@ files/directories, and more.") ".tar.gz")) (sha256 (base32 - "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg")))) + "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf")))) (build-system haskell-build-system) (home-page "https://github.com/simonmar/ghc-paths") (synopsis -- cgit 1.4.1 From 6b7b89db52236d1508bc959b14ccbee56e12c8ce Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:18:46 -0400 Subject: gnu: ghc-mime-types: Update to 0.1.0.9. * gnu/packages/haskell-web.scm (ghc-mime-types): Update to 0.1.0.9. --- 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 6f1c460eaa..15f000f489 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -699,7 +699,7 @@ Haskell.") (define-public ghc-mime-types (package (name "ghc-mime-types") - (version "0.1.0.8") + (version "0.1.0.9") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -707,7 +707,7 @@ Haskell.") version ".tar.gz")) (sha256 (base32 - "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8")))) + "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha")))) (build-system haskell-build-system) (home-page "https://github.com/yesodweb/wai") (synopsis "Basic MIME type handling types and functions") -- cgit 1.4.1 From 1c9c4d587c117d591a274bb93d762bc5958621a7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:18:58 -0400 Subject: gnu: ghc-transformers-compat: Update to 0.6.5. * gnu/packages/haskell-xyz.scm (ghc-transformers-compat): Update to 0.6.5. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 93f53071d3..aabb5f834f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10498,7 +10498,7 @@ compatibility to run on old versions of the platform.") (define-public ghc-transformers-compat (package (name "ghc-transformers-compat") - (version "0.6.2") + (version "0.6.5") (source (origin (method url-fetch) @@ -10507,7 +10507,7 @@ compatibility to run on old versions of the platform.") "/transformers-compat-" version ".tar.gz")) (sha256 (base32 - "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw")))) + "02v2fjbvcrlpvhcsssap8dy8y9pp95jykrlc5arm39sxa48wyrys")))) (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 1.4.1 From a3748d44c80371c09d7268ad6a4a00fa1184d26c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:19:20 -0400 Subject: gnu: ghc-entropy: Update to 0.4.1.5. * gnu/packages/haskell-crypto.scm (ghc-entropy): Update to 0.4.1.5. --- 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 882773ab68..d6ccabba63 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -358,7 +358,7 @@ are implemented as FFI bindings to efficient code from zlib.") (define-public ghc-entropy (package (name "ghc-entropy") - (version "0.4.1.4") + (version "0.4.1.5") (source (origin (method url-fetch) @@ -366,7 +366,7 @@ are implemented as FFI bindings to efficient code from zlib.") "entropy-" version "/" "entropy-" version ".tar.gz")) (sha256 - (base32 "1fgf47l9klwn1xssbcbq6by651vikd8hlfxhiwd5bqzxr1jnlgrf")))) + (base32 "0szf8hi1pi8g0kxnkcymh65gk1b0niyl1nnkckzdqyar87qal0jm")))) (build-system haskell-build-system) (home-page "https://github.com/TomMD/entropy") (synopsis "Provides platform independent entropy source for Haskell") -- cgit 1.4.1 From 4d6fddc3f5177d10763e52b332e486b5d60fe29f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:21:15 -0400 Subject: gnu: ghc-string-qq: Update to 0.0.4. * gnu/packages/haskell-xyz.scm (ghc-string-qq): Update to 0.0.4. [native-inputs]: Add 'ghc-hunit'. --- gnu/packages/haskell-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index aabb5f834f..127058e00a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9746,7 +9746,7 @@ literals.") (define-public ghc-string-qq (package (name "ghc-string-qq") - (version "0.0.2") + (version "0.0.4") (source (origin (method url-fetch) @@ -9756,8 +9756,10 @@ literals.") ".tar.gz")) (sha256 (base32 - "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp")))) + "0wfxkw4x6j6jq9nd82k83g2k3hskpsvk1dp4cpkshvjr4wg9qny8")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) (home-page "http://hackage.haskell.org/package/string-qq") (synopsis "QuasiQuoter for non-interpolated strings, texts and bytestrings.") -- cgit 1.4.1 From f8cfee0632b0bea758fa262d2e4c0d1613058614 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:21:38 -0400 Subject: gnu: ghc-hxt-charproperties: Update to 9.4.0.0. * gnu/packages/haskell-web.scm (ghc-hxt-charproperties): Update to 9.4.0.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 15f000f489..a84f965a58 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1198,7 +1198,7 @@ whereas most of the core code lives in @code{ghc-yesod-core}.") (define-public ghc-hxt-charproperties (package (name "ghc-hxt-charproperties") - (version "9.2.0.1") + (version "9.4.0.0") (source (origin (method url-fetch) @@ -1207,7 +1207,7 @@ whereas most of the core code lives in @code{ghc-yesod-core}.") version ".tar.gz")) (sha256 (base32 - "1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4")))) + "1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm")))) (build-system haskell-build-system) (home-page "https://github.com/UweSchmidt/hxt") (synopsis "Character properties and classes for XML and Unicode") -- cgit 1.4.1 From 1159d1a52696b9336bdbf7b23fbea1dc429d3e41 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:22:21 -0400 Subject: gnu: ghc-appar: Update to 0.1.8. * gnu/packages/haskell-xyz.scm (ghc-appar): Update to 0.1.8. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 127058e00a..6e7e81d2a9 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -336,7 +336,7 @@ colored output using the ansi-terminal package.") (define-public ghc-appar (package (name "ghc-appar") - (version "0.1.4") + (version "0.1.8") (source (origin (method url-fetch) @@ -346,7 +346,7 @@ colored output using the ansi-terminal package.") ".tar.gz")) (sha256 (base32 - "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq")))) + "07v3h766q9mnhphsm53718h1lds147ix7dj15kc5hnsj4vffvkn4")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/appar") -- cgit 1.4.1 From 9d7cfc9ba9f6e48a0217db64d838312493909653 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:22:38 -0400 Subject: gnu: ghc-setlocale: Update to 1.0.0.9. * gnu/packages/haskell-xyz.scm (ghc-setlocale): Update to 1.0.0.9. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 6e7e81d2a9..b16d82284e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9098,7 +9098,7 @@ environment variables.") (define-public ghc-setlocale (package (name "ghc-setlocale") - (version "1.0.0.8") + (version "1.0.0.9") (source (origin (method url-fetch) (uri (string-append @@ -9106,7 +9106,7 @@ environment variables.") version "/setlocale-" version ".tar.gz")) (sha256 (base32 - "0sdrsmkhw08483d73ysgm2926fdbhii61br03lqpqw0lfzj4ilbd")))) + "18b6xafspzxrmz5m9r9nzy3z053crqi59xc8n8aqd4gw0pvqdcrv")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/setlocale") (synopsis "Haskell bindings to setlocale") -- cgit 1.4.1 From 8b56c1fd68e59e05b6818857651fe468e6a39f3f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:24:57 -0400 Subject: gnu: ghc-basement: Update to 0.0.11. * gnu/packages/haskell-xyz.scm (ghc-basement): Update to 0.0.11. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b16d82284e..b847f79251 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -665,7 +665,7 @@ pragmas in your code.") (define-public ghc-basement (package (name "ghc-basement") - (version "0.0.8") + (version "0.0.11") (source (origin (method url-fetch) @@ -673,7 +673,7 @@ pragmas in your code.") "basement/basement-" version ".tar.gz")) (sha256 (base32 - "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67")))) + "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37")))) (build-system haskell-build-system) (home-page "https://github.com/haskell-foundation/foundation") (synopsis "Basic primitives for Foundation starter pack") -- cgit 1.4.1 From 19419709769cc921e14b452226b59f698b2280ea Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:25:22 -0400 Subject: gnu: ghc-statevar: Update to 1.2. * gnu/packages/haskell-xyz.scm (ghc-statevar): Update to 1.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b847f79251..e155c54c76 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9393,7 +9393,7 @@ mainstream languages.") (define-public ghc-statevar (package (name "ghc-statevar") - (version "1.1.1.1") + (version "1.2") (source (origin (method url-fetch) @@ -9403,7 +9403,7 @@ mainstream languages.") ".tar.gz")) (sha256 (base32 - "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b")))) + "12sz6zkc9j5z3lwrjvljrkfxa5vhwnir5wsarigz2f6d3w13dh5g")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/StateVar") (synopsis "State variables for Haskell") -- cgit 1.4.1 From f6bb651995c112de1ac0f72a577a67c45f809ee6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:26:11 -0400 Subject: gnu: ghc-code-page: Update to 0.2. * gnu/packages/haskell-xyz.scm (ghc-code-page): Update to 0.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e155c54c76..c8d34c4d9f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1767,7 +1767,7 @@ of the C library.") (define-public ghc-code-page (package (name "ghc-code-page") - (version "0.1.3") + (version "0.2") (source (origin (method url-fetch) @@ -1776,7 +1776,7 @@ of the C library.") version ".tar.gz")) (sha256 (base32 - "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76")))) + "0i0qbrbhvrwkbikqb7hh7yxaipaavwzvyrw211d0vkz99f62mqxz")))) (build-system haskell-build-system) (home-page "https://github.com/RyanGlScott/code-page") (synopsis "Windows code page library for Haskell") -- cgit 1.4.1 From 099dda5b558b213a7a592e8556b42c2a1cc92e36 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:27:22 -0400 Subject: gnu: ghc-fixed: Update to 0.3. * gnu/packages/haskell-xyz.scm (ghc-fixed): Update to 0.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c8d34c4d9f..019eaf8211 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3564,7 +3564,7 @@ simple general-purpose data structure\".") (define-public ghc-fixed (package (name "ghc-fixed") - (version "0.2.1.1") + (version "0.3") (source (origin (method url-fetch) @@ -3572,7 +3572,7 @@ simple general-purpose data structure\".") version ".tar.gz")) (sha256 (base32 - "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94")))) + "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j")))) (build-system haskell-build-system) (home-page "https://github.com/ekmett/fixed") (synopsis "Signed 15.16 precision fixed point arithmetic") -- cgit 1.4.1 From bd76b20a331833ccebc811530d1e1090536a0e1d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:27:42 -0400 Subject: gnu: ghc-th-lift: Update to 0.8.0.1. * gnu/packages/haskell-xyz.scm (ghc-th-lift): Update to 0.8.0.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 019eaf8211..a15c283151 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10264,14 +10264,14 @@ Template Haskell.") (define-public ghc-th-lift (package (name "ghc-th-lift") - (version "0.7.11") + (version "0.8.0.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "th-lift/th-lift-" version ".tar.gz")) (sha256 (base32 - "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m")))) + "1a6qlbdg15cfr5rvl9g3blgwx4v1p0xic0pzv13zx165xbc36ld0")))) (build-system haskell-build-system) (inputs `(("ghc-th-abstraction" ,ghc-th-abstraction))) -- cgit 1.4.1 From ce684db049b24d661f375aa045c19fc06dc1c172 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:28:06 -0400 Subject: gnu: ghc-regex-tdfa: Update to 1.2.3.2. * gnu/packages/haskell-xyz.scm (ghc-regex-tdfa): Update to 1.2.3.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a15c283151..bb23a0ff64 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8390,7 +8390,7 @@ Haskell library @code{regex-base}.") (define-public ghc-regex-tdfa (package (name "ghc-regex-tdfa") - (version "1.2.3.1") + (version "1.2.3.2") (source (origin (method url-fetch) @@ -8399,7 +8399,7 @@ Haskell library @code{regex-base}.") version ".tar.gz")) (sha256 (base32 - "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala")))) + "03yhpqrqz977nwlnhnyz9dacnbzw8xb6j18h365rkgmbc05sb3hf")))) (build-system haskell-build-system) (inputs `(("ghc-regex-base" ,ghc-regex-base))) -- cgit 1.4.1 From 7683a084bc3aefd8309913ef037cd1a3545baa62 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:28:25 -0400 Subject: gnu: ghc-pretty-show: Update to 1.9.5. * gnu/packages/haskell-xyz.scm (ghc-pretty-show): Update to 1.9.5. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index bb23a0ff64..7380cdfab6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7829,7 +7829,7 @@ ByteStrings in the style of other common *nix hex dump tools.") (define-public ghc-pretty-show (package (name "ghc-pretty-show") - (version "1.7") + (version "1.9.5") (source (origin (method url-fetch) @@ -7837,7 +7837,7 @@ ByteStrings in the style of other common *nix hex dump tools.") "pretty-show-" version ".tar.gz")) (sha256 (base32 - "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq")))) + "0gs2pabi4qa4b0r5vffpf9b1cf5n9y2939a3lljjw7cmg6xvx5dh")))) (build-system haskell-build-system) (inputs `(("ghc-haskell-lexer" ,ghc-haskell-lexer) -- cgit 1.4.1 From 7ae528671749ab906b5531d1f7a6ca2c9199dc7a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:41:50 -0400 Subject: gnu: ghc-microlens-th: Update to 0.4.2.3. * gnu/packages/haskell-xyz.scm (ghc-microlens-th): Update to 0.4.2.3. [arguments]: Set Cabal file to r1. --- gnu/packages/haskell-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7380cdfab6..d7386f591e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6291,7 +6291,7 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (define-public ghc-microlens-th (package (name "ghc-microlens-th") - (version "0.4.2.2") + (version "0.4.2.3") (source (origin (method url-fetch) @@ -6300,8 +6300,11 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") "microlens-th-" version ".tar.gz")) (sha256 (base32 - "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05")))) + "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "167in7b1qhgrspx81bdm2jyg9qji66sk7id282c0s99kmp0d01n6"))) (inputs `(("ghc-microlens" ,ghc-microlens) ("ghc-th-abstraction" ,ghc-th-abstraction))) (home-page -- cgit 1.4.1 From e0389704a922ec5bcd8bdec6736b1f64e0ecd4bf Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:42:13 -0400 Subject: gnu: ghc-mmorph: Update to 1.1.3. * gnu/packages/haskell-xyz.scm (ghc-mmorph): Update to 1.1.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d7386f591e..b692da8e6e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6378,7 +6378,7 @@ do on-demand loading.") (define-public ghc-mmorph (package (name "ghc-mmorph") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) @@ -6388,7 +6388,7 @@ do on-demand loading.") ".tar.gz")) (sha256 (base32 - "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9")))) + "0rfsy9n9mlinpmqi2s17fhc67fzma2ig5fbmh6m5m830canzf8vr")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) -- cgit 1.4.1 From 0a702df90febab5ae19e6b35afdaae463a94f159 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:42:30 -0400 Subject: gnu: ghc-foundation: Update to 0.0.25. * gnu/packages/haskell-xyz.scm (ghc-foundation): Update to 0.0.25. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b692da8e6e..44edf2b95b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3641,7 +3641,7 @@ and are often as efficient as hand-written folds.") (define-public ghc-foundation (package (name "ghc-foundation") - (version "0.0.21") + (version "0.0.25") (source (origin (method url-fetch) @@ -3649,7 +3649,7 @@ and are often as efficient as hand-written folds.") "foundation/foundation-" version ".tar.gz")) (sha256 (base32 - "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf")))) + "0q6kx57ygmznlpf8n499hid4x6mj3180paijx0a8dgi9hh7man61")))) (build-system haskell-build-system) (inputs `(("ghc-basement" ,ghc-basement))) (home-page "https://github.com/haskell-foundation/foundation") -- cgit 1.4.1 From 081d85d6f426524b7df2659ea419e4bdf033e9a6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 23:55:03 -0400 Subject: gnu: Add ghc-sop-core. * gnu/packages/haskell-xyz.scm (ghc-sop-core): New variable. --- gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 44edf2b95b..57c1ce71ab 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9368,6 +9368,29 @@ automatically by SmallCheck.") "This library provides a SOCKS proxy (version 5) implementation.") (license license:bsd-3))) +(define-public ghc-sop-core + (package + (name "ghc-sop-core") + (version "0.4.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "sop-core/sop-core-" version ".tar.gz")) + (sha256 + (base32 + "07ci2mh8cbjvipb576rxsj3iyhkj5c5dnsns4xkdppp2p3pv10d3")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/sop-core") + (synopsis "True Sums of Products") + (description "This package provides an implementation of +@math{n}-ary sums and @math{n}-ary products. The module @code{Data.SOP} +is the main module of this library and contains more detailed +documentation. The main use case of this package is to serve as the +core of @url{https://hackage.haskell.org/package/generics-sop, +generics-sop}.") + (license license:bsd-3))) + (define-public ghc-split (package (name "ghc-split") -- cgit 1.4.1 From 3ed40e10c8a13edb1d89e5f08a4c5d63213f647d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:42:48 -0400 Subject: gnu: ghc-generics-sop: Update to 0.4.0.1. * gnu/packages/haskell-xyz.scm (ghc-generics-sop): Update to 0.4.0.1. [inputs]: Add 'ghc-sop-core'. --- gnu/packages/haskell-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 57c1ce71ab..5e1c3e3840 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3767,7 +3767,7 @@ deriving mechanism in Haskell to arbitrary classes.") (define-public ghc-generics-sop (package (name "ghc-generics-sop") - (version "0.3.2.0") + (version "0.4.0.1") (source (origin (method url-fetch) @@ -3776,9 +3776,11 @@ deriving mechanism in Haskell to arbitrary classes.") "generics-sop-" version ".tar.gz")) (sha256 (base32 - "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h")))) + "160knr2phnzh2gldfv954lz029jzc7y8kz5xpmbf4z3vb5ngm6fw")))) (build-system haskell-build-system) - (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) + (inputs + `(("ghc-sop-core" ,ghc-sop-core) + ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/well-typed/generics-sop") (synopsis "Generic Programming using True Sums of Products for Haskell") (description "This Haskell package supports the definition of generic -- cgit 1.4.1 From f0f3756aeac46fe340f0036c7dea63ab0c60ddbc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:43:06 -0400 Subject: gnu: ghc-tagged: Update to 0.8.6. * gnu/packages/haskell-xyz.scm (ghc-tagged): Update to 0.8.6. [arguments]: Set Cabal file to r1. --- gnu/packages/haskell-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 5e1c3e3840..d4f47a0034 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10029,7 +10029,7 @@ increasing type safety.") (define-public ghc-tagged (package (name "ghc-tagged") - (version "0.8.5") + (version "0.8.6") (source (origin (method url-fetch) @@ -10039,11 +10039,11 @@ increasing type safety.") ".tar.gz")) (sha256 (base32 - "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74")))) + "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md")))) (build-system haskell-build-system) (arguments `(#:cabal-revision - ("2" "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5"))) + ("1" "070xwfw7y81hd63il76dmwbdl9ca1rd07c54zynfx6vpr4wyx4vh"))) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://hackage.haskell.org/package/tagged") -- cgit 1.4.1 From ee946143ebbe8164185172d42a1fcb56ae2b5275 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:44:58 -0400 Subject: gnu: ghc-regex-pcre-builtin: Update to 0.94.5.8.8.35. * gnu/packages/haskell-xyz.scm (ghc-regex-pcre-builtin): Update to 0.94.5.8.8.35. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d4f47a0034..8f54a465cc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8349,7 +8349,7 @@ this problem.") (define-public ghc-regex-pcre-builtin (package (name "ghc-regex-pcre-builtin") - (version "0.94.4.8.8.35") + (version "0.94.5.8.8.35") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -8357,7 +8357,7 @@ this problem.") version ".tar.gz")) (sha256 (base32 - "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b")))) + "1s755qdg1mxrf125sh83bsc5kjkrj8fkq8wf6dg1jan86c7p7gl4")))) (build-system haskell-build-system) (inputs `(("ghc-regex-base" ,ghc-regex-base))) -- cgit 1.4.1 From f1b4a73fdc1ee5947a673daede1652d0d7fa0ea9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:45:25 -0400 Subject: gnu: ghc-ansi-terminal: Update to 0.9.1. * gnu/packages/haskell-xyz.scm (ghc-ansi-terminal): Update to 0.9.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 8f54a465cc..db46c33505 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -289,7 +289,7 @@ a variety of ways.") (define-public ghc-ansi-terminal (package (name "ghc-ansi-terminal") - (version "0.8.0.4") + (version "0.9.1") (source (origin (method url-fetch) @@ -299,7 +299,7 @@ a variety of ways.") ".tar.gz")) (sha256 (base32 - "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b")))) + "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l")))) (build-system haskell-build-system) (inputs `(("ghc-colour" ,ghc-colour))) -- cgit 1.4.1 From 027beb557215fc2aa1160be0f51adfa47e5a4141 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:45:50 -0400 Subject: gnu: ghc-microlens-ghc: Update to 0.4.10. * gnu/packages/haskell-xyz.scm (ghc-microlens-ghc): Update to 0.4.10. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index db46c33505..87c3510774 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6195,7 +6195,7 @@ stripped. As the result, this package has no dependencies.") (define-public ghc-microlens-ghc (package (name "ghc-microlens-ghc") - (version "0.4.9.1") + (version "0.4.10") (source (origin (method url-fetch) @@ -6205,7 +6205,7 @@ stripped. As the result, this package has no dependencies.") ".tar.gz")) (sha256 (base32 - "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj")))) + "102dbrdsdadxbbhvx8avv1wbk84767a7lkb8ckp3zxk9g7qlly33")))) (build-system haskell-build-system) (inputs `(("ghc-microlens" ,ghc-microlens))) (home-page "https://github.com/monadfix/microlens") -- cgit 1.4.1 From 6bdd36c0e32aa08a773731672ee78c01027c2a8d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:48:10 -0400 Subject: gnu: ghc-cmark: Update to 0.6. * gnu/packages/haskell-xyz.scm (ghc-cmark): Update to 0.6. --- gnu/packages/haskell-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 87c3510774..89e4c07eff 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1695,16 +1695,16 @@ timer functions of different operating systems via a unified API.") (define-public ghc-cmark (package (name "ghc-cmark") - (version "0.5.6") + (version "0.6") (source (origin (method url-fetch) - ;; XXX As of version 0.5.6, this package bundles libcmark 0.28.0. + ;; XXX As of version 0.6, this package bundles libcmark 0.28.0. ;; See cbits/cmark_version.h. (uri (string-append "https://hackage.haskell.org/package/" "cmark/cmark-" version ".tar.gz")) (sha256 (base32 - "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45")))) + "1p41z6z8dqxk62287lvhhg4ayy9laai9ljh4azsnzb029v6mbv0d")))) (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit))) -- cgit 1.4.1 From fad9cff23f20418f9dfb18f0f3b6d55919fa9ddb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:48:29 -0400 Subject: gnu: ghc-unix-time: Update to 0.4.7. * gnu/packages/haskell-xyz.scm (ghc-unix-time): Update to 0.4.7. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 89e4c07eff..55f20fe777 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10846,7 +10846,7 @@ isn't available, portable implementations are used.") (define-public ghc-unix-time (package (name "ghc-unix-time") - (version "0.3.8") + (version "0.4.7") (source (origin (method url-fetch) @@ -10856,7 +10856,7 @@ isn't available, portable implementations are used.") ".tar.gz")) (sha256 (base32 - "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw")))) + "02fyh298lm8jsg52i3z0ikazwz477ljqjmhnqr2d88grmn5ky8qr")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Test fails with "System.Time not found". This -- cgit 1.4.1 From 24fc8daea3f3ee348b839cd7aa33767ae65613fd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:48:45 -0400 Subject: gnu: ghc-cmark-gfm: Update to 0.2.0. * gnu/packages/haskell-xyz.scm (ghc-cmark-gfm): Update to 0.2.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 55f20fe777..e0c8918080 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1720,7 +1720,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.5") + (version "0.2.0") (source (origin (method url-fetch) @@ -1729,7 +1729,7 @@ sources, and does not require prior installation of the C library.") version ".tar.gz")) (sha256 (base32 - "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7")))) + "03xflrkyw84qv3yjly5iks9311bqv5cmrmsylr763v4ph0fn7rjq")))) (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit))) -- cgit 1.4.1 From c38746eb7b7918e5c45deffc5fbf7c093403ae51 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:48:59 -0400 Subject: gnu: ghc-ansi-wl-pprint: Update to 0.6.9. * gnu/packages/haskell-xyz.scm (ghc-ansi-wl-pprint): Update to 0.6.9. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e0c8918080..f1e3081f92 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -313,7 +313,7 @@ cursor, and changing the title.") (define-public ghc-ansi-wl-pprint (package (name "ghc-ansi-wl-pprint") - (version "0.6.8.2") + (version "0.6.9") (source (origin (method url-fetch) @@ -322,7 +322,7 @@ cursor, and changing the title.") version ".tar.gz")) (sha256 (base32 - "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56")))) + "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7")))) (build-system haskell-build-system) (inputs `(("ghc-ansi-terminal" ,ghc-ansi-terminal))) -- cgit 1.4.1 From 49367c92a1bb29f76c7f1a4b2c1eee974c3f6a0f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 22:59:23 -0400 Subject: gnu: Add ghc-splitmix-bootstrap. * gnu/packages/haskell-xyz.scm (ghc-splitmix-bootstrap): New variable. --- gnu/packages/haskell-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f1e3081f92..e00883a7f2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9418,6 +9418,39 @@ splitting lists into parts, akin to the @code{split} function found in several mainstream languages.") (license license:bsd-3))) +(define-public ghc-splitmix-bootstrap + (package + (name "ghc-splitmix-bootstrap") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "splitmix/splitmix-" version ".tar.gz")) + (sha256 + (base32 + "1k0amgkz7rvyz3lnw7m786ilnr1cibwhx9sc4qynq329gxan5r7w")))) + (properties '((hidden? #t))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) + (inputs + `(("ghc-random" ,ghc-random))) + (home-page "http://hackage.haskell.org/package/splitmix") + (synopsis "Fast and splittable pseudorandom number generator") + (description "This package provides a Pure Haskell implementation of the +SplitMix pseudorandom number generator. SplitMix is a \"splittable\" +pseudorandom number generator that is quite fast: 9 64-bit +arithmetic/logical operations per 64 bits generated. SplitMix is tested +with two standard statistical test suites (DieHarder and TestU01, this +implementation only using the former) and it appears to be adequate for +\"everyday\" use, such as Monte Carlo algorithms and randomized data +structures where speed is important. In particular, it @strong{should not +be used for cryptographic or security applications}, because generated +sequences of pseudorandom values are too predictable (the mixing functions +are easily inverted, and two successive outputs suffice to reconstruct the +internal state).") + (license license:bsd-3))) + (define-public ghc-statevar (package (name "ghc-statevar") -- cgit 1.4.1 From 6cf0daa4c0b0bca355948c930e33eacfc6a1c727 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 22:57:33 -0400 Subject: gnu: ghc-primitive: Update Cabal file to r1. * gnu/packages/haskell-xyz.scm (ghc-primitive): Update Cabal file to r1. --- gnu/packages/haskell-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e00883a7f2..e6f7e97ff0 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7875,6 +7875,9 @@ examination.") (base32 "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "18a14k1yiam1m4l29rin9a0y53yp3nxvkz358nysld8aqwy2qsjv"))) (home-page "https://github.com/haskell/primitive") (synopsis "Primitive memory-related operations") -- cgit 1.4.1 From 178f69cb418c0684f986dac1e6126f6ff45d65c6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:52:05 -0400 Subject: gnu: ghc-quickcheck: Update to 2.13.2. * gnu/packages/haskell-check.scm (ghc-quickcheck): Update to 2.13.2. [inputs]: Add 'ghc-splitmix-bootstrap'. --- gnu/packages/haskell-check.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index ac41fb7518..d861e72687 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -397,7 +397,7 @@ use HUnit assertions as QuickCheck properties.") (define-public ghc-quickcheck (package (name "ghc-quickcheck") - (version "2.11.3") + (version "2.13.2") (outputs '("out" "doc")) (source (origin @@ -408,12 +408,13 @@ use HUnit assertions as QuickCheck properties.") ".tar.gz")) (sha256 (base32 - "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328")))) + "0426j43af8v3qmdjjqxivazsvr3a2brac8yw09vpgpjkb2m0nmkv")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (inputs `(("ghc-random" ,ghc-random) + ("ghc-splitmix" ,ghc-splitmix-bootstrap) ("ghc-tf-random" ,ghc-tf-random))) (home-page "https://github.com/nick8325/quickcheck") (synopsis "Automatic testing of Haskell programs") -- cgit 1.4.1 From 07d65eef0551113646e414041fb011a4c68e2952 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:53:48 -0400 Subject: gnu: ghc-syb: Update to 0.7.1. * gnu/packages/haskell-xyz.scm (ghc-syb): Update to 0.7.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e6f7e97ff0..a3a68582db 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9913,7 +9913,7 @@ default) (define-public ghc-syb (package (name "ghc-syb") - (version "0.7") + (version "0.7.1") (outputs '("out" "doc")) (source (origin @@ -9924,7 +9924,7 @@ default) ".tar.gz")) (sha256 (base32 - "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq")))) + "0077vxzyi9ppbphi2ialac3p376k49qly1kskdgf57wdwix9qjp0")))) (build-system haskell-build-system) (inputs `(("ghc-hunit" ,ghc-hunit))) -- cgit 1.4.1 From e4946e32b67e7c4a730eb81d8b294eed039b6c0c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:54:06 -0400 Subject: gnu: ghc-intervalmap: Update to 0.6.1.1. * gnu/packages/haskell-xyz.scm (ghc-intervalmap): Update to 0.6.1.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a3a68582db..13aa3a5959 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5261,7 +5261,7 @@ Haskell.") (define-public ghc-intervalmap (package (name "ghc-intervalmap") - (version "0.6.0.0") + (version "0.6.1.1") (source (origin (method url-fetch) @@ -5269,7 +5269,7 @@ Haskell.") "IntervalMap-" version ".tar.gz")) (sha256 (base32 - "06hin9wf1by8aqa7820fsi2339bh82184frkwz3jsb9sqa0hszcg")))) + "0vdlvxvhf7vjyv0mfn6jaj2i2gclqv8419ck32s2jxfcmki5m5g8")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) -- cgit 1.4.1 From 6eeee6ea25ce76ef607703906baf9f3fdea985d9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:54:21 -0400 Subject: gnu: ghc-tagsoup: Update to 0.14.8. * gnu/packages/haskell-web.scm (ghc-tagsoup): Update to 0.14.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 a84f965a58..2eedcf6a3b 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -39,7 +39,7 @@ (define-public ghc-tagsoup (package (name "ghc-tagsoup") - (version "0.14.6") + (version "0.14.8") (source (origin (method url-fetch) @@ -47,7 +47,7 @@ "tagsoup-" version ".tar.gz")) (sha256 (base32 - "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb")))) + "1m9sx6gr9y9yxvkmcap8xsks8cnhznvma1mrfl39zljkv005azms")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) -- cgit 1.4.1 From ebcb4f23f669be8b6a39636c1e7b703f85659b48 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:54:39 -0400 Subject: gnu: ghc-hs-bibutils: Update to 6.7.0.0. * gnu/packages/haskell-xyz.scm (ghc-hs-bibutils): Update to 6.7.0.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 13aa3a5959..83b34c7a35 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4918,7 +4918,7 @@ are described in a file named @code{package.yaml}. Both @code{cabal2nix} and (define-public ghc-hs-bibutils (package (name "ghc-hs-bibutils") - (version "6.6.0.0") + (version "6.7.0.0") (source (origin (method url-fetch) @@ -4927,7 +4927,7 @@ are described in a file named @code{package.yaml}. Both @code{cabal2nix} and version ".tar.gz")) (sha256 (base32 - "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l")))) + "1qfyssl76lm4g09yxr3y10kmf8cnzls46g5h0ijk0wpk9wlhbln5")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) (home-page "https://hackage.haskell.org/package/hs-bibutils") -- cgit 1.4.1 From 0ad3d574bdc16997b56e31dc9264460ae00f0400 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:54:56 -0400 Subject: gnu: ghc-json: Update to 0.9.3. * gnu/packages/haskell-xyz.scm (ghc-json): Update to 0.9.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 83b34c7a35..dbed3eecc5 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5441,7 +5441,7 @@ supported systems.") (define-public ghc-json (package (name "ghc-json") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) @@ -5449,7 +5449,7 @@ supported systems.") "json-" version ".tar.gz")) (sha256 (base32 - "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6")))) + "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) -- cgit 1.4.1 From 142415b0c788a72626d45865ea2de1c41bcea8da Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:31:32 -0400 Subject: gnu: ghc-pqueue: Update to 1.4.1.2. * gnu/packages/haskell-xyz.scm (ghc-pqueue): Update to 1.4.1.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index dbed3eecc5..83b5489e81 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7749,7 +7749,7 @@ Strings.") (define-public ghc-pqueue (package (name "ghc-pqueue") - (version "1.4.1.1") + (version "1.4.1.2") (source (origin (method url-fetch) @@ -7757,7 +7757,7 @@ Strings.") "pqueue/pqueue-" version ".tar.gz")) (sha256 (base32 - "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x")))) + "1v4zhv2sc1zsw91hvnarkjhayx2dnf7ccxz6rrhsqpcs0szaranj")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) -- cgit 1.4.1 From 197ddf33ac5ddfaff1111e9ee93f2e735fea4f86 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:55:11 -0400 Subject: gnu: ghc-dlist: Update to 0.8.0.7. * gnu/packages/haskell-xyz.scm (ghc-dlist): Update to 0.8.0.7. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 83b5489e81..9318b403d4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2654,7 +2654,7 @@ Dual to @code{Traversable}.") (define-public ghc-dlist (package (name "ghc-dlist") - (version "0.8.0.4") + (version "0.8.0.7") (source (origin (method url-fetch) @@ -2663,7 +2663,7 @@ Dual to @code{Traversable}.") version ".tar.gz")) (sha256 - (base32 "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc")))) + (base32 "0b5spkzvj2kx8pk86xz0djkxs13j7dryf5fl16dk4mlp1wh6mh53")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) -- cgit 1.4.1 From 8c766600bd47602dc0791a5805d9b3980970d949 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:55:25 -0400 Subject: gnu: ghc-th-expand-syns: Update to 0.4.5.0. * gnu/packages/haskell-xyz.scm (ghc-th-expand-syns): Update to 0.4.5.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9318b403d4..44a1abd05c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10306,7 +10306,7 @@ Template Haskell.") (define-public ghc-th-expand-syns (package (name "ghc-th-expand-syns") - (version "0.4.4.0") + (version "0.4.5.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -10314,7 +10314,7 @@ Template Haskell.") version ".tar.gz")) (sha256 (base32 - "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc")))) + "1p4wfyycan8zsp9wi7npx36qwbfsbcgdyxi3ii51scf69dkrx42y")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) -- cgit 1.4.1 From 74bf69651dcbc03db6173cf841fd38a8a7d331ec Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:58:24 -0400 Subject: gnu: ghc-optparse-applicative: Update to 0.14.3.0. * gnu/packages/haskell-xyz.scm (ghc-optparse-applicative): Update to 0.14.3.0. [arguments]: Set Cabal file to r2. --- gnu/packages/haskell-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 44a1abd05c..c98050be11 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7161,7 +7161,7 @@ easily work with command-line options.") (define-public ghc-optparse-applicative (package (name "ghc-optparse-applicative") - (version "0.14.2.0") + (version "0.14.3.0") (source (origin (method url-fetch) @@ -7170,8 +7170,11 @@ easily work with command-line options.") "/optparse-applicative-" version ".tar.gz")) (sha256 (base32 - "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71")))) + "0qvn1s7jwrabbpmqmh6d6iafln3v3h9ddmxj2y4m0njmzq166ivj")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1a08dqjly1xy730f6jf45frr8g8gap0n1vg9b0mpzpydv0kgzmrp"))) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint))) -- cgit 1.4.1 From 3ad67f6b3a84c9e02dc21bbf653b55160f40dade Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:58:45 -0400 Subject: gnu: ghc-vector: Update to 0.12.0.3. * gnu/packages/haskell-xyz.scm (ghc-vector): Update to 0.12.0.3. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c98050be11..ad0383c793 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11298,7 +11298,7 @@ representing a store for a single element.") (define-public ghc-vector (package (name "ghc-vector") - (version "0.12.0.1") + (version "0.12.0.3") (outputs '("out" "doc")) (source (origin @@ -11309,14 +11309,12 @@ representing a store for a single element.") ".tar.gz")) (sha256 (base32 - "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i")))) + "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq")))) (build-system haskell-build-system) ;; FIXME: To simplify upgrading all Haskell packages, we leave the tests ;; disabled for now. (arguments - `(#:cabal-revision - ("3" "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x") - #:tests? #f)) + `(#:tests? #f)) (inputs `(("ghc-primitive" ,ghc-primitive) ("ghc-random" ,ghc-random) -- cgit 1.4.1 From 32d4a6ae5531f952d9f139119f20c12997e75401 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:59:01 -0400 Subject: gnu: ghc-th-reify-many: Update to 0.1.9. * gnu/packages/haskell-xyz.scm (ghc-th-reify-many): Update to 0.1.9. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ad0383c793..bad70138cd 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10442,7 +10442,7 @@ package is similar to the @code{threadmanager}, @code{async} and (define-public ghc-th-reify-many (package (name "ghc-th-reify-many") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -10450,7 +10450,7 @@ package is similar to the @code{threadmanager}, @code{async} and version ".tar.gz")) (sha256 (base32 - "0hzy6hvhvcd6i60vx5cp2b7ggmnnjh9rx4h8bm8xw4grglcaxjnf")))) + "0hxf56filzqnyrc8q7766vai80y6cgrrbrczx6n93caskl1dv2gq")))) (build-system haskell-build-system) (inputs `(("ghc-safe" ,ghc-safe) -- cgit 1.4.1 From 4e1cf65115c9bfda397d59189d09a589739e8dfb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:59:14 -0400 Subject: gnu: ghc-language-c: Update to 0.8.3. * gnu/packages/haskell-xyz.scm (ghc-language-c): Update to 0.8.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index bad70138cd..a2c6f52d26 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5519,7 +5519,7 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") (define-public ghc-language-c (package (name "ghc-language-c") - (version "0.8.1") + (version "0.8.3") (source (origin (method url-fetch) @@ -5527,7 +5527,7 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") "language-c/language-c-" version ".tar.gz")) (sha256 (base32 - "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d")))) + "0bi02jdirkys8v7flf39vrpla2a74z1z0sdhy9lb9v7cmcc6rmpk")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb))) (native-inputs -- cgit 1.4.1 From d3db399e3ec504202b5297f8181c8572a063b921 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:59:32 -0400 Subject: gnu: ghc-th-lift-instances: Update to 0.1.14. * gnu/packages/haskell-xyz.scm (ghc-th-lift-instances): Update to 0.1.14. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a2c6f52d26..2f74043aed 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10352,7 +10352,7 @@ datatypes.") (define-public ghc-th-lift-instances (package (name "ghc-th-lift-instances") - (version "0.1.11") + (version "0.1.14") (source (origin (method url-fetch) @@ -10361,7 +10361,7 @@ datatypes.") version ".tar.gz")) (sha256 (base32 - "1f56cp6ckcalld5jchv0kxpjkwcsixd7smd0g7r8cg67ppx6m90x")))) + "0r1b4jnvcj64wp4hfccwkl4a70n1p1q7qzyx6ax7cmd8k961jz78")))) (build-system haskell-build-system) (inputs `(("ghc-th-lift" ,ghc-th-lift) -- cgit 1.4.1 From e71f316f7580d49a4f699934bc93c514ffd3ef2b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:59:47 -0400 Subject: gnu: ghc-vector-algorithms: Update to 0.8.0.1. * gnu/packages/haskell-xyz.scm (ghc-vector-algorithms): Update to 0.8.0.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2f74043aed..1dd25f2e5f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11334,7 +11334,7 @@ optimisation framework.") (define-public ghc-vector-algorithms (package (name "ghc-vector-algorithms") - (version "0.7.0.4") + (version "0.8.0.1") (source (origin (method url-fetch) @@ -11343,7 +11343,7 @@ optimisation framework.") "vector-algorithms-" version ".tar.gz")) (sha256 (base32 - "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg")))) + "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m")))) (build-system haskell-build-system) (inputs `(("ghc-vector" ,ghc-vector))) -- cgit 1.4.1 From 65a16a4500132c1bcf3de910cc2ebbb9ac748f27 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 22:52:43 -0400 Subject: gnu: ghc-hashable: Update Cabal file to r1. * gnu/packages/haskell-xyz.scm (ghc-hashable): Update Cabal file to r1. (ghc-hashable-bootstrap): Splice in arguments from 'ghc-hashable'. --- gnu/packages/haskell-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1dd25f2e5f..3bd6c140fe 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4346,6 +4346,9 @@ Happy works in a similar way to the yacc tool for C.") (base32 "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "197063dpl0wn67dp7a06yc2hxp81n24ykk7klbjx0fndm5n87dh3"))) (inputs `(("ghc-random" ,ghc-random))) (native-inputs @@ -4367,7 +4370,9 @@ combine hash values.") (package (inherit ghc-hashable) (name "ghc-hashable-bootstrap") - (arguments `(#:tests? #f)) + (arguments + `(#:tests? #f + ,@(package-arguments ghc-hashable))) (native-inputs '()) (properties '((hidden? #t))))) -- cgit 1.4.1 From d418ec06579092efaec05fb2a1c19d92386e2ae6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 23:03:41 -0400 Subject: gnu: ghc-test-framework: Update Cabal file to r5. * gnu/packages/haskell-check.scm (ghc-test-framework): Update Cabal file to r5, and remove a now unneeded 'update-constraints' phase. --- gnu/packages/haskell-check.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index d861e72687..6c9f5250ae 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -441,13 +441,8 @@ expressed in Haskell, using combinators defined in the QuickCheck library.") (build-system haskell-build-system) (arguments `(#: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"))))))) + #:cabal-revision + ("5" "18g92ajx3ghznd6k3ihj22ln29n676ailzwx3k0f1kj3bmpilnh6"))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck))) -- cgit 1.4.1 From fee444f56362299553a0bdbee596d9b3b8a1f449 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:00:01 -0400 Subject: gnu: ghc-test-framework-quickcheck2: Update to 0.3.0.5. * gnu/packages/haskell-check.scm (ghc-test-framework-quickcheck2): Update to 0.3.0.5. [arguments]: Update Cabal file hash. --- gnu/packages/haskell-check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 6c9f5250ae..c7f1afdbc4 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -496,7 +496,7 @@ reporting and test statistics output.") (define-public ghc-test-framework-quickcheck2 (package (name "ghc-test-framework-quickcheck2") - (version "0.3.0.4") + (version "0.3.0.5") (source (origin (method url-fetch) @@ -505,11 +505,11 @@ reporting and test statistics output.") "test-framework-quickcheck2-" version ".tar.gz")) (sha256 (base32 - "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp")))) + "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9")))) (build-system haskell-build-system) (arguments `(#:cabal-revision - ("1" "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff"))) + ("1" "1vmpk70h1594h9s216d3ngkb399fpny1d3sh4gg0vrc75p4as68d"))) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From bd95427ea0bf09e9b0a34839e2809fd161bd38bb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:01:11 -0400 Subject: gnu: ghc-cereal: Update to 0.5.8.1. * gnu/packages/haskell-xyz.scm (ghc-cereal): Update to 0.5.8.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3bd6c140fe..d970ab167c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1311,7 +1311,7 @@ the resulting type will be insensitive to cases.") (define-public ghc-cereal (package (name "ghc-cereal") - (version "0.5.7.0") + (version "0.5.8.1") (source (origin (method url-fetch) @@ -1321,7 +1321,7 @@ the resulting type will be insensitive to cases.") ".tar.gz")) (sha256 (base32 - "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs")))) + "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From 6c4581a370aede2595d81faa7e54ae85af1e7cbf Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:01:33 -0400 Subject: gnu: ghc-x11: Update to 1.9.1. * gnu/packages/haskell-xyz.scm (ghc-x11): Update to 1.9.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d970ab167c..c3db0edb91 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11669,14 +11669,14 @@ modernized interface.") (define-public ghc-x11 (package (name "ghc-x11") - (version "1.9") + (version "1.9.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/X11/" "X11-" version ".tar.gz")) (sha256 - (base32 "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh")))) + (base32 "0gg6852mrlgl8zng1j84fismz7k81jr5fk92glgkscf8q6ryg0bm")))) (build-system haskell-build-system) (inputs `(("libx11" ,libx11) -- cgit 1.4.1 From aac14fdc7006cd70dc455b92a75a0cd34ae6a752 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:01:50 -0400 Subject: gnu: ghc-fingertree: Update to 0.1.4.2. * gnu/packages/haskell-xyz.scm (ghc-fingertree): Update to 0.1.4.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c3db0edb91..f40644db3c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3535,7 +3535,7 @@ an executable.") (define-public ghc-fingertree (package (name "ghc-fingertree") - (version "0.1.4.1") + (version "0.1.4.2") (source (origin (method url-fetch) @@ -3544,7 +3544,7 @@ an executable.") version ".tar.gz")) (sha256 (base32 - "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p")))) + "0zvandj8fysck7ygpn0dw5bhrhmj1s63i326nalxbfkh2ls4iacm")))) (build-system haskell-build-system) (native-inputs `(("ghc-hunit" ,ghc-hunit) -- cgit 1.4.1 From 63056e6133fc3aff232f9d7243eee501134f8eb5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:03:20 -0400 Subject: gnu: ghc-vector-th-unbox: Update to 0.2.1.7. * gnu/packages/haskell-xyz.scm (ghc-vector-th-unbox): Update to 0.2.1.7. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f40644db3c..0de7f42524 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11429,7 +11429,7 @@ vector. ") (define-public ghc-vector-th-unbox (package (name "ghc-vector-th-unbox") - (version "0.2.1.6") + (version "0.2.1.7") (source (origin (method url-fetch) @@ -11438,7 +11438,7 @@ vector. ") "vector-th-unbox-" version ".tar.gz")) (sha256 (base32 - "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy")))) + "0q8dqnbv1c2gi7jjdhqj14abj1vik23ki6lq4iz2sz18yc7q69fi")))) (build-system haskell-build-system) (inputs `(("ghc-vector" ,ghc-vector) -- cgit 1.4.1 From 46d3e65b7962cb431892292c1cdcfab67f833013 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:03:42 -0400 Subject: gnu: ghc-exceptions: Update to 0.10.3. * gnu/packages/haskell-xyz.scm (ghc-exceptions): Update to 0.10.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0de7f42524..a33610272e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3211,7 +3211,7 @@ excluding @file{.lhs} files.") (define-public ghc-exceptions (package (name "ghc-exceptions") - (version "0.10.0") + (version "0.10.3") (source (origin (method url-fetch) @@ -3221,7 +3221,7 @@ excluding @file{.lhs} files.") ".tar.gz")) (sha256 (base32 - "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y")))) + "1w25j4ys5s6v239vbqlbipm9fdwxl1j2ap2lzms7f7rgnik5ir24")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From f5051e319b50c240f347390a3bc351d58561c166 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:03:55 -0400 Subject: gnu: ghc-hashable-time: Update to 0.2.0.2. * gnu/packages/haskell-xyz.scm (ghc-hashable-time): Update to 0.2.0.2. [arguments]: Set Cabal file to r2. --- gnu/packages/haskell-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a33610272e..e547e628ec 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4379,7 +4379,7 @@ combine hash values.") (define-public ghc-hashable-time (package (name "ghc-hashable-time") - (version "0.2.0.1") + (version "0.2.0.2") (source (origin (method url-fetch) @@ -4389,11 +4389,11 @@ combine hash values.") ".tar.gz")) (sha256 (base32 - "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm")))) + "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs")))) (build-system haskell-build-system) (arguments `(#:cabal-revision - ("1" "0rv40xkg3gj8jnqsry1gq3f5s5la6d5arg8fzkirnwdpcgha1as6"))) + ("2" "006phc5y9rrvsshdcmjmhxzxh8dpgs685mpqbkjm9c40xb1ydjbz"))) (inputs `(("ghc-hashable" ,ghc-hashable))) (home-page "http://hackage.haskell.org/package/hashable-time") (synopsis "Hashable instances for Data.Time") -- cgit 1.4.1 From 19edf0d017b568343a02a144589c7e55964da8be Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:04:07 -0400 Subject: gnu: ghc-hashtables: Update to 1.2.3.4. * gnu/packages/haskell-xyz.scm (ghc-hashtables): Update to 1.2.3.4. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e547e628ec..b1f51f84bc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4405,7 +4405,7 @@ combine hash values.") (define-public ghc-hashtables (package (name "ghc-hashtables") - (version "1.2.3.1") + (version "1.2.3.4") (source (origin (method url-fetch) @@ -4413,7 +4413,7 @@ combine hash values.") "https://hackage.haskell.org/package/hashtables/hashtables-" version ".tar.gz")) (sha256 - (base32 "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg")))) + (base32 "1rjmxnr30g4hygiywkpz5p9sanh0abs7ap4zc1kgd8zv04kycp0j")))) (build-system haskell-build-system) (inputs `(("ghc-hashable" ,ghc-hashable) -- cgit 1.4.1 From 048ef066cc7530f097dad6d23e8fd7c22a23e747 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:09:04 -0400 Subject: gnu: ghc-async: Update to 2.2.2. * gnu/packages/haskell-xyz.scm (ghc-async): Update to 2.2.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b1f51f84bc..53107a21a8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -358,7 +358,7 @@ style.") (define-public ghc-async (package (name "ghc-async") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) @@ -368,7 +368,7 @@ style.") ".tar.gz")) (sha256 (base32 - "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg")))) + "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb")))) (build-system haskell-build-system) (inputs `(("ghc-hashable" ,ghc-hashable) -- cgit 1.4.1 From 1f67853e7701183d5902e1d0ea3f2bd8d1c4435f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 22:51:38 -0400 Subject: gnu: ghc-chasingbottoms: Update to 1.3.1.7. * gnu/packages/haskell-xyz.scm (ghc-chasingbottoms): Update to 1.3.1.7. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 53107a21a8..458254ad23 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1487,7 +1487,7 @@ backend for the Charts library.") (define-public ghc-chasingbottoms (package (name "ghc-chasingbottoms") - (version "1.3.1.4") + (version "1.3.1.7") (source (origin (method url-fetch) @@ -1495,7 +1495,7 @@ backend for the Charts library.") "ChasingBottoms-" version ".tar.gz")) (sha256 (base32 - "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633")))) + "0ziiqfsvv1ypdra6kd0bhbsl852i0wqn43jkfii38yl879cdacan")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From ca01f8d3af44494c1b030230fc34fcc925dfc8f2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:09:26 -0400 Subject: gnu: ghc-unordered-containers: Update to 0.2.10.0. * gnu/packages/haskell-xyz.scm (ghc-unordered-containers): Update to 0.2.10.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 458254ad23..d830dad95d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10970,7 +10970,7 @@ functions.") (define-public ghc-unordered-containers (package (name "ghc-unordered-containers") - (version "0.2.9.0") + (version "0.2.10.0") (outputs '("out" "doc")) (source (origin @@ -10980,7 +10980,7 @@ functions.") "/unordered-containers-" version ".tar.gz")) (sha256 (base32 - "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37")))) + "0wy5hfrs880hh8hvp648bl07ws777n3kkmczzdszr7papnyigwb5")))) (build-system haskell-build-system) (inputs `(("ghc-chasingbottoms" ,ghc-chasingbottoms) -- cgit 1.4.1 From b45de2bf24fce0bad6c3c1791ce3c60f52dd901a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:09:43 -0400 Subject: gnu: ghc-math-functions: Update to 0.3.3.0. * gnu/packages/haskell-xyz.scm (ghc-math-functions): Update to 0.3.3.0. [inputs]: Add 'ghc-data-default-class'. --- gnu/packages/haskell-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d830dad95d..799b3d8306 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6039,7 +6039,7 @@ same time is a literate Haskell program.") (define-public ghc-math-functions (package (name "ghc-math-functions") - (version "0.2.1.0") + (version "0.3.3.0") (source (origin (method url-fetch) @@ -6048,11 +6048,12 @@ same time is a literate Haskell program.") "math-functions-" version ".tar.gz")) (sha256 (base32 - "1sv5vabsx332v1lpb6v3jv4zrzvpx1n7yprzd8wlcda5vsc5a6zp")))) + "1s5nbs40sc3r4z08n0j8bw40cy0zkp03fjjn3p27zkd4fvm9kib3")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: 1 test fails. (inputs - `(("ghc-vector" ,ghc-vector) + `(("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-vector" ,ghc-vector) ("ghc-vector-th-unbox" ,ghc-vector-th-unbox))) (native-inputs `(("ghc-hunit" ,ghc-hunit) -- cgit 1.4.1 From 33268e2c0bd9e7e3649fdb4988bcbe03b4e15a21 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:10:34 -0400 Subject: gnu: ghc-mwc-random: Update to 0.14.0.0. * gnu/packages/haskell-xyz.scm (ghc-mwc-random): Update to 0.14.0.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 799b3d8306..0c344696d4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6698,7 +6698,7 @@ binding.") (define-public ghc-mwc-random (package (name "ghc-mwc-random") - (version "0.13.6.0") + (version "0.14.0.0") (source (origin (method url-fetch) @@ -6707,7 +6707,7 @@ binding.") "mwc-random-" version ".tar.gz")) (sha256 (base32 - "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6")))) + "18pg24sw3b79b32cwx8q01q4k0lm34mwr3l6cdkchl8alvd0wdq0")))) (build-system haskell-build-system) (inputs `(("ghc-primitive" ,ghc-primitive) -- cgit 1.4.1 From 85decc1f6f4b0c92be89fdcc3198ddf1af91c2e4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:10:48 -0400 Subject: gnu: ghc-microlens-platform: Update to 0.3.11. * gnu/packages/haskell-xyz.scm (ghc-microlens-platform): Update to 0.3.11. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0c344696d4..3feafe482b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6256,7 +6256,7 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (define-public ghc-microlens-platform (package (name "ghc-microlens-platform") - (version "0.3.10") + (version "0.3.11") (source (origin (method url-fetch) @@ -6265,7 +6265,7 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") "microlens-platform/microlens-platform-" version ".tar.gz")) (sha256 (base32 - "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv")))) + "18950lxgmsg5ksvyyi3zs1smjmb1qf1q73a3p3g44bh21miz0xwb")))) (build-system haskell-build-system) (inputs `(("ghc-hashable" ,ghc-hashable) -- cgit 1.4.1 From 4fce0a4a34d0bc5b787634091664aca861902d26 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:25:06 -0400 Subject: gnu: ghc-concurrent-output: Update to 1.10.11. * gnu/packages/haskell-xyz.scm (ghc-concurrent-output): Update to 1.10.11. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3feafe482b..fc438ccfb8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1916,7 +1916,7 @@ Python.") (define-public ghc-concurrent-output (package (name "ghc-concurrent-output") - (version "1.10.9") + (version "1.10.11") (source (origin (method url-fetch) @@ -1926,7 +1926,7 @@ Python.") ".tar.gz")) (sha256 (base32 - "0mwf155w89nbbkjln7hhbn8k3f8p0ylcvgrg31cm7ijpx4499i4c")))) + "1d1aaqg5814k59b0iws3fh06p3g2siaj922gkhs75qgncj0my2p3")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) -- cgit 1.4.1 From c2342abba5aabf48fb3bd8e9f8b502de278cba03 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:12:45 -0400 Subject: gnu: ghc-hinotify: Update to 0.4. * gnu/packages/haskell-xyz.scm (ghc-hinotify): Update to 0.4. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fc438ccfb8..213d56ffc6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4704,7 +4704,7 @@ library and an executable.") (define-public ghc-hinotify (package (name "ghc-hinotify") - (version "0.3.10") + (version "0.4") (source (origin (method url-fetch) (uri (string-append @@ -4712,7 +4712,7 @@ library and an executable.") "hinotify-" version ".tar.gz")) (sha256 (base32 - "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg")))) + "1x1lm685ws2q0z0ibwq6x3l72xh67mj06s36xiga3al48d92q63x")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async))) -- cgit 1.4.1 From 9bbc21a7601cccc36c394a2c7df62472c01e3869 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 21:53:49 -0400 Subject: gnu: ghc-split: Update Cabal file to r2. * gnu/packages/haskell-xyz.scm (ghc-split): Update Cabal file to r2. --- gnu/packages/haskell-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 213d56ffc6..d43ab28813 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9421,6 +9421,9 @@ generics-sop}.") (base32 "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1c8bcssxq5rkxkixgms6w6x6lzf4n7cxk6cx6av1dp3lixdy9j34"))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://hackage.haskell.org/package/split") -- cgit 1.4.1 From 65e29ed181bbafb2725a242d5ab533bb7129d244 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:13:01 -0400 Subject: gnu: ghc-hmatrix: Update to 0.20.0.0. * gnu/packages/haskell-xyz.scm (ghc-hmatrix): Update to 0.20.0.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d43ab28813..3c51f4c245 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4726,7 +4726,7 @@ accessed or modified.") (define-public ghc-hmatrix (package (name "ghc-hmatrix") - (version "0.19.0.0") + (version "0.20.0.0") (source (origin (method url-fetch) @@ -4734,7 +4734,7 @@ accessed or modified.") "https://hackage.haskell.org/package/hmatrix/hmatrix-" version ".tar.gz")) (sha256 - (base32 "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj")))) + (base32 "1sqy1aci5zfagkb34mz3xdil7cl96z4b4cx28cha54vc5sx1lhpg")))) (build-system haskell-build-system) (inputs `(("ghc-random" ,ghc-random) -- cgit 1.4.1 From b900f4860ebdd607361d34c6dbc0124d6600ae66 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:13:35 -0400 Subject: gnu: ghc-glob: Update to 0.10.0. * gnu/packages/haskell-xyz.scm (ghc-glob): Update to 0.10.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3c51f4c245..fa585133dc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3898,7 +3898,7 @@ info for more informative bug reports.") (define-public ghc-glob (package (name "ghc-glob") - (version "0.9.2") + (version "0.10.0") (source (origin (method url-fetch) @@ -3907,7 +3907,7 @@ info for more informative bug reports.") "Glob-" version ".tar.gz")) (sha256 (base32 - "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg")))) + "0953f91f62ncna402vsrfzdcyxhdpjna3bgdw017kad0dfymacs7")))) (build-system haskell-build-system) (inputs `(("ghc-dlist" ,ghc-dlist) -- cgit 1.4.1 From 518891213ea31ba08f5d5fe661b86e3fcebdaf85 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:13:53 -0400 Subject: gnu: ghc-void: Update to 0.7.3. * gnu/packages/haskell-xyz.scm (ghc-void): Update to 0.7.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fa585133dc..77eaef2a49 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11457,7 +11457,7 @@ and from some existing type with an Unbox instance.") (define-public ghc-void (package (name "ghc-void") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) @@ -11467,7 +11467,7 @@ and from some existing type with an Unbox instance.") ".tar.gz")) (sha256 (base32 - "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk")))) + "05vk3x1r9a2pqnzfji475m5gdih2im1h7rbi2sc67p1pvj6pbbsk")))) (build-system haskell-build-system) (inputs `(("ghc-semigroups" ,ghc-semigroups) -- cgit 1.4.1 From 86a704dbc5eb80750e348ef59252dbee3a87f08e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:18:57 -0400 Subject: gnu: ghc-integer-logarithms: Update to 1.0.3. * gnu/packages/haskell-xyz.scm (ghc-integer-logarithms): Update to 1.0.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 77eaef2a49..86e0de6159 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5191,7 +5191,7 @@ minimal overhead. No FFI required.") (define-public ghc-integer-logarithms (package (name "ghc-integer-logarithms") - (version "1.0.2.1") + (version "1.0.3") (source (origin (method url-fetch) @@ -5200,7 +5200,7 @@ minimal overhead. No FFI required.") version ".tar.gz")) (sha256 (base32 - "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) + "05pc5hws66csvcvfswlwcr2fplwn1lbssvwifjxkbbwqhq0n5qjs")))) (build-system haskell-build-system) (arguments `(#:phases -- cgit 1.4.1 From 28049c2ac89bfd70410b593d5bb8ca121fa699e5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:14:13 -0400 Subject: gnu: ghc-tasty: Update to 1.2.3. * gnu/packages/haskell-check.scm (ghc-tasty): Update to 1.2.3. --- 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 c7f1afdbc4..2ae02cda61 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -156,7 +156,7 @@ contains the correct result for the test.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "1.1.0.3") + (version "1.2.3") (source (origin (method url-fetch) @@ -166,7 +166,7 @@ contains the correct result for the test.") ".tar.gz")) (sha256 (base32 - "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) + "0qpn0avpw4w1qq5r2gwh2piipj0llqq6ylagr3xnqiraq6mhg8cc")))) (build-system haskell-build-system) (inputs `(("ghc-tagged" ,ghc-tagged) -- cgit 1.4.1 From 0841b6f248f6099bdc9b127bc7b34afed62ca6b4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:20:11 -0400 Subject: gnu: ghc-clock: Update to 0.8. * gnu/packages/haskell-xyz.scm (ghc-clock): Update to 0.8. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 86e0de6159..b4fa789923 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1662,7 +1662,7 @@ classy-prelude.") (define-public ghc-clock (package (name "ghc-clock") - (version "0.7.2") + (version "0.8") (source (origin (method url-fetch) @@ -1671,7 +1671,7 @@ classy-prelude.") "clock/" "clock-" version ".tar.gz")) (sha256 - (base32 "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8")))) + (base32 "0539w9bjw6xbfv9v6aq9hijszxqdnqhilwpbwpql1400ji95r8q8")))) (build-system haskell-build-system) (inputs `(("ghc-tasty" ,ghc-tasty) -- cgit 1.4.1 From ad128630cb91f763f6f4c8003297e6bb3cf696c6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:10:18 -0400 Subject: gnu: ghc-hspec-meta: Update to 2.6.0. * gnu/packages/haskell-check.scm (ghc-hspec-meta): Update to 2.6.0. [inputs]: Remove 'ghc-async' and add 'ghc-clock'. --- gnu/packages/haskell-check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 2ae02cda61..e734290c41 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -637,7 +637,7 @@ be used to extend Hspec's functionality.") (define-public ghc-hspec-meta (package (name "ghc-hspec-meta") - (version "2.4.6") + (version "2.6.0") (source (origin (method url-fetch) @@ -645,13 +645,13 @@ be used to extend Hspec's functionality.") "hspec-meta-" version ".tar.gz")) (sha256 (base32 - "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b")))) + "1n1a4633wfivylglji8920f67mx7qz8j4q58n8p7dxk6yg4h3mz6")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit) ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-async" ,ghc-async) + ("ghc-clock" ,ghc-clock) ("ghc-hspec-expectations" ,ghc-hspec-expectations) ("ghc-setenv" ,ghc-setenv) ("ghc-random" ,ghc-random) -- cgit 1.4.1 From a5a870d86354f9582cb53382f087cef6b91f7f76 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:13:20 -0400 Subject: gnu: hspec-discover: Update to 2.7.1. * gnu/packages/haskell-check.scm (hspec-discover): Update to 2.7.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 e734290c41..cdfa119050 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -584,7 +584,7 @@ JUnit tool for Java.") (define-public hspec-discover (package (name "hspec-discover") - (version "2.5.5") + (version "2.7.1") (source (origin (method url-fetch) @@ -593,7 +593,7 @@ JUnit tool for Java.") version ".tar.gz")) (sha256 (base32 - "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz")))) + "0r47fm94wa6qrhp8cc1zzkjrxc32rnagfn9m9ga4dm6p6ydw4c8b")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From e7b35ff07d852a36315bfed2effe6e48ae30d6a1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:14:22 -0400 Subject: gnu: ghc-contravariant: Update to 1.5.2. * gnu/packages/haskell-xyz.scm (ghc-contravariant): Update to 1.5.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b4fa789923..db1fa829d4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2212,7 +2212,7 @@ a vocabulary for working with them.") (define-public ghc-contravariant (package (name "ghc-contravariant") - (version "1.4.1") + (version "1.5.2") (source (origin (method url-fetch) @@ -2222,7 +2222,7 @@ a vocabulary for working with them.") ".tar.gz")) (sha256 (base32 - "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9")))) + "0366gl62wwwdbl9i6kqy60asf60876k55v91la6bmhnwwcj2q9n4")))) (build-system haskell-build-system) (inputs `(("ghc-void" ,ghc-void) -- cgit 1.4.1 From e9b359f51dec6a7e8a76ed0db42b0e7b731db608 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:16:07 -0400 Subject: gnu: ghc-hmatrix-gsl-stats: Update to 0.4.1.8. * gnu/packages/haskell-xyz.scm (ghc-hmatrix-gsl-stats): Update to 0.4.1.8. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index db1fa829d4..277f7d8305 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4783,7 +4783,7 @@ using GSL.") (define-public ghc-hmatrix-gsl-stats (package (name "ghc-hmatrix-gsl-stats") - (version "0.4.1.7") + (version "0.4.1.8") (source (origin (method url-fetch) @@ -4792,7 +4792,7 @@ using GSL.") "https://hackage.haskell.org/package/hmatrix-gsl-stats/hmatrix-gsl-stats-" version ".tar.gz")) (sha256 - (base32 "1gslgk58lzin43cvbpivhw7nrn9qyaa6qwhy1z9ypvyal5p8n3sa")))) + (base32 "1cq049sj3q5r06x7i35hqrkf2jc4p4kfi9zv0jmi2vp7w4644i5q")))) (build-system haskell-build-system) (inputs `(("ghc-vector" ,ghc-vector) -- cgit 1.4.1 From 13e9d13c0c077695a68fe965430cf2bd58b30995 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:16:21 -0400 Subject: gnu: ghc-tasty-expected-failure: Update to 0.11.1.2. * gnu/packages/haskell-check.scm (ghc-tasty-expected-failure): Update to 0.11.1.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 cdfa119050..33d08ea4c3 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -288,7 +288,7 @@ been added since previous test run.") (define-public ghc-tasty-expected-failure (package (name "ghc-tasty-expected-failure") - (version "0.11.1.1") + (version "0.11.1.2") (source (origin (method url-fetch) @@ -297,7 +297,7 @@ been added since previous test run.") version ".tar.gz")) (sha256 (base32 - "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji")))) + "175gdk1mkslcwjxajkbl4zmaigzf8h4svzd7va5qb519y0dxk28n")))) (build-system haskell-build-system) (inputs `(("ghc-tagged" ,ghc-tagged) -- cgit 1.4.1 From 92db1a887f6cd294f06e760debe3a83fc67d7f68 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:16:39 -0400 Subject: gnu: ghc-tasty-hunit: Update to 0.10.0.2. * gnu/packages/haskell-check.scm (ghc-tasty-hunit): Update to 0.10.0.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 33d08ea4c3..dec68a570e 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -187,7 +187,7 @@ and any other types of tests into a single test suite.") (define-public ghc-tasty-hunit (package (name "ghc-tasty-hunit") - (version "0.10.0.1") + (version "0.10.0.2") (source (origin (method url-fetch) @@ -197,7 +197,7 @@ and any other types of tests into a single test suite.") ".tar.gz")) (sha256 (base32 - "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g")))) + "1xvf5xs0r8xqkcg354klz4wyzwyzvinalyl6f4fnxwqmzrgch8s8")))) (build-system haskell-build-system) (inputs `(("ghc-call-stack" ,ghc-call-stack-boot) -- cgit 1.4.1 From 79d9326f621476e43a80332de801c08592af64d8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:25:41 -0400 Subject: gnu: ghc-logict: Update to 0.7.0.2. * gnu/packages/haskell-xyz.scm (ghc-logict): Update to 0.7.0.2. [native-inputs]: Add 'ghc-tasty' and 'ghc-tasty-hunit'. --- gnu/packages/haskell-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 277f7d8305..7f0b3b3776 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5904,7 +5904,7 @@ back-ends.") (define-public ghc-logict (package (name "ghc-logict") - (version "0.6.0.2") + (version "0.7.0.2") (source (origin (method url-fetch) @@ -5914,8 +5914,11 @@ back-ends.") ".tar.gz")) (sha256 (base32 - "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi")))) + "1xfgdsxg0lp8m0a2cb83rcxrnnc37asfikay2kydi933anh9ihfc")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "http://code.haskell.org/~dolio/") (synopsis "Backtracking logic-programming monad") (description "This library provides a continuation-based, backtracking, -- cgit 1.4.1 From 5d1339427a688234a5d05b11e8dfeccf822c8193 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:10:01 -0400 Subject: gnu: ghc-psqueues: Update to 0.2.7.2. * gnu/packages/haskell-xyz.scm (ghc-psqueues): Update to 0.2.7.2. [native-inputs]: Remove 'ghc-test-framework', 'ghc-test-framework-hunit', and 'ghc-test-framework-quickcheck2'; add 'ghc-tasty', 'ghc-tasty-hunit', and 'ghc-tasty-quickcheck'. --- gnu/packages/haskell-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7f0b3b3776..aa15fd5b59 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7961,7 +7961,7 @@ API.") (define-public ghc-psqueues (package (name "ghc-psqueues") - (version "0.2.7.0") + (version "0.2.7.2") (source (origin (method url-fetch) @@ -7970,7 +7970,7 @@ API.") "psqueues-" version ".tar.gz")) (sha256 (base32 - "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc")))) + "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6")))) (build-system haskell-build-system) (inputs `(("ghc-hashable" ,ghc-hashable))) @@ -7978,9 +7978,9 @@ API.") `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-tagged" ,ghc-tagged) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) (home-page "https://github.com/jaspervdj/psqueues") (synopsis "Pure priority search queues") (description "The psqueues package provides -- cgit 1.4.1 From d66473fb263e7a4f513b0a07c8e407c293c76519 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:17:01 -0400 Subject: gnu: ghc-indents: Update to 0.5.0.1. * gnu/packages/haskell-xyz.scm (ghc-indents): Update to 0.5.0.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index aa15fd5b59..ccc6cef99c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5104,7 +5104,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like (define-public ghc-indents (package (name "ghc-indents") - (version "0.5.0.0") + (version "0.5.0.1") (source (origin (method url-fetch) (uri (string-append @@ -5112,7 +5112,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like version ".tar.gz")) (sha256 (base32 - "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n")))) + "0dpcwiz0dwn5aqdsc50plfaawh86adhf7jx5dsmhn5q5nz32qn51")))) (build-system haskell-build-system) ;; This package needs an older version of tasty. (arguments '(#:tests? #f)) -- cgit 1.4.1 From b542650c55690c5eeec552a3c42859102caf95f8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:17:16 -0400 Subject: gnu: ghc-tasty-quickcheck: Update to 0.10.1. * gnu/packages/haskell-check.scm (ghc-tasty-quickcheck): Update to 0.10.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 dec68a570e..ba54b1378a 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -95,7 +95,7 @@ Haskell test framework.") (define-public ghc-tasty-quickcheck (package (name "ghc-tasty-quickcheck") - (version "0.10") + (version "0.10.1") (source (origin (method url-fetch) @@ -104,7 +104,7 @@ Haskell test framework.") "tasty-quickcheck-" version ".tar.gz")) (sha256 (base32 - "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h")))) + "0k4vvd5vmrncv1s6gdf03l4xijwlk428sb9jfx8n1zaz02971msh")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From 30f60e420d9ce374a869cb6993ec35ce8e895639 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:17:31 -0400 Subject: gnu: ghc-regex-applicative: Update to 0.3.3.1. * gnu/packages/haskell-xyz.scm (ghc-regex-applicative): Update to 0.3.3.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ccc6cef99c..caadd0a21b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8266,7 +8266,7 @@ copious examples.") (define-public ghc-regex-applicative (package (name "ghc-regex-applicative") - (version "0.3.3") + (version "0.3.3.1") (source (origin (method url-fetch) @@ -8275,7 +8275,7 @@ copious examples.") "regex-applicative-" version ".tar.gz")) (sha256 (base32 - "1riv7jqf26lbv4rm54sd6mrx8xdh4dvh4xbzymzdfdw13k6a4nb6")))) + "0p0anx5vamrhrdvviwkh2zn6pa3pv2bjb7nfyc7dvz2q7g14y1lg")))) (build-system haskell-build-system) (inputs `(("ghc-smallcheck" ,ghc-smallcheck) -- cgit 1.4.1 From ca0701ef9f69826c172f47fc163c667abb9d5bd3 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:17:43 -0400 Subject: gnu: ghc-vector-binary-instances: Update to 0.2.5.1. * gnu/packages/haskell-xyz.scm (ghc-vector-binary-instances): Update to 0.2.5.1. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index caadd0a21b..5c7e9c847f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11369,7 +11369,7 @@ optimisation framework.") (define-public ghc-vector-binary-instances (package (name "ghc-vector-binary-instances") - (version "0.2.4") + (version "0.2.5.1") (source (origin (method url-fetch) @@ -11379,11 +11379,8 @@ optimisation framework.") version ".tar.gz")) (sha256 (base32 - "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb")))) + "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i"))) (inputs `(("ghc-vector" ,ghc-vector))) (native-inputs -- cgit 1.4.1 From d2c7d3367fc0141c1847c6c56e32767572e59f06 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:19:08 -0400 Subject: gnu: ghc-memory: Update to 0.14.18. * gnu/packages/haskell-xyz.scm (ghc-memory): Update to 0.14.18. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 5c7e9c847f..d37acba959 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6127,14 +6127,14 @@ speed, flexibility, and quality of parse errors.") (define-public ghc-memory (package (name "ghc-memory") - (version "0.14.16") + (version "0.14.18") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "memory/memory-" version ".tar.gz")) (sha256 (base32 - "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v")))) + "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm")))) (build-system haskell-build-system) (inputs `(("ghc-basement" ,ghc-basement) -- cgit 1.4.1 From 7d30fcf38752b7cabf76579b7600aeb61dc65915 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:19:22 -0400 Subject: gnu: ghc-blaze-markup: Update to 0.8.2.3. * gnu/packages/haskell-xyz.scm (ghc-blaze-markup): Update to 0.8.2.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d37acba959..f1764a3f18 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -854,7 +854,7 @@ interoperate with code that uses the new implementation.") (define-public ghc-blaze-markup (package (name "ghc-blaze-markup") - (version "0.8.2.1") + (version "0.8.2.3") (source (origin (method url-fetch) @@ -863,7 +863,7 @@ interoperate with code that uses the new implementation.") version ".tar.gz")) (sha256 (base32 - "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh")))) + "1g9m7ansj7fdyzhz1wqkbzn5amjm50vjgjdwkbjc5qqhagnv1y3j")))) (build-system haskell-build-system) (arguments `(#:phases -- cgit 1.4.1 From 853748c424d391714a249a2eada6bad12d19455a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 11:21:00 -0500 Subject: gnu: ghc-bytestring-handle: Fix Cabal dependency constraints. Rather than patch the 'base' constraints, we update the Cabal file to r1 so that it accepts 'base' from GHC 8.6. * gnu/packages/haskell-xyz.scm (ghc-bytestring-handle): Update the Cabal file to r1; remove 'base' constraint fix; and update the 'QuickCheck' constraint to allow version 2.13. --- gnu/packages/haskell-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f1764a3f18..c86deae8f7 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1046,15 +1046,15 @@ Compatibility package for older packages.") "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y")))) (build-system haskell-build-system) (arguments - `(#:phases + `(#:cabal-revision + ("1" "0x11aj6w1lijh84jcdq1qgyvdnc7i9ivbyq4wf9rxicg57viisz9") + #: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"))))))) + "QuickCheck >= 2.1.2 && < 2.14"))))))) (inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From ec83929f5f73b8a5072497b3e09d139cfb7b8008 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:19:40 -0400 Subject: gnu: ghc-tar: Update to 0.5.1.1. * gnu/packages/haskell-xyz.scm (ghc-tar): Update to 0.5.1.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c86deae8f7..437f11922d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10106,7 +10106,7 @@ having to unsafely pass dummy arguments.") (define-public ghc-tar (package (name "ghc-tar") - (version "0.5.1.0") + (version "0.5.1.1") (source (origin (method url-fetch) @@ -10115,7 +10115,7 @@ having to unsafely pass dummy arguments.") version ".tar.gz")) (sha256 (base32 - "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8")))) + "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k")))) (build-system haskell-build-system) ;; FIXME: 2/24 tests fail. (arguments `(#:tests? #f)) -- cgit 1.4.1 From bf12089a9b4c078082841441de8b0eb15b9260e6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:19:54 -0400 Subject: gnu: ghc-zlib: Update to 0.6.2.1. * gnu/packages/haskell-xyz.scm (ghc-zlib): Update to 0.6.2.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 437f11922d..ac64baaac6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11882,7 +11882,7 @@ modifying, and extracting files from zip archives in Haskell.") (define-public ghc-zlib (package (name "ghc-zlib") - (version "0.6.2") + (version "0.6.2.1") (outputs '("out" "doc")) (source (origin @@ -11893,7 +11893,7 @@ modifying, and extracting files from zip archives in Haskell.") ".tar.gz")) (sha256 (base32 - "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d")))) + "1l11jraslcrp9d4wnhwfyhwk4fsiq1aq8i6vj81vcq1m2zzi1y7h")))) (build-system haskell-build-system) (arguments `(#:phases -- cgit 1.4.1 From 2c86548e12e81084994b0e36e76bdb7120877313 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:20:22 -0400 Subject: gnu: ghc-blaze-html: Update to 0.9.1.2. * gnu/packages/haskell-web.scm (ghc-blaze-html): Update to 0.9.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 2eedcf6a3b..15002addc0 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -741,7 +741,7 @@ documents.") (define-public ghc-blaze-html (package (name "ghc-blaze-html") - (version "0.9.1.1") + (version "0.9.1.2") (source (origin (method url-fetch) @@ -750,7 +750,7 @@ documents.") version ".tar.gz")) (sha256 (base32 - "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa")))) + "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30")))) (build-system haskell-build-system) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) -- cgit 1.4.1 From b50b600466fbc13fc6ac95adeef829d8ed0bf3fb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:21:48 -0400 Subject: gnu: ghc-juicypixels: Update to 3.3.4. * gnu/packages/haskell-xyz.scm (ghc-juicypixels): Update to 3.3.4. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ac64baaac6..b8386750ae 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5468,7 +5468,7 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.") (define-public ghc-juicypixels (package (name "ghc-juicypixels") - (version "3.2.9.5") + (version "3.3.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -5476,7 +5476,7 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.") version ".tar.gz")) (sha256 (base32 - "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744")))) + "0qacrnz2qcykj3f6c4k2p8qd31pa2slpv3ykfblgizrfh3401q6x")))) (build-system haskell-build-system) (inputs `(("ghc-zlib" ,ghc-zlib) -- cgit 1.4.1 From 10650c441b4a555ad78b9fbcd328bc5cc5231f8e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:22:01 -0400 Subject: gnu: ghc-extra: Update to 1.6.18. * gnu/packages/haskell-xyz.scm (ghc-extra): Update to 1.6.18. [inputs]: Add 'ghc-semigroups'. --- gnu/packages/haskell-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b8386750ae..685419e7e2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3281,7 +3281,7 @@ versions of GHC (i.e., < 6.10).") (define-public ghc-extra (package (name "ghc-extra") - (version "1.6.9") + (version "1.6.18") (source (origin (method url-fetch) @@ -3291,10 +3291,11 @@ versions of GHC (i.e., < 6.10).") ".tar.gz")) (sha256 (base32 - "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b")))) + "0jvd4l0hi8pf5899pxc32yc638y0mrc357w0rph99k3hm277i0cy")))) (build-system haskell-build-system) (inputs `(("ghc-clock" ,ghc-clock) + ("ghc-semigroups" ,ghc-semigroups) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/ndmitchell/extra") (synopsis "Extra Haskell functions") -- cgit 1.4.1 From a777c69aaf6b89554550044b0b9ac6235d0e290b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:22:19 -0400 Subject: gnu: ghc-hspec-core: Update to 2.7.1. * gnu/packages/haskell-check.scm (ghc-hspec-core): Update to 2.7.1. [inputs]: Remove 'ghc-async' and add 'ghc-tf-random'. --- gnu/packages/haskell-check.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index ba54b1378a..4d28ad9156 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -607,7 +607,7 @@ runs Hspec tests.") (define-public ghc-hspec-core (package (name "ghc-hspec-core") - (version "2.5.5") + (version "2.7.1") (source (origin (method url-fetch) @@ -615,19 +615,19 @@ runs Hspec tests.") "hspec-core-" version ".tar.gz")) (sha256 (base32 - "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x")))) + "08vk8588lap00hsln8zl64dazbb28lzk4b4h5vnm7xvhg7r21k1c")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs `(("ghc-setenv" ,ghc-setenv) ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-async" ,ghc-async) ("ghc-clock" ,ghc-clock) ("ghc-quickcheck-io" ,ghc-quickcheck-io) ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hspec-expectations" ,ghc-hspec-expectations) - ("ghc-silently" ,ghc-silently))) + ("ghc-silently" ,ghc-silently) + ("ghc-tf-random" ,ghc-tf-random))) (home-page "https://hspec.github.io/") (synopsis "Testing framework for Haskell") (description "This library exposes internal types and functions that can -- cgit 1.4.1 From a47ef464ce051fd6860d0b45b7f4016ddbc1ebf5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:22:50 -0400 Subject: gnu: ghc-asn1-types: Update to 0.3.3. * gnu/packages/haskell-crypto.scm (ghc-asn1-types): Update to 0.3.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 d6ccabba63..081309e645 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -36,7 +36,7 @@ (define-public ghc-asn1-types (package (name "ghc-asn1-types") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -44,7 +44,7 @@ version ".tar.gz")) (sha256 (base32 - "05vjchyqiy9n275cygffhn0ma7fz7jx52j0dcdm9qm8h9bziymqc")))) + "162lacdl9jr42pdhaj9hxqlba6hjxm6g866anna74q6v3cvw5ssp")))) (build-system haskell-build-system) (inputs `(("ghc-memory" ,ghc-memory) -- cgit 1.4.1 From abbe5a2a47860703477ef019e3f33f368e090027 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:23:09 -0400 Subject: gnu: ghc-hspec: Update to 2.7.1. * gnu/packages/haskell-check.scm (ghc-hspec): Update to 2.7.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 4d28ad9156..bcbb707866 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -665,7 +665,7 @@ used to test the in-development version of Hspec.") (define-public ghc-hspec (package (name "ghc-hspec") - (version "2.5.5") + (version "2.7.1") (source (origin (method url-fetch) @@ -673,7 +673,7 @@ used to test the in-development version of Hspec.") "hspec-" version ".tar.gz")) (sha256 (base32 - "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm")))) + "1x8rcr7j1azcaw0fg1xzp8j0gr4ias36z09aj24i4xp8pnyfp341")))) (build-system haskell-build-system) (inputs `(("ghc-hspec-core" ,ghc-hspec-core) -- cgit 1.4.1 From d215f1ccadd06e8d4a177812ccc4b7d003cf3865 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 09:51:55 -0400 Subject: gnu: ghc-reflection: Update to 2.1.5. * gnu/packages/haskell-xyz.scm (ghc-reflection): Update to 2.1.5. [native-inputs]: Add 'ghc-hspec', 'ghc-quickcheck', and 'hspec-discover'. --- gnu/packages/haskell-xyz.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 685419e7e2..9b2ee0b0cc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8197,7 +8197,7 @@ specify refactorings without depending on GHC.") (define-public ghc-reflection (package (name "ghc-reflection") - (version "2.1.4") + (version "2.1.5") (source (origin (method url-fetch) @@ -8207,9 +8207,13 @@ specify refactorings without depending on GHC.") ".tar.gz")) (sha256 (base32 - "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj")))) + "0xr947nj1vww5b8fwqmypxm3y3j5sxl4z8wnf834f83jzfzyjbi7")))) (build-system haskell-build-system) (inputs `(("ghc-tagged" ,ghc-tagged))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/ekmett/reflection") (synopsis "Reify arbitrary terms into types that can be reflected back into terms") -- cgit 1.4.1 From 1b5dbe95a9539f6205e1f3facd26a32a3715290d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:23:26 -0400 Subject: gnu: ghc-asn1-encoding: Update to 0.9.6. * gnu/packages/haskell-crypto.scm (ghc-asn1-encoding): Update to 0.9.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 081309e645..fe9c862603 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -59,7 +59,7 @@ format.") (define-public ghc-asn1-encoding (package (name "ghc-asn1-encoding") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -67,7 +67,7 @@ format.") version ".tar.gz")) (sha256 (base32 - "0adgbamyq0mj1l1hdq4zyyllay714bac1wl0rih3fv1z6vykp1hy")))) + "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r")))) (build-system haskell-build-system) (inputs `(("ghc-hourglass" ,ghc-hourglass) -- cgit 1.4.1 From 4daaa3710acab1e85f73257097267b38b1dbfcaf Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:23:38 -0400 Subject: gnu: ghc-base-compat: Update to 0.10.5. * gnu/packages/haskell-xyz.scm (ghc-base-compat): Update to 0.10.5. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9b2ee0b0cc..3bff3fdee4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -639,7 +639,7 @@ Haskell @code{ByteString}s.") (define-public ghc-base-compat (package (name "ghc-base-compat") - (version "0.10.4") + (version "0.10.5") (source (origin (method url-fetch) @@ -649,7 +649,7 @@ Haskell @code{ByteString}s.") ".tar.gz")) (sha256 (base32 - "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d")))) + "0hgvlqcr852hfp52jp99snhbj550mvxxpi8qn15d8ml9aqhyl2lr")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From 9ac341aced694c6df0209639caa757ec10d3ddd9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:25:25 -0400 Subject: gnu: ghc-resourcet: Update to 1.2.2. * gnu/packages/haskell-xyz.scm (ghc-resourcet): Update to 1.2.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3bff3fdee4..ea143907a8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8540,7 +8540,7 @@ connections.") (define-public ghc-resourcet (package (name "ghc-resourcet") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) @@ -8548,7 +8548,7 @@ connections.") "resourcet-" version ".tar.gz")) (sha256 (base32 - "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7")))) + "1rfbfcv3r1h29y0yqr3x6a1s04lbc3vzm3jqnfg4f9rqp9d448qk")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-base" ,ghc-transformers-base) -- cgit 1.4.1 From a4084db16897ff78c72c62f8abe09a480c61f60a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:25:38 -0400 Subject: gnu: ghc-unliftio: Update to 0.2.12. * gnu/packages/haskell-xyz.scm (ghc-unliftio): Update to 0.2.12. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ea143907a8..256e33b900 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10929,7 +10929,7 @@ for Unix time in Haskell.") (define-public ghc-unliftio (package (name "ghc-unliftio") - (version "0.2.7.0") + (version "0.2.12") (source (origin (method url-fetch) @@ -10939,7 +10939,7 @@ for Unix time in Haskell.") ".tar.gz")) (sha256 (base32 - "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs")))) + "02gy1zrxgzg4xmzm8lafsf1nyr3as1q20r8ld73xg3q7rkag9acg")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH (inputs -- cgit 1.4.1 From 3f1ba75dcd7d0a7181364f86d85abc6dbfa18586 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:25:52 -0400 Subject: gnu: ghc-validity: Update to 0.9.0.2. * gnu/packages/haskell-xyz.scm (ghc-validity): Update to 0.9.0.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 256e33b900..3e01f349dd 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11259,7 +11259,7 @@ example of, \"An applicative functor that is not a monad.\"") (define-public ghc-validity (package (name "ghc-validity") - (version "0.7.0.0") + (version "0.9.0.2") (source (origin (method url-fetch) @@ -11269,7 +11269,7 @@ example of, \"An applicative functor that is not a monad.\"") ".tar.gz")) (sha256 (base32 - "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f")))) + "1aa93lp1pqwv7vhx19nazlig8qhbp3psblbz360s5lii3s5rli2v")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) -- cgit 1.4.1 From bb148db899adb4828fd6baf091d13143b088c1e8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:26:09 -0400 Subject: gnu: ghc-hspec-contrib: Update to 0.5.1. * gnu/packages/haskell-check.scm (ghc-hspec-contrib): Update to 0.5.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 bcbb707866..4e619b3b0e 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -692,7 +692,7 @@ Haskell, inspired by the Ruby library RSpec.") (define-public ghc-hspec-contrib (package (name "ghc-hspec-contrib") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -700,7 +700,7 @@ Haskell, inspired by the Ruby library RSpec.") version ".tar.gz")) (sha256 (base32 - "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv")))) + "0hhzxaa3fxz5mk5qcsrnfr98a7bn3szx2ydgr0x9mbqmm1jg06rc")))) (build-system haskell-build-system) (inputs `(("ghc-hspec-core" ,ghc-hspec-core) -- cgit 1.4.1 From 17482b26fb0fa676700ce302d91a51ecbcab04d9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:26:27 -0400 Subject: gnu: ghc-fgl: Update to 5.7.0.1. * gnu/packages/haskell-xyz.scm (ghc-fgl): Update to 5.7.0.1. [arguments]: Change the phase that updates the Cabal file to allow for newer versions of 'hspec' and 'QuickCheck'. --- gnu/packages/haskell-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3e01f349dd..3d06fc316e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3395,7 +3395,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") (define-public ghc-fgl (package (name "ghc-fgl") - (version "5.6.0.0") + (version "5.7.0.1") (outputs '("out" "doc")) (source (origin @@ -3406,7 +3406,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") ".tar.gz")) (sha256 (base32 - "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll")))) + "04793yh778ck3kz1z2svnfdwwls2kisbnky4lzvf4zjfgpv7mkpz")))) (build-system haskell-build-system) (arguments `(#:phases @@ -3414,10 +3414,10 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") (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"))))))) + (("QuickCheck >= 2\\.8 && < 2\\.13") + "QuickCheck >= 2.8 && < 2.14") + (("hspec >= 2\\.1 && < 2\\.7") + "hspec >= 2.1 && < 2.8"))))))) (inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) -- cgit 1.4.1 From 780477fb0844b83f694058fd29def538ef4ab8ca Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:26:38 -0400 Subject: gnu: ghc-base-orphans: Update to 0.8.1. * gnu/packages/haskell-xyz.scm (ghc-base-orphans): Update to 0.8.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3d06fc316e..40ebcbcd22 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -685,7 +685,7 @@ packages.") (define-public ghc-base-orphans (package (name "ghc-base-orphans") - (version "0.7") + (version "0.8.1") (source (origin (method url-fetch) @@ -695,7 +695,7 @@ packages.") ".tar.gz")) (sha256 (base32 - "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a")))) + "1nwr9av27i9p72k0sn96mw3ywdczw65dy5gd5wxpabhhxlxdcas4")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From 4a35e3c34e755de91d6c5f2f0d610530dd935349 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:22:00 -0400 Subject: gnu: ghc-storable-complex: Update to 0.2.3.0. * gnu/packages/haskell-xyz.scm (ghc-storable-complex): Update to 0.2.3.0. [inputs]: Add 'ghc-base-orphans'. --- gnu/packages/haskell-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 40ebcbcd22..01b532cdd7 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9638,7 +9638,7 @@ for strict state threads.") (define-public ghc-storable-complex (package (name "ghc-storable-complex") - (version "0.2.2") + (version "0.2.3.0") (source (origin (method url-fetch) @@ -9646,8 +9646,10 @@ for strict state threads.") "https://hackage.haskell.org/package/storable-complex/storable-complex-" version ".tar.gz")) (sha256 - (base32 "01kwwkpbfjrv26vj83cd92px5qbq1bpgxj0r45534aksqhany1xb")))) + (base32 "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s")))) (build-system haskell-build-system) + (inputs + `(("ghc-base-orphans" ,ghc-base-orphans))) (home-page "https://github.com/cartazio/storable-complex") (synopsis "Haskell Storable instance for Complex") (description "This package provides a Haskell library including a -- cgit 1.4.1 From d443a52a5648a3a35e85c717ac8e8b72b76ea69a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:26:51 -0400 Subject: gnu: ghc-fast-logger: Update to 2.4.17. * gnu/packages/haskell-xyz.scm (ghc-fast-logger): Update to 2.4.17. [inputs]: Add 'ghc-unix-compat'. --- gnu/packages/haskell-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 01b532cdd7..9518ca3cb8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3333,7 +3333,7 @@ when used with GHC versions which already provide the (define-public ghc-fast-logger (package (name "ghc-fast-logger") - (version "2.4.11") + (version "2.4.17") (source (origin (method url-fetch) @@ -3343,12 +3343,13 @@ when used with GHC versions which already provide the ".tar.gz")) (sha256 (base32 - "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv")))) + "02mxb1ckvx1s2r2m11l5i2l5rdl7232p0f61af6773haykjp0qxk")))) (build-system haskell-build-system) (inputs `(("ghc-auto-update" ,ghc-auto-update) ("ghc-easy-file" ,ghc-easy-file) - ("ghc-unix-time" ,ghc-unix-time))) + ("ghc-unix-time" ,ghc-unix-time) + ("ghc-unix-compat" ,ghc-unix-compat))) (native-inputs `(("hspec-discover" ,hspec-discover) ("ghc-hspec" ,ghc-hspec))) -- cgit 1.4.1 From c07e16dd2cf0b80da9ea9a08e42ba8b6be89f12b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:27:05 -0400 Subject: gnu: ghc-newtype-generics: Update to 0.5.4. * gnu/packages/haskell-xyz.scm (ghc-newtype-generics): Update to 0.5.4. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9518ca3cb8..2f56849f28 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6909,7 +6909,7 @@ IPv4, IPv6 and MAC addresses.") (define-public ghc-newtype-generics (package (name "ghc-newtype-generics") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) @@ -6918,7 +6918,7 @@ IPv4, IPv6 and MAC addresses.") version ".tar.gz")) (sha256 (base32 - "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj")))) + "0cprfg4n0z62cnix1qrbc79bfdd4s50b05fj9m9hk6vm1pc3szq0")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) -- cgit 1.4.1 From e2c0db367594a6b9975ba93af87ad53e0bf2e813 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:27:25 -0400 Subject: gnu: ghc-asn1-parse: Update to 0.9.5. * gnu/packages/haskell-crypto.scm (ghc-asn1-parse): Update to 0.9.5. --- 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 fe9c862603..1652ae2b15 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -85,7 +85,7 @@ supports for high level forms of ASN1 (BER, and DER).") (define-public ghc-asn1-parse (package (name "ghc-asn1-parse") - (version "0.9.4") + (version "0.9.5") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -93,7 +93,7 @@ supports for high level forms of ASN1 (BER, and DER).") version ".tar.gz")) (sha256 (base32 - "025prsihk5g6rdv9xlfmj0zpa0wa3qjzj5i4ilzvg7f6f3sji8y6")))) + "17pk8y3nwv9b9i5j15qlmwi7fmq9ab2z4kfpjk2rvcrh9lsf27wg")))) (build-system haskell-build-system) (inputs `(("ghc-asn1-types" ,ghc-asn1-types) -- cgit 1.4.1 From 55c1e6bedaabd45d48e2af467c6559068c26e5c9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:27:38 -0400 Subject: gnu: ghc-generic-deriving: Update to 1.12.4. * gnu/packages/haskell-xyz.scm (ghc-generic-deriving): Update to 1.12.4. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2f56849f28..f0ff122f10 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3743,7 +3743,7 @@ specific Windows, Mac, and Linux file system event notification.") (define-public ghc-generic-deriving (package (name "ghc-generic-deriving") - (version "1.12.2") + (version "1.12.4") (source (origin (method url-fetch) @@ -3753,7 +3753,7 @@ specific Windows, Mac, and Linux file system event notification.") ".tar.gz")) (sha256 (base32 - "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n")))) + "0vdg9qdq35jl3m11a87wk8cq1y71qm4i1g1b2pxki0wk70yw20a4")))) (build-system haskell-build-system) (inputs `(("ghc-th-abstraction" ,ghc-th-abstraction))) -- cgit 1.4.1 From 19c14a0fb7ad0f217a28fc7a1cf6074e2dc4cbb6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:29:18 -0400 Subject: gnu: ghc-doctest: Update to 0.16.2. * gnu/packages/haskell-xyz.scm (ghc-doctest): Update to 0.16.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f0ff122f10..f41178b9b2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2707,7 +2707,7 @@ Writer monad), where list append quickly becomes too expensive.") (define-public ghc-doctest (package (name "ghc-doctest") - (version "0.16.0") + (version "0.16.2") (source (origin (method url-fetch) @@ -2717,7 +2717,7 @@ Writer monad), where list append quickly becomes too expensive.") ".tar.gz")) (sha256 (base32 - "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv")))) + "0lk4cjfzi5bx2snfzw1zi06li0gvgz3ckfh2kwa98l7nxfdl39ag")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: missing test framework (inputs -- cgit 1.4.1 From 920f44a1baff859566b41f7e7ff288882a6c7eb1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:29:32 -0400 Subject: gnu: ghc-genvalidity: Update to 0.8.0.0. * gnu/packages/haskell-xyz.scm (ghc-genvalidity): Update to 0.8.0.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f41178b9b2..9910ff24d2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3815,7 +3815,7 @@ geniplate} package, written by Lennart Augustsson.") (define-public ghc-genvalidity (package (name "ghc-genvalidity") - (version "0.5.1.0") + (version "0.8.0.0") (source (origin (method url-fetch) @@ -3825,7 +3825,7 @@ geniplate} package, written by Lennart Augustsson.") ".tar.gz")) (sha256 (base32 - "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0")))) + "0w38aq9hfyymidncgkrs6yvja7j573d9sap5qfg5rz910fhsij9a")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From c69f98bafdd2b352de84b187cfcfc0cc08c44221 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:29:48 -0400 Subject: gnu: ghc-tasty-ant-xml: Update to 1.1.6. * gnu/packages/haskell-check.scm (ghc-tasty-ant-xml): Update to 1.1.6. --- 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 4e619b3b0e..3787b4defe 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -39,7 +39,7 @@ (define-public ghc-tasty-ant-xml (package (name "ghc-tasty-ant-xml") - (version "1.1.4") + (version "1.1.6") (source (origin (method url-fetch) @@ -49,7 +49,7 @@ ".tar.gz")) (sha256 (base32 - "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8")))) + "13qqpl1prr9dda87dp45mqybay24n8rhxxgvpc9j34kh72g8j5qw")))) (build-system haskell-build-system) (inputs `(("ghc-generic-deriving" ,ghc-generic-deriving) -- cgit 1.4.1 From 15ebc815472d36bfa3de102cb2afd82a593409cc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:31:14 -0400 Subject: gnu: ghc-openglraw: Update to 3.3.3.0. * gnu/packages/haskell-xyz.scm (ghc-openglraw): Update to 3.3.3.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9910ff24d2..60c2762dee 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7063,7 +7063,7 @@ version 1.3).") (define-public ghc-openglraw (package (name "ghc-openglraw") - (version "3.3.1.0") + (version "3.3.3.0") (source (origin (method url-fetch) @@ -7073,7 +7073,7 @@ version 1.3).") ".tar.gz")) (sha256 (base32 - "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb")))) + "0zgllb4bcash2i2cispa3j565aw3dpxs41ghmhpvyvi4a6xmyldx")))) (build-system haskell-build-system) (inputs `(("ghc-half" ,ghc-half) -- cgit 1.4.1 From b9a5e634d149390885988ea19f29815fbe7c7457 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:30:03 -0400 Subject: gnu: ghc-regex: Update to 1.0.2.0. * gnu/packages/haskell-xyz.scm (ghc-regex): Update to 1.0.2.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 60c2762dee..3b322f350a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8227,7 +8227,7 @@ configurations to coexist without resorting to mutable global variables or (define-public ghc-regex (package (name "ghc-regex") - (version "1.0.1.3") + (version "1.0.2.0") (source (origin (method url-fetch) @@ -8235,7 +8235,7 @@ configurations to coexist without resorting to mutable global variables or "regex-" version ".tar.gz")) (sha256 (base32 - "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb")))) + "1f2z025hif1fr24b5khq3qxxyvpxrnhyx8xmbms332arw28rpkda")))) (build-system haskell-build-system) (arguments `(#:phases -- cgit 1.4.1 From 882b23e2392342bfae531dba4b7e5a380f5179d3 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:30:13 -0400 Subject: gnu: ghc-th-orphans: Update to 0.13.9. * gnu/packages/haskell-xyz.scm (ghc-th-orphans): Update to 0.13.9. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3b322f350a..9da282679e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10397,14 +10397,14 @@ instances. This package provides orphan instances for @code{containers}, (define-public ghc-th-orphans (package (name "ghc-th-orphans") - (version "0.13.6") + (version "0.13.9") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "th-orphans/th-orphans-" version ".tar.gz")) (sha256 (base32 - "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp")))) + "1xj1gssv77hdx1r3ndg8k49v3ipj3a6r7crkyvx13jrps3m6ng1z")))) (build-system haskell-build-system) (inputs `(("ghc-th-lift" ,ghc-th-lift) -- cgit 1.4.1 From f9d78c7f785db7a1e41e7dd49a36fc999c295ca2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 13:52:59 -0400 Subject: gnu: Add ghc-base-compat-batteries. * gnu/packages/haskell-xyz.scm (ghc-base-compat-batteries): New variable. --- gnu/packages/haskell-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9da282679e..f2363a655f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -662,6 +662,39 @@ of base to a wider range of compilers, without requiring the use of CPP pragmas in your code.") (license license:bsd-3))) +(define-public ghc-base-compat-batteries + (package + (name "ghc-base-compat-batteries") + (version "0.10.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "base-compat-batteries/base-compat-batteries-" + version ".tar.gz")) + (sha256 + (base32 + "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base-compat" ,ghc-base-compat))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("hspec-discover" ,hspec-discover))) + (arguments + `(#:cabal-revision + ("1" "15sn2qc8k0hxbb2nai341kkrci98hlhzcj2ci087m0zxcg5jcdbp"))) + (home-page "http://hackage.haskell.org/package/base-compat-batteries") + (synopsis "base-compat with extra batteries") + (description "This library provides functions available in later +versions of @code{base} to a wider range of compilers, without requiring +you to use CPP pragmas in your code. This package provides the same API +as the @code{base-compat} library, but depends on compatibility +packages (such as @code{semigroups}) to offer a wider support window +than @code{base-compat}, which has no dependencies.") + (license license:expat))) + (define-public ghc-basement (package (name "ghc-basement") -- cgit 1.4.1 From 7799d17f8ba75cf4811e1f523f1b06518e2b6b70 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 22:59:23 -0400 Subject: gnu: Add ghc-splitmix. * gnu/packages/haskell-xyz.scm (ghc-splitmix): New variable. (ghc-splitmix-bootstrap): Inherit from 'ghc-splitmix'. --- gnu/packages/haskell-xyz.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f2363a655f..7edca40a77 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9475,9 +9475,9 @@ splitting lists into parts, akin to the @code{split} function found in several mainstream languages.") (license license:bsd-3))) -(define-public ghc-splitmix-bootstrap +(define-public ghc-splitmix (package - (name "ghc-splitmix-bootstrap") + (name "ghc-splitmix") (version "0.0.3") (source (origin @@ -9487,11 +9487,15 @@ mainstream languages.") (sha256 (base32 "1k0amgkz7rvyz3lnw7m786ilnr1cibwhx9sc4qynq329gxan5r7w")))) - (properties '((hidden? #t))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) (inputs `(("ghc-random" ,ghc-random))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-async" ,ghc-async) + ("ghc-base-compat-batteries" ,ghc-base-compat-batteries) + ("ghc-tf-random" ,ghc-tf-random) + ("ghc-vector" ,ghc-vector))) (home-page "http://hackage.haskell.org/package/splitmix") (synopsis "Fast and splittable pseudorandom number generator") (description "This package provides a Pure Haskell implementation of the @@ -9508,6 +9512,14 @@ are easily inverted, and two successive outputs suffice to reconstruct the internal state).") (license license:bsd-3))) +(define-public ghc-splitmix-bootstrap + (package + (inherit ghc-splitmix) + (name "ghc-splitmix-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) + (define-public ghc-statevar (package (name "ghc-statevar") -- cgit 1.4.1 From 511c3204b78955d3bfa9575ae42d90b48767d13f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:56:06 -0400 Subject: gnu: ghc-attoparsec: Update to 0.13.2.3. * gnu/packages/haskell-xyz.scm (ghc-attoparsec): Update to 0.13.2.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7edca40a77..053cc5a11c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -441,7 +441,7 @@ permissions while atomically writing to a file.") (define-public ghc-attoparsec (package (name "ghc-attoparsec") - (version "0.13.2.2") + (version "0.13.2.3") (source (origin (method url-fetch) @@ -451,7 +451,7 @@ permissions while atomically writing to a file.") ".tar.gz")) (sha256 (base32 - "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx")))) + "1ngjn9h5n0vyki0m2jir4mg85875ysswy9hznpmj1r856mqwc6ix")))) (build-system haskell-build-system) (arguments `(#:phases -- cgit 1.4.1 From e4ede35b9c5f02d9f2dedad0f9baa32d40d41c89 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:30:28 -0400 Subject: gnu: ghc-genvalidity-property: Update to 0.4.0.0. * gnu/packages/haskell-xyz.scm (ghc-genvalidity-property): Update to 0.4.0.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 053cc5a11c..3619370b15 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3879,7 +3879,7 @@ with the @code{Validity} typeclass.") (define-public ghc-genvalidity-property (package (name "ghc-genvalidity-property") - (version "0.2.1.1") + (version "0.4.0.0") (source (origin (method url-fetch) @@ -3890,7 +3890,7 @@ with the @code{Validity} typeclass.") ".tar.gz")) (sha256 (base32 - "0cjw5i2pydidda9bnp6x37ylhxdk9g874x5sadr6sscg5kq85a1b")))) + "0zayycx62226w54rvkxwhvqhznsr33dk3ds55yyqrfqbnhvph1s9")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From e4c92f28255857db561f52e74f5ac7f58e16dbb3 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:30:41 -0400 Subject: gnu: ghc-distributive: Update to 0.6.1. * gnu/packages/haskell-xyz.scm (ghc-distributive): Update to 0.6.1. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3619370b15..3654683188 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2652,7 +2652,7 @@ disk space usage.") (define-public ghc-distributive (package (name "ghc-distributive") - (version "0.5.3") + (version "0.6.1") (source (origin (method url-fetch) @@ -2662,11 +2662,8 @@ disk space usage.") ".tar.gz")) (sha256 (base32 - "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi")))) + "1wnayzzb4vk8rhh9gzhdpd9f64366k4vmbhximavmqqmp3cv2jbp")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("6" "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"))) (inputs `(("ghc-tagged" ,ghc-tagged) ("ghc-base-orphans" ,ghc-base-orphans) -- cgit 1.4.1 From d34860c797ab6a1359ab33f7f60477adfab627d9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:30:56 -0400 Subject: gnu: ghc-gnuplot: Update to 0.5.6. * gnu/packages/haskell-xyz.scm (ghc-gnuplot): Update to 0.5.6. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3654683188..a987600389 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4011,7 +4011,7 @@ programs.") (define-public ghc-gnuplot (package (name "ghc-gnuplot") - (version "0.5.5.2") + (version "0.5.6") (source (origin (method url-fetch) @@ -4019,7 +4019,7 @@ programs.") "mirror://hackage/package/gnuplot/gnuplot-" version ".tar.gz")) (sha256 - (base32 "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn")))) + (base32 "1g6xgnlkh17avivn1rlq7l2nvs26dvrbx4rkfld0bf6kyqaqwrgp")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) -- cgit 1.4.1 From 1631a0f794257c2b5a92f7ef405b7d1ce4889da7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:31:33 -0400 Subject: gnu: ghc-wave: Update to 0.2.0. * gnu/packages/haskell-xyz.scm (ghc-wave): Update to 0.2.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a987600389..ba512debd2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11533,7 +11533,7 @@ given term should not exist.") (define-public ghc-wave (package (name "ghc-wave") - (version "0.1.5") + (version "0.2.0") (source (origin (method url-fetch) (uri (string-append @@ -11542,7 +11542,7 @@ given term should not exist.") ".tar.gz")) (sha256 (base32 - "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5")))) + "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki")))) (build-system haskell-build-system) (arguments '(#:phases -- cgit 1.4.1 From 93c1fdd3032446f3933fba5c6bae367a191dd1d4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:32:59 -0400 Subject: gnu: ghc-zip-archive: Update to 0.4.1. * gnu/packages/haskell-xyz.scm (ghc-zip-archive): Update to 0.4.1. [arguments]: Add a phase that sets up the environment for the tests. [native-inputs]: Add 'which'. --- gnu/packages/haskell-xyz.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ba512debd2..e6c3275f86 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11904,7 +11904,7 @@ documents.") (define-public ghc-zip-archive (package (name "ghc-zip-archive") - (version "0.3.3") + (version "0.4.1") (source (origin (method url-fetch) @@ -11914,15 +11914,26 @@ documents.") ".tar.gz")) (sha256 (base32 - "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq")))) + "1cdix5mnxrbs7b2kivhdydhfzgxidd9dqlw71mdw5p21cabwkmf5")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-PATH-for-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((unzip (assoc-ref inputs "unzip")) + (which (assoc-ref inputs "which")) + (path (getenv "PATH"))) + (setenv "PATH" (string-append unzip "/bin:" which "/bin:" path)) + #t)))))) (inputs `(("ghc-digest" ,ghc-digest) ("ghc-temporary" ,ghc-temporary) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-hunit" ,ghc-hunit) - ("unzip" ,unzip))) + ("unzip" ,unzip) + ("which" ,which))) (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 1.4.1 From 4a0ffae5900bb542017f244c11b7874612714360 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 12:22:18 -0500 Subject: gnu: ghc-fgl-arbitrary: Update dependency constraints. * gnu/packages/haskell-xyz.scm (ghc-fgl-arbitrary): Change the phase that updates the Cabal file to allow for newer versions of 'hspec' and 'QuickCheck'. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e6c3275f86..6a5f26b8ab 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3482,9 +3482,9 @@ encourages inductive, recursive definitions of graph algorithms.") (lambda _ (substitute* "fgl-arbitrary.cabal" (("QuickCheck >= 2\\.3 && < 2\\.10") - "QuickCheck >= 2.3 && < 2.12") + "QuickCheck >= 2.3 && < 2.14") (("hspec >= 2\\.1 && < 2\\.5") - "hspec >= 2.1 && < 2.6"))))))) + "hspec >= 2.1 && < 2.8"))))))) (inputs `(("ghc-fgl" ,ghc-fgl) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From c264bd422e92ca28fd74defa5ed1bab584d4219b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 10:31:44 -0400 Subject: gnu: ghc-graphviz: Update to 2999.20.0.3. * gnu/packages/haskell-xyz.scm (ghc-graphviz): Update to 2999.20.0.3. [arguments]: Change the phase that updates the Cabal file to allow for newer versions of 'hspec' and 'QuickCheck'. --- gnu/packages/haskell-xyz.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 6a5f26b8ab..8dec2a1212 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4046,15 +4046,25 @@ programs.") (define-public ghc-graphviz (package (name "ghc-graphviz") - (version "2999.20.0.2") + (version "2999.20.0.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "graphviz/graphviz-" version ".tar.gz")) (sha256 (base32 - "0kj7ap0gnliviq2p8lscw1m06capnsa90vpvcys24nqy5nw2wrp7")))) + "04k26zw61nfv1pkd00iaq89pgsaiym0sf4cbzkmm2k2fj5xa587g")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "graphviz.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.13") + "QuickCheck >= 2.3 && < 2.14") + (("hspec >= 2\\.1 && < 2\\.7") + "hspec >= 2.1 && < 2.8"))))))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-colour" ,ghc-colour) -- cgit 1.4.1 From c09d1e62401403f950edc55a059347ef27af5e39 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:54:22 -0400 Subject: gnu: ghc-atomic-write: Update to 0.2.0.6. * gnu/packages/haskell-xyz.scm (ghc-atomic-write): Update to 0.2.0.6. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 8dec2a1212..f99dc244d0 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -408,7 +408,7 @@ This library provides a safer method based on the concept of @code{Ticket}s.") (define-public ghc-atomic-write (package (name "ghc-atomic-write") - (version "0.2.0.5") + (version "0.2.0.6") (source (origin (method url-fetch) @@ -418,7 +418,7 @@ This library provides a safer method based on the concept of @code{Ticket}s.") ".tar.gz")) (sha256 (base32 - "1iaq0hprxcv0sl1sgwcgmm87zraf738va1bciwnx2jkk3k1v9iyv")))) + "1xs3shwnlj8hmnm3q6jc8nv78z0481i5n4hrqqdmbpx8grvlnqyl")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) -- cgit 1.4.1 From b6d9777f49e5147eae25df0b766960ec0d6ba3bc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:54:49 -0400 Subject: gnu: ghc-weigh: Update to 0.0.14. * gnu/packages/haskell-xyz.scm (ghc-weigh): Update to 0.0.14. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f99dc244d0..9c08b96715 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11615,7 +11615,7 @@ widths to the Char type.") (define-public ghc-weigh (package (name "ghc-weigh") - (version "0.0.12") + (version "0.0.14") (source (origin (method url-fetch) @@ -11623,7 +11623,7 @@ widths to the Char type.") "weigh-" version ".tar.gz")) (sha256 (base32 - "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x")))) + "0l85marb5rl9nr1c0id42dnr5i9fk1jciy5h6lywhb34w3hbj61g")))) (build-system haskell-build-system) (inputs `(("ghc-split" ,ghc-split) -- cgit 1.4.1 From d44732025e286fde4cba6b86d69b0968a3fe9c03 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:55:03 -0400 Subject: gnu: ghc-network: Update to 2.8.0.1. * gnu/packages/haskell-xyz.scm (ghc-network): Update to 2.8.0.1. (ghc-network-2.8): Remove variable. * gnu/packages/idris.scm (idris)[inputs]: Replace 'ghc-network-2.8' with 'ghc-network'. --- gnu/packages/haskell-xyz.scm | 22 ++-------------------- gnu/packages/idris.scm | 2 +- 2 files changed, 3 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9c08b96715..4b628f311c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6850,7 +6850,7 @@ ncurses.") (define-public ghc-network (package (name "ghc-network") - (version "2.6.3.6") + (version "2.8.0.1") (outputs '("out" "doc")) (source (origin @@ -6861,7 +6861,7 @@ ncurses.") ".tar.gz")) (sha256 (base32 - "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv")))) + "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1")))) (build-system haskell-build-system) ;; The regression tests depend on an unpublished module. (arguments `(#:tests? #f)) @@ -6876,24 +6876,6 @@ ncurses.") "This package provides a low-level networking interface.") (license license:bsd-3))) -;;; Until we update our default GHC to >=8.6 we cannot update our ghc-network -;;; package, since the 'cabal-install' package that supports the current -;;; 'Cabal' module requires 'network==2.6.*'. Here we provide an updated -;;; version to be used for our idris package. -(define-public ghc-network-2.8 - (hidden-package - (package - (inherit ghc-network) - (version "2.8.0.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/network/" - "network-" version ".tar.gz")) - (sha256 - (base32 - "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1"))))))) - (define-public ghc-network-info (package (name "ghc-network-info") diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 7e6ee302b0..cd682832bc 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -71,7 +71,7 @@ ("ghc-ieee754" ,ghc-ieee754) ("ghc-libffi" ,ghc-libffi) ("ghc-megaparsec" ,ghc-megaparsec-7) - ("ghc-network" ,ghc-network-2.8) + ("ghc-network" ,ghc-network) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-safe" ,ghc-safe) -- cgit 1.4.1 From 72fb84a5d06ee646aef4ca7f573e5298141e6e27 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:55:24 -0400 Subject: gnu: ghc-typed-process: Update to 0.2.6.0. * gnu/packages/haskell-xyz.scm (ghc-typed-process): Update to 0.2.6.0. [inputs]: Add 'ghc-unliftio-core'. --- gnu/packages/haskell-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 4b628f311c..59f390dc8a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10763,7 +10763,7 @@ statically known size.") (define-public ghc-typed-process (package (name "ghc-typed-process") - (version "0.2.3.0") + (version "0.2.6.0") (source (origin (method url-fetch) @@ -10772,10 +10772,11 @@ statically known size.") version ".tar.gz")) (sha256 (base32 - "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0")))) + "1cf2pfym8zdxvvy7xv72ixj7wy3rjrdss6f57k1ysgs66cgsi8ii")))) (build-system haskell-build-system) (inputs - `(("ghc-async" ,ghc-async))) + `(("ghc-async" ,ghc-async) + ("ghc-unliftio-core" ,ghc-unliftio-core))) (native-inputs `(("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-hspec" ,ghc-hspec) -- cgit 1.4.1 From 484476f38d5614e07c441f58a7da8b31d6b8a7db Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 21:08:10 -0500 Subject: gnu: ghc-patience: Update to 0.3. * gnu/packages/haskell-xyz.scm (ghc-patience): Update to 0.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 59f390dc8a..b25bd6a397 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7591,7 +7591,7 @@ files/directories, and more.") (define-public ghc-patience (package (name "ghc-patience") - (version "0.1.1") + (version "0.3") (source (origin (method url-fetch) @@ -7600,7 +7600,7 @@ files/directories, and more.") version ".tar.gz")) (sha256 (base32 - "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm")))) + "1i1b37lgi31c17yrjyf8pdm4nf5lq8vw90z3rri78hf0k66d0p3i")))) (build-system haskell-build-system) (home-page "https://hackage.haskell.org/package/patience") (synopsis "Patience diff and longest increasing subsequence") -- cgit 1.4.1 From acdd03be2d5c2682abec331faea1631edd9be599 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 21:05:10 -0500 Subject: gnu: ghc-chell: Update to 0.5. * gnu/packages/haskell-xyz.scm (ghc-chell): Update to 0.5. [arguments] Set Cabal file to r1. --- gnu/packages/haskell-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b25bd6a397..416138cb62 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1580,7 +1580,7 @@ cross-site scripting (@dfn{XSS}) attacks.") (define-public ghc-chell (package (name "ghc-chell") - (version "0.4.0.2") + (version "0.5") (source (origin (method url-fetch) @@ -1589,8 +1589,11 @@ cross-site scripting (@dfn{XSS}) attacks.") version ".tar.gz")) (sha256 (base32 - "10ingy9qnbmc8cqh4i9pskcw43l0mzk8f3d76b3qz3fig5ary3j9")))) + "1i845isfbk0yq852am9bqmxfpfkpnlha8nfidffsv4gw2p8gg6fg")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "1q93wrw03ix4cmnkz3lzkixcvvizw6i2ia2zifdfak1dvxnblxk0"))) (inputs `(("ghc-options-bootstrap" ,ghc-options-bootstrap) ("ghc-patience" ,ghc-patience) -- cgit 1.4.1 From e0e21831d33b97a40cdac6fb44e873539bcbc316 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 21:06:33 -0500 Subject: gnu: ghc-chell-quickcheck: Update to 0.2.5.2. * gnu/packages/haskell-xyz.scm (ghc-chell-quickcheck): Update to 0.2.5.2. [arguments]: Change the 'update-constraints' phase to allow even newer versions of 'QuickCheck'. (ghc-chell-quickcheck-bootstrap): Likewise. --- gnu/packages/haskell-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 416138cb62..360fbec509 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1611,7 +1611,7 @@ testing strategies.") (define-public ghc-chell-quickcheck (package (name "ghc-chell-quickcheck") - (version "0.2.5.1") + (version "0.2.5.2") (source (origin (method url-fetch) @@ -1620,7 +1620,7 @@ testing strategies.") "chell-quickcheck-" version ".tar.gz")) (sha256 (base32 - "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a")))) + "0n8c57n88r2bx0bh8nabsz07m42rh23ahs3hgyzf8gr76l08zq03")))) (build-system haskell-build-system) (arguments `(#:phases @@ -1628,8 +1628,8 @@ testing strategies.") (add-before 'configure 'update-constraints (lambda _ (substitute* "chell-quickcheck.cabal" - (("QuickCheck >= 2\\.3 && < 2\\.11") - "QuickCheck >= 2.3 && < 2.12"))))))) + (("QuickCheck >= 2\\.3 && < 2\\.13") + "QuickCheck >= 2.3 && < 2.14"))))))) (inputs `(("ghc-chell" ,ghc-chell) ("ghc-chell-quickcheck-bootstrap" ,ghc-chell-quickcheck-bootstrap) @@ -1643,7 +1643,7 @@ testing strategies.") (define ghc-chell-quickcheck-bootstrap (package (name "ghc-chell-quickcheck-bootstrap") - (version "0.2.5.1") + (version "0.2.5.2") (source (origin (method url-fetch) @@ -1652,7 +1652,7 @@ testing strategies.") "chell-quickcheck-" version ".tar.gz")) (sha256 (base32 - "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a")))) + "0n8c57n88r2bx0bh8nabsz07m42rh23ahs3hgyzf8gr76l08zq03")))) (build-system haskell-build-system) (inputs `(("ghc-chell" ,ghc-chell) @@ -1665,8 +1665,8 @@ testing strategies.") (add-before 'configure 'update-constraints (lambda _ (substitute* "chell-quickcheck.cabal" - (("QuickCheck >= 2\\.3 && < 2\\.11") - "QuickCheck >= 2.3 && < 2.12"))))))) + (("QuickCheck >= 2\\.3 && < 2\\.13") + "QuickCheck >= 2.3 && < 2.14"))))))) (home-page "https://john-millikin.com/software/chell/") (synopsis "QuickCheck support for the Chell testing library") (description "More complex tests for @code{chell}.") -- cgit 1.4.1 From dcfb99d4cb88e210ecdf07e4a32914b0eef9949f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:55:37 -0400 Subject: gnu: ghc-system-fileio: Update to 0.3.16.4. * gnu/packages/haskell-xyz.scm (ghc-system-fileio): Update to 0.3.16.4. [arguments]: Add a phase that updates the Cabal file to allow for newer versions of 'chell'. --- gnu/packages/haskell-xyz.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 360fbec509..946948be99 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10002,7 +10002,7 @@ variety of traversals.") (define-public ghc-system-fileio (package (name "ghc-system-fileio") - (version "0.3.16.3") + (version "0.3.16.4") (source (origin (method url-fetch) @@ -10011,8 +10011,16 @@ variety of traversals.") version ".tar.gz")) (sha256 (base32 - "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i")))) + "1iy6g1f35gzyj12g9mdiw4zf75mmxpv1l8cyaldgyscsl648pr9l")))) (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "system-fileio.cabal" + (("chell >= 0\\.4 && < 0\\.5") "chell >= 0.4")) + #t))))) (inputs `(("ghc-system-filepath" ,ghc-system-filepath) ("ghc-chell" ,ghc-chell) -- cgit 1.4.1 From 75cfc9a2f15a9c348aab189372253444208a151f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 23:00:36 -0400 Subject: gnu: Add ghc-time-compat. * gnu/packages/haskell-xyz.scm (ghc-time-compat): New variable. --- gnu/packages/haskell-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 946948be99..e7276795a9 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10529,6 +10529,38 @@ datatypes reachable from an initial datatype, and passing these names to some function which generates instances.") (license license:bsd-3))) +(define-public ghc-time-compat + (package + (name "ghc-time-compat") + (version "1.9.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "time-compat/time-compat-" version ".tar.gz")) + (sha256 + (base32 + "05va0rqs759vbridbcl6hksp967j9anjvys8vx72fnfkhlrn2s52")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base-orphans" ,ghc-base-orphans))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-base-compat" ,ghc-base-compat) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tagged" ,ghc-tagged) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (arguments + `(#:cabal-revision + ("1" "0k8ph4sydaiqp8dav4if6hpiaq8h1xsr93khmdr7a1mmfwdxr64r"))) + (home-page "https://github.com/phadej/time-compat") + (synopsis "Compatibility package for time") + (description "This packages tries to compat as many @code{time} +features as possible.") + (license license:bsd-3))) + (define-public ghc-time-locale-compat (package (name "ghc-time-locale-compat") -- cgit 1.4.1 From e9f64fa00bef905f5f6ba6875025adc6fc151973 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:55:53 -0400 Subject: gnu: ghc-quickcheck-instances: Update to 0.3.22. * gnu/packages/haskell-check.scm (ghc-quickcheck-instances): Update to 0.3.22. [arguments]: Use Cabal file revision 2. [inputs]: Add 'ghc-time-compat'. --- 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 3787b4defe..ea7f30e680 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -314,7 +314,7 @@ development.") (define-public ghc-quickcheck-instances (package (name "ghc-quickcheck-instances") - (version "0.3.18") + (version "0.3.22") (source (origin (method url-fetch) @@ -324,11 +324,11 @@ development.") version ".tar.gz")) (sha256 (base32 - "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55")))) + "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax")))) (build-system haskell-build-system) (arguments `(#:cabal-revision - ("1" "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly"))) + ("2" "1ia5fjhpg7rz793552v88gv2iqx7hl9mi2g09m0llasy1cpzc9jr"))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-base-compat" ,ghc-base-compat) @@ -337,6 +337,7 @@ development.") ("ghc-old-time" ,ghc-old-time) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) + ("ghc-time-compat" ,ghc-time-compat) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-uuid-types" ,ghc-uuid-types) -- cgit 1.4.1 From 871ceb317bdcc61112928f7f030297839701ce64 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:56:26 -0400 Subject: gnu: ghc-tldr: Update to 0.4.0.2. * gnu/packages/haskell-xyz.scm (ghc-tldr): Update to 0.4.0.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e7276795a9..f6b8bde303 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10606,7 +10606,7 @@ used CPU time of monadic computation with an IO base.") (define-public ghc-tldr (package (name "ghc-tldr") - (version "0.4.0.1") + (version "0.4.0.2") (source (origin (method url-fetch) @@ -10616,7 +10616,7 @@ used CPU time of monadic computation with an IO base.") ".tar.gz")) (sha256 (base32 - "0nc581y9jjzwd8l88g48c72mla7k6q1w102akl7gl5jsk9ljamd3")))) + "1zy9yyg7bxiyz1prkvrscggsb9p0f8y0nqxxxzlgzvnh2nmqf8f2")))) (build-system haskell-build-system) (inputs `(("ghc-cmark" ,ghc-cmark) -- cgit 1.4.1 From 79a069108902fc8bdff2dd4d5774d60ce8bb1382 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:56:39 -0400 Subject: gnu: ghc-opengl: Update to 3.0.3.0. * gnu/packages/haskell-xyz.scm (ghc-opengl): Update to 3.0.3.0. [arguments]: Set Cabal file to r1. --- gnu/packages/haskell-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f6b8bde303..840b2fbab3 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7061,7 +7061,7 @@ old @code{time} library. For new projects, the newer (define-public ghc-opengl (package (name "ghc-opengl") - (version "3.0.2.2") + (version "3.0.3.0") (source (origin (method url-fetch) @@ -7071,8 +7071,11 @@ old @code{time} library. For new projects, the newer ".tar.gz")) (sha256 (base32 - "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc")))) + "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "1748mrb6r9mpf5jbrx436lwbg8w6dadyy8dhxw2dwnrj5z7zf741"))) (inputs `(("ghc-objectname" ,ghc-objectname) ("ghc-gluraw" ,ghc-gluraw) -- cgit 1.4.1 From ec25d53677a7e26514b92d5a501233c9ab591039 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:56:51 -0400 Subject: gnu: ghc-iproute: Update to 1.7.7. * gnu/packages/haskell-xyz.scm (ghc-iproute): Update to 1.7.7. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 840b2fbab3..1af61d119f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5440,7 +5440,7 @@ through a forwarding proxy that is configured to speak this protocol.") (define-public ghc-iproute (package (name "ghc-iproute") - (version "1.7.5") + (version "1.7.7") (source (origin (method url-fetch) @@ -5450,7 +5450,7 @@ through a forwarding proxy that is configured to speak this protocol.") ".tar.gz")) (sha256 (base32 - "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd")))) + "0gab5930nvzrpvisx3x43ydnp2rd4fbmy9cq1zpgqy1adx5gx8z6")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find System.ByteOrder, ; exported by ghc-byteorder. Doctest issue. -- cgit 1.4.1 From d23edfce561fe9693e7d63e4c36645454f0068df Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:58:21 -0400 Subject: gnu: ghc-hsopenssl: Update to 0.11.4.17. * gnu/packages/haskell-crypto.scm (ghc-hsopenssl): Update to 0.11.4.17. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-crypto.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 1652ae2b15..8e3168eedd 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -780,7 +780,7 @@ extensions.") (define-public ghc-hsopenssl (package (name "ghc-hsopenssl") - (version "0.11.4.15") + (version "0.11.4.17") (source (origin (method url-fetch) @@ -788,14 +788,11 @@ extensions.") "HsOpenSSL/HsOpenSSL-" version ".tar.gz")) (sha256 (base32 - "0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff")))) + "0qivl9clmybfglwxqp2sq308rv4ia4rhwshcsc8b029bvpp0mpsi")))) (build-system haskell-build-system) (inputs `(("ghc-network" ,ghc-network) ("openssl" ,openssl))) - (arguments - `(#:cabal-revision - ("1" "0bkcw2pjfgv1bhgkrpncvwq9czfr7cr4ak14n0v8c2y33i33wk5z"))) (home-page "https://github.com/vshabanov/HsOpenSSL") (synopsis "Partial OpenSSL binding for Haskell") (description "HsOpenSSL is an OpenSSL binding for Haskell. It can -- cgit 1.4.1 From 1a825512d35864186de38c7494188691d10c8c01 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:58:51 -0400 Subject: gnu: ghc-comonad: Update to 5.0.5. * gnu/packages/haskell-xyz.scm (ghc-comonad): Update to 5.0.5. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1af61d119f..9ebde51ee2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1850,7 +1850,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") (define-public ghc-comonad (package (name "ghc-comonad") - (version "5.0.4") + (version "5.0.5") (source (origin (method url-fetch) @@ -1860,7 +1860,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") ".tar.gz")) (sha256 (base32 - "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q")))) + "1l7snp2mszgnjgd0nc9kzfyd13vla0rlazqi03rwx2akcxk14n3c")))) (build-system haskell-build-system) (native-inputs `(("cabal-doctest" ,cabal-doctest) -- cgit 1.4.1 From 03b0c92e2a75c73204791fa28858e0de21856c14 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:59:06 -0400 Subject: gnu: ghc-megaparsec: Update to 7.0.5. * gnu/packages/haskell-xyz.scm (ghc-megaparsec): Update to 7.0.5. [arguments]: Remove '#:cabal-revision'. (ghc-megaparsec-7): Remove variable. * gnu/packages/haskell-apps.scm (kmonad)[inputs]: Replace 'ghc-megaparsec-7' with 'ghc-megaparsec'. * gnu/packages/idris.scm (idris)[inputs]: Likewise. --- gnu/packages/haskell-apps.scm | 2 +- gnu/packages/haskell-xyz.scm | 25 ++----------------------- gnu/packages/idris.scm | 2 +- 3 files changed, 4 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index eac07ca9b8..1e0dafe227 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -543,7 +543,7 @@ and mIRC chat codes.") ("ghc-exceptions" ,ghc-exceptions) ("ghc-hashable" ,ghc-hashable) ("ghc-lens" ,ghc-lens) - ("ghc-megaparsec" ,ghc-megaparsec-7) + ("ghc-megaparsec" ,ghc-megaparsec) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-unagi-chan" ,ghc-unagi-chan) ("ghc-unliftio" ,ghc-unliftio) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9ebde51ee2..cfc5f05c35 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6120,7 +6120,7 @@ functions are often useful in statistical and numerical computing.") (define-public ghc-megaparsec (package (name "ghc-megaparsec") - (version "6.5.0") + (version "7.0.5") (source (origin (method url-fetch) @@ -6129,11 +6129,8 @@ functions are often useful in statistical and numerical computing.") version ".tar.gz")) (sha256 (base32 - "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy")))) + "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("4" "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"))) (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-parser-combinators" ,ghc-parser-combinators) @@ -6151,24 +6148,6 @@ Megaparsec is a feature-rich package that strikes a nice balance between speed, flexibility, and quality of parse errors.") (license license:bsd-2))) -;;; Idris 1.3.2 requires 'megaparse>=7.0.4' but we'd like to keep the public -;;; package at the current Stackage LTS version: -(define-public ghc-megaparsec-7 - (hidden-package - (package - (inherit ghc-megaparsec) - (version "7.0.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/megaparsec/" - "megaparsec-" version ".tar.gz")) - (sha256 - (base32 - "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j")))) - (arguments (strip-keyword-arguments (list #:cabal-revision) - (package-arguments ghc-megaparsec)))))) - (define-public ghc-memory (package (name "ghc-memory") diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index cd682832bc..e5c0ac210e 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -70,7 +70,7 @@ ("ghc-fsnotify" ,ghc-fsnotify) ("ghc-ieee754" ,ghc-ieee754) ("ghc-libffi" ,ghc-libffi) - ("ghc-megaparsec" ,ghc-megaparsec-7) + ("ghc-megaparsec" ,ghc-megaparsec) ("ghc-network" ,ghc-network) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-regex-tdfa" ,ghc-regex-tdfa) -- cgit 1.4.1 From ab761e9dd845b72b0a2e6bd8d2b1af0fa82fde99 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:59:26 -0400 Subject: gnu: ghc-socks: Update to 0.6.1. * gnu/packages/haskell-xyz.scm (ghc-socks): Update to 0.6.1. [inputs]: Add 'ghc-basement'. --- gnu/packages/haskell-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index cfc5f05c35..8a85ffd9f4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9380,17 +9380,18 @@ automatically by SmallCheck.") (define-public ghc-socks (package (name "ghc-socks") - (version "0.5.6") + (version "0.6.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "socks/socks-" version ".tar.gz")) (sha256 (base32 - "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs")))) + "0wvaxy3dkv97wrncjv1rxrmjr4014hgxz82kixvcwqdhidalfi3k")))) (build-system haskell-build-system) (inputs `(("ghc-cereal" ,ghc-cereal) + ("ghc-basement" ,ghc-basement) ("ghc-network" ,ghc-network))) (home-page "https://github.com/vincenthz/hs-socks") (synopsis "SOCKS proxy (version 5) implementation") -- cgit 1.4.1 From e5ccc5f78c658c25171c094b310d1497508f8d2a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:59:40 -0400 Subject: gnu: ghc-hslogger: Update to 1.2.12. * gnu/packages/haskell-xyz.scm (ghc-hslogger): Update to 1.2.12. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 8a85ffd9f4..a655faeb24 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4991,7 +4991,7 @@ MODS-format XML intermediate.") (define-public ghc-hslogger (package (name "ghc-hslogger") - (version "1.2.10") + (version "1.2.12") (source (origin (method url-fetch) @@ -4999,7 +4999,7 @@ MODS-format XML intermediate.") "hslogger-" version "/" "hslogger-" version ".tar.gz")) (sha256 (base32 - "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp")))) + "0ykcsk7wqygvrg60r5kpl6xfinr706al8pfyk5wj67wjs24lqypr")))) (build-system haskell-build-system) (inputs `(("ghc-network" ,ghc-network) -- cgit 1.4.1 From 37a05591293eeb8c3051e8c5aac7f2e1ca9abde5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 12:59:54 -0400 Subject: gnu: ghc-haskell-src-exts: Update to 1.21.1. * gnu/packages/haskell-xyz.scm (ghc-haskell-src-exts): Update to 1.21.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a655faeb24..753da9e373 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4523,7 +4523,7 @@ package are to parse or generate Haskell 98 code.") (define-public ghc-haskell-src-exts (package (name "ghc-haskell-src-exts") - (version "1.20.2") + (version "1.21.1") (source (origin (method url-fetch) @@ -4533,7 +4533,7 @@ package are to parse or generate Haskell 98 code.") ".tar.gz")) (sha256 (base32 - "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz")))) + "0q1y8n3d82gid9bcx8wxsqqmj9mq11fg3gp5yzpfbw958dhi3j9f")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) -- cgit 1.4.1 From 8bda2fa7dab87f29a6e60d3784bcef1ec4202f91 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:00:09 -0400 Subject: gnu: ghc-rio: Update to 0.1.12.0. * gnu/packages/haskell-xyz.scm (ghc-rio): Update to 0.1.12.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 753da9e373..ea267362e1 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8600,7 +8600,7 @@ better for some purposes.") (define-public ghc-rio (package (name "ghc-rio") - (version "0.1.5.0") + (version "0.1.12.0") (source (origin (method url-fetch) @@ -8609,7 +8609,7 @@ better for some purposes.") version ".tar.gz")) (sha256 (base32 - "064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g")))) + "0xzjkh6aavynpyskikhs8dmv0zhkiqiwz9zdn80zbd25b2182pif")))) (build-system haskell-build-system) (inputs `(("ghc-exceptions" ,ghc-exceptions) -- cgit 1.4.1 From 8284bd09e02487a8c5a5a49c65c0c3c6313c7ec3 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:00:26 -0400 Subject: gnu: ghc-glut: Update to 2.7.0.15. * gnu/packages/haskell-xyz.scm (ghc-glut): Update to 2.7.0.15. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ea267362e1..e985af2356 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3987,7 +3987,7 @@ basis for a nicer interface.") (define-public ghc-glut (package (name "ghc-glut") - (version "2.7.0.14") + (version "2.7.0.15") (source (origin (method url-fetch) @@ -3997,7 +3997,7 @@ basis for a nicer interface.") ".tar.gz")) (sha256 (base32 - "01i162fly4q1751fp60lgkzlb8kr0qqbvmxj74zc6skb19qggy2w")))) + "0271vnf6wllhxjwy0m348x90kv27aybxcbqkkglmd5w4cpwjg5g9")))) (build-system haskell-build-system) (inputs `(("ghc-statevar" ,ghc-statevar) -- cgit 1.4.1 From 0beaec66bdf8547cf8154253ff1d4b2a8d7fa979 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:00:42 -0400 Subject: gnu: ghc-bifunctors: Update to 5.5.5. * gnu/packages/haskell-xyz.scm (ghc-bifunctors): Update to 5.5.5. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e985af2356..729044ceba 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -804,7 +804,7 @@ stand for certain ASCII character sequences, i.e. → instead of @code{->}, (define-public ghc-bifunctors (package (name "ghc-bifunctors") - (version "5.5.3") + (version "5.5.5") (source (origin (method url-fetch) @@ -814,7 +814,7 @@ stand for certain ASCII character sequences, i.e. → instead of @code{->}, ".tar.gz")) (sha256 (base32 - "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l")))) + "0rn47q8dzv0g1fyams99p4py6q0asxdc50q9k0nj497brk738xcb")))) (build-system haskell-build-system) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) -- cgit 1.4.1 From 35ee173ca0f3fefa9094913f76b6fb82d0b61a8a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 14:14:57 -0400 Subject: gnu: ghc-charset: Update Cabal file to r1. * gnu/packages/haskell-xyz.scm (ghc-charset): Update Cabal file to r1. --- gnu/packages/haskell-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 729044ceba..0d4f91f135 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1454,6 +1454,9 @@ parser isolation, and labeled blocks for better error messages.") (base32 "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "1z6nxw2g9vgsjq0g159sk8mwj68lwzxzi5iv5ynha0h85jcqxszy"))) (inputs `(("ghc-semigroups" ,ghc-semigroups) ("ghc-unordered-containers" ,ghc-unordered-containers))) -- cgit 1.4.1 From 6818f970ac9dcd3db9dae04c2df8ac59994b3248 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:00:56 -0400 Subject: gnu: ghc-parsers: Update to 0.12.10. * gnu/packages/haskell-xyz.scm (ghc-parsers): Update to 0.12.10. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0d4f91f135..219f970b45 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7449,7 +7449,7 @@ combinators.") (define-public ghc-parsers (package (name "ghc-parsers") - (version "0.12.9") + (version "0.12.10") (source (origin (method url-fetch) @@ -7459,7 +7459,7 @@ combinators.") ".tar.gz")) (sha256 (base32 - "1r05sc1mcglk8w596kq9a1brfn9c2vll8lq16j07ln0vsz4jzrc1")))) + "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Test fails with "cannot satisfy ; -package attoparsec-0.13.0.1" -- cgit 1.4.1 From 1c86a8aa2b23dbf45e55075ad1edb4f0739d4cfa Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:02:27 -0400 Subject: gnu: ghc-aeson: Update to 1.4.5.0. * gnu/packages/haskell-web.scm (ghc-aeson): Update to 1.4.5.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 15002addc0..6b99dec218 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -769,7 +769,7 @@ documents.") (define-public ghc-aeson (package (name "ghc-aeson") - (version "1.3.1.1") + (version "1.4.5.0") (source (origin (method url-fetch) @@ -779,7 +779,7 @@ documents.") ".tar.gz")) (sha256 (base32 - "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4")))) + "1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs -- cgit 1.4.1 From 77355bdfc8cf6f306387ef58bce4af95df97a82f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:07:24 -0400 Subject: gnu: ghc-haskell-src-exts-util: Update to 0.2.5. * gnu/packages/haskell-xyz.scm (ghc-haskell-src-exts-util): Update to 0.2.5. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 219f970b45..78e6d4b01f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4559,7 +4559,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.3") + (version "0.2.5") (source (origin (method url-fetch) @@ -4568,7 +4568,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") version ".tar.gz")) (sha256 (base32 - "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8")))) + "0fvqi72m74p7q5sbpy8m2chm8a1lgy10mfrcxcz8wrh59vngj0n8")))) (build-system haskell-build-system) (inputs `(("ghc-data-default" ,ghc-data-default) -- cgit 1.4.1 From e94b3c721a90d962f24d925d05ee10e70242d607 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:07:45 -0400 Subject: gnu: ghc-haskell-src-meta: Update to 0.8.3. * gnu/packages/haskell-xyz.scm (ghc-haskell-src-meta): Update to 0.8.3. [native-inputs]: Remove 'ghc-test-framework' and 'ghc-test-framework-hunit'; add 'ghc-tasty' and 'ghc-tasty-hunit'. --- gnu/packages/haskell-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 78e6d4b01f..e338175283 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4585,7 +4585,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (define-public ghc-haskell-src-meta (package (name "ghc-haskell-src-meta") - (version "0.8.0.3") + (version "0.8.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -4593,7 +4593,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") version ".tar.gz")) (sha256 (base32 - "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4")))) + "17znnaqj2hnnfyc9p9xjzbs97h2jh1h4f4qbw648y3xa14wx5ra9")))) (build-system haskell-build-system) (inputs `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) @@ -4601,8 +4601,8 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") ("ghc-th-orphans" ,ghc-th-orphans))) (native-inputs `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://hackage.haskell.org/package/haskell-src-meta") (synopsis "Parse source to template-haskell abstract syntax") (description -- cgit 1.4.1 From 97f267c85bd99daca270a17cace3a05775dade5a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:08:01 -0400 Subject: gnu: ghc-attoparsec-iso8601: Update to 1.0.1.0. * gnu/packages/haskell-xyz.scm (ghc-attoparsec-iso8601): Update to 1.0.1.0. [arguments]: Update the Cabal revision hash. --- gnu/packages/haskell-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e338175283..100db9a278 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -494,7 +494,7 @@ complicated text/binary file formats.") (define-public ghc-attoparsec-iso8601 (package (name "ghc-attoparsec-iso8601") - (version "1.0.0.0") + (version "1.0.1.0") (source (origin (method url-fetch) @@ -503,11 +503,11 @@ complicated text/binary file formats.") "attoparsec-iso8601-" version ".tar.gz")) (sha256 (base32 - "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a")))) + "0hj10w15qp2z5bz2v4xahhmbgzclpyfi5l2sv97wqycysg9gp7s9")))) (build-system haskell-build-system) (arguments `(#:cabal-revision - ("1" "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"))) + ("1" "1rjhscmczgs1bwyqx7lvkm8py3ylxjd2797mrzgnq60fvm292750"))) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-base-compat" ,ghc-base-compat))) (home-page "https://github.com/bos/aeson") -- cgit 1.4.1 From 30eebbe6c341bfafad2124cbb9992e35676933f6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 22:14:20 -0400 Subject: gnu: Add ghc-network-bsd. * gnu/packages/haskell-xyz.scm (ghc-network-bsd): New variable. --- gnu/packages/haskell-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 100db9a278..d6f5653e89 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6861,6 +6861,27 @@ ncurses.") "This package provides a low-level networking interface.") (license license:bsd-3))) +(define-public ghc-network-bsd + (package + (name "ghc-network-bsd") + (version "2.8.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "network-bsd/network-bsd-" version ".tar.gz")) + (sha256 + (base32 + "0dfbwgrr28y6ypw7p1ppqg7v746qf14569q4xazj4ahdjw2xkpi5")))) + (build-system haskell-build-system) + (inputs + `(("ghc-network" ,ghc-network))) + (home-page "https://github.com/haskell/network-bsd") + (synopsis "POSIX network database () API") + (description "This package provides Haskell bindings to the the POSIX +network database () API.") + (license license:bsd-3))) + (define-public ghc-network-info (package (name "ghc-network-info") -- cgit 1.4.1 From 858bf39fd05db082ccffe07baf6cd3e799704a18 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:08:15 -0400 Subject: gnu: ghc-httpd-shed: Update to 0.4.1.1. * gnu/packages/haskell-web.scm (ghc-httpd-shed): Update to 0.4.1.1. [inputs]: Add 'ghc-network-bsd'. --- gnu/packages/haskell-web.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 6b99dec218..b85fae905a 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -95,7 +95,7 @@ for screen-scraping.") (define-public ghc-httpd-shed (package (name "ghc-httpd-shed") - (version "0.4.0.3") + (version "0.4.1.1") (source (origin (method url-fetch) @@ -103,10 +103,11 @@ for screen-scraping.") "httpd-shed-" version ".tar.gz")) (sha256 (base32 - "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh")))) + "19dgdimpzr7pxk7pqvyin6j87gmvnf0rm35gzhmna8qr835wy3sr")))) (build-system haskell-build-system) (inputs - `(("ghc-network-uri" ,ghc-network-uri) + `(("ghc-network-bsd" ,ghc-network-bsd) + ("ghc-network-uri" ,ghc-network-uri) ("ghc-network" ,ghc-network))) (home-page "https://hackage.haskell.org/package/httpd-shed") (synopsis "Simple web-server with an interact style API") -- cgit 1.4.1 From e2303abb5c061debc4d6224ac7ce57640fcc7f13 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 21:09:13 -0500 Subject: gnu: ghc-stringsearch: Update Cabal file to r1. * gnu/packages/haskell-xyz.scm (ghc-stringsearch): Update Cabal file to r1. --- gnu/packages/haskell-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d6f5653e89..27daca10c0 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9914,6 +9914,9 @@ and bytestrings.") (base32 "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378"))) (home-page "https://bitbucket.org/dafis/stringsearch") (synopsis "Fast searching, splitting and replacing of ByteStrings") (description "This package provides several functions to quickly search -- cgit 1.4.1 From b6b2c2183bdd8271f8926650b9751dbee20a3ddd Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:08:27 -0400 Subject: gnu: ghc-cgi: Update to 3001.4.0.0. * gnu/packages/haskell-xyz.scm (ghc-cgi): Update to 3001.4.0.0. [arguments]: Remove the 'update-constraints' phase. --- gnu/packages/haskell-xyz.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 27daca10c0..4da0455a09 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1398,7 +1398,7 @@ parser isolation, and labeled blocks for better error messages.") (define-public ghc-cgi (package (name "ghc-cgi") - (version "3001.3.0.2") + (version "3001.4.0.0") (source (origin (method url-fetch) @@ -1408,22 +1408,8 @@ parser isolation, and labeled blocks for better error messages.") ".tar.gz")) (sha256 (base32 - "1hbpplss1m4rdpm4ibip6fpimlhssqa14fl338kl2jbc463i64cj")))) + "1d0nh5ymkqskkp4yn0gfz4mff8i0cxyw1wws8xxp6k1mg1ywa25k")))) (build-system haskell-build-system) - (arguments - `(#: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-exceptions" ,ghc-exceptions) ("ghc-multipart" ,ghc-multipart) -- cgit 1.4.1 From 8fd2a8169bd1d2ad120d7b4e4dee52703a893e49 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:08:39 -0400 Subject: gnu: ghc-hxt: Update to 9.3.1.18. * gnu/packages/haskell-web.scm (ghc-hxt): Update to 9.3.1.18. --- 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 b85fae905a..4e2e151576 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1274,7 +1274,7 @@ derivations of regular expressions.") (define-public ghc-hxt (package (name "ghc-hxt") - (version "9.3.1.16") + (version "9.3.1.18") (source (origin (method url-fetch) @@ -1284,7 +1284,7 @@ derivations of regular expressions.") ".tar.gz")) (sha256 (base32 - "1qq3ykgn355rx242xjcbqqksgvwr6k2fdj5phw4iv28qqxff6m8d")))) + "0836k65px3w9c5h1h2bmzq5a7mp6ajxwvfg3pfr2kbxwkgc0j63j")))) (build-system haskell-build-system) (inputs `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) -- cgit 1.4.1 From cc784d7b63dceb533557e21eb8d29e40899ca2d6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:08:51 -0400 Subject: gnu: ghc-hslua: Update to 1.0.3.2. * gnu/packages/haskell-xyz.scm (ghc-hslua): Update to 1.0.3.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 4da0455a09..cb323f9fbe 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5006,14 +5006,14 @@ handler built in.") (define-public ghc-hslua (package (name "ghc-hslua") - (version "0.9.5.2") + (version "1.0.3.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "hslua/hslua-" version ".tar.gz")) (sha256 (base32 - "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f")))) + "183bgl5jcx5y2r94lviqfw0a5w9089nxjd1z40k8vx9y2h60pm6j")))) (build-system haskell-build-system) (arguments `(#:configure-flags '("-fsystem-lua"))) -- cgit 1.4.1 From 59e98d754a3cdf37bb8b045fdfba51f62d42444f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:09:02 -0400 Subject: gnu: ghc-io-streams: Update to 1.5.1.0. * gnu/packages/haskell-xyz.scm (ghc-io-streams): Update to 1.5.1.0. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index cb323f9fbe..3bf5630969 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5359,7 +5359,7 @@ functors). For more information, see Edward Kmett's article (define-public ghc-io-streams (package (name "ghc-io-streams") - (version "1.5.0.1") + (version "1.5.1.0") (source (origin (method url-fetch) @@ -5367,7 +5367,7 @@ functors). For more information, see Edward Kmett's article "io-streams/io-streams-" version ".tar.gz")) (sha256 (base32 - "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx")))) + "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) @@ -5383,9 +5383,6 @@ functors). For more information, see Edward Kmett's article ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) ("ghc-zlib" ,ghc-zlib))) - (arguments - `(#:cabal-revision - ("2" "1mcab95d6hm098myh9gp7sh10srigjphgvm8s9pfs7jg5hzghy14"))) (home-page "http://hackage.haskell.org/package/io-streams") (synopsis "Simple and composable stream I/O") (description "This library contains simple and easy-to-use -- cgit 1.4.1 From bbf9845f4ff6d59164758a7f2a5b2294e99fc0c6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:31:09 -0400 Subject: gnu: ghc-libmpd: Update to 0.9.0.10. * gnu/packages/haskell-xyz.scm (ghc-libmpd): Update to 0.9.0.10. [inputs]: Add 'ghc-safe-exceptions'. --- gnu/packages/haskell-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3bf5630969..a32cc94c80 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5712,7 +5712,7 @@ to be called from Haskell.") (define-public ghc-libmpd (package (name "ghc-libmpd") - (version "0.9.0.9") + (version "0.9.0.10") (source (origin (method url-fetch) @@ -5722,7 +5722,7 @@ to be called from Haskell.") ".tar.gz")) (sha256 (base32 - "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv")))) + "0vy287mn1vk8kvij5i3hc0p02l886cpsq5dds7kl6g520si3abkb")))) (build-system haskell-build-system) ;; Tests fail on i686. ;; See https://github.com/vimus/libmpd-haskell/issues/112 @@ -5732,6 +5732,7 @@ to be called from Haskell.") ("ghc-old-locale" ,ghc-old-locale) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-network" ,ghc-network) + ("ghc-safe-exceptions" ,ghc-safe-exceptions) ("ghc-utf8-string" ,ghc-utf8-string))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit 1.4.1 From a4fe1c648a653b1b629fd27eedd45150cbc32d0a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:10:10 -0400 Subject: gnu: ghc-email-validate: Update to 2.3.2.12. * gnu/packages/haskell-xyz.scm (ghc-email-validate): Update to 2.3.2.12. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a32cc94c80..512ff0bf4c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2974,7 +2974,7 @@ Damerau-Levenshtein algorithms.") (define-public ghc-email-validate (package (name "ghc-email-validate") - (version "2.3.2.6") + (version "2.3.2.12") (source (origin (method url-fetch) @@ -2985,7 +2985,7 @@ Damerau-Levenshtein algorithms.") ".tar.gz")) (sha256 (base32 - "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5")))) + "0ar3cfjia3x11chb7w60mi7hp5djanms883ddk875l6lifr2lyqf")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) -- cgit 1.4.1 From 641207cb85d04b17448eb85f087c35db32d175df Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:10:26 -0400 Subject: gnu: ghc-missingh: Update to 1.4.1.0. * gnu/packages/haskell-xyz.scm (ghc-missingh): Update to 1.4.1.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 512ff0bf4c..ac92c15d69 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6342,7 +6342,7 @@ used both from lens and microlens).") (define-public ghc-missingh (package (name "ghc-missingh") - (version "1.4.0.1") + (version "1.4.1.0") (source (origin (method url-fetch) @@ -6350,7 +6350,7 @@ used both from lens and microlens).") "MissingH-" version ".tar.gz")) (sha256 (base32 - "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8")))) + "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29")))) (build-system haskell-build-system) ;; Tests require the unmaintained testpack package, which depends on the ;; outdated QuickCheck version 2.7, which can no longer be built with -- cgit 1.4.1 From b5b6d7ea62537fdd19173fdcb537832cbdd63e09 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:10:38 -0400 Subject: gnu: ghc-lifted-async: Update to 0.10.0.4. * gnu/packages/haskell-xyz.scm (ghc-lifted-async): Update to 0.10.0.4. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ac92c15d69..606b98ce5d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5773,7 +5773,7 @@ Music Player Daemon.") (define-public ghc-lifted-async (package (name "ghc-lifted-async") - (version "0.10.0.2") + (version "0.10.0.4") (source (origin (method url-fetch) @@ -5782,7 +5782,7 @@ Music Player Daemon.") version ".tar.gz")) (sha256 (base32 - "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf")))) + "0cwl1d0wjpdk0v1l1qxiqiksmak950c8gx169c1q77cg0z18ijf9")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) -- cgit 1.4.1 From f9c6af6516e175e3be8ceb3ed9493b288b743b65 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:10:56 -0400 Subject: gnu: ghc-tls-session-manager: Update to 0.0.3. * gnu/packages/haskell-web.scm (ghc-tls-session-manager): Update to 0.0.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 4e2e151576..83a87befad 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -590,7 +590,7 @@ based WAI (Web Application Interface in Haskell).") (define-public ghc-tls-session-manager (package (name "ghc-tls-session-manager") - (version "0.0.0.2") + (version "0.0.3") (source (origin (method url-fetch) @@ -600,7 +600,7 @@ based WAI (Web Application Interface in Haskell).") version ".tar.gz")) (sha256 (base32 - "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5")))) + "0k57flqp2b4bipafiyfipnqmdqv04ky39yr4s4s9sx577zz2j2yi")))) (build-system haskell-build-system) (inputs `(("ghc-auto-update" ,ghc-auto-update) -- cgit 1.4.1 From ecaf0b0c8629f6e1fa942487ca283d55aa8c5564 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:11:14 -0400 Subject: gnu: ghc-hslua-module-text: Update to 0.2.1. * gnu/packages/haskell-xyz.scm (ghc-hslua-module-text): Update to 0.2.1. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 606b98ce5d..f5f7174212 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5038,7 +5038,7 @@ described in @url{https://www.lua.org/}.") (define-public ghc-hslua-module-text (package (name "ghc-hslua-module-text") - (version "0.1.2.1") + (version "0.2.1") (source (origin (method url-fetch) @@ -5047,11 +5047,8 @@ described in @url{https://www.lua.org/}.") version ".tar.gz")) (sha256 (base32 - "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf")))) + "1ikdwvvxhbd5wmfr85dzs2ccamh9rbbpgy899z7s1vlv5q1dj0hk")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"))) (inputs `(("ghc-hslua" ,ghc-hslua))) (native-inputs -- cgit 1.4.1 From 6ee0d2584c9f7dbcc331caad42ecdadf2e3b5819 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:11:27 -0400 Subject: gnu: ghc-connection: Update to 0.3.1. * gnu/packages/haskell-xyz.scm (ghc-connection): Update to 0.3.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f5f7174212..4827f8ba41 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2177,7 +2177,7 @@ and daemons. The features include: (define-public ghc-connection (package (name "ghc-connection") - (version "0.2.8") + (version "0.3.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -2185,7 +2185,7 @@ and daemons. The features include: version ".tar.gz")) (sha256 (base32 - "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh")))) + "1nbmafhlg0wy4aa3p7amjddbamdz6avzrxn4py3lvhrjqn4raxax")))) (build-system haskell-build-system) (inputs `(("ghc-byteable" ,ghc-byteable) -- cgit 1.4.1 From 8a5924dcfecf02ae755d717cd11643b8a42bd7fc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:11:39 -0400 Subject: gnu: ghc-snap-core: Update to 1.0.4.0. * gnu/packages/haskell-web.scm (ghc-snap-core): Update to 1.0.4.0. [arguments]: Remove '#:cabal-revision'. --- 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 83a87befad..577f37f8eb 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1365,7 +1365,7 @@ deal with the result.") (define-public ghc-snap-core (package (name "ghc-snap-core") - (version "1.0.3.2") + (version "1.0.4.0") (source (origin (method url-fetch) @@ -1373,7 +1373,7 @@ deal with the result.") "snap-core/snap-core-" version ".tar.gz")) (sha256 (base32 - "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc")))) + "0dklxgrbqhnb6bc4ic358g4fyj11ywmjrkxxhqcjmci2hhpn00mr")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) @@ -1401,9 +1401,6 @@ deal with the result.") ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) ("ghc-zlib" ,ghc-zlib))) - (arguments - `(#:cabal-revision - ("3" "0wlhn33r7c9g7j23y006ddq9d87lkmianvvfrbl8jd8mvjvj2gfa"))) (home-page "http://snapframework.com/") (synopsis "Haskell Web Framework (core interfaces and types)") (description "Snap is a simple and fast web development framework -- cgit 1.4.1 From a6a79897bc492cf708c8cbe8df665cdbc13f38f8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:11:51 -0400 Subject: gnu: ghc-http-client: Update to 0.6.4. * gnu/packages/haskell-web.scm (ghc-http-client): Update to 0.6.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 577f37f8eb..fb04b71951 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -186,7 +186,7 @@ responses coming back.") (define-public ghc-http-client (package (name "ghc-http-client") - (version "0.5.13.1") + (version "0.6.4") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -194,7 +194,7 @@ responses coming back.") version ".tar.gz")) (sha256 (base32 - "0szwbgvkkdz56lgi91armkagmb7nnfwbpp4j7cm9zhmffv3ba8g1")))) + "1n9rnbp8lwkd4whi2anniywi4y1bn9kx6nzfigfvz28d7pn7i4in")))) (build-system haskell-build-system) ;; Tests require access to the web. (arguments `(#:tests? #f)) -- cgit 1.4.1 From 899b5297cc91e5ff427728434d357eba1d4b1f5a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:12:04 -0400 Subject: gnu: ghc-profunctors: Update to 5.3. * gnu/packages/haskell-xyz.scm (ghc-profunctors): Update to 5.3. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 4827f8ba41..c8fbec048d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7944,7 +7944,7 @@ API.") (define-public ghc-profunctors (package (name "ghc-profunctors") - (version "5.2.2") + (version "5.3") (source (origin (method url-fetch) @@ -7954,11 +7954,8 @@ API.") ".tar.gz")) (sha256 (base32 - "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9")))) + "1dx3nkc27yxsrbrhh3iwhq7dl1xn6bj7n62yx6nh8vmpbg62lqvl")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq"))) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-bifunctors" ,ghc-bifunctors) -- cgit 1.4.1 From cdffb73c04d0c68d7edf19ee02fc3a554dea04bc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:12:16 -0400 Subject: gnu: ghc-aeson-pretty: Update to 0.8.8. * gnu/packages/haskell-web.scm (ghc-aeson-pretty): Update to 0.8.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 fb04b71951..c80e72a916 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -816,7 +816,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") (define-public ghc-aeson-pretty (package (name "ghc-aeson-pretty") - (version "0.8.7") + (version "0.8.8") (source (origin (method url-fetch) (uri (string-append @@ -824,7 +824,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") version ".tar.gz")) (sha256 (base32 - "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1")))) + "09n7gs91y1fbw6gjszrd2na3isnvk3y5rsi90lzjrwywnqfadkl1")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) -- cgit 1.4.1 From a531ff94c3dcf480be5c085c52f2c2d9bc532712 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 21:56:40 -0400 Subject: gnu: ghc-diff: Patch to work with newer QuickCheck. * gnu/packages/patches/ghc-diff-swap-cover-args.patch: New file. * gnu/local.mk: Add it. * gnu/packages/haskell-xyz.scm (ghc-diff): Use it. --- gnu/local.mk | 1 + gnu/packages/haskell-xyz.scm | 1 + gnu/packages/patches/ghc-diff-swap-cover-args.patch | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 gnu/packages/patches/ghc-diff-swap-cover-args.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 47618993bf..a9548d4bd6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -878,6 +878,7 @@ dist_patch_DATA = \ %D%/packages/patches/gd-freetype-test-failure.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ + %D%/packages/patches/ghc-diff-swap-cover-args.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ %D%/packages/patches/ghc-haddock-library-unbundle.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c8fbec048d..86e0d2a60e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2606,6 +2606,7 @@ and parsers with useful semantics.") (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "Diff/Diff-" version ".tar.gz")) + (patches (search-patches "ghc-diff-swap-cover-args.patch")) (sha256 (base32 "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp")))) diff --git a/gnu/packages/patches/ghc-diff-swap-cover-args.patch b/gnu/packages/patches/ghc-diff-swap-cover-args.patch new file mode 100644 index 0000000000..724416ff7a --- /dev/null +++ b/gnu/packages/patches/ghc-diff-swap-cover-args.patch @@ -0,0 +1,20 @@ +The QuickCheck library swapped the order of the arguments of the 'cover' +function in version 2.12. Version 0.3.4 of the Diff library still uses +the old argument order. Swapping the argument order makes Diff work +with newer versions of QuickCheck. + +See for the +upstream bug report. + +diff -ruN a/test/Test.hs b/test/Test.hs +--- a/test/Test.hs 2016-04-23 01:21:45.000000000 -0400 ++++ b/test/Test.hs 2019-11-01 19:13:04.590770903 -0400 +@@ -134,7 +134,7 @@ + prop_ppDiffR (DiffInput le ri) = + let haskDiff=ppDiff $ getGroupedDiff le ri + utilDiff= unsafePerformIO (runDiff (unlines le) (unlines ri)) +- in cover (haskDiff == utilDiff) 90 "exact match" $ ++ in cover 90 (haskDiff == utilDiff) "exact match" $ + classify (haskDiff == utilDiff) "exact match" + (div ((length haskDiff)*100) (length utilDiff) < 110) -- less than 10% bigger + where -- cgit 1.4.1 From 1826c2a8aec49d83c32d28a668284ea3f0aac962 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:31:48 -0400 Subject: gnu: ghc-skylighting-core: Update to 0.8.2.1. * gnu/packages/haskell-xyz.scm (ghc-skylighting-core): Update to 0.8.2.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 86e0d2a60e..cf30b16a2d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9299,7 +9299,7 @@ are the bottleneck of web servers.") (define-public ghc-skylighting-core (package (name "ghc-skylighting-core") - (version "0.7.2") + (version "0.8.2.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -9307,7 +9307,7 @@ are the bottleneck of web servers.") version ".tar.gz")) (sha256 (base32 - "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq")))) + "0hdchivb4af9w7v5v7lrwfwawd3kcwmpzk69m1vkkm3pis8lcr1s")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) -- cgit 1.4.1 From 55ec98f29ab8c7a310706f1ca37333bab15572a6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:13:22 -0400 Subject: gnu: ghc-inline-c: Update to 0.7.0.1. * gnu/packages/haskell-xyz.scm (ghc-inline-c): Update to 0.7.0.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index cf30b16a2d..88f7e8dbe4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5164,7 +5164,7 @@ lines continued at an indented level below.") (define-public ghc-inline-c (package (name "ghc-inline-c") - (version "0.6.1.0") + (version "0.7.0.1") (source (origin (method url-fetch) @@ -5172,7 +5172,7 @@ lines continued at an indented level below.") "inline-c-" version ".tar.gz")) (sha256 (base32 - "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h")))) + "19scbviwiv1fbsdcjji3dscjg7w0xa8r97xwkqqrwm7zhvrg5wns")))) (build-system haskell-build-system) (inputs `(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) -- cgit 1.4.1 From f680955fb520e78e30eb104ffa621d2b53cd52bb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:13:42 -0400 Subject: gnu: ghc-shakespeare: Update to 2.0.22. * gnu/packages/haskell-xyz.scm (ghc-shakespeare): Update to 2.0.22. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 88f7e8dbe4..dbf6a10db0 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9153,7 +9153,7 @@ environment variables.") (define-public ghc-shakespeare (package (name "ghc-shakespeare") - (version "2.0.15") + (version "2.0.22") (source (origin (method url-fetch) @@ -9162,7 +9162,7 @@ environment variables.") "shakespeare-" version ".tar.gz")) (sha256 (base32 - "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23")))) + "1mc1a0vv070gcawwcx6vzpj6gpfh1qnlqrndiyfic3p500y656vh")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) ("ghc-blaze-markup" ,ghc-blaze-markup) -- cgit 1.4.1 From 0bafb755606b015bf01d921c4f97f717615fce26 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:14:05 -0400 Subject: gnu: ghc-aeson-compat: Update to 0.3.9. * gnu/packages/haskell-xyz.scm (ghc-aeson-compat): Update to 0.3.9. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index dbf6a10db0..977437d4ad 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -167,7 +167,7 @@ for Haskell.") (define-public ghc-aeson-compat (package (name "ghc-aeson-compat") - (version "0.3.8") + (version "0.3.9") (source (origin (method url-fetch) @@ -176,7 +176,7 @@ for Haskell.") "aeson-compat-" version ".tar.gz")) (sha256 (base32 - "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i")))) + "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.10 (inputs `(("ghc-base-compat" ,ghc-base-compat) -- cgit 1.4.1 From 0eaa88c8ac8536f600a101fdd5187e18afd81328 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:14:24 -0400 Subject: gnu: ghc-pandoc-types: Update to 1.17.6.1. * gnu/packages/haskell-xyz.scm (ghc-pandoc-types): Update to 1.17.6.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 977437d4ad..ad8f498b60 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7359,7 +7359,7 @@ suitable for inclusion in pandoc YAML metadata.") (define-public ghc-pandoc-types (package (name "ghc-pandoc-types") - (version "1.17.5.1") + (version "1.17.6.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -7367,7 +7367,7 @@ suitable for inclusion in pandoc YAML metadata.") version ".tar.gz")) (sha256 (base32 - "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717")))) + "1d6ygq991ddria71l7hg9yd7lq94sjy4m71rdws1v8hq943c4d0q")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb) -- cgit 1.4.1 From 1a4fbc3647923d0133890eaa536b51f6a874d9db Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:14:38 -0400 Subject: gnu: ghc-io-streams-haproxy: Update to 1.0.1.0. * gnu/packages/haskell-xyz.scm (ghc-io-streams-haproxy): Update to 1.0.1.0. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ad8f498b60..bd7073b081 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5390,7 +5390,7 @@ primitives for I/O using streams.") (define-public ghc-io-streams-haproxy (package (name "ghc-io-streams-haproxy") - (version "1.0.0.2") + (version "1.0.1.0") (source (origin (method url-fetch) @@ -5399,7 +5399,7 @@ primitives for I/O using streams.") version ".tar.gz")) (sha256 (base32 - "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp")))) + "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) @@ -5409,9 +5409,6 @@ primitives for I/O using streams.") `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (arguments - `(#:cabal-revision - ("4" "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l"))) (home-page "http://snapframework.com/") (synopsis "HAProxy protocol 1.5 support for io-streams") (description "HAProxy protocol version 1.5 support -- cgit 1.4.1 From a8aaadf211cab14ae057f39dfd6346f7406390bb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:14:49 -0400 Subject: gnu: ghc-semigroupoids: Update to 5.3.3. * gnu/packages/haskell-xyz.scm (ghc-semigroupoids): Update to 5.3.3. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index bd7073b081..05f59965c6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9024,7 +9024,7 @@ a memory chunk that will be auto-scrubbed after it run out of scope.") (define-public ghc-semigroupoids (package (name "ghc-semigroupoids") - (version "5.2.2") + (version "5.3.3") (source (origin (method url-fetch) @@ -9034,11 +9034,8 @@ a memory chunk that will be auto-scrubbed after it run out of scope.") ".tar.gz")) (sha256 (base32 - "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4")))) + "016hc4imr9l4szs3p7f1aahvxr5wv4clvr3qzrm3nibssg5vrs61")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("4" "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"))) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-transformers-compat" ,ghc-transformers-compat) -- cgit 1.4.1 From a57236eb00e41f238e3d026c143416c26c2f9a2f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:15:02 -0400 Subject: gnu: ghc-http-api-data: Update to 0.4.1. * gnu/packages/haskell-xyz.scm (ghc-http-api-data): Update to 0.4.1. [arguments]: Enable tests. [inputs]: Remove 'ghc-time-locale-compat' and 'ghc-uri-bytestring'; add 'ghc-cookie' and 'ghc-time-compat'. [native-inputs]: Add 'cabal-doctest', 'ghc-nats', 'ghc-hunit', 'ghc-hspec', 'ghc-quickcheck', 'ghc-quickcheck-instances', 'ghc-doctest', and 'hspec-discover' --- gnu/packages/haskell-xyz.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 05f59965c6..953d60de29 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5066,7 +5066,7 @@ for Haskell. The functions provided by this module are @code{upper}, (define-public ghc-http-api-data (package (name "ghc-http-api-data") - (version "0.3.8.1") + (version "0.4.1") (source (origin (method url-fetch) @@ -5075,17 +5075,25 @@ for Haskell. The functions provided by this module are @code{upper}, "http-api-data-" version ".tar.gz")) (sha256 (base32 - "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf")))) + "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.9 (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-attoparsec-iso8601" ,ghc-attoparsec-iso8601) + ("ghc-cookie" ,ghc-cookie) ("ghc-hashable" ,ghc-hashable) ("ghc-http-types" ,ghc-http-types) - ("ghc-time-locale-compat" ,ghc-time-locale-compat) + ("ghc-time-compat" ,ghc-time-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-uri-bytestring" ,ghc-uri-bytestring) ("ghc-uuid-types" ,ghc-uuid-types))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-nats" ,ghc-nats) + ("ghc-hunit" ,ghc-hunit) + ("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-doctest" ,ghc-doctest) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/fizruk/http-api-data") (synopsis "Convert to/from HTTP API data like URL pieces, headers and query parameters") -- cgit 1.4.1 From a627e599d6eacf6571a8505336a7ad362f6614a7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:15:15 -0400 Subject: gnu: ghc-openssl-streams: Update to 1.2.2.0. * gnu/packages/haskell-crypto.scm (ghc-openssl-streams): Update to 1.2.2.0. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-crypto.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 8e3168eedd..b7c13edc8d 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -808,7 +808,7 @@ implementation of SSL.") (define-public ghc-openssl-streams (package (name "ghc-openssl-streams") - (version "1.2.1.3") + (version "1.2.2.0") (source (origin (method url-fetch) @@ -817,7 +817,7 @@ implementation of SSL.") version ".tar.gz")) (sha256 (base32 - "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw")))) + "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr")))) (build-system haskell-build-system) (inputs `(("ghc-hsopenssl" ,ghc-hsopenssl) @@ -827,9 +827,6 @@ implementation of SSL.") `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (arguments - `(#:cabal-revision - ("2" "1004kgdryflpkp19dv4ikilhcn0xbfc5dsp6v3ib34580pcfj7wy"))) (home-page "http://hackage.haskell.org/package/openssl-streams") (synopsis "OpenSSL network support for io-streams") (description "This library contains io-streams routines for secure -- cgit 1.4.1 From 36c940cf5285d07326b12783d67aebb75ad3ee4d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:32:03 -0400 Subject: gnu: ghc-skylighting: Update to 0.8.2.1. * gnu/packages/haskell-xyz.scm (ghc-skylighting): Update to 0.8.2.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 953d60de29..5b82975444 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9345,14 +9345,14 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (package (inherit ghc-skylighting-core) (name "ghc-skylighting") - (version "0.7.2") + (version "0.8.2.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/skylighting-" version "/skylighting-" version ".tar.gz")) (sha256 (base32 - "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch")))) + "1xls8ycad77m55ax4hp55k60h3pi5sm3m32hycbc8baixbgfx5xz")))) (inputs `(("ghc-skylighting-core" ,ghc-skylighting-core) ,@(package-inputs ghc-skylighting-core))))) -- cgit 1.4.1 From cae58e5659211c6811aa5a14c42db704822665ff Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:15:37 -0400 Subject: gnu: ghc-inline-c-cpp: Update to 0.3.0.3. * gnu/packages/haskell-xyz.scm (ghc-inline-c-cpp): Update to 0.3.0.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 5b82975444..d11e0904c8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5206,7 +5206,7 @@ minimal overhead. No FFI required.") (define-public ghc-inline-c-cpp (package (name "ghc-inline-c-cpp") - (version "0.2.2.1") + (version "0.3.0.3") (source (origin (method url-fetch) @@ -5214,7 +5214,7 @@ minimal overhead. No FFI required.") "inline-c-cpp-" version ".tar.gz")) (sha256 (base32 - "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci")))) + "1sxwx9dh60qfpa72dymj015zwd6prhb70x5mkabqzi7nhg3aakln")))) (build-system haskell-build-system) (inputs `(("ghc-inline-c" ,ghc-inline-c) -- cgit 1.4.1 From 7fec7e66309b2d7f5d32ea74407465cf9d1e2f3b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:32:31 -0400 Subject: gnu: ghc-texmath: Update to 0.11.3. * gnu/packages/haskell-xyz.scm (ghc-texmath): Update to 0.11.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d11e0904c8..30d9098e1f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10262,14 +10262,14 @@ dependency.") (define-public ghc-texmath (package (name "ghc-texmath") - (version "0.11.0.1") + (version "0.11.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "texmath/texmath-" version ".tar.gz")) (sha256 (base32 - "11dc09hfnyfsz20ch2c867w0zdgjkzq41506lm61i3dk87ngdisf")))) + "03rpxbp43bjs62mmw4hv4785n6f6nbf8kj2y9mma5nzk6i2xs09f")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb) -- cgit 1.4.1 From faac56f3af797973c4a8400d841bbddc303e924b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 10:54:04 -0500 Subject: gnu: ghc-monad-par: Add a patch to fix tests on GHC 8.6. * gnu/packages/patches/ghc-monad-par-fix-tests.patch: New file. * gnu/local.mk: Add it. * gnu/packages/haskell-xyz.scm (ghc-monad-par): Use it. --- gnu/local.mk | 3 +- gnu/packages/haskell-xyz.scm | 1 + gnu/packages/patches/ghc-monad-par-fix-tests.patch | 45 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ghc-monad-par-fix-tests.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a9548d4bd6..c6f0dfdb46 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -880,7 +880,8 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-diff-swap-cover-args.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ - %D%/packages/patches/ghc-haddock-library-unbundle.patch \ + %D%/packages/patches/ghc-haddock-library-unbundle.patch \ + %D%/packages/patches/ghc-monad-par-fix-tests.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 30d9098e1f..604c2deaa9 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6541,6 +6541,7 @@ operators for looping.") (uri (string-append "https://hackage.haskell.org/package/" "monad-par-" version "/" "monad-par-" version ".tar.gz")) + (patches (search-patches "ghc-monad-par-fix-tests.patch")) (sha256 (base32 "0ldrzqy24fsszvn2a2nr77m2ih7xm0h9bgkjyv1l274aj18xyk7q")))) diff --git a/gnu/packages/patches/ghc-monad-par-fix-tests.patch b/gnu/packages/patches/ghc-monad-par-fix-tests.patch new file mode 100644 index 0000000000..d21a1e485c --- /dev/null +++ b/gnu/packages/patches/ghc-monad-par-fix-tests.patch @@ -0,0 +1,45 @@ +This patch is taken from upstream. It fixes a test to work with GHC 8.6. +The paths have been slightly altered to work with the release tarball. + +See . + +From e20f81c8060208e4fb038e8f0e0668b41d72a6fb Mon Sep 17 00:00:00 2001 +From: Clint Adams +Date: Sat, 31 Aug 2019 14:12:34 -0400 +Subject: [PATCH] Use a case statement instead of pattern-matching in + case_test_diamond + +This avoids the need for a MonadFail instance. Closes #66 +--- + monad-par/tests/ParTests_shared.hs | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/tests/ParTests_shared.hs b/tests/ParTests_shared.hs +index 31f438d..b2de50c 100644 +--- a/tests/ParTests_shared.hs ++++ b/tests/ParTests_shared.hs +@@ -109,12 +109,15 @@ case_test_diamond :: Assertion + case_test_diamond = 9 @=? (m :: Int) + where + m = runPar $ do +- [a,b,c,d] <- sequence [new,new,new,new] +- fork $ do x <- get a; put b (x+1) +- fork $ do x <- get a; put c (x+2) +- fork $ do x <- get b; y <- get c; put d (x+y) +- fork $ do put a 3 +- get d ++ abcd <- sequence [new,new,new,new] ++ case abcd of ++ [a,b,c,d] -> do ++ fork $ do x <- get a; put b (x+1) ++ fork $ do x <- get a; put c (x+2) ++ fork $ do x <- get b; y <- get c; put d (x+y) ++ fork $ do put a 3 ++ get d ++ _ -> error "Oops" + + -- | Violate IVar single-assignment: + -- +-- +2.23.0 + -- cgit 1.4.1 From e924e17e4a4ee91265f5804326c23a7e41edc689 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 5 Nov 2019 01:54:41 -0500 Subject: gnu: Add ghc-dense-linear-algebra. * gnu/packages/haskell-xyz.scm (ghc-dense-linear-algebra): New variable. --- gnu/packages/haskell-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 604c2deaa9..035b9636bb 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2566,6 +2566,36 @@ It includes hashing functions for all basic Haskell98 types.") providing an @code{rnf} implementation.") (license license:bsd-3))) +(define-public ghc-dense-linear-algebra + (package + (name "ghc-dense-linear-algebra") + (version "0.1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "dense-linear-algebra/dense-linear-algebra-" + version ".tar.gz")) + (sha256 + (base32 + "1m7jjxahqxj7ilic3r9806mwp5rnnsmn8vvipkmk40xl65wplxzp")))) + (build-system haskell-build-system) + (inputs + `(("ghc-math-functions" ,ghc-math-functions) + ("ghc-primitive" ,ghc-primitive) + ("ghc-vector" ,ghc-vector) + ("ghc-vector-algorithms" ,ghc-vector-algorithms) + ("ghc-vector-th-unbox" ,ghc-vector-th-unbox) + ("ghc-vector-binary-instances" ,ghc-vector-binary-instances))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "http://hackage.haskell.org/package/dense-linear-algebra") + (synopsis "Simple and incomplete implementation of linear algebra") + (description "This library is simply a collection of linear-algebra +related modules split from the statistics library.") + (license license:bsd-2))) + (define-public ghc-descriptive (package (name "ghc-descriptive") -- cgit 1.4.1 From 60e78e684e9627e9366f0c062d66caefbf3b7c03 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:15:50 -0400 Subject: gnu: ghc-statistics: Update to 0.15.1.1. * gnu/packages/haskell-xyz.scm (ghc-statistics): Update to 0.15.1.1. [arguments]: Remove '#:cabal-revision'. [inputs]: Remove 'ghc-erf'; add 'ghc-async' and 'ghc-dense-linear-algebra'. --- gnu/packages/haskell-xyz.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 035b9636bb..58709be6b8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9555,7 +9555,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (define-public ghc-statistics (package (name "ghc-statistics") - (version "0.14.0.2") + (version "0.15.1.1") (source (origin (method url-fetch) @@ -9564,17 +9564,16 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") "statistics-" version ".tar.gz")) (sha256 (base32 - "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l")))) + "015rn74f1glii26j4b2fh1fc63xvxzrh2xckiancz48kc8jdzabj")))) (build-system haskell-build-system) (arguments - '(#:cabal-revision - ("2" "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3") - ;; Two tests fail: "Discrete CDF is OK" and "Quantile is CDF inverse". + '(;; Two tests fail: "Discrete CDF is OK" and "Quantile is CDF inverse". #:tests? #f)) (inputs `(("ghc-aeson" ,ghc-aeson) + ("ghc-async" ,ghc-async) ("ghc-base-orphans" ,ghc-base-orphans) - ("ghc-erf" ,ghc-erf) + ("ghc-dense-linear-algebra" ,ghc-dense-linear-algebra) ("ghc-math-functions" ,ghc-math-functions) ("ghc-monad-par" ,ghc-monad-par) ("ghc-mwc-random" ,ghc-mwc-random) -- cgit 1.4.1 From d3a0e0b4c262b948e260834582f105d46d8e0c94 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:17:15 -0400 Subject: gnu: ghc-invariant: Update to 0.5.3. * gnu/packages/haskell-xyz.scm (ghc-invariant): Update to 0.5.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 58709be6b8..c5a1c006f9 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5359,7 +5359,7 @@ example code on the home page for a quick introduction.") (define-public ghc-invariant (package (name "ghc-invariant") - (version "0.5.1") + (version "0.5.3") (source (origin (method url-fetch) @@ -5368,7 +5368,7 @@ example code on the home page for a quick introduction.") version ".tar.gz")) (sha256 (base32 - "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b")))) + "03245nhcqxx6b0yw81fzqaqd7cgllmx8awzhvs2xv7ys73pmsgnp")))) (build-system haskell-build-system) (inputs `(("ghc-bifunctors" ,ghc-bifunctors) -- cgit 1.4.1 From b40a436e6a6b645b88964afd2cac1fba05e1eef1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:17:28 -0400 Subject: gnu: ghc-vault: Update to 0.3.1.3. * gnu/packages/haskell-xyz.scm (ghc-vault): Update to 0.3.1.3. [inputs]: Replace 'ghc-semigroupoids' with 'ghc-semigroups'. --- gnu/packages/haskell-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c5a1c006f9..789ae840cd 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11387,7 +11387,7 @@ explicit by providing a function to check whether the invariants hold.") (define-public ghc-vault (package (name "ghc-vault") - (version "0.3.1.2") + (version "0.3.1.3") (source (origin (method url-fetch) @@ -11397,12 +11397,12 @@ explicit by providing a function to check whether the invariants hold.") ".tar.gz")) (sha256 (base32 - "072mbrihsdsb8c6xvg6lvk0rqjgvxvi8qkg4n6wwym5hq0pfa04y")))) + "0vdm472vn734xa27jjm2mjacl37mxiqaaahvm4hzqjgyh4cqq377")))) (build-system haskell-build-system) (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-hashable" ,ghc-hashable) - ("ghc-semigroupoids" ,ghc-semigroupoids))) + ("ghc-semigroups" ,ghc-semigroups))) (home-page "https://github.com/HeinrichApfelmus/vault") (synopsis "Persistent store for arbitrary values") -- cgit 1.4.1 From 5e18bb9e93589e2bdbbc30d63176767b772954c6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:17:44 -0400 Subject: gnu: ghc-cheapskate: Update to 0.1.1.1. * gnu/packages/haskell-xyz.scm (ghc-cheapskate): Update to 0.1.1.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 789ae840cd..46ed0f9f48 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1539,7 +1539,7 @@ Partial and Infinite Values\"}.") (define-public ghc-cheapskate (package (name "ghc-cheapskate") - (version "0.1.1") + (version "0.1.1.1") (source (origin (method url-fetch) @@ -1549,7 +1549,7 @@ Partial and Infinite Values\"}.") ".tar.gz")) (sha256 (base32 - "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) + "0qnyd8bni2rby6b02ff4bvfdhm1hwc8vzpmnms84jgrlg1lly3fm")))) (build-system haskell-build-system) (inputs `(("ghc-blaze-html" ,ghc-blaze-html) -- cgit 1.4.1 From 096781a111253211a911b9721b376903e51b18d8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 22:11:16 -0500 Subject: gnu: Add ghc-network-byte-order. * gnu/packages/haskell-xyz.scm (ghc-network-byte-order): New variable. --- gnu/packages/haskell-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 46ed0f9f48..7b1c4756fb 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6900,6 +6900,28 @@ ncurses.") network database () API.") (license license:bsd-3))) +(define-public ghc-network-byte-order + (package + (name "ghc-network-byte-order") + (version "0.1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "network-byte-order/network-byte-order-" + version ".tar.gz")) + (sha256 + (base32 + "19cs6157amcc925vwr92q1azwwzkbam5g0k70i6qi80fhpikh37c")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-doctest" ,ghc-doctest))) + (home-page "http://hackage.haskell.org/package/network-byte-order") + (synopsis "Network byte order utilities") + (description "This library provides peek and poke functions for network +byte order.") + (license license:bsd-3))) + (define-public ghc-network-info (package (name "ghc-network-info") -- cgit 1.4.1 From 59ea213790f6703b66fee6094b3558b9bb5740fa Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:17:58 -0400 Subject: gnu: ghc-http2: Update to 1.6.5. * gnu/packages/haskell-web.scm (ghc-http2): Update to 1.6.5. [inputs]: Remove 'ghc-bytestring-builder' and 'ghc-hex'; add 'ghc-network-byte-order' and 'ghc-base16-bytestring'. --- gnu/packages/haskell-web.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index c80e72a916..c5d216159b 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -286,7 +286,7 @@ Date in Haskell.") (define-public ghc-http2 (package (name "ghc-http2") - (version "1.6.3") + (version "1.6.5") (source (origin (method url-fetch) @@ -295,14 +295,14 @@ Date in Haskell.") "http2-" version ".tar.gz")) (sha256 (base32 - "0hww0rfsv6lqx62qzycbcqy5q6rh9k09qkyjkdm5m1sp1z50wqk1")))) + "1vlmy8vnp6ml2n2pr11aa5fzigldsscgzmibrni64ykgfvpd3sqn")))) (build-system haskell-build-system) (inputs - `(("ghc-bytestring-builder" ,ghc-bytestring-builder) - ("ghc-case-insensitive" ,ghc-case-insensitive) + `(("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-network-byte-order" ,ghc-network-byte-order) ("ghc-aeson" ,ghc-aeson) ("ghc-aeson-pretty" ,ghc-aeson-pretty) - ("ghc-hex" ,ghc-hex) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) ("ghc-word8" ,ghc-word8) -- cgit 1.4.1 From cb71ac3d34020b066f959bca0cac6e22b1f54a6c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:24:13 -0400 Subject: gnu: ghc-hedgehog: Update to 1.0.1. * gnu/packages/haskell-check.scm (ghc-hedgehog): Update to 1.0.1. [inputs]: Add 'ghc-fail'. --- gnu/packages/haskell-check.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index ea7f30e680..0537fb91df 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -795,7 +795,7 @@ implementations of cryptographic ciphers.") (define-public ghc-hedgehog (package (name "ghc-hedgehog") - (version "0.6.1") + (version "1.0.1") (source (origin (method url-fetch) @@ -805,13 +805,14 @@ implementations of cryptographic ciphers.") ".tar.gz")) (sha256 (base32 - "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj")))) + "1qc7hkqbnsk3f5r26wc35r3qiy941nmcxhfqgcq9027kw4gs0bi0")))) (build-system haskell-build-system) (inputs `(("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-async" ,ghc-async) ("ghc-concurrent-output" ,ghc-concurrent-output) ("ghc-exceptions" ,ghc-exceptions) + ("ghc-fail" ,ghc-fail) ("ghc-lifted-async" ,ghc-lifted-async) ("ghc-mmorph" ,ghc-mmorph) ("ghc-monad-control" ,ghc-monad-control) -- cgit 1.4.1 From 5e2d41f467a605befd5e689e578a1ef2a81f4f7a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 21:13:54 -0500 Subject: gnu: Add ghc-tasty-hedgehog. * gnu/packages/haskell-check.scm (ghc-tasty-hedgehog): New variable. --- gnu/packages/haskell-check.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 0537fb91df..8fac25a6d0 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -184,6 +184,36 @@ you combine your unit tests, golden tests, QuickCheck/SmallCheck properties, and any other types of tests into a single test suite.") (license license:expat))) +(define-public ghc-tasty-hedgehog + (package + (name "ghc-tasty-hedgehog") + (version "1.0.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "tasty-hedgehog/tasty-hedgehog-" version ".tar.gz")) + (sha256 + (base32 + "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz")))) + (build-system haskell-build-system) + (inputs + `(("ghc-tagged" ,ghc-tagged) + ("ghc-tasty" ,ghc-tasty) + ("ghc-hedgehog" ,ghc-hedgehog))) + (native-inputs + `(("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure))) + (arguments + `(#:cabal-revision + ("1" "1n6797fm8swyrk8cw7zxz593gq82wx8dayvm204rmgcz75bslcpn"))) + (home-page "https://github.com/qfpl/tasty-hedgehog") + (synopsis "Integration for tasty and hedgehog") + (description "This package provides the means for integrating the +@url{https://hackage.haskell.org/package/hedgehog, hedgehog testing library} +with the @url{https://hackage.haskell.org/package/tasty, tasty testing +framework}.") + (license license:bsd-3))) + (define-public ghc-tasty-hunit (package (name "ghc-tasty-hunit") -- cgit 1.4.1 From 803e6780968967d9624ecbda794d7a7410e6f69c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:28:37 -0400 Subject: gnu: ghc-bsb-http-chunked: Update to 0.0.0.4. * gnu/packages/haskell-web.scm (ghc-bsb-http-chunked): Update to 0.0.0.4. [inputs]: Remove 'ghc-bytestring-builder'. [native-inputs]: Add 'ghc-attoparsec', 'ghc-blaze-builder', 'ghc-hedgehog', 'ghc-tasty', 'ghc-tasty-hedgehog', 'ghc-tasty-hunit', and 'ghc-doctest'. --- gnu/packages/haskell-web.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index c5d216159b..eea7378e27 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -520,7 +520,7 @@ Haskell's Web Application Interface (WAI).") (define-public ghc-bsb-http-chunked (package (name "ghc-bsb-http-chunked") - (version "0.0.0.2") + (version "0.0.0.4") (source (origin (method url-fetch) @@ -530,10 +530,16 @@ Haskell's Web Application Interface (WAI).") version ".tar.gz")) (sha256 (base32 - "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8")))) + "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql")))) (build-system haskell-build-system) - (inputs - `(("ghc-bytestring-builder" ,ghc-bytestring-builder))) + (native-inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-blaze-builder" ,ghc-blaze-builder) + ("ghc-hedgehog" ,ghc-hedgehog) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hedgehog" ,ghc-tasty-hedgehog) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-doctest" ,ghc-doctest))) (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 -- cgit 1.4.1 From b9debc37b80df414925e1b0438b3c0377f3d3b1b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 21:14:06 -0500 Subject: gnu: Add ghc-retry. * gnu/packages/haskell-xyz.scm (ghc-retry): New variable. --- gnu/packages/haskell-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7b1c4756fb..d5ce5400ee 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8635,6 +8635,40 @@ connections.") code where you can safely allocate resources.") (license license:bsd-3))) +(define-public ghc-retry + (package + (name "ghc-retry") + (version "0.8.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "retry/retry-" version ".tar.gz")) + (sha256 + (base32 + "02k03r86amg1vbrsvb644342ym13d9jwkzki9sk93pdg5l8j35dj")))) + (build-system haskell-build-system) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-random" ,ghc-random))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-hedgehog" ,ghc-tasty-hedgehog) + ("ghc-hedgehog" ,ghc-hedgehog))) + (home-page "http://github.com/Soostone/retry") + (synopsis "Retry combinators for monadic actions that may fail") + (description "This package exposes combinators that can wrap +arbitrary monadic actions. They run the action and potentially retry +running it with some configurable delay for a configurable number of +times. The purpose is to make it easier to work with IO and especially +network IO actions that often experience temporary failure and warrant +retrying of the original action. For example, a database query may time +out for a while, in which case we should hang back for a bit and retry +the query instead of simply raising an exception.") + (license license:bsd-3))) + (define-public ghc-rfc5051 (package (name "ghc-rfc5051") -- cgit 1.4.1 From 11b1b6cdd479f5228f16fa33b9d09530366940ab Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 01:25:59 -0400 Subject: gnu: ghc-auto-update: Update to 0.1.6. * gnu/packages/haskell-xyz.scm (ghc-auto-update): Update to 0.1.6. [native-inputs] Add 'ghc-hspec', 'ghc-hunit', 'ghc-retry', and 'hspec-discover'. --- gnu/packages/haskell-xyz.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d5ce5400ee..7c0336095c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -519,7 +519,7 @@ from aeson.") (define-public ghc-auto-update (package (name "ghc-auto-update") - (version "0.1.4") + (version "0.1.6") (source (origin (method url-fetch) @@ -529,8 +529,13 @@ from aeson.") ".tar.gz")) (sha256 (base32 - "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy")))) + "1i36xc2i34aync8271x3pv515l3zb53i518dybn8ghqkhzf27q7l")))) (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-hunit" ,ghc-hunit) + ("ghc-retry" ,ghc-retry) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/yesodweb/wai") (synopsis "Efficiently run periodic, on-demand actions") (description "This library provides mechanisms to efficiently run -- cgit 1.4.1 From d35ffd39215151dad8af4c899c57b06dea57b463 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:02:01 -0400 Subject: gnu: ghc-uri-bytestring: Update to 0.3.2.2. * gnu/packages/haskell-xyz.scm (ghc-uri-bytestring): Update to 0.3.2.2. [inputs]: Remove 'ghc-fail'. [native-inputs]: Remove 'ghc-attoparsec', 'ghc-quickcheck', 'ghc-tasty-quickcheck', 'ghc-quickcheck-instances', and 'ghc-generics-sop'; add 'ghc-hedgehog', 'ghc-tasty-hedgehog', and 'ghc-safe'. --- gnu/packages/haskell-xyz.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7c0336095c..b774fd3078 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11214,7 +11214,7 @@ a style ready for qualification, that is, you should import them by (define-public ghc-uri-bytestring (package (name "ghc-uri-bytestring") - (version "0.3.2.0") + (version "0.3.2.2") (source (origin (method url-fetch) @@ -11223,22 +11223,19 @@ a style ready for qualification, that is, you should import them by "uri-bytestring-" version ".tar.gz")) (sha256 (base32 - "1q04j5ybvk37zk2m0bkjwyhblz0ymdj0cn4rvsvdca1ikn5xdv5c")))) + "0spzv3mwlpxiamd7347sxwcy2xri16ak1y7p1v4fisnvq4jprm67")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-fail" ,ghc-fail) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-th-lift-instances" ,ghc-th-lift-instances))) - (native-inputs `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) + (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-hedgehog" ,ghc-hedgehog) + ("ghc-tasty-hedgehog" ,ghc-tasty-hedgehog) ("ghc-base-compat" ,ghc-base-compat) - ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) ("ghc-semigroups" ,ghc-semigroups) - ("ghc-generics-sop" ,ghc-generics-sop))) + ("ghc-safe" ,ghc-safe))) (home-page "https://github.com/Soostone/uri-bytestring") (synopsis "Haskell URI parsing as ByteStrings") (description "This Haskell package aims to be an RFC3986 compliant URI -- cgit 1.4.1 From a06613eaaf0ad34c77d4fc3a782ddcc5b329a8bc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:31:22 -0400 Subject: gnu: ghc-path-io: Update to 1.4.2. * gnu/packages/haskell-xyz.scm (ghc-path-io): Update to 1.4.2. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b774fd3078..f692b8d7b9 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7586,7 +7586,7 @@ invariants.") (define-public ghc-path-io (package (name "ghc-path-io") - (version "1.3.3") + (version "1.4.2") (source (origin (method url-fetch) @@ -7596,7 +7596,7 @@ invariants.") ".tar.gz")) (sha256 (base32 - "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a")))) + "0jqx3mi4an4kb3kg78n1p3xrz832yrfrnvj795b0xhkv6h1z5ir3")))) (build-system haskell-build-system) (inputs `(("ghc-dlist" ,ghc-dlist) @@ -7607,9 +7607,6 @@ invariants.") ("ghc-temporary" ,ghc-temporary))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) - (arguments - `(#:cabal-revision - ("3" "1h9hsibbflkxpjl2fqamqiv3x3gasf51apnmklrs9l9x8r32hzcc"))) (home-page "https://github.com/mrkkrp/path-io") (synopsis "Functions for manipulating well-typed paths") -- cgit 1.4.1 From 4081565d3d8ab31274d2a61a58d198f36d4e6af6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:18:14 -0400 Subject: gnu: ghc-free: Update to 5.1.2. * gnu/packages/haskell-xyz.scm (ghc-free): Update to 5.1.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f692b8d7b9..d0a80c6441 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3735,7 +3735,7 @@ Foundation has the following goals: (define-public ghc-free (package (name "ghc-free") - (version "5.0.2") + (version "5.1.2") (source (origin (method url-fetch) @@ -3745,7 +3745,7 @@ Foundation has the following goals: ".tar.gz")) (sha256 (base32 - "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg")))) + "0vlf3f2ckl3cr7z2zl8c9c8qkdlfgvmh04gxkp2fg0z9dz80nlyb")))) (build-system haskell-build-system) (inputs `(("ghc-prelude-extras" ,ghc-prelude-extras) -- cgit 1.4.1 From a3fd4dc7d8bb9f7dea949dd3bebb567dfcfa911b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:18:27 -0400 Subject: gnu: ghc-either: Update to 5.0.1.1. * gnu/packages/haskell-xyz.scm (ghc-either): Update to 5.0.1.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d0a80c6441..3afa1b8148 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2977,7 +2977,7 @@ Damerau-Levenshtein algorithms.") (define-public ghc-either (package (name "ghc-either") - (version "5.0.1") + (version "5.0.1.1") (source (origin (method url-fetch) @@ -2986,7 +2986,7 @@ Damerau-Levenshtein algorithms.") "either-" version ".tar.gz")) (sha256 (base32 - "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc")))) + "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2")))) (build-system haskell-build-system) (inputs `(("ghc-bifunctors" ,ghc-bifunctors) ("ghc-exceptions" ,ghc-exceptions) -- cgit 1.4.1 From 560f940b6c91fb5ed86a93c2355b68e505bb2127 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:18:39 -0400 Subject: gnu: ghc-wai: Update to 3.2.2.1. * gnu/packages/haskell-web.scm (ghc-wai): Update to 3.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 eea7378e27..39c82bd666 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -380,7 +380,7 @@ which allow you to avoid direct usage of conduits.") (define-public ghc-wai (package (name "ghc-wai") - (version "3.2.1.2") + (version "3.2.2.1") (source (origin (method url-fetch) @@ -390,7 +390,7 @@ which allow you to avoid direct usage of conduits.") ".tar.gz")) (sha256 (base32 - "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8")))) + "058871axlq6r0gcqxbjw37w57df9xbv81dmz99b1zq59wf329xzy")))) (build-system haskell-build-system) (inputs `(("ghc-bytestring-builder" ,ghc-bytestring-builder) -- cgit 1.4.1 From ae7fe90864a16b7fdc0e2b719cbb7a379c0f4dca Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:18:52 -0400 Subject: gnu: ghc-snap-server: Update to 1.1.1.1. * gnu/packages/haskell-web.scm (ghc-snap-server): Update to 1.1.1.1. [arguments]: Set Cabal file to r1. --- gnu/packages/haskell-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 39c82bd666..84d4693df3 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1418,7 +1418,7 @@ contains the core definitions and types for the Snap framework.") (define-public ghc-snap-server (package (name "ghc-snap-server") - (version "1.1.0.0") + (version "1.1.1.1") (source (origin (method url-fetch) @@ -1426,7 +1426,7 @@ contains the core definitions and types for the Snap framework.") "snap-server/snap-server-" version ".tar.gz")) (sha256 (base32 - "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4")))) + "0lw475wp0lnrbgc3jcfif3qjjc3pmrh2k74d8cgpnc1304g6a2s5")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) @@ -1457,7 +1457,7 @@ contains the core definitions and types for the Snap framework.") ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (arguments `(#:cabal-revision - ("3" "0a9d3nqb5rvgm25nak68lp6yj9m6cwhbgdbg5l7ib5i2czcg7yjh"))) + ("1" "094b7ll47lxd4lvr6kd59jyw0vz686gw5cx16w758d6fli0cy3x3"))) (home-page "http://snapframework.com/") (synopsis "Web server for the Snap Framework") (description "Snap is a simple and fast web development framework -- cgit 1.4.1 From 50614014e4a739175123d42c118797e9c0a35a56 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:19:06 -0400 Subject: gnu: ghc-exactprint: Update to 0.6.1. * gnu/packages/haskell-xyz.scm (ghc-exactprint): Update to 0.6.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3afa1b8148..5999f521ff 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3237,7 +3237,7 @@ generated SQL and optimize it for your backend.") (define-public ghc-exactprint (package (name "ghc-exactprint") - (version "0.5.6.1") + (version "0.6.1") (source (origin (method url-fetch) @@ -3246,7 +3246,7 @@ generated SQL and optimize it for your backend.") "ghc-exactprint/ghc-exactprint-" version ".tar.gz")) (sha256 (base32 - "141k6qiys0m0r4br7ikp4i546vs3xcil9cwglzcdfcbnb5nj1z87")))) + "12nqpqmi9c57a3hgpfy8q073zryz66ylmcvf29hyffpj7vmmnvhl")))) (build-system haskell-build-system) (inputs `(("ghc-paths" ,ghc-paths) -- cgit 1.4.1 From e28c737c81b63e55a83daca738fabdd33975d77c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:24:37 -0400 Subject: gnu: ghc-wai-logger: Update to 2.3.5. * gnu/packages/haskell-web.scm (ghc-wai-logger): Update to 2.3.5. --- 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 84d4693df3..6a5b7e0cc3 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -414,7 +414,7 @@ communication between web applications and web servers.") (define-public ghc-wai-logger (package (name "ghc-wai-logger") - (version "2.3.2") + (version "2.3.5") (source (origin (method url-fetch) @@ -424,7 +424,7 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d")))) + "05gbipyw0672irynsc3wqvvgzqixhmq69ay2mxh2phb734r8bcmm")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find libraries exported ; by propagated-inputs. -- cgit 1.4.1 From f3aca0869f54bf46dfbb58ac1c0420fdf7bc3d45 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 14:13:53 -0400 Subject: gnu: ghc-contravariant-extras: Update Cabal file to r1. * gnu/packages/haskell-xyz.scm (ghc-contravariant-extras): Update Cabal file to r1. --- gnu/packages/haskell-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 5999f521ff..644b3ce7a6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2279,6 +2279,9 @@ a vocabulary for working with them.") (base32 "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "1h2955ahga6i4fn7k8v66l03v77p6fhsac6ck8gpabkc08ij60wp"))) (inputs `(("ghc-tuple-th" ,ghc-tuple-th) ("ghc-contravariant" ,ghc-contravariant) -- cgit 1.4.1 From 79a925f4e713d201eb5109bcf83b87c406c19484 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 14:16:44 -0400 Subject: gnu: ghc-cryptohash-md5: Update Cabal file to r4. * gnu/packages/haskell-crypto.scm (ghc-cryptohash-md5): Update Cabal file to r4. --- gnu/packages/haskell-crypto.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index b7c13edc8d..b7a1b1f1fb 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -212,7 +212,7 @@ that hides the C implementation.") (build-system haskell-build-system) (arguments `(#:cabal-revision - ("2" "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a") + ("4" "0gzaibjkipijwj9m9l6wrhfk5s3kdvfbhdl7cl1373cjfs41v0m3") #:tests? #f)) ; tests require old version of ghc-hunit (0.9) (native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring) ("ghc-puremd5" ,ghc-puremd5) -- cgit 1.4.1 From 0dbd310598ac8a38d995cb5fdc5f6d476d323442 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 14:17:36 -0400 Subject: gnu: ghc-cryptohash-sha1: Update Cabal file to r4. * gnu/packages/haskell-crypto.scm (ghc-cryptohash-sha1): Update Cabal file to r4. --- gnu/packages/haskell-crypto.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index b7a1b1f1fb..6c0ff0dcea 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -240,7 +240,7 @@ that hides the C implementation.") (build-system haskell-build-system) (arguments `(#:cabal-revision - ("2" "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m") + ("4" "0qb2wasfc4dpf6f9ahvhlv8njb3p3p9iwblg4032ssi95cg85718") #:tests? #f)) ; tests require old version of ghc-hunit (0.9) (native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring) ("ghc-sha" ,ghc-sha) -- cgit 1.4.1 From 8d2ae3fe2c9c5b92be5398d08b808092ba5252c5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:19:16 -0400 Subject: gnu: ghc-rebase: Update to 1.3.1.1. * gnu/packages/haskell-xyz.scm (ghc-rebase): Update to 1.3.1.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 644b3ce7a6..779779a501 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8167,7 +8167,7 @@ includes efficient implementations for common data types.") (define-public ghc-rebase (package (name "ghc-rebase") - (version "1.2.4") + (version "1.3.1.1") (source (origin (method url-fetch) @@ -8176,7 +8176,7 @@ includes efficient implementations for common data types.") "rebase-" version ".tar.gz")) (sha256 (base32 - "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya")))) + "0q4m2fa7wkgxs0grir8rlqwibasmi3s1x7c107ynndwfm62nzv0a")))) (build-system haskell-build-system) (inputs `(("ghc-hashable" ,ghc-hashable) ("ghc-vector" ,ghc-vector) -- cgit 1.4.1 From cdec7b8ceffbadf8d1c5e2dc0284a7d9e64e8b21 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:20:20 -0400 Subject: gnu: ghc-rerebase: Update to 1.3.1.1. * gnu/packages/haskell-xyz.scm (ghc-rerebase): Update to 1.3.1.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 779779a501..f24c4e77c2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8537,7 +8537,7 @@ inspired by libtre.") (define-public ghc-rerebase (package (name "ghc-rerebase") - (version "1.2.2") + (version "1.3.1.1") (source (origin (method url-fetch) @@ -8546,7 +8546,7 @@ inspired by libtre.") version ".tar.gz")) (sha256 (base32 - "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks")))) + "1jbqif6k249rkknm2zwk8v8jil3kgi9ar53358v8l4ffx346rm82")))) (build-system haskell-build-system) (inputs `(("ghc-rebase" ,ghc-rebase))) -- cgit 1.4.1 From ef53b1f59eb254f9841b4b4508f58a3dd4b28ae9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:20:38 -0400 Subject: gnu: ghc-wai-extra: Update to 3.0.28. * gnu/packages/haskell-web.scm (ghc-wai-extra): Update to 3.0.28. [inputs]: Remove 'ghc-blaze-builder'; add 'ghc-http2'. --- gnu/packages/haskell-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 6a5b7e0cc3..7b887d7be5 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -447,7 +447,7 @@ communication between web applications and web servers.") (define-public ghc-wai-extra (package (name "ghc-wai-extra") - (version "3.0.24.2") + (version "3.0.28") (source (origin (method url-fetch) @@ -457,13 +457,12 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci")))) + "0iky7k4kirngvk1p2nz19zgzffb5hppfaxdjan80v06ikc8w1wm7")))) (build-system haskell-build-system) (inputs `(("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-cookie" ,ghc-cookie) - ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-network" ,ghc-network) ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-streaming-commons" ,ghc-streaming-commons) @@ -477,6 +476,7 @@ communication between web applications and web servers.") ("ghc-void" ,ghc-void) ("ghc-wai" ,ghc-wai) ("ghc-http-types" ,ghc-http-types) + ("ghc-http2" ,ghc-http2) ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-unix-compat" ,ghc-unix-compat) -- cgit 1.4.1 From 1fc05441dac09b50320265bca3076afe8fef2d09 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:20:56 -0400 Subject: gnu: ghc-vector-builder: Update to 0.3.8. * gnu/packages/haskell-xyz.scm (ghc-vector-builder): Update to 0.3.8. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f24c4e77c2..0e75078088 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11563,7 +11563,7 @@ boxed and storable vectors.") (define-public ghc-vector-builder (package (name "ghc-vector-builder") - (version "0.3.6") + (version "0.3.8") (source (origin (method url-fetch) @@ -11572,7 +11572,7 @@ boxed and storable vectors.") "vector-builder-" version ".tar.gz")) (sha256 (base32 - "06d2pa1fb3ydrl7l6rjazqyxv5i73v65x2f5fp0ypjxfbm6jsmn8")))) + "0ww0l52p8s6gmh985adnjbvm1vrqpqbm08qdcrvxwhhcqmxgv6m3")))) (build-system haskell-build-system) (inputs `(("ghc-vector" ,ghc-vector) ("ghc-semigroups" ,ghc-semigroups) -- cgit 1.4.1 From 26c4104fd4dec0cbc1b3932e11edae5d2509df52 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:21:11 -0400 Subject: gnu: ghc-foldl: Update to 1.4.5. * gnu/packages/haskell-xyz.scm (ghc-foldl): Update to 1.4.5. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0e75078088..d2813fc0eb 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3671,7 +3671,7 @@ completely unverified though.") (define-public ghc-foldl (package (name "ghc-foldl") - (version "1.4.3") + (version "1.4.5") (source (origin (method url-fetch) @@ -3680,7 +3680,7 @@ completely unverified though.") "foldl-" version ".tar.gz")) (sha256 (base32 - "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk")))) + "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b")))) (build-system haskell-build-system) (inputs `(("ghc-mwc-randam" ,ghc-mwc-random) ("ghc-primitive" ,ghc-primitive) -- cgit 1.4.1 From 23bb445b8bbeeca5ad056286bc12e416ebaa2f10 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:21:32 -0400 Subject: gnu: ghc-mono-traversable: Update to 1.0.13.0. * gnu/packages/haskell-xyz.scm (ghc-mono-traversable): Update to 1.0.13.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d2813fc0eb..8bb70d130a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6698,7 +6698,7 @@ the @code{mtl-tf} package.") (define-public ghc-mono-traversable (package (name "ghc-mono-traversable") - (version "1.0.9.0") + (version "1.0.13.0") (source (origin (method url-fetch) @@ -6707,7 +6707,7 @@ the @code{mtl-tf} package.") "mono-traversable-" version ".tar.gz")) (sha256 (base32 - "0180ks0dyvpk1r20w5jw2w2n79mjnk69n9vhspaxzlyxqgim5psa")))) + "1bqy982lpdb83lacfy76n8kqw5bvd31avxj25kg8gkgycdh0g0ma")))) (build-system haskell-build-system) (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-hashable" ,ghc-hashable) -- cgit 1.4.1 From 1ac981d4e56319aaf3f28c4b9858a92e02226aaf Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:25:16 -0400 Subject: gnu: ghc-conduit: Update to 1.3.1.1. * gnu/packages/haskell-xyz.scm (ghc-conduit): Update to 1.3.1.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 8bb70d130a..05321bb94e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1979,14 +1979,14 @@ concurrent threads. Can be used for progress displays etc.") (define-public ghc-conduit (package (name "ghc-conduit") - (version "1.3.0.3") + (version "1.3.1.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "conduit/conduit-" version ".tar.gz")) (sha256 (base32 - "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v")))) + "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4")))) (build-system haskell-build-system) (inputs `(("ghc-exceptions" ,ghc-exceptions) -- cgit 1.4.1 From 151774d9cd526e12ec509d41a3b9e0d67fc92f1d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:21:45 -0400 Subject: gnu: ghc-conduit-extra: Update to 1.3.4. * gnu/packages/haskell-xyz.scm (ghc-conduit-extra): Update to 1.3.4. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 05321bb94e..3c0763f3e8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2098,7 +2098,7 @@ as well as a convenient Conduit module.") (define-public ghc-conduit-extra (package (name "ghc-conduit-extra") - (version "1.3.1.1") + (version "1.3.4") (source (origin (method url-fetch) @@ -2107,7 +2107,7 @@ as well as a convenient Conduit module.") version ".tar.gz")) (sha256 (base32 - "0jaj350vv6mbb26gdwcqz4gwzfzrjydv5pis2da49wz1npbakcfw")))) + "1d853d39vj5pb8yxfcsnjwdzqzkm34ixzbnba8bslpihb7182wxi")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) -- cgit 1.4.1 From 3c95873a2772018e5a78fc79c82478ee14907f33 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 2 Nov 2019 01:08:36 -0400 Subject: gnu: Add libyaml@2.1. * gnu/packages/web.scm (libyaml-2.1): New variable. --- gnu/packages/web.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7ce4889caf..297eb605da 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1341,6 +1341,20 @@ hash/signatures.") "LibYAML is a YAML 1.1 parser and emitter written in C.") (license license:expat))) +(define-public libyaml-2.1 + (package + (inherit libyaml) + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "http://pyyaml.org/download/libyaml/yaml-" + version ".tar.gz")) + (sha256 + (base32 + "1karpcfgacgppa82wm2drcfn2kb6q2wqfykf5nrhy20sci2i2a3q")))))) + (define-public libquvi-scripts (package (name "libquvi-scripts") -- cgit 1.4.1 From 0c2d6fc22af6cde42909709458361d0dcecd2c99 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 2 Nov 2019 01:09:39 -0400 Subject: gnu: Add ghc-libyaml. * gnu/packages/haskell-xyz.scm (ghc-libyaml): New variable. --- gnu/packages/haskell-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3c0763f3e8..755a627ee7 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages sdl) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system haskell) @@ -5811,6 +5812,37 @@ Music Player Daemon.") "This library provides minimal Haskell binding to libxml2.") (license license:bsd-3))) +(define-public ghc-libyaml + (package + (name "ghc-libyaml") + (version "0.1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "libyaml/libyaml-" version ".tar.gz")) + (sha256 + (base32 + "0psznm9c3yjsyj9aj8m2svvv9m2v0x90hnwarcx5sbswyi3l00va")) + (modules '((guix build utils))) + (snippet + ;; Delete bundled LibYAML. + '(begin + (delete-file-recursively "libyaml_src") + #t)))) + (build-system haskell-build-system) + (arguments + `(#:configure-flags `("--flags=system-libyaml"))) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-resourcet" ,ghc-resourcet) + ("libyaml" ,libyaml-2.1))) + (home-page "https://github.com/snoyberg/yaml#readme") + (synopsis "Low-level, streaming YAML interface.") + (description "This package provides a Haskell wrapper over the +LibYAML C library.") + (license license:bsd-3))) + (define-public ghc-lifted-async (package (name "ghc-lifted-async") -- cgit 1.4.1 From b58e5b84235382954838e3a3af3e4a4f2dc41d6d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:21:58 -0400 Subject: gnu: ghc-yaml: Update to 0.11.1.2. * gnu/packages/haskell-xyz.scm (ghc-yaml): Update to 0.11.1.2. [arguments]: Enable tests. [inputs]: Add 'ghc-libyaml'. [native-inputs]: Add 'ghc-raw-strings-qq'. --- gnu/packages/haskell-xyz.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 755a627ee7..b8bd712442 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -12013,18 +12013,15 @@ documents.") (define-public ghc-yaml (package (name "ghc-yaml") - (version "0.8.32") + (version "0.11.1.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "yaml/yaml-" version ".tar.gz")) (sha256 (base32 - "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w")))) + "028pz77n92l6kjgjv263h4b6yhw1iibdbf3a3dkn5qnz537xpzhc")))) (build-system haskell-build-system) - ;; The tests are broken on i686. They are fixed in 0.10.3.0. - ;; See https://github.com/snoyberg/yaml/issues/158 - (arguments `(#:tests? #f)) (inputs `(("ghc-conduit" ,ghc-conduit) ("ghc-resourcet" ,ghc-resourcet) @@ -12036,12 +12033,14 @@ documents.") ("ghc-semigroups" ,ghc-semigroups) ("ghc-temporary" ,ghc-temporary) ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) - ("ghc-base-compat" ,ghc-base-compat))) + ("ghc-base-compat" ,ghc-base-compat) + ("ghc-libyaml" ,ghc-libyaml))) (native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-hunit" ,ghc-hunit) ("hspec-discover" ,hspec-discover) - ("ghc-mockery" ,ghc-mockery))) + ("ghc-mockery" ,ghc-mockery) + ("ghc-raw-strings-qq" ,ghc-raw-strings-qq))) (home-page "https://github.com/snoyberg/yaml/") (synopsis "Parsing and rendering YAML documents") (description -- cgit 1.4.1 From 5fba8d6d17352232d9d6754da7249626b2740d70 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:22:18 -0400 Subject: gnu: ghc-bzlib-conduit: Update to 0.3.0.2. * gnu/packages/haskell-xyz.scm (ghc-bzlib-conduit): Update to 0.3.0.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b8bd712442..49b5ae9afe 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1129,7 +1129,7 @@ from strict or lazy bytestrings.") (define-public ghc-bzlib-conduit (package (name "ghc-bzlib-conduit") - (version "0.3.0.1") + (version "0.3.0.2") (source (origin (method url-fetch) @@ -1137,7 +1137,7 @@ from strict or lazy bytestrings.") "bzlib-conduit-" version ".tar.gz")) (sha256 (base32 - "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23")))) + "0a21zin5plsl37hkxh2jv8cxwyjrbs2fy7n5cyrzgdaa7lmp6b7b")))) (build-system haskell-build-system) (inputs `(("ghc-bindings-dsl" ,ghc-bindings-dsl) -- cgit 1.4.1 From 26980aae0bb53460ed0e1e18211ea8c921b470f9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:22:31 -0400 Subject: gnu: ghc-monad-logger: Update to 0.3.30. * gnu/packages/haskell-xyz.scm (ghc-monad-logger): Update to 0.3.30. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 49b5ae9afe..5ad900a627 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6547,7 +6547,7 @@ a subset of @code{MonadBase} into which generic control operations such as (define-public ghc-monad-logger (package (name "ghc-monad-logger") - (version "0.3.29") + (version "0.3.30") (source (origin (method url-fetch) @@ -6556,7 +6556,7 @@ a subset of @code{MonadBase} into which generic control operations such as "monad-logger-" version ".tar.gz")) (sha256 (base32 - "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv")))) + "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-stm-chans" ,ghc-stm-chans) -- cgit 1.4.1 From 13e889a7583a38669f6c5feacea872945a3a1522 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:22:41 -0400 Subject: gnu: ghc-http: Update to 4000.3.14. * gnu/packages/haskell-web.scm (ghc-http): Update to 4000.3.14. --- 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 7b887d7be5..a6ed7e1c0d 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -147,7 +147,7 @@ both client and server code).") (define-public ghc-http (package (name "ghc-http") - (version "4000.3.12") + (version "4000.3.14") (outputs '("out" "doc")) (source (origin @@ -156,7 +156,7 @@ both client and server code).") "HTTP-" version ".tar.gz")) (sha256 (base32 - "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3")))) + "0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6")))) (build-system haskell-build-system) (native-inputs `(("ghc-httpd-shed" ,ghc-httpd-shed) -- cgit 1.4.1 From bdc877c4d273bbb6ee0d21cdceb3ff36804a076c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 5 Nov 2019 14:03:31 -0500 Subject: gnu: Add ghc-text-metrics. * gnu/packages/haskell-xyz.scm (ghc-text-metrics): New variable. --- gnu/packages/haskell-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 5ad900a627..46bf1e53c8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10435,6 +10435,33 @@ instances for strict and lazy text types for versions older than 1.2.1 of the text package.") (license license:bsd-2))) +(define-public ghc-text-metrics + (package + (name "ghc-text-metrics") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "text-metrics/text-metrics-" version ".tar.gz")) + (sha256 + (base32 + "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q")))) + (build-system haskell-build-system) + (inputs + `(("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec))) + (arguments + `(#:cabal-revision + ("4" "017drxq9x56b345d8w5m8xdsi1zzs0z16pbdx8j35cd1lsnh3kf1"))) + (home-page "https://github.com/mrkkrp/text-metrics") + (synopsis "Calculate various string metrics efficiently") + (description "This library provides tools to calculate various +string metrics efficiently.") + (license license:bsd-3))) + (define-public ghc-tf-random (package (name "ghc-tf-random") -- cgit 1.4.1 From 1f656b17d9c5d148f07e01d28044d84ba3a91679 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 5 Nov 2019 14:03:40 -0500 Subject: gnu: Add ghc-infer-license. * gnu/packages/haskell-xyz.scm (ghc-infer-license): New variable. --- gnu/packages/haskell-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 46bf1e53c8..e0aa5ee23a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5208,6 +5208,30 @@ contexts. It parses blocks of lines all indented to the same level as well as lines continued at an indented level below.") (license license:bsd-3))) +(define-public ghc-infer-license + (package + (name "ghc-infer-license") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "infer-license/infer-license-" version ".tar.gz")) + (sha256 + (base32 + "0wlfm6bf55kfvm74xar9lmjg5v1103rs9m3grw1rq5bmcmhzxrhj")))) + (build-system haskell-build-system) + (inputs + `(("ghc-text-metrics" ,ghc-text-metrics))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "http://hackage.haskell.org/package/infer-license") + (synopsis "Infer software license from a given license file") + (description "This library provides tools to infer a software +license from a given license file.") + (license license:expat))) + (define-public ghc-inline-c (package (name "ghc-inline-c") -- cgit 1.4.1 From 06344a3a39b773972a8e8e8d2acf8d1722618e9c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:23:47 -0400 Subject: gnu: ghc-hpack: Update to 0.31.2. * gnu/packages/haskell-xyz.scm (ghc-hpack): Update to 0.31.2. [source]: Use a patch to fix tests. [inputs]: Add 'ghc-infer-license'. * gnu/packages/patches/ghc-hpack-fix-tests.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/haskell-xyz.scm | 6 +- gnu/packages/patches/ghc-hpack-fix-tests.patch | 193 +++++++++++++++++++++++++ 3 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/ghc-hpack-fix-tests.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c6f0dfdb46..9c4d1013d8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -881,6 +881,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-diff-swap-cover-args.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ %D%/packages/patches/ghc-haddock-library-unbundle.patch \ + %D%/packages/patches/ghc-hpack-fix-tests.patch \ %D%/packages/patches/ghc-monad-par-fix-tests.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e0aa5ee23a..14d9d6924b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4953,15 +4953,16 @@ representations of current time.") (define-public ghc-hpack (package (name "ghc-hpack") - (version "0.28.2") + (version "0.31.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/hpack/" "hpack-" version ".tar.gz")) + (patches (search-patches "ghc-hpack-fix-tests.patch")) (sha256 (base32 - "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r")))) + "1l2d6185lawwhsj70swxkvcacm0hvcn9qsrlx4ph4gs6k578603g")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) @@ -4971,6 +4972,7 @@ representations of current time.") ("ghc-http-client" ,ghc-http-client) ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-http-types" ,ghc-http-types) + ("ghc-infer-license" ,ghc-infer-license) ("ghc-scientific" ,ghc-scientific) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) diff --git a/gnu/packages/patches/ghc-hpack-fix-tests.patch b/gnu/packages/patches/ghc-hpack-fix-tests.patch new file mode 100644 index 0000000000..19aa762174 --- /dev/null +++ b/gnu/packages/patches/ghc-hpack-fix-tests.patch @@ -0,0 +1,193 @@ +This patch is taken and adapted from upstream. It landed shortly after +the release of 0.31.2, and fixes eleven tests. The patch has been +lightly adapted to apply to the release tarball, but the commit message +was left untouched, so it refers to some changes not included in the +patch. + +From a8d9362d4b686074f698c04c20beea88587511a1 Mon Sep 17 00:00:00 2001 +From: quasicomputational +Date: Sat, 1 Jun 2019 15:11:31 +0100 +Subject: [PATCH] Make CI green (#345) + +* AppVeyor workaround for TMP issue + +https://github.com/commercialhaskell/stack/issues/3944 + +* Bump resolver to nightly-2018-12-12. + +This has the primary benefit of moving to GHC 8.6.3 and should fix +AppVeyor. + +* Add clock 0.8 as an extra-dep. + +* Adapt expected output to aeson 1.4.3.0. +--- + appveyor.yml | 3 +++ + hpack.cabal | 10 +++++----- + package.yaml | 2 +- + stack.yaml | 5 +++-- + test/Data/Aeson/Config/FromValueSpec.hs | 2 +- + test/Data/Aeson/Config/TypesSpec.hs | 2 +- + test/EndToEndSpec.hs | 8 ++++---- + test/Hpack/ConfigSpec.hs | 2 +- + test/Hpack/Syntax/DefaultsSpec.hs | 2 +- + test/Hpack/Syntax/DependenciesSpec.hs | 4 ++-- + 10 files changed, 22 insertions(+), 18 deletions(-) + +diff --git a/hpack.cabal b/hpack.cabal +index fedb9a8..4db3014 100644 +--- a/hpack.cabal ++++ b/hpack.cabal +@@ -1,10 +1,10 @@ + cabal-version: 1.12 + +--- This file has been generated from package.yaml by hpack version 0.31.0. ++-- This file has been generated from package.yaml by hpack version 0.31.2. + -- + -- see: https://github.com/sol/hpack + -- +--- hash: 3d060180293c32b8d0c25b710d0f419e96a6cc6ec3f95ac5e70bb77f44cbafc3 ++-- hash: bd5dd178c7e9f7f7a3456d79b592ea336c41ef43c9892354c001f06659e8b901 + + name: hpack + version: 0.31.2 +@@ -31,7 +31,7 @@ library + build-depends: + Cabal >=2.2 + , Glob >=0.9.0 +- , aeson >=1.2.1.0 ++ , aeson >=1.4.3.0 + , base >=4.9 && <5 + , bifunctors + , bytestring +@@ -87,7 +87,7 @@ executable hpack + build-depends: + Cabal >=2.2 + , Glob >=0.9.0 +- , aeson >=1.2.1.0 ++ , aeson >=1.4.3.0 + , base >=4.9 && <5 + , bifunctors + , bytestring +@@ -125,7 +125,7 @@ test-suite spec + , Glob >=0.9.0 + , HUnit >=1.6.0.0 + , QuickCheck +- , aeson >=1.2.1.0 ++ , aeson >=1.4.3.0 + , base >=4.9 && <5 + , bifunctors + , bytestring +diff --git a/test/Data/Aeson/Config/FromValueSpec.hs b/test/Data/Aeson/Config/FromValueSpec.hs +index 33de8b7..06b3eb9 100644 +--- a/test/Data/Aeson/Config/FromValueSpec.hs ++++ b/test/Data/Aeson/Config/FromValueSpec.hs +@@ -85,7 +85,7 @@ spec = do + [yaml| + name: "Joe" + age: "23" +- |] `shouldDecodeTo` left "Error while parsing $.age - expected Int, encountered String" ++ |] `shouldDecodeTo` left "Error while parsing $.age - parsing Int failed, expected Number, but encountered String" + + context "with (,)" $ do + it "captures unrecognized fields" $ do +diff --git a/test/Data/Aeson/Config/TypesSpec.hs b/test/Data/Aeson/Config/TypesSpec.hs +index c954534..472aa42 100644 +--- a/test/Data/Aeson/Config/TypesSpec.hs ++++ b/test/Data/Aeson/Config/TypesSpec.hs +@@ -13,7 +13,7 @@ spec = do + context "List" $ do + let + parseError :: String -> Result (List Int) +- parseError prefix = Left (prefix ++ " - expected Int, encountered String") ++ parseError prefix = Left (prefix ++ " - parsing Int failed, expected Number, but encountered String") + + context "when parsing single values" $ do + it "returns the value in a singleton list" $ do +diff --git a/test/EndToEndSpec.hs b/test/EndToEndSpec.hs +index 283c72c..46389ea 100644 +--- a/test/EndToEndSpec.hs ++++ b/test/EndToEndSpec.hs +@@ -285,7 +285,7 @@ spec = around_ (inTempDirectoryNamed "foo") $ do + path: defaults.yaml + ref: "2017" + library: {} +- |] `shouldFailWith` (file ++ ": Error while parsing $ - expected Object, encountered Array") ++ |] `shouldFailWith` (file ++ ": Error while parsing $ - expected Object, but encountered Array") + + it "warns on unknown fields" $ do + let file = joinPath ["defaults", "sol", "hpack-template", "2017", "defaults.yaml"] +@@ -340,7 +340,7 @@ spec = around_ (inTempDirectoryNamed "foo") $ do + it "rejects other values" $ do + [i| + version: {} +- |] `shouldFailWith` "package.yaml: Error while parsing $.version - expected Number or String, encountered Object" ++ |] `shouldFailWith` "package.yaml: Error while parsing $.version - expected Number or String, but encountered Object" + + describe "license" $ do + it "accepts cabal-style licenses" $ do +@@ -1363,14 +1363,14 @@ spec = around_ (inTempDirectoryNamed "foo") $ do + then: + dependencies: Win32 + else: null +- |] `shouldFailWith` "package.yaml: Error while parsing $.when.else - expected Object, encountered Null" ++ |] `shouldFailWith` "package.yaml: Error while parsing $.when.else - expected Object, but encountered Null" + + it "rejects invalid conditionals" $ do + [i| + dependencies: + - foo + - 23 +- |] `shouldFailWith` "package.yaml: Error while parsing $.dependencies[1] - expected Object or String, encountered Number" ++ |] `shouldFailWith` "package.yaml: Error while parsing $.dependencies[1] - expected Object or String, but encountered Number" + + it "warns on unknown fields" $ do + [i| +diff --git a/test/Hpack/ConfigSpec.hs b/test/Hpack/ConfigSpec.hs +index 9f4b279..69cbea1 100644 +--- a/test/Hpack/ConfigSpec.hs ++++ b/test/Hpack/ConfigSpec.hs +@@ -675,7 +675,7 @@ spec = do + it "rejects other values" $ do + [yaml| + 23 +- |] `shouldDecodeTo` (Left "Error while parsing $ - expected Boolean or String, encountered Number" :: Result Cond) ++ |] `shouldDecodeTo` (Left "Error while parsing $ - expected Boolean or String, but encountered Number" :: Result Cond) + + describe "formatOrList" $ do + it "formats a singleton list" $ do +diff --git a/test/Hpack/Syntax/DefaultsSpec.hs b/test/Hpack/Syntax/DefaultsSpec.hs +index 5875413..5438b7a 100644 +--- a/test/Hpack/Syntax/DefaultsSpec.hs ++++ b/test/Hpack/Syntax/DefaultsSpec.hs +@@ -151,4 +151,4 @@ spec = do + it "fails" $ do + [yaml| + 10 +- |] `shouldDecodeTo` left "Error while parsing $ - expected Object or String, encountered Number" ++ |] `shouldDecodeTo` left "Error while parsing $ - expected Object or String, but encountered Number" +diff --git a/test/Hpack/Syntax/DependenciesSpec.hs b/test/Hpack/Syntax/DependenciesSpec.hs +index 1a83732..d95044f 100644 +--- a/test/Hpack/Syntax/DependenciesSpec.hs ++++ b/test/Hpack/Syntax/DependenciesSpec.hs +@@ -125,7 +125,7 @@ spec = do + it "rejects invalid values" $ do + [yaml| + hpack: [] +- |] `shouldDecodeTo` left "Error while parsing $.hpack - expected Null, Object, Number, or String, encountered Array" ++ |] `shouldDecodeTo` left "Error while parsing $.hpack - expected Null, Object, Number, or String, but encountered Array" + + context "when the constraint is a Number" $ do + it "accepts 1" $ do +@@ -213,7 +213,7 @@ spec = do + [yaml| + foo: + version: {} +- |] `shouldDecodeTo` left "Error while parsing $.foo.version - expected Null, Number, or String, encountered Object" ++ |] `shouldDecodeTo` left "Error while parsing $.foo.version - expected Null, Number, or String, but encountered Object" + + it "accepts a string" $ do + [yaml| +-- +2.23.0 + -- cgit 1.4.1 From e34df1c385b8cb593462b682e5d4a38f89538a64 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 2 Nov 2019 14:53:02 -0400 Subject: gnu: Add ghc-lib-parser. * gnu/packages/haskell-xyz.scm (ghc-lib-parser): New variable. --- gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 14d9d6924b..f7c3d04399 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5812,6 +5812,29 @@ to be called from Haskell.") Music Player Daemon.") (license license:expat))) +(define-public ghc-lib-parser + (package + (name "ghc-lib-parser") + (version "8.8.0.20190424") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "ghc-lib-parser/ghc-lib-parser-" version ".tar.gz")) + (sha256 + (base32 + "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-alex" ,ghc-alex) + ("ghc-happy" ,ghc-happy))) + (home-page "https://github.com/digital-asset/ghc-lib") + (synopsis "The GHC API, decoupled from GHC versions") + (description "This library implements the GHC API. It is like the +compiler-provided @code{ghc} package, but it can be loaded on many +compiler versions.") + (license license:bsd-3))) + (define-public ghc-libxml (package (name "ghc-libxml") -- cgit 1.4.1 From cfbb0a95fa6ea31a9c8c74e61016892a5de580f8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:24:07 -0400 Subject: gnu: hlint: Update to 2.1.26. * gnu/packages/haskell-apps.scm (hlint): Update to 2.1.26. [inputs]: Add 'ghc-lib-parser'. --- gnu/packages/haskell-apps.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 1e0dafe227..00c4c27c4d 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -391,7 +391,7 @@ used to keep a folder in sync between computers.") (define-public hlint (package (name "hlint") - (version "2.1.10") + (version "2.1.26") (source (origin (method url-fetch) @@ -400,7 +400,7 @@ used to keep a folder in sync between computers.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w")))) + "16zkkpbfrd69853cdqf597fva969lirfc86b039i9zd7ghlrcayc")))) (build-system haskell-build-system) (inputs `(("cpphs" ,cpphs) @@ -416,6 +416,7 @@ used to keep a folder in sync between computers.") ("ghc-extra" ,ghc-extra) ("ghc-refact" ,ghc-refact) ("ghc-aeson" ,ghc-aeson) + ("ghc-lib-parser" ,ghc-lib-parser) ("hscolour" ,hscolour))) (home-page "http://community.haskell.org/~ndm/hlint/") (synopsis "Suggest improvements for Haskell source code") -- cgit 1.4.1 From 08f5439074918d3f90906cb38143a0245b440c07 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:24:26 -0400 Subject: gnu: ghc-simple-sendfile: Update to 0.2.30. * gnu/packages/haskell-xyz.scm (ghc-simple-sendfile): Update to 0.2.30. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f7c3d04399..d643ed21c4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9446,7 +9446,7 @@ them.") (define-public ghc-simple-sendfile (package (name "ghc-simple-sendfile") - (version "0.2.27") + (version "0.2.30") (source (origin (method url-fetch) @@ -9455,7 +9455,7 @@ them.") "simple-sendfile-" version ".tar.gz")) (sha256 (base32 - "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn")))) + "112j0qfsjazf9wg1zywf7hjybgsiywk9wkm27yi8xzv27hmlv1mn")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) -- cgit 1.4.1 From cd518e951371d8dcc3e8a94ea43290ed8e3f96f4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:24:39 -0400 Subject: gnu: ghc-stm-conduit: Update to 4.0.1. * gnu/packages/haskell-xyz.scm (ghc-stm-conduit): Update to 4.0.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d643ed21c4..cc260018ea 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9779,7 +9779,7 @@ features.") (define-public ghc-stm-conduit (package (name "ghc-stm-conduit") - (version "4.0.0") + (version "4.0.1") (source (origin (method url-fetch) @@ -9787,7 +9787,7 @@ features.") "stm-conduit-" version ".tar.gz")) (sha256 (base32 - "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z")))) + "0hhlxvpp7mah8dcvkknh6skx44jfk3092zz2w52zlr255bkmn3p8")))) (build-system haskell-build-system) (inputs `(("ghc-stm-chans" ,ghc-stm-chans) -- cgit 1.4.1 From a41c16dc32f27f9a5a7b017557510c9cac56e4b4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:24:52 -0400 Subject: gnu: ghc-feed: Update to 1.2.0.1. * gnu/packages/haskell-xyz.scm (ghc-feed): Update to 1.2.0.1. [arguments]: Remove '#:cabal-revision'. [native-inputs]: Add 'ghc-markdown-unlit'. --- gnu/packages/haskell-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index cc260018ea..2ec48926fd 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3423,7 +3423,7 @@ when used with GHC versions which already provide the (define-public ghc-feed (package (name "ghc-feed") - (version "1.0.0.0") + (version "1.2.0.1") (source (origin (method url-fetch) @@ -3431,11 +3431,8 @@ when used with GHC versions which already provide the "feed/feed-" version ".tar.gz")) (sha256 (base32 - "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck")))) + "004lwdng4slj6yl8mgscr3cgj0zzc8hzkf4450dby2l6cardg4w0")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("4" "0baavcavm3ywykcr9cm07aqr7sna98jba2n68lyn3kany8ri214d"))) (inputs `(("ghc-base-compat" ,ghc-base-compat) ("ghc-old-locale" ,ghc-old-locale) @@ -3447,6 +3444,7 @@ when used with GHC versions which already provide the ("ghc-xml-types" ,ghc-xml-types))) (native-inputs `(("ghc-hunit" ,ghc-hunit) + ("ghc-markdown-unlit" ,ghc-markdown-unlit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) (home-page "https://github.com/bergmark/feed") -- cgit 1.4.1 From 18a38da5ab8d4263026c9f83f723d69aabd6fb47 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:25:04 -0400 Subject: gnu: ghc-persistent: Update to 2.9.2. * gnu/packages/haskell-xyz.scm (ghc-persistent): Update to 2.9.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2ec48926fd..df032e5437 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7775,7 +7775,7 @@ syntax and semantics as Perl 5.") (define-public ghc-persistent (package (name "ghc-persistent") - (version "2.8.2") + (version "2.9.2") (source (origin (method url-fetch) @@ -7784,7 +7784,7 @@ syntax and semantics as Perl 5.") "persistent-" version ".tar.gz")) (sha256 (base32 - "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9")))) + "1wsa3kn427v88a6r0vwr6mz23snik2krbsgc8zqp18xajqn5szj9")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) ("ghc-conduit" ,ghc-conduit) -- cgit 1.4.1 From 132e107480fe3f71e3874d59f016bb2ca328475c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 5 Nov 2019 14:19:42 -0500 Subject: gnu: ghc-cryptohash-sha256: Update Cabal file to r3. * gnu/packages/haskell-crypto.scm (ghc-cryptohash-sha256): Update Cabal file to r3. --- gnu/packages/haskell-crypto.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 6c0ff0dcea..6467e9bbca 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -274,7 +274,7 @@ the C implementation.") (build-system haskell-build-system) (arguments `(#:cabal-revision - ("1" "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3") + ("3" "1arhz4y792kx439s2zv9x291gvvl2zxcfx9sq0nxsjlz7c3hpyp1") #:tests? #f)) ; tests require old version of ghc-hunit (0.9) (inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring))) -- cgit 1.4.1 From d7d143e5537ec131f0b10c47bb66ffca16408e0d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 21:24:53 -0500 Subject: gnu: ghc-edit-distance: Update dependency constraints. * gnu/packages/haskell-xyz.scm (ghc-edit-distance): Change the phase that updates the Cabal file to allow for newer versions of 'QuickCheck'. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index df032e5437..d206231cdd 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2964,7 +2964,7 @@ with various performance characteristics.") (lambda _ (substitute* "edit-distance.cabal" (("QuickCheck >= 2\\.4 && <2\\.9") - "QuickCheck >= 2.4 && < 2.12"))))))) + "QuickCheck >= 2.4 && < 2.14"))))))) (inputs `(("ghc-random" ,ghc-random) ("ghc-test-framework" ,ghc-test-framework) -- cgit 1.4.1 From 034380f3146916fbce972eec3f9f7707db9ca93d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 5 Nov 2019 14:45:06 -0500 Subject: gnu: ghc-hackage-security: Update Cabal file to r6. * gnu/packages/haskell-xyz.scm (ghc-hackage-security): Update Cabal file to r6. --- gnu/packages/haskell-xyz.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d206231cdd..3bab36acb1 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4174,7 +4174,9 @@ tools are not needed to actually run Gtk2Hs programs.") "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v")))) (build-system haskell-build-system) (arguments - `(#:tests? #f)) ; Tests fail because of framework updates. + `(#:cabal-revision + ("6" "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay") + #:tests? #f)) ; Tests fail because of framework updates. (inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring) ("ghc-base64-bytestring" ,ghc-base64-bytestring) -- cgit 1.4.1 From 87309478b3944a90f8bbef296c6d30c3ec0e9269 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 5 Nov 2019 14:46:35 -0500 Subject: gnu: ghc-resolv: Update to 0.1.1.2. * gnu/packages/haskell-xyz.scm (ghc-resolv): Update to 0.1.1.2. [arguments]: Remove '#:cabal-revision', enable tests, and add a phase to update the Cabal file to allow newer versions of 'tasty'. [native-inputs]: Add 'ghc-tasty' and 'ghc-tasty-hunit'. --- gnu/packages/haskell-xyz.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3bab36acb1..afbbb0a9de 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8641,7 +8641,7 @@ the project's home page}.") (define-public ghc-resolv (package (name "ghc-resolv") - (version "0.1.1.1") + (version "0.1.1.2") (source (origin (method url-fetch) @@ -8650,14 +8650,22 @@ the project's home page}.") version ".tar.gz")) (sha256 (base32 - "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9")))) + "0wczdy3vmpfcfwjn1m95bygc5d83m97xxmavhdvy5ayn8c402fp4")))) (build-system haskell-build-system) (arguments - `(#:cabal-revision - ("1" "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma") - #:tests? #f)) ; The required test frameworks are too old. + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "resolv.cabal" + (("tasty >= 1\\.1 && < 1\\.2") + "tasty >= 1.1 && < 1.3")) + #t))))) (inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (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 -- cgit 1.4.1 From a78262be5af4e158aa37f189b973b976c9dd982e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 13:54:07 -0400 Subject: gnu: ghc-adjunctions: Update Cabal file to r2. * gnu/packages/haskell-xyz.scm (ghc-adjunctions): Update Cabal file to r2. --- gnu/packages/haskell-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index afbbb0a9de..052f9a3b84 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -144,6 +144,9 @@ module for more details.") (base32 "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1yfsjx7dqikg3hvld7i91xfsg5lawmr5980lvfd794sybmgxsf17"))) (inputs `(("ghc-profunctors" ,ghc-profunctors) ("ghc-comonad" ,ghc-comonad) -- cgit 1.4.1 From 262e63237c535baa1e50d4901b4ab3c71eb35b55 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:25:47 -0400 Subject: gnu: ghc-lens: Update to 4.17.1. * gnu/packages/haskell-xyz.scm (ghc-lens): Update to 4.17.1. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 052f9a3b84..24722e8a80 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5703,7 +5703,7 @@ with @code{wc} (for a web service).") (define-public ghc-lens (package (name "ghc-lens") - (version "4.16.1") + (version "4.17.1") (source (origin (method url-fetch) @@ -5711,11 +5711,8 @@ with @code{wc} (for a web service).") version ".tar.gz")) (sha256 (base32 - "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm")))) + "1gpkc53l2cggnfrgg5k4ih82rycjbdvpj9pnbi5cq8ms0dbvs4a7")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri"))) (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-bifunctors" ,ghc-bifunctors) -- cgit 1.4.1 From 5ffe8cfdc3c20e589ebbffac00c18878a884814c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 2 Nov 2019 20:04:21 -0400 Subject: gnu: ghc-trifecta: Update Cabal file to r4. * gnu/packages/haskell-xyz.scm (ghc-trifecta): Update Cabal file to r4. --- gnu/packages/haskell-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 24722e8a80..83e56741ee 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10951,7 +10951,10 @@ compute the difference between arbitrary abstract datatypes (ADTs) using (base32 "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; doctest suite fails to build on i686 + (arguments + `(#:tests? #f ; doctest suite fails to build on i686 + #:cabal-revision + ("4" "0xbwyvwl6f2zylk60f2akwgq03qv49113xil7b1z1s3vlwbn5aj1"))) (inputs `(("ghc-reducers" ,ghc-reducers) ("ghc-semigroups" ,ghc-semigroups) -- cgit 1.4.1 From c022a4d4e43cbed72517f145b8f72c41d8db401c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 22:53:43 -0500 Subject: gnu: Add ghc-time-manager. * gnu/packages/haskell-xyz.scm (ghc-time-manager): New variable. --- gnu/packages/haskell-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 83e56741ee..0da0212e50 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10780,6 +10780,27 @@ features as possible.") @code{TimeLocale}.") (license license:bsd-3))) +(define-public ghc-time-manager + (package + (name "ghc-time-manager") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "time-manager/time-manager-" version ".tar.gz")) + (sha256 + (base32 + "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh")))) + (build-system haskell-build-system) + (inputs + `(("ghc-auto-update" ,ghc-auto-update))) + (home-page "https://github.com/yesodweb/wai") + (synopsis "Scalable timer") + (description "This library contains scalable timer functions provided by a +timer manager.") + (license license:expat))) + (define-public ghc-timeit (package (name "ghc-timeit") -- cgit 1.4.1 From 2f9be5e7dd23d1d44290ff48e06a42cd2f4bce5a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:24:52 -0400 Subject: gnu: ghc-warp: Update to 3.2.28. * gnu/packages/haskell-web.scm (ghc-warp): Update to 3.2.28. [inputs]: Add 'ghc-time-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 a6ed7e1c0d..a733405cde 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -550,7 +550,7 @@ transfers.") (define-public ghc-warp (package (name "ghc-warp") - (version "3.2.27") + (version "3.2.28") (source (origin (method url-fetch) @@ -558,7 +558,7 @@ transfers.") "warp-" version "/" "warp-" version ".tar.gz")) (sha256 - (base32 "0p2w88q0zd55ms20qylipbi0qzbf324i9r8b9qqxyds5yc1anq76")))) + (base32 "0w2w3aiccpb2f8zssqiszcxzqdysihqi5xply23lwif5arz4saw7")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) @@ -570,6 +570,7 @@ transfers.") ("ghc-iproute" ,ghc-iproute) ("ghc-network" ,ghc-network) ("ghc-streaming-commons" ,ghc-streaming-commons) + ("ghc-time-manager" ,ghc-time-manager) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-vault" ,ghc-vault) ("ghc-wai" ,ghc-wai) -- cgit 1.4.1 From 8428e92c55653eced5323d4414b0ea17d067ba78 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 5 Nov 2019 17:42:19 -0500 Subject: gnu: Add ghc-zstd. * gnu/packages/haskell-xyz.scm (ghc-zstd): New variable. --- gnu/packages/haskell-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0da0212e50..9115afd0c5 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -12263,3 +12263,28 @@ provides access to the full zlib feature set.") (description "This package provides low-level bindings to the @code{zlib} package.") (license license:bsd-3))) + +(define-public ghc-zstd + (package + (name "ghc-zstd") + (version "0.1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "zstd/zstd-" version ".tar.gz")) + (sha256 + (base32 + "147s496zvw13akxqzg65mgfvk3bvhrcilxgf8n786prxg5cm4jz2")))) + (build-system haskell-build-system) + (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/luispedro/hs-zstd") + (synopsis "Haskell bindings to the Zstandard compression algorithm") + (description "This library provides Haskell bindings to the +Zstandard compression algorithm, a fast lossless compression algorithm +targeting real-time compression scenarios at zlib-level and better +compression ratios.") + (license license:bsd-3))) -- cgit 1.4.1 From b59c35182e5516be5b3f9ded130235de1e7271bb Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 5 Nov 2019 17:42:53 -0500 Subject: gnu: Add ghc-conduit-zstd. * gnu/packages/haskell-xyz.scm (ghc-conduit-zstd): New variable. --- gnu/packages/haskell-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9115afd0c5..565d613d1c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2141,6 +2141,37 @@ dependencies. The basic idea is that this package should only depend on @code{haskell-platform} packages and @code{conduit}.") (license license:expat))) +(define-public ghc-conduit-zstd + (package + (name "ghc-conduit-zstd") + (version "0.0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "conduit-zstd/conduit-zstd-" version ".tar.gz")) + (sha256 + (base32 + "04h7w2903hgw4gjcx2pg29yinnmfapawvc19hd3r57rr12fzb0c6")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-zstd" ,ghc-zstd))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-conduit-combinators" ,ghc-conduit-combinators) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-th" ,ghc-test-framework-th))) + (home-page "https://github.com/luispedro/conduit-zstd#readme") + (synopsis "Conduit-based ZStd Compression") + (description "Zstandard compression packaged as a conduit. This is +a very thin wrapper around the +@url{https://github.com/facebookexperimental/hs-zstd/, official hs-zstd +interface}.") + (license license:expat))) + (define-public ghc-configurator (package (name "ghc-configurator") -- cgit 1.4.1 From 503b74ae9ae41a7673b64dd0e0876a94ee94e3a2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:25:35 -0400 Subject: gnu: ghc-conduit-algorithms: Update to 0.0.11.0. * gnu/packages/haskell-xyz.scm (ghc-conduit-algorithms): Update to 0.0.11.0. [inputs]: Add 'ghc-conduit-zstd'. --- gnu/packages/haskell-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 565d613d1c..703cedc18b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2022,7 +2022,7 @@ space as enumerator/iteratee and pipes.") (define-public ghc-conduit-algorithms (package (name "ghc-conduit-algorithms") - (version "0.0.8.1") + (version "0.0.11.0") (source (origin (method url-fetch) @@ -2031,7 +2031,7 @@ space as enumerator/iteratee and pipes.") version ".tar.gz")) (sha256 (base32 - "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd")))) + "0c1jwz30kkvimx7lb61782yk0kyfamrf5bqc3g1h7g51lk8bbv9i")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) @@ -2039,6 +2039,7 @@ space as enumerator/iteratee and pipes.") ("ghc-conduit" ,ghc-conduit) ("ghc-conduit-combinators" ,ghc-conduit-combinators) ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-conduit-zstd" ,ghc-conduit-zstd) ("ghc-exceptions" ,ghc-exceptions) ("ghc-lzma-conduit" ,ghc-lzma-conduit) ("ghc-monad-control" ,ghc-monad-control) -- cgit 1.4.1 From 08397fde1394b0d17682782228a1381c94f59b5e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:32:48 -0400 Subject: gnu: ghc-validation: Update to 1.1. * gnu/packages/haskell-xyz.scm (ghc-validation): Update to 1.1. [arguments]: Update Cabal file hash. --- gnu/packages/haskell-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 703cedc18b..51c442f915 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11544,7 +11544,7 @@ functions.") (define-public ghc-validation (package (name "ghc-validation") - (version "1") + (version "1.1") (source (origin (method url-fetch) @@ -11554,11 +11554,11 @@ functions.") ".tar.gz")) (sha256 (base32 - "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh")))) + "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5")))) (build-system haskell-build-system) (arguments `(#:cabal-revision - ("1" "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3"))) + ("1" "1rrjg9z399k6pb55nv85mlr5bkmdqbjwkvl1cy7ydccdx6ks4syp"))) (inputs `(("ghc-semigroups" ,ghc-semigroups) ("ghc-semigroupoids" ,ghc-semigroupoids) -- cgit 1.4.1 From 490ceae4e22f583963bb8f287c066e39a5f8c682 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 1 Nov 2019 14:15:47 -0400 Subject: gnu: ghc-deepseq-generics: Update Cabal file to r4. * gnu/packages/haskell-xyz.scm (ghc-deepseq-generics): Update Cabal file to r4. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 51c442f915..a2a0b63e03 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -2597,7 +2597,7 @@ It includes hashing functions for all basic Haskell98 types.") (build-system haskell-build-system) (arguments `(#:cabal-revision - ("2" "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb"))) + ("4" "0928s2qnbqsjzrm94x88rvmvbigfmhcyp4m73gw6asinp2qg1kii"))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) -- cgit 1.4.1 From fd7e8dcf29487ac88d0049fdbfbfc77dfafdb4c8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:25:55 -0400 Subject: gnu: ghc-yesod-core: Update to 1.6.16.1. * gnu/packages/haskell-web.scm (ghc-yesod-core): Update to 1.6.16.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 a733405cde..35db7f381d 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1019,7 +1019,7 @@ avoid any issues with characters.") (define-public ghc-yesod-core (package (name "ghc-yesod-core") - (version "1.6.6") + (version "1.6.16.1") (source (origin (method url-fetch) @@ -1028,7 +1028,7 @@ avoid any issues with characters.") "yesod-core-" version ".tar.gz")) (sha256 (base32 - "0xahf6m5c7mkl74p0gimy4wb5w4s3lh92wwxmk517fbq666c92kb")))) + "0a0yv7wkwvb0n6iia532y9nzrirgnm09pjc8hpm0lx4ff609pgd2")))) (build-system haskell-build-system) (inputs `(("ghc-wai" ,ghc-wai) ("ghc-extra" ,ghc-extra) -- cgit 1.4.1 From 2e9aaf0766dd58f72a018a8194fd1118c5db7f1b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:29:23 -0400 Subject: gnu: ghc-warp-tls: Update to 3.2.8. * gnu/packages/haskell-web.scm (ghc-warp-tls): Update to 3.2.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 35db7f381d..f03346490f 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -623,7 +623,7 @@ limitation, automatic pruning, energy saving and replay resistance.") (define-public ghc-warp-tls (package (name "ghc-warp-tls") - (version "3.2.4.3") + (version "3.2.8") (source (origin (method url-fetch) @@ -632,7 +632,7 @@ limitation, automatic pruning, energy saving and replay resistance.") "warp-tls-" version ".tar.gz")) (sha256 (base32 - "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4")))) + "1z5jzl40x1gp249fk8h51gkw6m3hzxchm2bp3kbpqdgmw8r5im8y")))) (build-system haskell-build-system) (inputs `(("ghc-cryptonite" ,ghc-cryptonite) -- cgit 1.4.1 From bc78e0d9561675b8f54b6bb87a6a347e2781726a Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:29:47 -0400 Subject: gnu: ghc-persistent-template: Update to 2.6.0. * gnu/packages/haskell-xyz.scm (ghc-persistent-template): Update to 2.6.0. [arguments]: Remove '#:cabal-revision'. --- gnu/packages/haskell-xyz.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a2a0b63e03..50e4d32ac3 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7890,7 +7890,7 @@ system dependencies.") (define-public ghc-persistent-template (package (name "ghc-persistent-template") - (version "2.5.4") + (version "2.6.0") (source (origin (method url-fetch) @@ -7899,11 +7899,8 @@ system dependencies.") "persistent-template-" version ".tar.gz")) (sha256 (base32 - "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc")))) + "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6"))) (inputs `(("ghc-persistent" ,ghc-persistent) ("ghc-monad-control" ,ghc-monad-control) ("ghc-aeson" ,ghc-aeson) -- cgit 1.4.1 From 86526f37c3c431e8c0513e156301a2935306e4a2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:30:04 -0400 Subject: gnu: ghc-linear: Update to 1.20.9. * gnu/packages/haskell-xyz.scm (ghc-linear): Update to 1.20.9. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 50e4d32ac3..bce7556410 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5989,7 +5989,7 @@ Kaseorg.") (define-public ghc-linear (package (name "ghc-linear") - (version "1.20.8") + (version "1.20.9") (source (origin (method url-fetch) @@ -5997,7 +5997,7 @@ Kaseorg.") "linear-" version ".tar.gz")) (sha256 (base32 - "046vkvxlb0s286qr55s0c6db0rlwbm1cmlmwhrrkqbkzhfcipgay")))) + "0h7yqigq593n7wsl7nz6a5f137wznm7y679wsii0ph0zsc4v5af5")))) (build-system haskell-build-system) (inputs `(("ghc-adjunctions" ,ghc-adjunctions) -- cgit 1.4.1 From 6cd84b98dcad77de0bd647a0b56b65453ce318a9 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:30:22 -0400 Subject: gnu: ghc-chart: Update to 1.9.1. * gnu/packages/haskell-xyz.scm (ghc-chart): Update to 1.9.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index bce7556410..4c592ff4a2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1464,7 +1464,7 @@ Haskell, based on complemented PATRICIA tries.") (define-public ghc-chart (package (name "ghc-chart") - (version "1.9") + (version "1.9.1") (source (origin (method url-fetch) @@ -1472,7 +1472,7 @@ Haskell, based on complemented PATRICIA tries.") "Chart-" version ".tar.gz")) (sha256 (base32 - "1f5azj17y8xsb3gjhf7gg1gnnlq12rxkmfjmgcly314d7vghs05z")))) + "1pn735k9ifxlb9mdh8xy7wi22cxni8xyr28n8zx9w0j6vprcg89l")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) -- cgit 1.4.1 From b4e26067d649b0efcc3b7d00d5dbe599e395da13 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:30:45 -0400 Subject: gnu: ghc-tree-diff: Update to 0.1. * gnu/packages/haskell-xyz.scm (ghc-tree-diff): Update to 0.1. [arguments]: Remove '#:cabal-revision' and '#:phases'. [inputs]: Remove 'ghc-generics-sop' and 'ghc-memotrie'; add 'ghc-bytestring-builder'. --- gnu/packages/haskell-xyz.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 4c592ff4a2..cf0df9a616 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10934,7 +10934,7 @@ but also need those types.") (define-public ghc-tree-diff (package (name "ghc-tree-diff") - (version "0.0.1") + (version "0.1") (source (origin (method url-fetch) @@ -10944,26 +10944,15 @@ but also need those types.") ".tar.gz")) (sha256 (base32 - "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz")))) + "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3")))) (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-bytestring-builder" ,ghc-bytestring-builder) ("ghc-hashable" ,ghc-hashable) - ("ghc-memotrie" ,ghc-memotrie) ("ghc-parsers" ,ghc-parsers) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-scientific" ,ghc-scientific) -- cgit 1.4.1 From 841f19541a386c4c149f53e682fa9ee6aa37852b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:25:18 -0400 Subject: gnu: cabal-install: Update to 2.4.0.0. * gnu/packages/haskell-apps.scm (cabal-install): Update to 2.4.0.0. [arguments]: Set Cabal file to r2, enable tests, and add a phase to update the Cabal file to allow a newer version of 'zip-archive'. [inputs]: Add 'ghc-zip-archive'. --- gnu/packages/haskell-apps.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 00c4c27c4d..2192c1c8ff 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -49,10 +49,14 @@ #:use-module (gnu packages rsync) #:use-module (gnu packages version-control)) +;; In Stackage LTS 14, this package is at 2.4.1.0. However, that +;; version requires version 2.4.1.0 of the 'Cabal' package, which is +;; provided by GHC 8.6.5 at version 2.4.0.1. Hence, we use an older +;; version to match the compiler's library. (define-public cabal-install (package (name "cabal-install") - (version "2.2.0.0") + (version "2.4.0.0") (source (origin (method url-fetch) @@ -61,9 +65,19 @@ version ".tar.gz")) (sha256 - (base32 "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8")))) - (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. + (base32 "1xmyl0x8wqfrnray6ky5wy0g0samv4264fbdlzxhqsvk9dbfja8k")))) (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1xil5pim6j1ckqj61zz6l7xpfxxr3rkw2hvpws2f7pr9shk645dl") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "cabal-install.cabal" + (("zip-archive >= 0\\.3\\.2\\.5 && < 0\\.4,") + "zip-archive >= 0.3.2.5 && <= 0.4.1,")) + #t))))) (inputs `(("ghc-async" ,ghc-async) ("ghc-base16-bytestring" ,ghc-base16-bytestring) @@ -78,6 +92,7 @@ ("ghc-random" ,ghc-random) ("ghc-resolv" ,ghc-resolv) ("ghc-tar" ,ghc-tar) + ("ghc-zip-archive" ,ghc-zip-archive) ("ghc-zlib" ,ghc-zlib))) (home-page "https://www.haskell.org/cabal/") (synopsis "Command-line interface for Cabal and Hackage") -- cgit 1.4.1 From 891b3fa9f3ea62ea1d4a7eecfd8a663331931c37 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:31:02 -0400 Subject: gnu: ghc-http-conduit: Update to 2.3.7.3. * gnu/packages/haskell-web.scm (ghc-http-conduit): Update to 2.3.7.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 f03346490f..dd4a1a90ea 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -321,7 +321,7 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") (define-public ghc-http-conduit (package (name "ghc-http-conduit") - (version "2.3.2") + (version "2.3.7.3") (source (origin (method url-fetch) @@ -330,7 +330,7 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") version ".tar.gz")) (sha256 (base32 - "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km")))) + "00rshi1y0h8y4rvsnnad0bppxgpvp40sk7lw1kxmdwy8pi8xrvbs")))) (build-system haskell-build-system) ;; FIXME: `httpLbs TLS` in test-suite `test` fails with ;; ConnectionFailure getProtocolByName: does not exist (no such protocol -- cgit 1.4.1 From 145148ca017187b1de0587b664aa4039fdc1852f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:31:22 -0400 Subject: gnu: ghc-sdl2: Update to 2.5.0.0. * gnu/packages/haskell-xyz.scm (ghc-sdl2): Update to 2.5.0.0. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index cf0df9a616..ce5dccac02 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9070,7 +9070,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") (define-public ghc-sdl2 (package (name "ghc-sdl2") - (version "2.4.1.0") + (version "2.5.0.0") (source (origin (method url-fetch) @@ -9078,7 +9078,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") "sdl2/sdl2-" version ".tar.gz")) (sha256 (base32 - "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991")))) + "1x368yhdd55b3cvx8dvj1sj6nzygzigbhrwhssjs4k0rcxlwqfw8")))) (build-system haskell-build-system) (arguments '(#:tests? #f)) ; tests require graphical environment (inputs -- cgit 1.4.1 From 801fbd7e0f9a4de2082e5946b5641473c951d0b0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:31:36 -0400 Subject: gnu: ghc-persistent-sqlite: Update to 2.9.3. * gnu/packages/haskell-xyz.scm (ghc-persistent-sqlite): Update to 2.9.3. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ce5dccac02..5b6aa93a7a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7855,7 +7855,7 @@ way.") (define-public ghc-persistent-sqlite (package (name "ghc-persistent-sqlite") - (version "2.8.2") + (version "2.9.3") (source (origin (method url-fetch) @@ -7864,7 +7864,7 @@ way.") "persistent-sqlite-" version ".tar.gz")) (sha256 (base32 - "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6")))) + "13wbn88ixv4d4dfjl1gabm1q60fbcnygbmixz57pi3z84drrynwq")))) (build-system haskell-build-system) (inputs `(("ghc-persistent" ,ghc-persistent) ("ghc-unliftio-core" ,ghc-unliftio-core) -- cgit 1.4.1 From 2648b604ac112839933b450ad21f01fb6a22a6ff Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 14:28:24 -0400 Subject: gnu: ghc-esqueleto: Update to 3.0.0. * gnu/packages/haskell-xyz.scm (ghc-esqueleto): Update to 3.0.0. [source]: Use 'url-fetch' instead of 'git-fetch'. --- gnu/packages/haskell-xyz.scm | 113 +++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 59 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 5b6aa93a7a..37f56df89b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3209,69 +3209,64 @@ directly uses the type system, rather than out-of-band exceptions.") (license license:bsd-3))) (define-public ghc-esqueleto - (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))) - (file-name (git-file-name name version)) - (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-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 + (package + (name "ghc-esqueleto") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "esqueleto/esqueleto-" version ".tar.gz")) + (sha256 + (base32 + "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy")))) + (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-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 ghc-exactprint (package -- cgit 1.4.1 From 12ee2d5d8466578b8cde03fa5a91ca15efcb3b4c Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:31:50 -0400 Subject: gnu: hoogle: Update to 5.0.17.11. * gnu/packages/haskell-apps.scm (hoogle): Update to 5.0.17.11. [inputs]: Remove 'ghc-network-uri' and 'ghc-network'; add 'ghc-blaze-html', 'ghc-blaze-markup', and 'ghc-foundation'. --- gnu/packages/haskell-apps.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 2192c1c8ff..682a10b327 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -443,7 +443,7 @@ unwanted suggestions, and to add your own custom suggestions.") (define-public hoogle (package (name "hoogle") - (version "5.0.17.3") + (version "5.0.17.11") (source (origin (method url-fetch) @@ -453,18 +453,19 @@ unwanted suggestions, and to add your own custom suggestions.") version ".tar.gz")) (sha256 (base32 - "174gp41v0krzj37m75pnr3aawyhkbk2wq4q6zk2z3zh0avvvmgk6")))) + "1svp8z9pad8z2j386pr0dda0ds8ddxab0salnz4gm51q877w93p1")))) (build-system haskell-build-system) (inputs - `(("ghc-network-uri" ,ghc-network-uri) - ("ghc-network" ,ghc-network) - ("ghc-quickcheck" ,ghc-quickcheck) + `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-aeson" ,ghc-aeson) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-cmdargs" ,ghc-cmdargs) ("ghc-conduit" ,ghc-conduit) ("ghc-conduit-extra" ,ghc-conduit-extra) ("ghc-connection" ,ghc-connection) ("ghc-extra" ,ghc-extra) + ("ghc-foundation" ,ghc-foundation) ("ghc-old-locale" ,ghc-old-locale) ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) ("ghc-http-conduit" ,ghc-http-conduit) -- cgit 1.4.1 From 1e0db876d1fb37720f1a9697f9bda34a17ab6e84 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:32:04 -0400 Subject: gnu: ghc-yesod-persistent: Update to 1.6.0.2. * gnu/packages/haskell-web.scm (ghc-yesod-persistent): Update to 1.6.0.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 dd4a1a90ea..36f98076d3 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1088,7 +1088,7 @@ functions, widgets, etc.") (define-public ghc-yesod-persistent (package (name "ghc-yesod-persistent") - (version "1.6.0") + (version "1.6.0.2") (source (origin (method url-fetch) @@ -1097,7 +1097,7 @@ functions, widgets, etc.") "yesod-persistent-" version ".tar.gz")) (sha256 (base32 - "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2")))) + "17adw0aaj29ia7ii3jka301442860b5wvfrms079q973gzahz5fd")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH. (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit 1.4.1 From 10707d572034e7389211cbe3df30dd92f93124f7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:33:24 -0400 Subject: gnu: ghc-haddock-library: Update to 1.7.0. The new source tarball does not have bundled dependencies, so it does not need to be patched. * gnu/packages/haskell-xyz.scm (ghc-haddock-library): Update to 1.7.0. [source]: Remove 'patches', 'modules' and 'snippet'. [arguments]: Update the 'relax-test-suite-dependencies' phase to allow newer versions of 'hspec' and 'QuickCheck'; remove the 'add-examples-directory' phase. * gnu/packages/patches/ghc-haddock-library-unbundle.patch: Delete file. * gnu/local.mk: Remove it. --- gnu/local.mk | 1 - gnu/packages/haskell-xyz.scm | 23 ++---- .../patches/ghc-haddock-library-unbundle.patch | 86 ---------------------- 3 files changed, 6 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/ghc-haddock-library-unbundle.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 9c4d1013d8..fd18592582 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -880,7 +880,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-diff-swap-cover-args.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ - %D%/packages/patches/ghc-haddock-library-unbundle.patch \ %D%/packages/patches/ghc-hpack-fix-tests.patch \ %D%/packages/patches/ghc-monad-par-fix-tests.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 37f56df89b..bd5b599ace 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4328,7 +4328,7 @@ documentation-generation tool for Haskell libraries.") (define-public ghc-haddock-library (package (name "ghc-haddock-library") - (version "1.5.0.1") + (version "1.7.0") (source (origin (method url-fetch) @@ -4338,29 +4338,18 @@ documentation-generation tool for Haskell libraries.") ".tar.gz")) (sha256 (base32 - "1cmbg8l5xrwpliclwy3l057raypjqy0hsg1h1743ahaj8gq10b7z")) - (patches (search-patches - "ghc-haddock-library-unbundle.patch")) - (modules '((guix build utils))) - (snippet '(begin - (delete-file-recursively "vendor") - #t)))) + "04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7")))) (build-system haskell-build-system) (arguments `(#:phases (modify-phases %standard-phases + ;; Since there is no revised Cabal file upstream, we have to + ;; patch it manually. (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") + (("hspec\\s*>= 2.4.4 && < 2.6") "hspec") + (("QuickCheck\\s*\\^>= 2.11") "QuickCheck")) #t))))) (native-inputs `(("ghc-base-compat" ,ghc-base-compat) diff --git a/gnu/packages/patches/ghc-haddock-library-unbundle.patch b/gnu/packages/patches/ghc-haddock-library-unbundle.patch deleted file mode 100644 index 0e8b548956..0000000000 --- a/gnu/packages/patches/ghc-haddock-library-unbundle.patch +++ /dev/null @@ -1,86 +0,0 @@ -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 1.4.1 From b37d0c825fa33a25cbd619402e9a31991f31ec50 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:11:11 -0500 Subject: gnu: Add ghc-tasty-lua. * gnu/packages/haskell-check.scm (ghc-tasty-lua): New variable. --- gnu/packages/haskell-check.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 8fac25a6d0..456ef3089e 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -261,6 +261,31 @@ test framework.") tasty.") (license license:expat))) +(define-public ghc-tasty-lua + (package + (name "ghc-tasty-lua") + (version "0.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "tasty-lua/tasty-lua-" version ".tar.gz")) + (sha256 + (base32 + "0xlj36rrhkx312h7smx6ay20rhlhxvw2ma2ckdnzv1pvmdn6p5qx")))) + (build-system haskell-build-system) + (inputs + `(("ghc-file-embed" ,ghc-file-embed) + ("ghc-hslua" ,ghc-hslua) + ("ghc-tasty" ,ghc-tasty))) + (native-inputs + `(("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/hslua/tasty-lua") + (synopsis "Write tests in Lua, integrate into tasty") + (description "This package gives users the ability to define tasty tests +from Lua.") + (license license:expat))) + (define-public ghc-tasty-th (package (name "ghc-tasty-th") -- cgit 1.4.1 From 64f4278624eb863059f4e9ac93bca37cb39b8fae Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:14:41 -0500 Subject: gnu: Add ghc-bitarray. * gnu/packages/haskell-xyz.scm (ghc-bitarray): New variable. --- gnu/packages/haskell-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index bd5b599ace..882df583d1 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -866,6 +866,27 @@ can use with C code to help write bindings to inline functions or macro functions.") (license license:bsd-3))) +(define-public ghc-bitarray + (package + (name "ghc-bitarray") + (version "0.0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "bitarray/bitarray-" version ".tar.gz")) + (sha256 + (base32 + "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "10fk92v9afjqk43zi621jxl0n8kci0xjj32lz3vqa9xbh67zjz45"))) + (home-page "https://hackage.haskell.org/package/bitarray") + (synopsis "Mutable and immutable bit arrays") + (description "The package provides mutable and immutable bit arrays.") + (license license:bsd-3))) + (define-public ghc-blaze-builder (package (name "ghc-blaze-builder") -- cgit 1.4.1 From 3ebae41f5a15d7d7b9356885830c47e4e1ecb54b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:18:35 -0500 Subject: gnu: Add ghc-edit-distance-vector. * gnu/packages/haskell-xyz.scm (ghc-edit-distance-vector): New variable. --- gnu/packages/haskell-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 882df583d1..700dc9c8a2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3034,6 +3034,39 @@ distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms.") (license license:bsd-3))) +(define-public ghc-edit-distance-vector + (package + (name "ghc-edit-distance-vector") + (version "1.0.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "edit-distance-vector/edit-distance-vector-" + version ".tar.gz")) + (sha256 + (base32 + "07qgc8dyi9kkzkd3xcd78wdlljy0xwhz65b4r2qg2piidpcdvpxp")))) + (build-system haskell-build-system) + (inputs + `(("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) + (home-page "https://github.com/thsutton/edit-distance-vector") + (synopsis "Calculate edit distances and edit scripts between vectors") + (description "This package provides implementation of the +Wagner-Fischer dynamic programming algorithm to find the optimal edit +script and cost between two sequences. The implementation in this +package is specialised to sequences represented with @code{Data.Vector} +but is otherwise agnostic to: +@itemize +@item The type of values in the vectors; +@item The type representing edit operations; and +@item The type representing the cost of operations. +@end itemize") + (license license:bsd-3)) ) + (define-public ghc-either (package (name "ghc-either") -- cgit 1.4.1 From e71fb57349109ec42207afe139153e578c43cd99 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:22:46 -0500 Subject: gnu: Add ghc-getopt-generics. * gnu/packages/haskell-xyz.scm (ghc-getopt-generics): New variable. --- gnu/packages/haskell-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 700dc9c8a2..ba6bd3ea19 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4019,6 +4019,37 @@ with the @code{Validity} typeclass.") properties for functions operating on them.") (license license:expat))) +(define-public ghc-getopt-generics + (package + (name "ghc-getopt-generics") + (version "0.13.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "getopt-generics/getopt-generics-" + version ".tar.gz")) + (sha256 + (base32 + "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-generics-sop" ,ghc-generics-sop) + ("ghc-tagged" ,ghc-tagged))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("ghc-safe" ,ghc-safe) + ("ghc-silently" ,ghc-silently) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/soenkehahn/getopt-generics") + (synopsis "Create command line interfaces with ease") + (description "This library provides tools to create command line +interfaces with ease.") + (license license:bsd-3))) + (define-public ghc-gitrev (package (name "ghc-gitrev") -- cgit 1.4.1 From b69d4aa7f82673917f47268cfbcad5fbae460170 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:24:53 -0500 Subject: gnu: Add ghc-unicode-transforms. * gnu/packages/haskell-xyz.scm (ghc-unicode-transforms): New variable. --- gnu/packages/haskell-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index ba6bd3ea19..3c75e38f40 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11214,6 +11214,32 @@ unbounded @code{Integer} type.") handled safely, this is what you're left with.") (license license:isc))) +(define-public ghc-unicode-transforms + (package + (name "ghc-unicode-transforms") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "unicode-transforms/unicode-transforms-" + version ".tar.gz")) + (sha256 + (base32 + "1akscvyssif4hki3g6hy0jmjyr8cqly1whzvzj0km2b3qh0x09l3")))) + (build-system haskell-build-system) + (inputs + `(("ghc-bitarray" ,ghc-bitarray))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-getopt-generics" ,ghc-getopt-generics) + ("ghc-split" ,ghc-split))) + (home-page "https://github.com/composewell/unicode-transforms") + (synopsis "Unicode normalization") + (description "This library provides tools for fast Unicode 12.1.0 +normalization in Haskell (normalization forms C, KC, D, and KD).") + (license license:bsd-3))) + (define-public ghc-union-find (package (name "ghc-union-find") -- cgit 1.4.1 From fac520bfa85d00563c3473ad42fbadb8c6ecf2c5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:28:17 -0500 Subject: gnu: Add ghc-hsyaml. * gnu/packages/haskell-xyz.scm (ghc-hsyaml): New variable. --- gnu/packages/haskell-xyz.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3c75e38f40..10d51f18ac 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5208,6 +5208,51 @@ for Haskell. The functions provided by this module are @code{upper}, @code{lower}, @code{len}, @code{reverse}, and @code{sub}.") (license license:expat))) +(define-public ghc-hsyaml + (package + (name "ghc-hsyaml") + (version "0.1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "HsYAML/HsYAML-" version ".tar.gz")) + (sha256 + (base32 + "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0j6qmmcz5yqh89hs2cq453maix50q61vl2h0ahj5lg02bygn42cf"))) + (home-page "https://github.com/haskell-hvr/HsYAML") + (synopsis "Pure Haskell YAML 1.2 parser") + (description "This library provides a +@url{http://yaml.org/spec/1.2/spec.html, YAML 1.2} parser implementation +for Haskell. Its features include: + +@itemize +@item Pure Haskell implementation with small dependency footprint and +emphasis on strict compliance with the YAML 1.2 specification. + +@item Direct decoding to native Haskell types via (aeson-inspired) +typeclass-based API (see @code{Data.YAML}). + +@item Support for constructing custom YAML node graph +representation (including support for cyclic YAML data structures). + +@item Support for the standard (untyped) @emph{Failsafe}, (strict) +@emph{JSON}, and (flexible) @emph{Core} ``schemas'' providing implicit +typing rules as defined in the YAML 1.2 specification (including support +for user-defined custom schemas). + +@item Event-based API resembling LibYAML's Event-based API (see +@code{Data.YAML.Event}). + +@item Low-level API access to lexical token-based scanner (see +@code{Data.YAML.Token}). +@end itemize") + (license license:gpl2+))) + (define-public ghc-http-api-data (package (name "ghc-http-api-data") -- cgit 1.4.1 From 1cd3333e3406d4e842e93d963fa374aee7c03db7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:30:45 -0500 Subject: gnu: Add ghc-microlens-aeson. * gnu/packages/haskell-xyz.scm (ghc-microlens-aeson): New variable. --- gnu/packages/haskell-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 10d51f18ac..96a0a93f6e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6480,6 +6480,37 @@ combinators (like @code{failing} and @code{singular}), but everything else is stripped. As the result, this package has no dependencies.") (license license:bsd-3))) +(define-public ghc-microlens-aeson + (package + (name "ghc-microlens-aeson") + (version "2.3.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "microlens-aeson/microlens-aeson-" + version ".tar.gz")) + (sha256 + (base32 + "0w630kk5bnily1qh41081gqgbwmslrh5ad21899gwnb2r3jripyw")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-hashable" ,ghc-hashable) + ("ghc-microlens" ,ghc-microlens) + ("ghc-scientific" ,ghc-scientific) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/fosskers/microlens-aeson") + (synopsis "Law-abiding lenses for Aeson, using microlens") + (description "This library provides law-abiding lenses for Aeson, using +microlens.") + (license license:expat))) + (define-public ghc-microlens-ghc (package (name "ghc-microlens-ghc") -- cgit 1.4.1 From cbc6f8618f378ebd2a514e8e0f455ae27b96575b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:34:00 -0500 Subject: gnu: Add ghc-aeson-diff. * gnu/packages/haskell-xyz.scm (ghc-aeson-diff): New variable. --- gnu/packages/haskell-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 96a0a93f6e..d175f41175 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -202,6 +202,45 @@ for Haskell.") ghc-aeson.") (license license:bsd-3))) +(define-public ghc-aeson-diff + (package + (name "ghc-aeson-diff") + (version "1.1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "aeson-diff/aeson-diff-" version ".tar.gz")) + (sha256 + (base32 + "01d48pd7d1mb9cd5yxfajln8rmjdjq8ch91s0lav4qw1azv6vp2r")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-edit-distance-vector" ,ghc-edit-distance-vector) + ("ghc-hashable" ,ghc-hashable) + ("ghc-scientific" ,ghc-scientific) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-optparse-applicative" ,ghc-optparse-applicative))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-glob" ,ghc-glob) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-doctest" ,ghc-doctest) + ("hlint" ,hlint))) + (home-page "https://github.com/thsutton/aeson-diff") + (synopsis "Extract and apply patches to JSON documents") + (description "This is a small library for working with changes to JSON +documents. It includes a library and two command-line executables in the +style of the @command{diff} and @command{patch} commands available on many +systems.") + (license license:bsd-3))) + (define-public ghc-alex (package (name "ghc-alex") -- cgit 1.4.1 From ff303e4ebf5cc31b1f00ec48a2f377673f67adad Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:38:03 -0500 Subject: gnu: Add ghc-hslua-module-system. * gnu/packages/haskell-xyz.scm (ghc-hslua-module-system): New variable. --- gnu/packages/haskell-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d175f41175..0d9339407e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5220,6 +5220,36 @@ handler built in.") described in @url{https://www.lua.org/}.") (license license:expat))) +(define-public ghc-hslua-module-system + (package + (name "ghc-hslua-module-system") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hslua-module-system/hslua-module-system-" + version ".tar.gz")) + (sha256 + (base32 + "1m7wz3g5c34pyizqw5mllzhsy2vziddhlbhjfwdvd7nhd3p4v3hh")))) + (build-system haskell-build-system) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-hslua" ,ghc-hslua) + ("ghc-temporary" ,ghc-temporary))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/hslua/hslua-module-system") + (synopsis "Lua module wrapper around Haskell's System module") + (description "This library provides access to system information and +functionality to Lua scripts via Haskell's @code{System} module. Intended +usage for this package is to preload it by adding the loader function to +@code{package.preload}. Note that the Lua @code{package} library must have +already been loaded before the loader can be added.") + (license license:expat))) + (define-public ghc-hslua-module-text (package (name "ghc-hslua-module-text") -- cgit 1.4.1 From 4828e54eaa9f46e04f9e4d23e5f2c245c94e20a0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 3 Nov 2019 08:39:29 -0500 Subject: gnu: Add ghc-ipynb. * gnu/packages/haskell-xyz.scm (ghc-ipynb): New variable. --- gnu/packages/haskell-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0d9339407e..b35452c60c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5738,6 +5738,38 @@ them on the longest match base. It is a kind of TRIE with one way branching removed. Both IPv4 and IPv6 are supported.") (license license:bsd-3))) +(define-public ghc-ipynb + (package + (name "ghc-ipynb") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "ipynb/ipynb-" version ".tar.gz")) + (sha256 + (base32 + "0daadhzil4q573mqb0rpvjzm0vpkzgzqcimw480qpvlh6rhppwj5")))) + (build-system haskell-build-system) + (inputs + `(("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-aeson" ,ghc-aeson) + ("ghc-semigroups" ,ghc-semigroups))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-aeson-diff" ,ghc-aeson-diff) + ("ghc-microlens-aeson" ,ghc-microlens-aeson) + ("ghc-microlens" ,ghc-microlens) + ("ghc-vector" ,ghc-vector))) + (home-page "https://hackage.haskell.org/package/ipynb") + (synopsis "Data structure for working with Jupyter notebooks") + (description "This library defines a data structure for representing +Jupyter notebooks, along with @code{ToJSON} and @code{FromJSON} +instances for conversion to and from JSON .ipynb files.") + (license license:bsd-3))) + (define-public ghc-iwlib (package (name "ghc-iwlib") -- cgit 1.4.1 From d9b1567a07ee26019e4ea12dda36d00dc3205ca6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 31 Oct 2019 13:33:38 -0400 Subject: gnu: ghc-pandoc: Update to 2.7.3. * gnu/packages/haskell-xyz.scm (ghc-pandoc): Update to 2.7.3. [source]: Add patches to fix tests. [arguments]: Remove '#:phases'. [inputs]: Remove 'ghc-deepseq-generics', 'ghc-old-locale', and 'ghc-yaml'; add 'ghc-hslua-module-system', 'ghc-hsyaml', 'ghc-ipynb', and 'ghc-unicode-transforms'. [native-inputs]: Add 'ghc-tasty-lua'. * gnu/packages/patches/ghc-pandoc-fix-html-tests.patch: New file. * gnu/packages/patches/ghc-pandoc-fix-latex-test.patch: New file. * gnu/local.mk: Add them. --- gnu/local.mk | 2 + gnu/packages/haskell-xyz.scm | 28 +++---- .../patches/ghc-pandoc-fix-html-tests.patch | 92 ++++++++++++++++++++++ .../patches/ghc-pandoc-fix-latex-test.patch | 31 ++++++++ 4 files changed, 134 insertions(+), 19 deletions(-) create mode 100644 gnu/packages/patches/ghc-pandoc-fix-html-tests.patch create mode 100644 gnu/packages/patches/ghc-pandoc-fix-latex-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index fd18592582..8e937c8734 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -882,6 +882,8 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ %D%/packages/patches/ghc-hpack-fix-tests.patch \ %D%/packages/patches/ghc-monad-par-fix-tests.patch \ + %D%/packages/patches/ghc-pandoc-fix-html-tests.patch \ + %D%/packages/patches/ghc-pandoc-fix-latex-test.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b35452c60c..aec3950e5d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7638,30 +7638,18 @@ command line options in Haskell.") (define-public ghc-pandoc (package (name "ghc-pandoc") - (version "2.2.1") + (version "2.7.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" version ".tar.gz")) + (patches (search-patches "ghc-pandoc-fix-html-tests.patch" + "ghc-pandoc-fix-latex-test.patch")) (sha256 (base32 - "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy")))) + "0dpjrr40h54cljzhvixyym07z792a9izg6b9dmqpjlgcg4rj0xx8")))) (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) @@ -7670,22 +7658,23 @@ command line options in Haskell.") ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-cmark-gfm" ,ghc-cmark-gfm) ("ghc-data-default" ,ghc-data-default) - ("ghc-deepseq-generics" ,ghc-deepseq-generics) ("ghc-diff" ,ghc-diff) ("ghc-doctemplates" ,ghc-doctemplates) ("ghc-executable-path" ,ghc-executable-path) ("ghc-glob" ,ghc-glob) ("ghc-haddock-library" ,ghc-haddock-library) ("ghc-hslua" ,ghc-hslua) + ("ghc-hslua-module-system" ,ghc-hslua-module-system) ("ghc-hslua-module-text" ,ghc-hslua-module-text) + ("ghc-hsyaml" ,ghc-hsyaml) ("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-ipynb" ,ghc-ipynb) ("ghc-juicypixels" ,ghc-juicypixels) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) - ("ghc-old-locale" ,ghc-old-locale) ("ghc-pandoc-types" ,ghc-pandoc-types) ("ghc-random" ,ghc-random) ("ghc-scientific" ,ghc-scientific) @@ -7696,16 +7685,17 @@ command line options in Haskell.") ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-temporary" ,ghc-temporary) ("ghc-texmath" ,ghc-texmath) + ("ghc-unicode-transforms" ,ghc-unicode-transforms) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) ("ghc-xml" ,ghc-xml) - ("ghc-yaml" ,ghc-yaml) ("ghc-zip-archive" ,ghc-zip-archive) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-golden" ,ghc-tasty-golden) ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-lua" ,ghc-tasty-lua) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit))) diff --git a/gnu/packages/patches/ghc-pandoc-fix-html-tests.patch b/gnu/packages/patches/ghc-pandoc-fix-html-tests.patch new file mode 100644 index 0000000000..b624ff9e9e --- /dev/null +++ b/gnu/packages/patches/ghc-pandoc-fix-html-tests.patch @@ -0,0 +1,92 @@ +This patch is taken from upstream. It fixes two HTML tests that are broken +due to using a Skylighting version greater than or equal to 0.8.2. + +From 968d2046a3cb6db661673be580660ac402753c34 Mon Sep 17 00:00:00 2001 +From: John MacFarlane +Date: Sun, 14 Jul 2019 10:48:14 -0700 +Subject: [PATCH] Update test for new skylighting. + +--- + test/lhs-test.html | 13 ++++++------- + test/lhs-test.html+lhs | 13 ++++++------- + 2 files changed, 12 insertions(+), 14 deletions(-) + +diff --git a/test/lhs-test.html b/test/lhs-test.html +index 6685555f4..446dd3d95 100644 +--- a/test/lhs-test.html ++++ b/test/lhs-test.html +@@ -12,19 +12,18 @@ + div.column{display: inline-block; vertical-align: top; width: 50%;} + + +