From 41e85ef889934ab61f2ddcfea880c04aafd8dbf9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Feb 2018 00:52:09 +0100 Subject: [PATCH 01/33] =?UTF-8?q?fwupdate:=208=20=E2=86=92=2010?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linux/firmware/fwupdate/default.nix | 99 +++++++++------ .../do-not-create-sharedstatedir.patch | 10 ++ .../linux/firmware/fwupdate/fix-paths.patch | 116 ++++++++++++++++++ 3 files changed, 188 insertions(+), 37 deletions(-) create mode 100644 pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch create mode 100644 pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index f2bb9bddd578..fd0d222eaac8 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -1,37 +1,62 @@ -{ stdenv, fetchurl, gnu-efi, efivar, libsmbios, popt, pkgconfig -, gettext }: -let version = "8"; in - stdenv.mkDerivation - { name = "fwupdate-${version}"; - src = fetchurl - { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; - sha256 = "10q8k1kghvbcb5fwcl2smzp8vqdfzimx9dkk0c3hz39py1phy4n8"; - }; - makeFlags = - [ "EFIDIR=nixos" - "LIBDIR=$(out)/lib" - "GNUEFIDIR=${gnu-efi}/lib" - "TARGETDIR=$(out)/boot/efi/nixos/" - "prefix=$(out)/" - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnu-efi libsmbios popt gettext ]; - propagatedBuildInputs = [ efivar ]; - # TODO: Just apply the disable to the efi subdir - hardeningDisable = [ "all" ]; - patchPhase = '' - sed -i 's|/usr/include/smbios_c/token.h|smbios_c/token.h|' \ - linux/libfwup.c - sed -i 's|/usr/share|$(prefix)share|' linux/Makefile - sed -i "s|/usr/include|$out/include|" linux/fwup.pc.in - find . -type f -print0 | xargs -0 sed -i -e 's|/boot/efi|/boot|g' -e 's|/boot/efi/EFI|/boot/EFI|g' - ''; - configurePhase = '' - arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' ) - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi -I${efivar}/include/efivar -I${gnu-efi}/include/efi/$arch" - ''; - meta = - { license = [ stdenv.lib.licenses.gpl2 ]; - platforms = stdenv.lib.platforms.linux; - }; - } +{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: +let + version = "10"; +in stdenv.mkDerivation { + name = "fwupdate-${version}"; + src = fetchurl { + url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; + sha256 = "0fpk3q0msq2l0bs2mvk0cqp8jbwnmi17ggc81r4v96h4jxh2rx3k"; + }; + + patches = [ + # https://github.com/rhboot/fwupdate/pull/99 + ./fix-paths.patch + ./do-not-create-sharedstatedir.patch + ]; + + NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" ]; + + # TODO: Just apply the disable to the efi subdir + hardeningDisable = [ "stackprotector" ]; + + makeFlags = [ + "EFIDIR=nixos" + "prefix=$(out)" + "LIBDIR=$(out)/lib" + "GNUEFIDIR=${gnu-efi}/lib" + "ESPMOUNTPOINT=$(out)/boot" + ]; + + nativeBuildInputs = [ + pkgconfig + gettext + ]; + + buildInputs = [ + gnu-efi + libsmbios + popt + ]; + + propagatedBuildInputs = [ + efivar + ]; + + # TODO: fix wrt cross-compilation + preConfigure = '' + arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' ) + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi/$arch" + ''; + + postInstall = '' + rm -rf $out/src + rm -rf $out/lib/debug + ''; + + meta = with stdenv.lib; { + description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates"; + maintainers = with maintainers; [ ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch b/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch new file mode 100644 index 000000000000..b8588ef2b11a --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch @@ -0,0 +1,10 @@ +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -131,7 +131,6 @@ + ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\ + ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\ + ) +- $(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/ + $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/ + $(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup + $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system diff --git a/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch new file mode 100644 index 000000000000..b01dfa355ef7 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch @@ -0,0 +1,116 @@ +--- a/Make.defaults ++++ b/Make.defaults +@@ -18,19 +18,20 @@ + ABIDIFF := abidiff + ABIDW := abidw + prefix ?= /usr/ +-prefix := $(abspath $(prefix))/ ++prefix := $(abspath $(prefix)) ++exec_prefix ?= $(prefix) + ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,) + ifeq ($(ARCH),x86_64) +- LIBDIR ?= $(prefix)lib64 ++ LIBDIR ?= $(exec_prefix)/lib64 + endif + ifeq ($(ARCH),ia32) +- LIBDIR ?= $(prefix)lib ++ LIBDIR ?= $(exec_prefix)/lib + endif + ifeq ($(ARCH),aarch64) +- LIBDIR ?= $(prefix)lib64 ++ LIBDIR ?= $(exec_prefix)/lib64 + endif + ifeq ($(ARCH),arm) +- LIBDIR ?= $(prefix)lib ++ LIBDIR ?= $(exec_prefix)/lib + endif + LIBDIR ?= unknown + ifeq ($(LIBDIR),unknown) +@@ -45,13 +46,13 @@ + GNUEFIDIR ?= $(LIBDIR)/gnuefi + libdir ?= $(LIBDIR) + pcdir ?= $(libdir)/pkgconfig +-mandir ?= $(prefix)share/man +-includedir ?= $(prefix)include +-bindir ?= $(prefix)bin +-datadir ?= $(prefix)share ++mandir ?= $(prefix)/share/man ++includedir ?= $(prefix)/include ++bindir ?= $(exec_prefix)/bin ++datadir ?= $(prefix)/share + localedir ?= $(datadir)/locale +-libexecdir ?= $(prefix)libexec +-libdatadir ?= $(prefix)lib ++libexecdir ?= $(exec_prefix)/libexec ++libdatadir ?= $(exec_prefix)/lib + sharedstatedir ?= /var/lib + + EFIDIR ?= $(shell x=$$(which --skip-alias --skip-functions git 2>/dev/null) ; [ -n "$$x" ] && git config --get fwupdate.efidir) +@@ -63,8 +64,8 @@ + ESPMOUNTPOINT = "/boot/efi" + endif + +-DEBUGINFO ?= $(prefix)lib/debug +-DEBUGSOURCE ?= $(prefix)src/debug ++DEBUGINFO ?= $(exec_prefix)/lib/debug ++DEBUGSOURCE ?= $(prefix)/src/debug + TARGETDIR ?= $(ESPMOUNTPOINT)/EFI/$(EFIDIR) + + .PHONY: check_efidir_error +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -93,16 +93,19 @@ + sed -e "s,@@VERSION@@,$(VERSION),g" \ + -e "s,@@FWUP_MAJOR_VERSION@@,$(MAJOR_VERSION),g" \ + -e "s,@@FWUP_MINOR_VERSION@@,$(MINOR_VERSION),g" \ ++ -e "s,@@PREFIX@@,$(prefix),g" \ ++ -e "s,@@EXEC_PREFIX@@,$(exec_prefix),g" \ + -e "s,@@SHAREDSTATEDIR@@,$(sharedstatedir),g" \ + -e "s,@@ESPMOUNTPOINT@@,$(ESPMOUNTPOINT),g" \ + -e "s,@@EFIDIR@@,$(EFIDIR),g" \ + -e "s,@@LIBDIR@@,$(libdir),g" \ + -e "s,@@LIBEXECDIR@@,$(libexecdir),g" \ ++ -e "s,@@INCLUDEDIR@@,$(includedir),g" \ + $< > $@ + + tester : tester.c +- $(CC) -Wall -Werror -ggdb -L. -I./include -I/usr/include/efivar \ +- -lefivar -lfwup -o $@ $^ ++ $(CC) -Wall -Werror -ggdb -L. -I./include $(shell $(PKG_CONFIG) --cflags efivar) \ ++ $(shell $(PKG_CONFIG) --libs efivar) -lfwup -o $@ $^ + + test : tester + LD_LIBRARY_PATH=$(shell pwd) ./tester +@@ -134,6 +137,6 @@ + $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system + $(INSTALL) -m 644 cleanup.service \ + $(DESTDIR)$(libdatadir)/systemd/system/fwupdate-cleanup.service +- $(INSTALL) -d -m 755 $(DESTDIR)/usr/share/bash-completion/completions/ ++ $(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/bash-completion/completions/ + $(INSTALL) -m 755 $(VPATH)/bash-completion \ +- $(DESTDIR)/usr/share/bash-completion/completions/fwupdate ++ $(DESTDIR)$(datadir)/bash-completion/completions/fwupdate +--- a/linux/fwup.pc.in ++++ b/linux/fwup.pc.in +@@ -1,7 +1,7 @@ +-prefix=/usr +-exec_prefix=/usr ++prefix=@@PREFIX@@ ++exec_prefix=@@EXEC_PREFIX@@ + libdir=@@LIBDIR@@ +-includedir=/usr/include ++includedir=@@INCLUDEDIR@@ + + Name: fwup + Description: Library for deployment of UEFI firmware updates. +--- a/linux/libfwup.c ++++ b/linux/libfwup.c +@@ -35,7 +35,7 @@ + + #include + #ifdef FWUPDATE_HAVE_LIBSMBIOS__ +-#include ++#include + #include + #endif + From 73f2f644bc83647edbfc0fc3e8e5bd31ef9f02d2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Feb 2018 01:49:49 +0100 Subject: [PATCH 02/33] =?UTF-8?q?fwupd:=201.0.4=20=E2=86=92=201.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linux/firmware/fwupd/default.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 858f1448dfac..ab25ed795143 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -6,14 +6,14 @@ , shared_mime_info, umockdev }: let - version = "1.0.4"; + version = "1.0.5"; python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]); installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]); in stdenv.mkDerivation { name = "fwupd-${version}"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3"; + sha256 = "0wm195vkf6x1kg1dz0sbfwpdcn9f6638l7vyzplcfrb3v07pqxpq"; }; outputs = [ "out" "devdoc" "man" "installedTests" ]; @@ -31,20 +31,9 @@ in stdenv.mkDerivation { patches = [ ./fix-missing-deps.patch - # https://github.com/hughsie/fwupd/issues/403 (fetchpatch { - url = https://github.com/hughsie/fwupd/commit/bd6082574989e4f48b66c7270bb408d439b77a06.patch; - sha256 = "17pixyizkmn6wlsjmr1wwya17ivn770hdv9mp769vifxinya8w9y"; - }) - # drop docbook2man - (fetchpatch { - url = https://github.com/hughsie/fwupd/commit/2c43d3e6e65868b66a9a64a76123697e259ec7c2.patch; - sha256 = "0vjv7jnai0g96frlipk2sc59pj3mhq9di01hajycjv7y5v6qqrmc"; - }) - # https://github.com/hughsie/fwupd/issues/405 - (fetchpatch { - url = https://github.com/hughsie/fwupd/pull/407.patch; - sha256 = "1dxhqps12x7bz0s974xk5hfpk4nwn1gs29vl0dfi9j54wy18f688"; + url = https://github.com/hughsie/fwupd/commit/767210e4b1401d5d5bb7ac1e7c052a60b6529d88.patch; + sha256 = "00adfabxpgdg74jx7i6jihhh8njjk2r7v3fxqs4scj3vn06k5fmw"; }) ]; @@ -77,7 +66,6 @@ in stdenv.mkDerivation { --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0" ''; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://fwupd.org/; maintainers = with maintainers; []; From 892740fe2f8b0b8e03e38f5cbe99abd547d86e1f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Feb 2018 01:51:47 +0100 Subject: [PATCH 03/33] =?UTF-8?q?libsmbios:=202.3.3=20=E2=86=92=202.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/libsmbios/default.nix | 25 ++++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 5d3e0dc8c975..62898675f2be 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,38 +1,37 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libtool, gettext +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext , libxml2, perl, doxygen }: stdenv.mkDerivation rec { name = "libsmbios-${version}"; - version = "2.3.3"; + version = "2.4.1"; src = fetchFromGitHub { owner = "dell"; repo = "libsmbios"; rev = "v${version}"; - sha256 = "1cl5nb6qk8ki87hwqf9n1dd9nlhkjnlpdxlhzvm82za16gs7apkl"; + sha256 = "158w5fz777is7nr5yhpr69b17nn6i1pavycxq1q9899frrpkzbsc"; }; - nativeBuildInputs = [ autoreconfHook doxygen gettext libtool perl pkgconfig ]; - buildInputs = [ libxml2 ]; + nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ]; configureFlags = [ "--disable-python" "--disable-graphviz" ]; enableParallelBuilding = true; - postInstall = - '' - mkdir -p $out/include - cp -a src/include/smbios_c $out/include/ - cp -a out/public-include/smbios_c $out/include/ - ''; + postInstall = '' + mkdir -p $out/include + cp -a src/include/smbios_c $out/include/ + cp -a out/public-include/smbios_c $out/include/ + ''; preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs - meta = { + meta = with stdenv.lib; { homepage = https://github.com/dell/libsmbios; description = "A library to obtain BIOS information"; - license = with stdenv.lib.licenses; [ osl21 gpl2Plus ]; + license = with licenses; [ osl21 gpl2Plus ]; + maintainers = with maintainers; [ ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } From 3b206f98f9f05031c907a1b9fbe301cd451b62e1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Feb 2018 02:18:40 +0100 Subject: [PATCH 04/33] efibootmgr: cleanup --- pkgs/tools/system/efibootmgr/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 31be8ab63f41..08cdec72c5b9 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -5,26 +5,25 @@ stdenv.mkDerivation rec { version = "15"; nativeBuildInputs = [ pkgconfig ]; - + buildInputs = [ efivar popt ]; src = fetchFromGitHub { - owner = "rhinstaller"; + owner = "rhboot"; repo = "efibootmgr"; rev = version; sha256 = "0z7h1dirp8za6lbbf4f3dzn7l1px891rdymhkbqc10yj6gi1jpqp"; }; - NIX_CFLAGS_COMPILE = "-I${efivar}/include/efivar"; - makeFlags = [ "EFIDIR=nixos" ]; installFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; - homepage = https://github.com/rhinstaller/efibootmgr; + homepage = https://github.com/rhboot/efibootmgr; license = licenses.gpl2; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } From cf1fb92b9e8f8e3644a4738bceeb09d46d36694e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Feb 2018 03:55:17 +0100 Subject: [PATCH 05/33] =?UTF-8?q?umockdev:=200.8.13=20=E2=86=92=200.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/umockdev/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index fdf882ce817e..09016bd9c2c7 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchFromGitHub, autoreconfHook -, pkgconfig, glib, systemd, libgudev, vala }: +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk_doc +, pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { - name = "umockdev"; - version = "0.8.13"; + name = "umockdev-${version}"; + version = "0.11"; src = fetchFromGitHub { owner = "martinpitt"; repo = "umockdev"; rev = version; - sha256 ="0bw2dpshlgbdwg5mhq4j22z474llpqix8pxii63r2bk5nhjc537k"; + sha256 ="1gpk2f03nad4qv084hx7549d68cqc1xibxm0ncanafm5xjz1hp55"; }; - buildInputs = [ glib systemd libgudev vala ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib systemd libgudev ]; + nativeBuildInputs = [ automake autoconf libtool gtk_doc pkgconfig vala ]; - ### docs/gtk-doc.make not found - prePatch = '' - sed -i 's|include $(top_srcdir)/docs/gtk-doc.make||g' docs/reference/Makefile.am - sed -i 's|+=|=|g' docs/reference/Makefile.am - ''; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; meta = with stdenv.lib; { description = "Mock hardware devices for creating unit tests"; From 30cc156c8c372076ca7d3c00e9da8aefcaea9e14 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Feb 2018 04:06:24 +0100 Subject: [PATCH 06/33] nixos/fwupd: use manual list of etc files Closes: #32142 --- nixos/modules/services/hardware/fwupd.nix | 6 +----- pkgs/os-specific/linux/firmware/fwupd/default.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 1f4acd21eccf..d8abde2a600a 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -8,12 +8,8 @@ let cfg = config.services.fwupd; originalEtc = let - isRegular = v: v == "regular"; - listFiles = d: builtins.attrNames (filterAttrs (const isRegular) (builtins.readDir d)); - copiedDirs = [ "fwupd/remotes.d" "pki/fwupd" "pki/fwupd-metadata" ]; - originalFiles = concatMap (d: map (f: "${d}/${f}") (listFiles "${pkgs.fwupd}/etc/${d}")) copiedDirs; mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; }; - in listToAttrs (map mkEtcFile originalFiles); + in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc); extraTrustedKeys = let mkName = p: "pki/fwupd/${baseNameOf (toString p)}"; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index ab25ed795143..aad4f5f61df9 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -6,6 +6,7 @@ , shared_mime_info, umockdev }: let + # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc version = "1.0.5"; python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]); installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]); @@ -66,6 +67,20 @@ in stdenv.mkDerivation { --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0" ''; + passthru = { + filesInstalledToEtc = [ + "fwupd/remotes.d/fwupd.conf" + "fwupd/remotes.d/lvfs-testing.conf" + "fwupd/remotes.d/lvfs.conf" + "fwupd/remotes.d/vendor.conf" + "pki/fwupd/GPG-KEY-Hughski-Limited" + "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" + "pki/fwupd/LVFS-CA.pem" + "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" + "pki/fwupd-metadata/LVFS-CA.pem" + ]; + }; + meta = with stdenv.lib; { homepage = https://fwupd.org/; maintainers = with maintainers; []; From d4075700d65b08279ae623a53128cc3c90d41849 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Feb 2018 04:09:15 +0100 Subject: [PATCH 07/33] Revert "nixos tests: disable fwupd for now" This reverts commit 11fc2bad56bb6464b161f5ce911511a0137cfe2c. --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 6bf2e4d8c7f8..4b8bd0d30e4c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -258,7 +258,7 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {}; - #tests.fwupd = callTest tests/fwupd.nix {}; # build during evaluation + tests.fwupd = callTest tests/fwupd.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gjs = callTest tests/gjs.nix {}; From 7ca25bdfcf503c26aa9cb1e69010d459c61ddb0d Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 23 Feb 2018 16:42:44 +0100 Subject: [PATCH 08/33] cups-zj-58: init at 2018-02-22 Adds cups drivers for Zjiang ZJ-58 --- pkgs/misc/cups/drivers/zj-58/default.nix | 32 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/misc/cups/drivers/zj-58/default.nix diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix new file mode 100644 index 000000000000..3f806c48ec6e --- /dev/null +++ b/pkgs/misc/cups/drivers/zj-58/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchFromGitHub, cups}: + +stdenv.mkDerivation rec { + pname = "cups-zj-58"; + version = "2018-02-22"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "klirichek"; + repo = "zj-58"; + rev = "e4212cd"; + sha256 = "1w2qkspm4qqg5h8n6gmakzhiww7gag64chvy9kf89xsl3wsyp6pi"; + }; + + buildInputs = [cups]; + + installPhase = '' + mkdir -p $out/lib/cups/filter + cp rastertozj $out/lib/cups/filter + + mkdir -p $out/share/cups/model/zjiang + cp ZJ-58.ppd $out/share/cups/model/zjiang/ + ''; + + meta = { + description = "CUPS filter for thermal printer Zjiang ZJ-58"; + homepage = https://github.com/klirichek/zj-58; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d24de9f0f6da..9a537468db5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19937,6 +19937,8 @@ with pkgs; cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {}; + cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; + crashplan = callPackage ../applications/backup/crashplan { }; crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { inherit (gnome3) gconf; }; From 36b0efc12f43da365b8d24db8f6c331edb8c2df2 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 23 Feb 2018 16:50:35 +0100 Subject: [PATCH 09/33] python.pkgs.send2trash: fix on darwin --- pkgs/development/python-modules/send2trash/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 379f5677bd1c..7ea0705f8154 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , pytest @@ -16,6 +17,7 @@ buildPythonPackage rec { sha256 = "1w502i5h8xaqf03g6h95h4vs1wqfv6kg925dn63phrwmg1hfz2xx"; }; + doCheck = !stdenv.isDarwin; checkPhase = "HOME=. py.test"; checkInputs = [ pytest configparser ]; From 89162cdd29ebffbe34595d67464bd4771b3b83a0 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 23 Feb 2018 17:00:21 +0100 Subject: [PATCH 10/33] sage: explicitly use gfortran6 The recent change from gfortran=gfortran6 to gfortran=gfortran7 broke the build. --- .../science/math/sage/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index ee646fee2c25..007cb68177e5 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -21,7 +21,7 @@ , bash , fetchurl , perl -, gfortran +, gfortran6 , python , autoreconfHook , gettext @@ -94,13 +94,13 @@ stdenv.mkDerivation rec { bash # needed for the build perl # needed for the build python # needed for the build - gfortran # needed to build giac, openblas + gfortran6 # needed to build giac, openblas autoreconfHook # needed to configure sage with prefix gettext # needed to build the singular spkg - hevea # needed to build the docs of the giac spkg which # needed in configure of mpir - # needed to build the docs of the giac spkg texinfo # needed to build maxima + ] ++ stdenv.lib.optionals(buildDocs) [ + hevea # needed to build the docs of the giac spkg (texlive.combine { inherit (texlive) scheme-basic collection-pstricks # needed by giac @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ gfortran perl which ]; + nativeBuildInputs = [ gfortran6 perl which ]; patches = [ # fix usages of /bin/rm @@ -153,13 +153,13 @@ stdenv.mkDerivation rec { cd .. mv "$dir" "$out/sage-root" + export SAGE_SPKG_INSTALL_DOCS='no' cd "$out/sage-root" # build in target dir, since `make` is also `make install` '' + stdenv.lib.optionalString (buildDocs) '' mkdir -p "$doc" export SAGE_DOC="$doc" export SAGE_DOCBUILD_OPTS="--no-pdf-links -k" - export SAGE_SPKG_INSTALL_DOCS='no' ''; buildFlags = if (buildDocs) then "doc" else "build"; @@ -191,6 +191,13 @@ stdenv.mkDerivation rec { rm -f "$out/sage-root/config.status" rm -f "$out/sage-root/build/make/Makefile-auto" rm -f "$out/sage-home/.sage/gap/libgap-workspace-"* + # Make sure unnessessary packages don't end up in the build closure + find "$out" \ + -iname 'config.log' \ + -delete \ + -or -iname 'Makefile' \ + -delete + rm -f "$out/lib/R/etc/Renviron" # Make sure all shebangs are properly patched bash $patchSageShebangs $out ''; From 1fbf33b78e7124d659189a52e88be620e920572b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 23 Feb 2018 16:38:26 +0000 Subject: [PATCH 11/33] zj-58: nitpicks --- pkgs/misc/cups/drivers/zj-58/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix index 3f806c48ec6e..9321cf526bee 100644 --- a/pkgs/misc/cups/drivers/zj-58/default.nix +++ b/pkgs/misc/cups/drivers/zj-58/default.nix @@ -12,21 +12,18 @@ stdenv.mkDerivation rec { sha256 = "1w2qkspm4qqg5h8n6gmakzhiww7gag64chvy9kf89xsl3wsyp6pi"; }; - buildInputs = [cups]; + buildInputs = [ cups ]; installPhase = '' - mkdir -p $out/lib/cups/filter - cp rastertozj $out/lib/cups/filter - - mkdir -p $out/share/cups/model/zjiang - cp ZJ-58.ppd $out/share/cups/model/zjiang/ + install -D rastertozj $out/lib/cups/filter/rastertozj + install -D ZJ-58.ppd $out/share/cups/model/zjiang/ZJ-58.ppd ''; - meta = { + meta = with stdenv.lib; { description = "CUPS filter for thermal printer Zjiang ZJ-58"; homepage = https://github.com/klirichek/zj-58; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; - license = stdenv.lib.licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ makefu ]; + license = licenses.bsd2; }; } From d544c454bda0829b6ed67d0ae4e63d5e4565de5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Feb 2018 15:51:58 +0100 Subject: [PATCH 12/33] LTS Haskell 10.6 --- .../configuration-hackage2nix.yaml | 138 +++++++++--------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9eed0a057777..82ffa2a64e0c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 10.5 + # LTS Haskell 10.6 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -77,7 +77,7 @@ default-package-overrides: - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - Agda ==2.5.3 - - airship ==0.9.2 + - airship ==0.9.3 - alarmclock ==0.4.0.3 - alerta ==0.1.0.6 - alerts ==0.1.0.0 @@ -209,7 +209,7 @@ default-package-overrides: - async-extra ==0.2.0.0 - async-refresh ==0.2.0.2 - async-refresh-tokens ==0.3.0.1 - - async-timer ==0.1.4.0 + - async-timer ==0.1.4.1 - atom-basic ==0.2.5 - atom-conduit ==0.5.0.1 - atomic-primops ==0.8.1.1 @@ -367,7 +367,7 @@ default-package-overrides: - cassava-conduit ==0.4.0.1 - cassette ==0.1.0 - cast ==0.1.0.2 - - cayley-client ==0.4.2 + - cayley-client ==0.4.3 - cereal ==0.5.5.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 @@ -376,9 +376,9 @@ default-package-overrides: - ChannelT ==0.0.0.4 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.3 - - Chart ==1.8.2 - - Chart-cairo ==1.8.2 - - Chart-diagrams ==1.8.2 + - Chart ==1.8.3 + - Chart-cairo ==1.8.3 + - Chart-diagrams ==1.8.3 - chart-unit ==0.5.5.0 - chaselev-deque ==0.5.0.5 - ChasingBottoms ==1.3.1.3 @@ -427,7 +427,7 @@ default-package-overrides: - colour ==2.3.4 - colour-accelerate ==0.2.0.0 - combinatorial ==0.0 - - comfort-graph ==0.0.2.1 + - comfort-graph ==0.0.3 - commutative ==0.0.1.4 - comonad ==5.0.3 - comonads-fd ==4.0 @@ -448,7 +448,7 @@ default-package-overrides: - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.2.13 - - conduit-algorithms ==0.0.7.1 + - conduit-algorithms ==0.0.7.2 - conduit-combinators ==1.1.2 - conduit-connection ==0.1.0.4 - conduit-extra ==1.2.3.2 @@ -516,7 +516,7 @@ default-package-overrides: - cubicbezier ==0.6.0.5 - cubicspline ==0.1.2 - cublas ==0.4.0.0 - - cuda ==0.9.0.0 + - cuda ==0.9.0.1 - cue-sheet ==1.0.1 - cufft ==0.8.0.0 - curl ==1.3.8 @@ -628,7 +628,7 @@ default-package-overrides: - docopt ==0.7.0.5 - doctemplates ==0.2.1 - doctest ==0.13.0 - - doctest-discover ==0.1.0.7 + - doctest-discover ==0.1.0.8 - doctest-driver-gen ==0.1.0.1 - do-list ==1.0.1 - dom-parser ==3.0.0 @@ -678,7 +678,7 @@ default-package-overrides: - EntrezHTTP ==1.0.4 - entropy ==0.3.8 - enummapset ==0.5.2.1 - - enumset ==0.0.4 + - enumset ==0.0.4.1 - envelope ==0.2.2.0 - envparse ==0.4 - envy ==1.3.0.2 @@ -702,7 +702,7 @@ default-package-overrides: - eventful-sql-common ==0.2.0 - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - - event-list ==0.1.1.3 + - event-list ==0.1.2 - eventsource-api ==1.1.1 - eventsource-geteventstore-store ==1.0.4 - eventsource-store-specs ==1.0.1 @@ -719,7 +719,7 @@ default-package-overrides: - executable-path ==0.0.3.1 - exhaustive ==1.1.5 - expiring-cache-map ==0.0.6.1 - - explicit-exception ==0.1.9 + - explicit-exception ==0.1.9.2 - exp-pairs ==0.1.5.2 - extensible ==0.4.7.1 - extensible-effects ==2.1.0.0 @@ -735,7 +735,7 @@ default-package-overrides: - fast-logger ==2.4.11 - fast-math ==1.0.2 - fb ==1.1.1 - - fclabels ==2.0.3.2 + - fclabels ==2.0.3.3 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - fedora-haskell-tools ==0.4 @@ -767,7 +767,7 @@ default-package-overrides: - flexible-defaults ==0.0.1.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - - flow ==1.0.10 + - flow ==1.0.11 - fmlist ==0.9.2 - fmt ==0.5.0.0 - fn ==0.3.0.2 @@ -840,7 +840,7 @@ default-package-overrides: - getopt-generics ==0.13.0.1 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - - ghc-events ==0.7.0 + - ghc-events ==0.7.1 - ghc-exactprint ==0.5.6.0 - ghcid ==0.6.10 - ghcjs-base-stub ==0.1.0.4 @@ -891,7 +891,7 @@ default-package-overrides: - GLURaw ==2.0.0.3 - GLUT ==2.7.0.12 - gluturtle ==0.0.58.1 - - gnuplot ==0.5.5 + - gnuplot ==0.5.5.1 - goggles ==0.1.0.3 - gogol ==0.3.0 - gogol-adexchange-buyer ==0.3.0 @@ -1038,7 +1038,7 @@ default-package-overrides: - hasbolt ==0.1.3.0 - hashable ==1.2.6.1 - hashable-time ==0.2.0.1 - - hashids ==1.0.2.3 + - hashids ==1.0.2.4 - hashmap ==1.3.3 - hashtables ==1.2.2.1 - haskeline ==0.7.4.2 @@ -1154,7 +1154,7 @@ default-package-overrides: - hpio ==0.9.0.5 - hpp ==0.5.1 - hpqtypes ==1.5.1.1 - - hprotoc ==2.4.6 + - hprotoc ==2.4.7 - hquantlib ==0.0.4.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 @@ -1167,8 +1167,8 @@ default-package-overrides: - hsebaysdk ==0.4.0.0 - hse-cpp ==0.2 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1301,8 +1301,8 @@ default-package-overrides: - intern ==0.9.1.4 - interpolate ==0.1.1 - interpolatedstring-perl6 ==1.0.0 - - Interpolation ==0.3.0 - interpolation ==0.1.0.2 + - Interpolation ==0.3.0 - IntervalMap ==0.5.3.1 - intervals ==0.8.1 - intro ==0.3.1.0 @@ -1318,9 +1318,9 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.2 - ip ==1.1.2 - ip6addr ==0.5.3 - - iproute ==1.7.1 + - iproute ==1.7.2 - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.4 + - IPv6DB ==0.2.5 - ipython-kernel ==0.9.0.1 - irc ==0.6.1.0 - irc-client ==1.0.1.1 @@ -1335,7 +1335,7 @@ default-package-overrides: - ixset ==1.0.7 - ixset-typed ==0.3.1.1 - ix-shapable ==0.1.0 - - jack ==0.7.1.1 + - jack ==0.7.1.3 - jailbreak-cabal ==1.3.2 - javascript-extras ==0.3.2.0 - jmacro ==0.6.14 @@ -1379,7 +1379,7 @@ default-package-overrides: - labels ==0.3.3 - lackey ==0.4.7 - lame ==0.1.1 - - language-c ==0.7.1 + - language-c ==0.7.2 - language-c-quote ==0.12.1 - language-docker ==1.0.0 - language-fortran ==0.5.1 @@ -1387,7 +1387,7 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - language-javascript ==0.6.0.10 - - language-puppet ==1.3.14 + - language-puppet ==1.3.15 - lapack-carray ==0.0 - lapack-ffi ==0.0 - lapack-ffi-tools ==0.0.0.1 @@ -1462,10 +1462,10 @@ default-package-overrides: - lrucache ==1.2.0.0 - lrucaching ==0.3.3 - lucid ==2.9.9 - - lxd-client ==0.1.0.5 + - lxd-client ==0.1.0.6 - lxd-client-config ==0.1.0.1 - lzma ==0.0.0.3 - - lzma-conduit ==1.2.0 + - lzma-conduit ==1.2.1 - machines ==0.6.3 - machines-binary ==0.3.0.3 - machines-directory ==0.2.1.0 @@ -1475,7 +1475,7 @@ default-package-overrides: - mainland-pretty ==0.6.1 - makefile ==1.1.0.0 - mallard ==0.6.1.1 - - managed ==1.0.5 + - managed ==1.0.6 - mandrill ==0.5.3.2 - markdown ==0.1.16 - markdown-unlit ==0.4.1 @@ -1518,7 +1518,7 @@ default-package-overrides: - microsoft-translator ==0.1.1 - microspec ==0.1.0.0 - microstache ==1.0.1.1 - - midi ==0.2.2.1 + - midi ==0.2.2.2 - midi-music-box ==0.0.0.4 - mighty-metropolis ==1.2.0 - milena ==0.5.2.1 @@ -1544,7 +1544,7 @@ default-package-overrides: - model ==0.4.4 - modern-uri ==0.1.2.1 - modify-fasta ==0.8.2.3 - - moesocks ==1.0.0.43 + - moesocks ==1.0.0.44 - mole ==0.0.6 - monad-control ==1.0.2.2 - monad-control-aligned ==0.0.1 @@ -1579,14 +1579,14 @@ default-package-overrides: - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - mongoDB ==2.3.0.2 + - mongoDB ==2.3.0.4 - monoidal-containers ==0.3.0.2 - monoid-extras ==0.4.2 - monoid-subclasses ==0.4.4 - - monoid-transformer ==0.0.3 + - monoid-transformer ==0.0.4 - mono-traversable ==1.0.8.1 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.14 + - morte ==1.6.15 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.1 @@ -1626,7 +1626,7 @@ default-package-overrides: - nettle ==0.2.0 - netwire ==5.0.2 - netwire-input ==0.0.6 - - netwire-input-glfw ==0.0.7 + - netwire-input-glfw ==0.0.8 - network ==2.6.3.3 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 @@ -1647,7 +1647,7 @@ default-package-overrides: - network-transport-tests ==0.2.4.2 - network-uri ==2.6.1.0 - newtype ==0.2 - - newtype-generics ==0.5.1 + - newtype-generics ==0.5.2.1 - next-ref ==0.1.0.2 - nfc ==0.1.0 - nicify-lib ==1.0.1 @@ -1658,7 +1658,7 @@ default-package-overrides: - nondeterminism ==1.4 - non-empty ==0.3 - non-empty-sequence ==0.2.0.2 - - non-negative ==0.1.1.2 + - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 - normalization-insensitive ==2.0.1 - NoTrace ==0.3.0.2 @@ -1666,7 +1666,7 @@ default-package-overrides: - n-tuple ==0.0.1.1 - numbers ==3000.2.0.1 - numeric-extras ==0.1 - - numeric-prelude ==0.4.2 + - numeric-prelude ==0.4.3 - numhask ==0.1.4.0 - numhask-range ==0.1.3.0 - NumInstances ==1.4 @@ -1702,7 +1702,7 @@ default-package-overrides: - operational ==0.2.3.5 - operational-class ==0.3.0.0 - opml-conduit ==0.6.0.4 - - optional-args ==1.0.1 + - optional-args ==1.0.2 - options ==1.2.1.1 - optparse-applicative ==0.14.0.0 - optparse-generic ==1.2.3 @@ -1727,16 +1727,16 @@ default-package-overrides: - ParsecTools ==0.0.2.0 - parser-combinators ==0.4.0 - parsers ==0.12.8 - - partial-handler ==1.0.2 + - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-order ==0.1.2.1 - - partial-semigroup ==0.3.0.2 + - partial-semigroup ==0.3.0.3 - path ==0.6.1 - path-extra ==0.0.6 - path-io ==1.3.3 - path-pieces ==0.2.1 - path-text-utf8 ==0.0.1.0 - - pathtype ==0.8 + - pathtype ==0.8.1 - pathwalk ==0.3.1.2 - patience ==0.1.1 - pattern-arrows ==0.0.2 @@ -1799,7 +1799,7 @@ default-package-overrides: - pointedlist ==0.6.1 - pointful ==1.0.9 - pointless-fun ==1.1.0.6 - - poll ==0.0 + - poll ==0.0.0.1 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 @@ -1858,8 +1858,8 @@ default-package-overrides: - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.5 - - protocol-buffers ==2.4.6 - - protocol-buffers-descriptor ==2.4.6 + - protocol-buffers ==2.4.7 + - protocol-buffers-descriptor ==2.4.7 - proto-lens ==0.2.2.0 - proto-lens-arbitrary ==0.1.1.1 - proto-lens-combinators ==0.1.0.8 @@ -1983,7 +1983,7 @@ default-package-overrides: - retry ==0.7.6.0 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - - riak ==1.1.2.3 + - riak ==1.1.2.4 - riak-protobuf ==0.23.0.0 - RNAlien ==1.3.7 - rng-utils ==0.3.0 @@ -2008,8 +2008,8 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.6 - sbv ==7.4 - - scalendar ==1.2.0 - SCalendar ==1.1.0 + - scalendar ==1.2.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -2049,7 +2049,7 @@ default-package-overrides: - servant-exceptions ==0.1.1 - servant-foreign ==0.10.1 - servant-generic ==0.1.0.1 - - servant-js ==0.9.3.1 + - servant-js ==0.9.3.2 - servant-JuicyPixels ==0.3.0.3 - servant-kotlin ==0.1.0.3 - servant-lucid ==0.7.1 @@ -2062,7 +2062,7 @@ default-package-overrides: - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.1 - servant-swagger ==1.1.4 - - servant-swagger-ui ==0.2.4.3.4.0 + - servant-swagger-ui ==0.2.5.3.9.1 - servant-websockets ==1.0.0 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 @@ -2072,13 +2072,13 @@ default-package-overrides: - serversession-frontend-yesod ==1.0 - servius ==1.2.0.3 - ses-html ==0.4.0.0 - - set-cover ==0.0.8 + - set-cover ==0.0.9 - setenv ==0.1.1.3 - setlocale ==1.0.0.5 - set-monad ==0.2.0.0 - sets ==0.0.5.2 - SHA ==1.6.4.2 - - shake ==0.16 + - shake ==0.16.2 - shake-language-c ==0.11.0 - shakespeare ==2.0.15 - shell-conduit ==4.6.1 @@ -2096,7 +2096,7 @@ default-package-overrides: - simple-sendfile ==0.2.27 - simple-session ==0.10.1.1 - simple-templates ==0.8.0.1 - - singleton-bool ==0.1.2.0 + - singleton-bool ==0.1.3 - singleton-nats ==0.4.0.4 - singletons ==2.3.1 - siphash ==1.0.3 @@ -2123,9 +2123,9 @@ default-package-overrides: - sort ==1.0.0.0 - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 - - sox ==0.2.2.7 + - sox ==0.2.3 - soxlib ==0.0.3 - - sparse-linear-algebra ==0.2.9.8 + - sparse-linear-algebra ==0.2.9.9 - spdx ==0.2.2.0 - special-values ==0.1.0.0 - speculate ==0.3.2 @@ -2170,9 +2170,9 @@ default-package-overrides: - stopwatch ==0.1.0.4 - storable-complex ==0.2.2 - storable-endian ==0.2.6 - - storable-record ==0.0.3.1 + - storable-record ==0.0.4 - storable-tuple ==0.0.3.3 - - storablevector ==0.2.12.1 + - storablevector ==0.2.13 - store ==0.4.3.2 - store-core ==0.4.1 - Strafunski-StrategyLib ==5.0.0.10 @@ -2189,8 +2189,8 @@ default-package-overrides: - strict-concurrency ==0.2.4.2 - strict-types ==0.1.2 - stringable ==0.1.3 - - stringbuilder ==0.5.0 - - string-class ==0.1.6.5 + - stringbuilder ==0.5.1 + - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 @@ -2241,7 +2241,7 @@ default-package-overrides: - tasty-expected-failure ==0.11.0.4 - tasty-fail-fast ==0.0.3 - tasty-golden ==2.3.1.2 - - tasty-hedgehog ==0.1.0.1 + - tasty-hedgehog ==0.1.0.2 - tasty-hspec ==1.1.3.3 - tasty-html ==0.4.1.1 - tasty-hunit ==0.9.2 @@ -2310,7 +2310,7 @@ default-package-overrides: - threads ==0.5.1.5 - threads-extras ==0.1.0.2 - threepenny-editors ==0.5.6 - - threepenny-gui ==0.8.2.0 + - threepenny-gui ==0.8.2.1 - threepenny-gui-flexbox ==0.4.2 - th-reify-compat ==0.0.1.3 - th-reify-many ==0.1.8 @@ -2391,7 +2391,7 @@ default-package-overrides: - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 - tz ==0.1.3.0 - - tzdata ==0.1.20170320.0 + - tzdata ==0.1.20180122.0 - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 - unagi-chan ==0.4.1.0 @@ -2402,7 +2402,7 @@ default-package-overrides: - unexceptionalio ==0.3.0 - unfoldable ==0.9.5 - unfoldable-restricted ==0.0.3 - - unicode ==0.0 + - unicode ==0.0.1 - unicode-show ==0.1.0.2 - unicode-transforms ==0.3.3 - unification-fd ==0.10.0.1 @@ -2450,19 +2450,19 @@ default-package-overrides: - validate-input ==0.4.0.0 - validation ==0.6.2 - validationt ==0.2.0.0 - - validity ==0.4.0.3 + - validity ==0.4.0.4 - validity-aeson ==0.1.0.0 - validity-bytestring ==0.2.0.0 - validity-containers ==0.2.0.0 - validity-path ==0.2.0.2 - validity-scientific ==0.1.0.0 - - validity-text ==0.2.0.0 + - validity-text ==0.2.0.1 - validity-time ==0.1.0.0 - validity-unordered-containers ==0.1.0.0 - validity-uuid ==0.0.0.0 - validity-vector ==0.1.0.0 - varying ==0.7.0.3 - - vault ==0.3.0.7 + - vault ==0.3.1.0 - vcswrapper ==0.1.6 - vector ==0.12.0.1 - vector-algorithms ==0.7.0.1 @@ -2505,7 +2505,7 @@ default-package-overrides: - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.3.0 - - wai-middleware-rollbar ==0.8.3 + - wai-middleware-rollbar ==0.8.4 - wai-middleware-static ==0.8.1 - wai-middleware-throttle ==0.2.2.0 - wai-predicates ==0.10.0 @@ -2585,7 +2585,7 @@ default-package-overrides: - xlsx ==0.6.0 - xlsx-tabular ==0.2.2 - xml ==1.3.14 - - xml-basic ==0.1.2 + - xml-basic ==0.1.3 - xml-conduit ==1.7.1.2 - xml-conduit-parse ==0.3.1.2 - xml-conduit-writer ==0.1.1.2 @@ -2658,7 +2658,7 @@ default-package-overrides: - zeromq4-haskell ==0.7.0 - zim-parser ==0.2.1.0 - zip ==0.2.0 - - zip-archive ==0.3.2.2 + - zip-archive ==0.3.2.3 - zippers ==0.2.5 - ziptastic-client ==0.3.0.3 - ziptastic-core ==0.2.0.3 From a6b30cb43d3a8cccb301e4260c07da417d299513 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Feb 2018 02:30:41 +0100 Subject: [PATCH 13/33] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.8.2-6-g7dfce29 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d165ed5500edda00bf97a56947e9c61f0b51737b. --- .../haskell-modules/hackage-packages.nix | 1914 ++++------------- 1 file changed, 454 insertions(+), 1460 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5382e63bce61..8303162b93c7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2704,23 +2704,6 @@ self: { }) {}; "Chart" = callPackage - ({ mkDerivation, array, base, colour, data-default-class, lens, mtl - , old-locale, operational, time, vector - }: - mkDerivation { - pname = "Chart"; - version = "1.8.2"; - sha256 = "13g27db8ln2n1hr2wvpa855x0x1izk3c10lb85an7972b5lw2hl4"; - libraryHaskellDepends = [ - array base colour data-default-class lens mtl old-locale - operational time vector - ]; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "A library for generating 2D Charts and Plots"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Chart_1_8_3" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector }: @@ -2735,27 +2718,9 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-cairo" = callPackage - ({ mkDerivation, array, base, cairo, Chart, colour - , data-default-class, lens, mtl, old-locale, operational, time - }: - mkDerivation { - pname = "Chart-cairo"; - version = "1.8.2"; - sha256 = "1hcg80ddq638cad6m69q61aa0fbj3glnb3a6pbbg8gy4ljfvmn3w"; - libraryHaskellDepends = [ - array base cairo Chart colour data-default-class lens mtl - old-locale operational time - ]; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Cairo backend for Charts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Chart-cairo_1_8_3" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time }: @@ -2770,32 +2735,9 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-diagrams" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour - , containers, data-default-class, diagrams-core, diagrams-lib - , diagrams-postscript, diagrams-svg, lens, mtl, old-locale - , operational, svg-builder, SVGFonts, text, time - }: - mkDerivation { - pname = "Chart-diagrams"; - version = "1.8.2"; - sha256 = "0hczp9dj9qs3g72hcgikym1bq3ki90graxfx068h5hds0kn1s66a"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base blaze-markup bytestring Chart colour containers - data-default-class diagrams-core diagrams-lib diagrams-postscript - diagrams-svg lens mtl old-locale operational svg-builder SVGFonts - text time - ]; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Diagrams backend for Charts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Chart-diagrams_1_8_3" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib , diagrams-postscript, diagrams-svg, lens, mtl, old-locale @@ -2815,7 +2757,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-gtk" = callPackage @@ -5318,6 +5259,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Facebook-Password-Hacker-Online-Latest-Version" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "Facebook-Password-Hacker-Online-Latest-Version"; + version = "1.0.1"; + sha256 = "0xvr2bj800i7ssbn6gbz4pknhakrgifkirf3rsn6ln4g35h29m07"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/"; + description = "Hack Lab"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Facts" = callPackage ({ mkDerivation, AC-Angle, base, containers, digits, QuickCheck , template-haskell @@ -10415,36 +10379,6 @@ self: { }) {}; "IPv6DB" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger - , hedis, hspec, http-client, http-types, IPv6Addr, mtl - , optparse-applicative, text, unordered-containers, vector, wai - , wai-logger, warp - }: - mkDerivation { - pname = "IPv6DB"; - version = "0.2.4"; - sha256 = "1axppdhckdch3kjcmw8dga76v865xccdwsksxfnahg32k613g8zd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring fast-logger hedis http-types IPv6Addr mtl - optparse-applicative text unordered-containers vector wai - wai-logger warp - ]; - testHaskellDepends = [ - aeson base hspec http-client http-types vector - ]; - homepage = "http://ipv6db.cybervisible.com"; - description = "A RESTful Web Service for IPv6-related data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "IPv6DB_0_2_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl , optparse-applicative, text, unordered-containers, vector, wai @@ -22857,36 +22791,6 @@ self: { }) {}; "airship" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, bytestring-trie, case-insensitive, containers - , cryptohash, directory, either, filepath, http-date, http-media - , http-types, lifted-base, microlens, mime-types, mmorph - , monad-control, mtl, network, old-locale, random, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-base, unix, unordered-containers, wai, wai-extra - }: - mkDerivation { - pname = "airship"; - version = "0.9.2"; - sha256 = "02r607yqvr5w6i6hba0ifbc02fshxijd4g46ygird9lsarcr2svp"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring - bytestring-trie case-insensitive containers cryptohash directory - either filepath http-date http-media http-types lifted-base - microlens mime-types mmorph monad-control mtl network old-locale - random text time transformers transformers-base unix - unordered-containers wai wai-extra - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck text - transformers wai - ]; - homepage = "https://github.com/helium/airship/"; - description = "A Webmachine-inspired HTTP library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "airship_0_9_3" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, bytestring-trie, case-insensitive, containers , cryptohash, directory, either, filepath, http-date, http-media @@ -22914,7 +22818,6 @@ self: { homepage = "https://github.com/helium/airship/"; description = "A Webmachine-inspired HTTP library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "airtable-api" = callPackage @@ -29193,28 +29096,6 @@ self: { }) {}; "async-timer" = callPackage - ({ mkDerivation, base, containers, criterion, HUnit, lifted-async - , lifted-base, monad-control, safe-exceptions, test-framework - , test-framework-hunit, transformers-base - }: - mkDerivation { - pname = "async-timer"; - version = "0.1.4.0"; - sha256 = "00kdhxq0wpml4f7gdjvr2h8km8i3yj68bawpa229rzpp0y0yp3k3"; - libraryHaskellDepends = [ - base lifted-async lifted-base monad-control safe-exceptions - transformers-base - ]; - testHaskellDepends = [ - base containers criterion HUnit lifted-async test-framework - test-framework-hunit - ]; - homepage = "https://github.com/mtesseract/async-timer"; - description = "Provides API for timer based execution of IO actions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "async-timer_0_1_4_1" = callPackage ({ mkDerivation, base, containers, criterion, HUnit, lifted-async , lifted-base, monad-control, safe-exceptions, test-framework , test-framework-hunit, transformers-base @@ -29234,7 +29115,6 @@ self: { homepage = "https://github.com/mtesseract/async-timer#readme"; description = "Provides API for timer based execution of IO actions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asynchronous-exceptions" = callPackage @@ -29628,8 +29508,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.17"; - sha256 = "13bxd28pyxyna8vv3vg8d29wmyi6iv296jqbcjh0p12jicxgf4i8"; + version = "0.2.0.22"; + sha256 = "19x2pa6fb1k343b4c07xwyc879kfwya1kll0bp59paza1bqhhnnk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -29653,8 +29533,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.4.2.19"; - sha256 = "0l8lrr4b99csr5wd4r9lxcax8b9jh8ij80hxsmwzs777fl295yjf"; + version = "2.5.0.3"; + sha256 = "1is5x18pscn318jc9nql8fx29aail71vl8j790ayzrs49228bsdj"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -29674,17 +29554,18 @@ self: { }) {}; "ats-setup" = callPackage - ({ mkDerivation, base, bytestring, Cabal, dependency, directory - , filemanip, http-client, http-client-tls, parallel-io, process - , tar, unix, zlib + ({ mkDerivation, base, bytestring, Cabal, composition-prelude + , dependency, directory, filemanip, http-client, http-client-tls + , parallel-io, process, tar, unix, zlib }: mkDerivation { pname = "ats-setup"; - version = "0.3.0.2"; - sha256 = "1fxk1602kh4i2dgfdjalnwfp37w8r775vd21431pkwf5xcf9ax0g"; + version = "0.3.1.1"; + sha256 = "0bzycyq6w87sdbvbkp2m95dcf28hv11kg5lr604q29wszvnq69rh"; libraryHaskellDepends = [ - base bytestring Cabal dependency directory filemanip http-client - http-client-tls parallel-io process tar unix zlib + base bytestring Cabal composition-prelude dependency directory + filemanip http-client http-client-tls parallel-io process tar unix + zlib ]; description = "ATS scripts for Cabal builds"; license = stdenv.lib.licenses.bsd3; @@ -38940,8 +38821,8 @@ self: { }: mkDerivation { pname = "burnt-explorer"; - version = "0.1.1"; - sha256 = "1swv8xy06bk3wkhg788mzlpgwghyp7v3g3c22c09jji9kxwsgslv"; + version = "1.0.0"; + sha256 = "1lddgjbm62k7avxvq8mlw7z4swbjavffk05nx5nla5fll7v4q219"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -39472,8 +39353,8 @@ self: { pname = "bytestring-plain"; version = "0.1.0.2"; sha256 = "1pgxwrn8m27cc01kbbxq4rd1q15lpapii2izjlhv3ilhbfxgnbcy"; - revision = "1"; - editedCabalFile = "0cjnvc57v2g543d4si3pwcsj56pjsm84sv2hn19yrd44bzajmcna"; + revision = "2"; + editedCabalFile = "06aysffha231adrhar9jqh49m7k3wga3ascvs7a17l4vx6p16ygs"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim hashable ]; @@ -40605,6 +40486,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_12_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , http-client, http-client-tls, http-conduit, process, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.12.1"; + sha256 = "0avp7prkzp522mpqnn60xmsqqp10zhp1phhlj14qzp4162772fss"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory filepath http-client + http-client-tls http-conduit process time unix + ]; + homepage = "https://github.com/juhp/cabal-rpm"; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -41573,6 +41474,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "canon" = callPackage + ({ mkDerivation, arithmoi, array, base, containers, polynomial }: + mkDerivation { + pname = "canon"; + version = "0.1.0.2"; + sha256 = "1x4vn72m724cq2ilhkn1jr1lhlxnwsslsv164gn55h7snj27xvby"; + libraryHaskellDepends = [ + arithmoi array base containers polynomial + ]; + homepage = "https://github.com/grandpascorpion/canon"; + description = "Massive Number Arithmetic"; + license = stdenv.lib.licenses.mit; + }) {}; + "canonical-filepath" = callPackage ({ mkDerivation, base, deepseq, directory, filepath }: mkDerivation { @@ -42824,27 +42739,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.4.2"; - sha256 = "1pzsr7jcqsi27mnxgq4y5np4ysig29cmk27iqp0m73xj5fiss6z8"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_4_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -47284,8 +47178,8 @@ self: { }: mkDerivation { pname = "codeworld-api"; - version = "0.2.2.0"; - sha256 = "14q4aqmp2q4jf1w1j071lypysj3b6fxd7k8n4hwi81c8g6n67r81"; + version = "0.2.2.1"; + sha256 = "0vb3v8d4jdzk14zs1jv4m5f2wa32bpxsfa0zr4f3w6z77as136sx"; libraryHaskellDepends = [ base blank-canvas cereal cereal-text containers hashable mtl random random-shuffle text time @@ -48130,25 +48024,6 @@ self: { }) {}; "comfort-graph" = callPackage - ({ mkDerivation, base, containers, QuickCheck, transformers - , utility-ht - }: - mkDerivation { - pname = "comfort-graph"; - version = "0.0.2.1"; - sha256 = "02brkbrvs6q7nss3mpqcqwgz3nmim2xz30nvbkxqy7zdxci6kign"; - libraryHaskellDepends = [ - base containers QuickCheck transformers utility-ht - ]; - testHaskellDepends = [ - base containers QuickCheck transformers utility-ht - ]; - homepage = "http://hub.darcs.net/thielema/comfort-graph"; - description = "Graph structure with type parameters for nodes and edges"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "comfort-graph_0_0_3" = callPackage ({ mkDerivation, base, containers, QuickCheck, semigroups , transformers, utility-ht }: @@ -48165,7 +48040,6 @@ self: { homepage = "http://hub.darcs.net/thielema/comfort-graph"; description = "Graph structure with type parameters for nodes and edges"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "comic" = callPackage @@ -48911,8 +48785,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.2.0.1"; - sha256 = "1rb7hy5xfmpv8hr4ik49883ph027g9kskfc77yzwrx29q3jmq3gj"; + version = "1.3.0.3"; + sha256 = "050w2h7all9r9rd68xq2d8cxg78ca8xh5b2ys17apla3amm9a7xi"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; @@ -49731,34 +49605,6 @@ self: { }) {}; "conduit-algorithms" = callPackage - ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit - , conduit-combinators, conduit-extra, containers, deepseq - , directory, HUnit, lzma-conduit, mtl, resourcet, stm, stm-conduit - , test-framework, test-framework-hunit, test-framework-th - , transformers, vector - }: - mkDerivation { - pname = "conduit-algorithms"; - version = "0.0.7.1"; - sha256 = "153g4lhd8ah97hbdvjxc1j4cnkdmpy6x2pbdjv2n7wyn80mqh9i7"; - libraryHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq lzma-conduit mtl resourcet stm - stm-conduit transformers vector - ]; - testHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory HUnit lzma-conduit mtl - resourcet stm stm-conduit test-framework test-framework-hunit - test-framework-th transformers vector - ]; - homepage = "https://github.com/luispedro/conduit-algorithms#readme"; - description = "Conduit-based algorithms"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "conduit-algorithms_0_0_7_2" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq , directory, HUnit, lzma-conduit, mtl, resourcet, stm, stm-conduit @@ -50685,8 +50531,8 @@ self: { ({ mkDerivation, base, tagged, void }: mkDerivation { pname = "constrained-categories"; - version = "0.3.0.1"; - sha256 = "0zga3841195dv0aw9x91ww9fl8y61chxicg3i4g6797dy0cv2752"; + version = "0.3.1.0"; + sha256 = "0xxmbvzxa2phwn25haxbr6gv0cnh92c1i2l5anhckqizx29gl668"; libraryHaskellDepends = [ base tagged void ]; homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; @@ -51226,6 +51072,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "control-iso" = callPackage + ({ mkDerivation, base, bytestring, newtype-generics, profunctors + , text + }: + mkDerivation { + pname = "control-iso"; + version = "0.1.0.0"; + sha256 = "1z4z3plxs06w485injj2azk8bl42wy0i6c65c4j7fzkkyk7pqbfj"; + libraryHaskellDepends = [ + base bytestring newtype-generics profunctors text + ]; + description = "A typeclass for type isomorphisms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "control-monad-attempt" = callPackage ({ mkDerivation, attempt, base, transformers }: mkDerivation { @@ -53755,16 +53616,16 @@ self: { }: mkDerivation { pname = "cryptoconditions"; - version = "0.1.0.0"; - sha256 = "0dbhlv7nh0awnvi1rwg3s25ksbxgvdlci543bwqp5ilkqdl3vlh0"; + version = "0.2.2.2"; + sha256 = "1j7acphhas2pg3sbc368qp9i46phwa0nk213751yxh37r6lbv3h2"; libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base base64-bytestring + aeson asn1-encoding asn1-parse asn1-types base base64-bytestring bytestring containers cryptonite memory text ]; testHaskellDepends = [ aeson aeson-quick asn1-encoding base base16-bytestring - base64-bytestring bytestring cryptonite tasty tasty-hunit text - transformers + base64-bytestring bytestring containers cryptonite tasty + tasty-hunit text transformers ]; homepage = "https://github.com/libscott/cryptoconditions-hs"; description = "Interledger Crypto-Conditions"; @@ -53922,6 +53783,8 @@ self: { pname = "cryptoids"; version = "0.5.0.0"; sha256 = "05xywzs7waz01c0p3y02qlf4yfhfpmpzpdfs2cmv5rmphf1hzck2"; + revision = "2"; + editedCabalFile = "1qzyqy4kjw174pm7jrwivdl5bcwkakv7dw36dpmrjm3bwsadqygh"; libraryHaskellDepends = [ base binary bytestring cryptoids-class cryptoids-types cryptonite directory exceptions filepath memory @@ -53936,6 +53799,8 @@ self: { pname = "cryptoids-class"; version = "0.0.0"; sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy"; + revision = "1"; + editedCabalFile = "1dirfpjyxipw4pj32x4ipgf9yiwr2jfy6bagag4f4dibhhr1z7lc"; libraryHaskellDepends = [ base cryptoids-types exceptions ]; description = "Typeclass-based interface to cryptoids"; license = stdenv.lib.licenses.bsd3; @@ -53947,6 +53812,8 @@ self: { pname = "cryptoids-types"; version = "0.0.0"; sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b"; + revision = "1"; + editedCabalFile = "0i12f6rsphs4plkxc8w3dalyf9iy5q67lkm4fxv4g1zcicqxgmqy"; libraryHaskellDepends = [ base binary http-api-data path-pieces ]; description = "Shared types for encrypting internal object identifiers before exposure"; license = stdenv.lib.licenses.bsd3; @@ -54401,20 +54268,23 @@ self: { }) {}; "csv-to-qif" = callPackage - ({ mkDerivation, base, Cabal, explicit-exception, hspec, regex-tdfa - , split, spreadsheet + ({ mkDerivation, base, Cabal, explicit-exception, hspec, parsec + , QuickCheck, regex-tdfa, split, spreadsheet }: mkDerivation { pname = "csv-to-qif"; - version = "0.3.2"; - sha256 = "1mfy19fvi92zzzqn70ga2p5csmc8qm0qnkn3vyl41ic6f69vm73x"; + version = "0.3.3"; + sha256 = "0ln7s3k1m802x00sr0py3l3zsww2wnv2lcb2fb71966pwqrbr4fp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base explicit-exception regex-tdfa split spreadsheet + base explicit-exception parsec regex-tdfa split spreadsheet ]; - testHaskellDepends = [ base Cabal hspec regex-tdfa split ]; - homepage = "https://github.com/mrVanDalo/csv-to-qif/"; + testHaskellDepends = [ + base Cabal explicit-exception hspec parsec QuickCheck regex-tdfa + split spreadsheet + ]; + homepage = "http://mrvandalo.github.io/csv-to-qif/"; description = "A small program that will read csv files and create qif files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -54584,27 +54454,6 @@ self: { }) {}; "cuda" = callPackage - ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath - , pretty, template-haskell - }: - mkDerivation { - pname = "cuda"; - version = "0.9.0.0"; - sha256 = "0zbichiribg9549fipsvq60abzz3j4i9ilf92j34avarby15q6ld"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ - base bytestring filepath template-haskell - ]; - libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base pretty ]; - homepage = "https://github.com/tmcdonell/cuda"; - description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cuda_0_9_0_1" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath , pretty, template-haskell }: @@ -54623,7 +54472,6 @@ self: { homepage = "https://github.com/tmcdonell/cuda"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cudd" = callPackage @@ -57185,6 +57033,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-stm32" = callPackage + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, containers, hxt + , hxt-xpath, pretty-simple, text, time + }: + mkDerivation { + pname = "data-stm32"; + version = "0.1.0.0"; + sha256 = "104m1lnm9kf64m3a0svahsvscmcmnb0ixvwm1vh32r61r1rc9fh1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint attoparsec base containers hxt hxt-xpath + pretty-simple text time + ]; + executableHaskellDepends = [ + ansi-wl-pprint attoparsec base containers hxt hxt-xpath + pretty-simple text time + ]; + testHaskellDepends = [ + ansi-wl-pprint attoparsec base containers hxt hxt-xpath + pretty-simple text time + ]; + homepage = "https://github.com/sorki/data-stm32#readme"; + description = "ARM SVD and CubeMX XML parser and pretty printer for STM32 family"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-store" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, criterion , deepseq, ixset, lens, mtl, QuickCheck, random, safecopy, tables @@ -63442,7 +63317,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "doctest_0_14_0" = callPackage + "doctest_0_14_1" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -63450,8 +63325,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.14.0"; - sha256 = "18qia153653fib1jdrdyvxa3wjcfhdn371r97mwv03q915i4bm3g"; + version = "0.14.1"; + sha256 = "1phnrsh2gjls54mlpqhfjs0x003jbrsz1sijy107mbg2gnck9cfj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63474,29 +63349,6 @@ self: { }) {}; "doctest-discover" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , filepath - }: - mkDerivation { - pname = "doctest-discover"; - version = "0.1.0.7"; - sha256 = "0w5xgw841fxp26n4c9srp84g0m0b105sa1snwrjg5dvxa7d6asmc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring directory doctest filepath - ]; - executableHaskellDepends = [ - aeson base bytestring directory doctest filepath - ]; - testHaskellDepends = [ base doctest ]; - doHaddock = false; - homepage = "http://github.com/karun012/doctest-discover"; - description = "Easy way to run doctests via cabal"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "doctest-discover_0_1_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath }: @@ -63517,7 +63369,6 @@ self: { homepage = "http://github.com/karun012/doctest-discover"; description = "Easy way to run doctests via cabal"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover-configurator" = callPackage @@ -67287,6 +67138,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3_2_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.2.2"; + sha256 = "1nwa97cnf04mapk6r5fr3bjzjb5gyfn0nmhz4a2x0p2ci01hrida"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + homepage = "https://github.com/Porges/email-validate-hs"; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -67941,17 +67810,6 @@ self: { }) {}; "enumset" = callPackage - ({ mkDerivation, base, data-accessor, storable-record }: - mkDerivation { - pname = "enumset"; - version = "0.0.4"; - sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w"; - libraryHaskellDepends = [ base data-accessor storable-record ]; - description = "Sets of enumeration values represented by machine words"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "enumset_0_0_4_1" = callPackage ({ mkDerivation, base, data-accessor, semigroups, storable-record }: mkDerivation { @@ -67963,7 +67821,6 @@ self: { ]; description = "Sets of enumeration values represented by machine words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "env-locale" = callPackage @@ -69228,25 +69085,6 @@ self: { }) {}; "event-list" = callPackage - ({ mkDerivation, base, non-negative, QuickCheck, random - , transformers, utility-ht - }: - mkDerivation { - pname = "event-list"; - version = "0.1.1.3"; - sha256 = "05l4bsq3pglyf81dq26djz9xsjsabxwq5k6z3wi43d7a774510pm"; - libraryHaskellDepends = [ - base non-negative QuickCheck transformers utility-ht - ]; - testHaskellDepends = [ - base non-negative QuickCheck random transformers utility-ht - ]; - homepage = "http://code.haskell.org/~thielema/event-list/"; - description = "Event lists with relative or absolute time stamps"; - license = "GPL"; - }) {}; - - "event-list_0_1_2" = callPackage ({ mkDerivation, base, non-negative, QuickCheck, random, semigroups , transformers, utility-ht }: @@ -69264,7 +69102,6 @@ self: { homepage = "http://code.haskell.org/~thielema/event-list/"; description = "Event lists with relative or absolute time stamps"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "event-monad" = callPackage @@ -70426,20 +70263,6 @@ self: { }) {}; "explicit-exception" = callPackage - ({ mkDerivation, base, deepseq, transformers }: - mkDerivation { - pname = "explicit-exception"; - version = "0.1.9"; - sha256 = "1kxx42kzm3r0mji7756yblpr7ys3lhx937jixgm8q1zsyg36m2hz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base deepseq transformers ]; - homepage = "http://www.haskell.org/haskellwiki/Exception"; - description = "Exceptions which are explicit in the type signature"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "explicit-exception_0_1_9_2" = callPackage ({ mkDerivation, base, deepseq, semigroups, transformers }: mkDerivation { pname = "explicit-exception"; @@ -70451,7 +70274,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Exception"; description = "Exceptions which are explicit in the type signature"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "explicit-iomodes" = callPackage @@ -71863,26 +71685,6 @@ self: { }) {}; "fclabels" = callPackage - ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "fclabels"; - version = "2.0.3.2"; - sha256 = "1c42f420bih3azhis9hhcdk6ijm10wp9rqa2kh763g68qgzq6pad"; - revision = "3"; - editedCabalFile = "19gd2jwjpfrmq80gpjk05djhn42vvj88fgka5yr7yaq6mfx103by"; - libraryHaskellDepends = [ base mtl template-haskell transformers ]; - testHaskellDepends = [ - base HUnit mtl template-haskell transformers - ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/sebastiaanvisser/fclabels"; - description = "First class accessor labels implemented as lenses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fclabels_2_0_3_3" = callPackage ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell , transformers }: @@ -71898,7 +71700,6 @@ self: { homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels implemented as lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fclabels-monadlib" = callPackage @@ -72999,6 +72800,8 @@ self: { pname = "filepath-crypto"; version = "0.1.0.0"; sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0"; + revision = "1"; + editedCabalFile = "1v6h4c3pv9jrj5wfcf2pvvjzhx673gmwdyig2g3gfvnhl5zkj5xb"; libraryHaskellDepends = [ base binary bytestring case-insensitive cryptoids cryptoids-class cryptoids-types exceptions filepath sandi template-haskell @@ -74378,19 +74181,6 @@ self: { }) {}; "flow" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; - version = "1.0.10"; - sha256 = "1k8p475m1485nq4236jf53gmls264c5dy8x57zihb7gbvgnl71fj"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - homepage = "https://github.com/tfausak/flow#readme"; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_11" = callPackage ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; @@ -74401,7 +74191,6 @@ self: { homepage = "https://github.com/tfausak/flow#readme"; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -76571,6 +76360,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freer-simple_1_1_0_0" = callPackage + ({ mkDerivation, base, criterion, extensible-effects, free, mtl + , natural-transformation, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers-base + }: + mkDerivation { + pname = "freer-simple"; + version = "1.1.0.0"; + sha256 = "00dvn620xg24pxw1h9p7dgl5wj25q77mfdsmxlmijsr0ysqwv611"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base natural-transformation transformers-base + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion extensible-effects free mtl + ]; + homepage = "https://github.com/lexi-lambda/freer-simple#readme"; + description = "Implementation of a friendly effect system for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel , pretty, random, syb @@ -80274,25 +80090,6 @@ self: { }) {}; "ghc-events" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, text - , vector - }: - mkDerivation { - pname = "ghc-events"; - version = "0.7.0"; - sha256 = "12vs1vpi969391k1n7apg2sd399dl5xdkjgb8rbn9sj0dmp9l946"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers text vector - ]; - executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-events_0_7_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: @@ -80309,7 +80106,6 @@ self: { testHaskellDepends = [ base ]; description = "Library and tool for parsing .eventlog files from GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-events-analyze" = callPackage @@ -81001,8 +80797,8 @@ self: { }: mkDerivation { pname = "ghc-vis"; - version = "0.8"; - sha256 = "03c73ip8k92fjrafaaj3mykql222y2fjiwx13lwvm5jk2p00is78"; + version = "0.9"; + sha256 = "134m5hzpbggifvigw2f4q6ci1lm5r2457va8lb0j7daiadq7xhcw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl @@ -84568,27 +84364,6 @@ self: { }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage - ({ mkDerivation, array, base, containers, data-accessor - , data-accessor-transformers, deepseq, filepath, process, temporary - , time, transformers, utility-ht - }: - mkDerivation { - pname = "gnuplot"; - version = "0.5.5"; - sha256 = "1ka756zvc6q5hkjhi8zknb7d5whizmyl7ff0qzclx1n8qbx4jv98"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base containers data-accessor data-accessor-transformers - deepseq filepath process temporary time transformers utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; - description = "2D and 3D plots using gnuplot"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gnuplot_0_5_5_1" = callPackage ({ mkDerivation, array, base, containers, data-accessor , data-accessor-transformers, deepseq, filepath, process , semigroups, temporary, time, transformers, utility-ht @@ -84608,7 +84383,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; description = "2D and 3D plots using gnuplot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gnutls" = callPackage @@ -93768,21 +93542,6 @@ self: { }) {}; "hashids" = callPackage - ({ mkDerivation, base, bytestring, containers, split }: - mkDerivation { - pname = "hashids"; - version = "1.0.2.3"; - sha256 = "0d15h8q4llq7x82g3r3pnyj1lw3ryj5q4nvi2i152agpx0sl5mzc"; - revision = "2"; - editedCabalFile = "1l4zz47c0kcpwi7l4dsizddi2c1a6k3v6a0b6w4wjylvzd066fz0"; - libraryHaskellDepends = [ base bytestring containers split ]; - testHaskellDepends = [ base bytestring containers split ]; - homepage = "http://hashids.org/"; - description = "Hashids generates short, unique, non-sequential ids from numbers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hashids_1_0_2_4" = callPackage ({ mkDerivation, base, bytestring, containers, split }: mkDerivation { pname = "hashids"; @@ -93793,7 +93552,6 @@ self: { homepage = "http://hashids.org/"; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashing" = callPackage @@ -97095,8 +96853,8 @@ self: { }: mkDerivation { pname = "haskus-utils"; - version = "0.7.0.0"; - sha256 = "0s28m6bhc5a1q3z7r1pd9f1l0nhsk5lnsi8y9zqadyg8j4jcv9kx"; + version = "0.8.0.0"; + sha256 = "1r2r1198hhv75f4yqcy5crr764dvvj766bgp3v3b5sdl603q8cl3"; libraryHaskellDepends = [ base containers extra file-embed list-t mtl stm stm-containers template-haskell transformers vector @@ -106339,36 +106097,6 @@ self: { }) {}; "hprotoc" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , directory, filepath, haskell-src-exts, mtl, parsec - , protocol-buffers, protocol-buffers-descriptor, utf8-string - }: - mkDerivation { - pname = "hprotoc"; - version = "2.4.6"; - sha256 = "05n8mgrbskdx2r78kvl1q8zzgha9jsds7gvajkc54wcgprfhv42z"; - revision = "1"; - editedCabalFile = "0bs5h6mq6yrwiwfq0l20b4an73myxq6gbaxjffdifscqzq8pdk94"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - executableToolDepends = [ alex ]; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hprotoc_2_4_7" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec , protocol-buffers, protocol-buffers-descriptor, utf8-string @@ -106394,7 +106122,6 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hprotoc-fork" = callPackage @@ -107384,20 +107111,20 @@ self: { }) {}; "hs2ats" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, cases, composition-prelude + ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude , cpphs, criterion, deepseq, haskell-src-exts, hspec , hspec-dirstream, language-ats, lens, optparse-generic - , system-filepath, text + , system-filepath }: mkDerivation { pname = "hs2ats"; - version = "0.2.1.5"; - sha256 = "0jxyj9pggs4m2ypw12z5xjrc5r0cq5gxi3dllbmvvablxlwzfkv1"; + version = "0.2.1.6"; + sha256 = "0i953zw2745067qmw06nw6cddjlg7snirbszncjb3d9gv0wpm90k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base cases composition-prelude cpphs deepseq - haskell-src-exts language-ats lens optparse-generic text + ansi-wl-pprint base casing composition-prelude cpphs deepseq + haskell-src-exts language-ats lens optparse-generic ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -116145,8 +115872,8 @@ self: { }: mkDerivation { pname = "imap"; - version = "0.3.0.5"; - sha256 = "1wkm6agp0gsqg8lqfqp7sm0aq64426lpfw56nmnzvfk1hkq2gwmp"; + version = "0.3.0.6"; + sha256 = "1acmjpp2l4d7p5yxayd3w6h8mc29siq3y3s50cj0n8japmqrrcgm"; libraryHaskellDepends = [ attoparsec base bytestring connection containers derive either exceptions hslogger list-t network pipes random rolling-queue stm @@ -118848,26 +118575,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.1"; - sha256 = "1viyxq3m1aifl05w0hxwrhhhcfpmvwz4ymil2gngi4nfm0yd1f2p"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - homepage = "http://www.mew.org/~kazu/proj/iproute/"; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_2" = callPackage ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec , network, QuickCheck, safe }: @@ -118885,7 +118592,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/iproute/"; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -120208,26 +119914,6 @@ self: { }) {}; "jack" = callPackage - ({ mkDerivation, array, base, bytestring, enumset, event-list - , explicit-exception, libjack2, midi, non-negative, transformers - }: - mkDerivation { - pname = "jack"; - version = "0.7.1.1"; - sha256 = "0h3c62knq5hblsplgp25wm94hbv6id8c97wv8xgzbvalj4lmsyyi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring enumset event-list explicit-exception midi - non-negative transformers - ]; - libraryPkgconfigDepends = [ libjack2 ]; - homepage = "http://www.haskell.org/haskellwiki/JACK"; - description = "Bindings for the JACK Audio Connection Kit"; - license = "GPL"; - }) {inherit (pkgs) libjack2;}; - - "jack_0_7_1_3" = callPackage ({ mkDerivation, array, base, bytestring, enumset, event-list , explicit-exception, libjack2, midi, non-negative, semigroups , transformers @@ -120246,7 +119932,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libjack2;}; "jack-bindings" = callPackage @@ -125452,17 +125137,18 @@ self: { "language-ats" = callPackage ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base - , composition-prelude, criterion, deepseq, happy, hspec - , hspec-dirstream, lens, recursion-schemes, system-filepath + , composition-prelude, containers, criterion, deepseq, happy, hspec + , hspec-dirstream, lens, mtl, recursion-schemes, system-filepath + , transformers }: mkDerivation { pname = "language-ats"; - version = "0.3.0.7"; - sha256 = "0q1nap6277w13f389jlvyp62018ywzay7rc04j6n5wmcs240inff"; + version = "1.0.1.1"; + sha256 = "0ypk9ic7q7v1mbsqzckhb27wm3ra6kignfgvk0ak8wmf31rcr82l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base composition-prelude deepseq - lens recursion-schemes + ansi-terminal ansi-wl-pprint array base composition-prelude + containers deepseq lens mtl recursion-schemes transformers ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -125539,25 +125225,6 @@ self: { }) {}; "language-c" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, filepath, happy, pretty, process, syb - }: - mkDerivation { - pname = "language-c"; - version = "0.7.1"; - sha256 = "1jm9yzj727wsbfpnqkvbavbaq0vzv4i2p8p2kqqwkgmkz4ip2i57"; - libraryHaskellDepends = [ - array base bytestring containers directory filepath pretty process - syb - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - homepage = "http://visq.github.io/language-c/"; - description = "Analysis and generation of C code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-c_0_7_2" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, pretty, process, syb }: @@ -125574,7 +125241,6 @@ self: { homepage = "http://visq.github.io/language-c/"; description = "Analysis and generation of C code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-c-comments" = callPackage @@ -126278,54 +125944,6 @@ self: { }) {}; "language-puppet" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, exceptions, filecache, filepath - , formatting, Glob, hashable, hruby, hslogger, hspec - , hspec-megaparsec, http-api-data, http-client, HUnit, lens - , lens-aeson, megaparsec, memory, mtl, neat-interpolation - , operational, optparse-applicative, parallel-io, parsec - , pcre-utils, process, protolude, random, regex-pcre-builtin - , scientific, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.14"; - sha256 = "1vf80dfdi2w5kwkbpqjqd9iahi7fg8qw5h243x8j286hzg3hx59d"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory exceptions - filecache filepath formatting hashable hruby hslogger hspec - http-api-data http-client lens lens-aeson megaparsec memory mtl - operational parsec pcre-utils process protolude random - regex-pcre-builtin scientific servant servant-client split stm - strict-base-types text time transformers unix unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers Glob hslogger - http-client lens megaparsec mtl optparse-applicative parallel-io - regex-pcre-builtin strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl neat-interpolation protolude scientific - strict-base-types temporary text transformers unix - unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; - }) {}; - - "language-puppet_1_3_15" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, exceptions, filecache, filepath @@ -126370,7 +125988,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -131912,7 +131530,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "log-warper_1_8_7" = callPackage + "log-warper_1_8_10" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers , data-default, deepseq, directory, filepath, fmt, hspec , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens @@ -131923,8 +131541,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.8.7"; - sha256 = "0bwk9wg2dhc56h7hwbnlxmw22pwswdlcf2bpjx62f9135q2cs7d8"; + version = "1.8.10"; + sha256 = "0wl1i68xnvla6fzgxfkqbk6hhqx9h0yp4br30y0fzwyk8p5v4l37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133443,37 +133061,6 @@ self: { }) {}; "lxd-client" = callPackage - ({ mkDerivation, aeson, async, base, bimap, bytestring, connection - , containers, data-default, directory, either, exceptions, filepath - , hspec, hspec-core, http-api-data, http-client, http-client-tls - , http-media, http-types, mtl, network, random, semigroups, servant - , servant-client, text, tls, transformers, turtle, unix, uuid - , websockets, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "lxd-client"; - version = "0.1.0.5"; - sha256 = "1981q1b71xgmxlis2hydhzhcwcspyrwnllg3fdrajv7m9z1zlryc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bimap bytestring connection containers - data-default directory either exceptions filepath http-api-data - http-client http-client-tls http-media http-types mtl network - semigroups servant servant-client text tls transformers unix - websockets x509 x509-store x509-validation - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base exceptions hspec hspec-core random text turtle uuid - ]; - homepage = "https://github.com/hverr/haskell-lxd-client#readme"; - description = "LXD client written in Haskell"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "lxd-client_0_1_0_6" = callPackage ({ mkDerivation, aeson, async, base, bimap, bytestring, connection , containers, data-default, directory, either, exceptions, filepath , hspec, hspec-core, http-api-data, http-client, http-client-tls @@ -133620,28 +133207,6 @@ self: { }) {}; "lzma-conduit" = callPackage - ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit - , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "lzma-conduit"; - version = "1.2.0"; - sha256 = "0jpzl1nb422d1a5k4ylh5wkl225x816xnx1y7qkd8wzxp5xxa7ba"; - libraryHaskellDepends = [ - base bytestring conduit lzma resourcet transformers - ]; - testHaskellDepends = [ - base base-compat bytestring conduit HUnit QuickCheck resourcet - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://github.com/alphaHeavy/lzma-conduit"; - description = "Conduit interface for lzma/xz compression"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "lzma-conduit_1_2_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers @@ -134510,17 +134075,6 @@ self: { }) {}; "managed" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "managed"; - version = "1.0.5"; - sha256 = "1q3j8w6z8jaxh5a0ifzj51vipyhfrb1hk6l87pm319ysv91rkjdr"; - libraryHaskellDepends = [ base transformers ]; - description = "A monad for managed values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "managed_1_0_6" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; @@ -134529,7 +134083,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee" = callPackage @@ -135550,6 +135103,8 @@ self: { pname = "massiv"; version = "0.1.0.0"; sha256 = "1hy87l8jv06jmgws7r28qh44ja1a4swpaki9z8dn9lviddlhiz3d"; + revision = "1"; + editedCabalFile = "0y4dyambndn36qa5v4raxi16lfr91bpj9jqksy1kkrf65wr89cma"; libraryHaskellDepends = [ base data-default-class deepseq ghc-prim primitive vector ]; @@ -135569,8 +135124,8 @@ self: { pname = "massiv-io"; version = "0.1.0.0"; sha256 = "1qj94ypn5yzl3pjdnpddjv926d1wjcvm1n673mg4i0x5pr71w7lw"; - revision = "1"; - editedCabalFile = "1k6hg12q6m6gi6w6km04r6hx7zq7xfdhxz90arlm1izag3dv1ic2"; + revision = "2"; + editedCabalFile = "1bzn45kcf3j275bzj00hsvxvxi3csm08bflnsbmy8ixkqcfdlizy"; libraryHaskellDepends = [ base bytestring data-default deepseq directory filepath JuicyPixels massiv netpbm process vector @@ -137995,29 +137550,6 @@ self: { }) {}; "midi" = callPackage - ({ mkDerivation, base, binary, bytestring, event-list - , explicit-exception, monoid-transformer, non-negative, QuickCheck - , random, transformers, utility-ht - }: - mkDerivation { - pname = "midi"; - version = "0.2.2.1"; - sha256 = "1kq3218g5cisyg6vmm4pm096zjs1954s6ng4pkdx8pxp39rk26a4"; - libraryHaskellDepends = [ - base binary bytestring event-list explicit-exception - monoid-transformer non-negative QuickCheck random transformers - utility-ht - ]; - testHaskellDepends = [ - base bytestring event-list explicit-exception non-negative - QuickCheck transformers utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/MIDI"; - description = "Handling of MIDI messages and files"; - license = "GPL"; - }) {}; - - "midi_0_2_2_2" = callPackage ({ mkDerivation, base, binary, bytestring, event-list , explicit-exception, monoid-transformer, non-negative, QuickCheck , random, semigroups, transformers, utility-ht @@ -138038,7 +137570,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Handling of MIDI messages and files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-alsa" = callPackage @@ -139576,29 +139107,6 @@ self: { }) {}; "moesocks" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring - , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens - , lens-aeson, mtl, network, optparse-applicative, random, stm - , strict, text, time, transformers, unordered-containers - }: - mkDerivation { - pname = "moesocks"; - version = "1.0.0.43"; - sha256 = "1wbxvsisk1aah186xn32sndw8djrk96dpawhsmygxkncn264599f"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson async attoparsec base binary bytestring containers cryptohash - hslogger HsOpenSSL iproute lens lens-aeson mtl network - optparse-applicative random stm strict text time transformers - unordered-containers - ]; - homepage = "https://github.com/nfjinjing/moesocks"; - description = "A functional firewall killer"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "moesocks_1_0_0_44" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens , lens-aeson, mtl, network, optparse-applicative, random, stm @@ -139619,7 +139127,6 @@ self: { homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mohws" = callPackage @@ -141119,37 +140626,6 @@ self: { }) {}; "mongoDB" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, conduit, conduit-extra, containers - , criterion, cryptohash, data-default-class, hashtables, hspec - , lifted-base, monad-control, mtl, network, nonce, old-locale - , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text - , time, tls, transformers, transformers-base - }: - mkDerivation { - pname = "mongoDB"; - version = "2.3.0.2"; - sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring conduit conduit-extra containers cryptohash - data-default-class hashtables lifted-base monad-control mtl network - nonce parsec pureMD5 random random-shuffle resourcet tagged text - time tls transformers transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - benchmarkHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers criterion cryptohash hashtables lifted-base - monad-control mtl network nonce parsec random random-shuffle text - transformers-base - ]; - homepage = "https://github.com/mongodb-haskell/mongodb"; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "mongoDB_2_3_0_4" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, conduit, conduit-extra, containers , criterion, cryptohash, data-default-class, hashtables, hspec @@ -141178,7 +140654,6 @@ self: { homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -141417,17 +140892,6 @@ self: { }) {}; "monoid-transformer" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "monoid-transformer"; - version = "0.0.3"; - sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l"; - libraryHaskellDepends = [ base ]; - description = "Monoid counterparts to some ubiquitous monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monoid-transformer_0_0_4" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { pname = "monoid-transformer"; @@ -141436,7 +140900,6 @@ self: { libraryHaskellDepends = [ base semigroups ]; description = "Monoid counterparts to some ubiquitous monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoidal-containers" = callPackage @@ -141718,38 +141181,6 @@ self: { }) {}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, code-page, containers - , criterion, deepseq, Earley, http-client, http-client-tls - , microlens, microlens-mtl, mtl, optparse-applicative, pipes - , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit - , tasty-quickcheck, text, text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.14"; - sha256 = "1wrm982gxm8hg2x8srm5ibp2s8752apsz2ljlldway2n49cf2bsm"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - base code-page optparse-applicative text text-format - ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - benchmarkHaskellDepends = [ base criterion system-filepath text ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_15" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, http-client, http-client-tls , microlens, microlens-mtl, mtl, optparse-applicative, pipes @@ -141779,7 +141210,6 @@ self: { benchmarkHaskellDepends = [ base criterion system-filepath text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -143889,6 +143319,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mxnet;}; + "my-test-docs" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec + , hspec-discover, lens, QuickCheck, servant, servant-auth + , servant-auth-docs, servant-docs, template-haskell, text + }: + mkDerivation { + pname = "my-test-docs"; + version = "1.0.12"; + sha256 = "1q3fzwqyams7748cy8q7adkn93jh4dds83x0ns44n9ca4myjvrxj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest hspec lens QuickCheck servant servant-auth + servant-auth-docs servant-docs template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/"; + description = "Nill"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "myTestlll" = callPackage ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring , Cabal, CCA, containers, deepseq, Euterpea, ghc-prim, HCodecs @@ -144357,7 +143810,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "nakadi-client_0_5_0_0" = callPackage + "nakadi-client_0_5_0_3" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, bytestring , classy-prelude, conduit, conduit-combinators, conduit-extra , containers, exceptions, fast-logger, hashable, http-client @@ -144370,8 +143823,8 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.5.0.0"; - sha256 = "10n278iqy8kp6vdx1d5rdlsbsk74m9s0fyi3w1vprrs0va92a06b"; + version = "0.5.0.3"; + sha256 = "0c0jrvvlk3mxwka6b1996gylgkhqqh023wc4vxg98qaaxpy851x4"; libraryHaskellDepends = [ aeson aeson-casing base bytestring conduit conduit-combinators conduit-extra containers exceptions hashable http-client @@ -145809,23 +145262,6 @@ self: { }) {}; "netwire-input-glfw" = callPackage - ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm - }: - mkDerivation { - pname = "netwire-input-glfw"; - version = "0.0.7"; - sha256 = "1rsvhwxrr00qpff7adwiwci5fl6hbv8r8mvxhkq3az235w9pll8g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers GLFW-b mtl netwire-input stm - ]; - homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; - description = "GLFW instance of netwire-input"; - license = stdenv.lib.licenses.mit; - }) {}; - - "netwire-input-glfw_0_0_8" = callPackage ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm }: mkDerivation { @@ -145840,7 +145276,6 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input-javascript" = callPackage @@ -147084,20 +146519,6 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, HUnit, transformers - }: - mkDerivation { - pname = "newtype-generics"; - version = "0.5.1"; - sha256 = "1cm9v5agz6dmqd2ijwl1llgabihk49zjvx0wxrvhlmdfj6b44gr7"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base hspec HUnit ]; - testToolDepends = [ hspec-discover ]; - description = "A typeclass and set of functions for working with newtypes, with generics support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "newtype-generics_0_5_2_1" = callPackage ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit , semigroups, transformers }: @@ -147111,7 +146532,6 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "newtype-th" = callPackage @@ -148027,19 +147447,6 @@ self: { }) {}; "non-negative" = callPackage - ({ mkDerivation, base, QuickCheck, utility-ht }: - mkDerivation { - pname = "non-negative"; - version = "0.1.1.2"; - sha256 = "1y5ayazrbw614g61ihilm8vn468dia1cphvsxwm8s0x3iw9gljs6"; - libraryHaskellDepends = [ base QuickCheck utility-ht ]; - testHaskellDepends = [ base QuickCheck utility-ht ]; - homepage = "http://code.haskell.org/~thielema/non-negative/"; - description = "Non-negative numbers"; - license = "GPL"; - }) {}; - - "non-negative_0_1_2" = callPackage ({ mkDerivation, base, QuickCheck, semigroups, utility-ht }: mkDerivation { pname = "non-negative"; @@ -148050,7 +147457,6 @@ self: { homepage = "http://code.haskell.org/~thielema/non-negative/"; description = "Non-negative numbers"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonce" = callPackage @@ -148755,27 +148161,6 @@ self: { }) {}; "numeric-prelude" = callPackage - ({ mkDerivation, array, base, containers, deepseq, non-negative - , parsec, QuickCheck, random, storable-record, utility-ht - }: - mkDerivation { - pname = "numeric-prelude"; - version = "0.4.2"; - sha256 = "1i6qavz3av3dbf70li7yqsh184bl618l1sm9s9ia15srrkzsj9sk"; - revision = "1"; - editedCabalFile = "1qpzdfy4xijb1vfiy0sxinchwg0wkfwfpjbyfvnpf4gz2j5i5gxc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base containers deepseq non-negative parsec QuickCheck random - storable-record utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; - description = "An experimental alternative hierarchy of numeric type classes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "numeric-prelude_0_4_3" = callPackage ({ mkDerivation, array, base, containers, deepseq, non-negative , parsec, QuickCheck, random, semigroups, storable-record , utility-ht @@ -148793,7 +148178,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; description = "An experimental alternative hierarchy of numeric type classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numeric-qq" = callPackage @@ -151293,17 +150677,6 @@ self: { }) {}; "optional-args" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "optional-args"; - version = "1.0.1"; - sha256 = "16gxy78r868k8hc88hayclhdkn8chyry08fbf99ipyy1xgb081ll"; - libraryHaskellDepends = [ base ]; - description = "Optional function arguments"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optional-args_1_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "optional-args"; @@ -151312,7 +150685,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Optional function arguments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "options" = callPackage @@ -154358,18 +153730,6 @@ self: { }) {}; "partial-handler" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "partial-handler"; - version = "1.0.2"; - sha256 = "1wd4dad207ljw4pfcx4v1qx38mbppjdjjwz17gmk2rhlyj8z5sgs"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/nikita-volkov/partial-handler"; - description = "A composable exception handler"; - license = stdenv.lib.licenses.mit; - }) {}; - - "partial-handler_1_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "partial-handler"; @@ -154379,7 +153739,6 @@ self: { homepage = "https://github.com/nikita-volkov/partial-handler"; description = "A composable exception handler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-isomorphisms" = callPackage @@ -154430,19 +153789,6 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, doctest, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; - version = "0.3.0.2"; - sha256 = "0r2rhcq73lb18j03h5nk7j6vzv9qxjnw8zsir3zy6cynkv4w35zd"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest hedgehog ]; - homepage = "https://github.com/chris-martin/partial-semigroup"; - description = "A partial binary associative operator"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_3_0_3" = callPackage ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; @@ -154453,7 +153799,6 @@ self: { homepage = "https://github.com/chris-martin/partial-semigroup"; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -154847,26 +154192,6 @@ self: { }) {}; "pathtype" = callPackage - ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck - , random, tagged, time, transformers, utility-ht - }: - mkDerivation { - pname = "pathtype"; - version = "0.8"; - sha256 = "15vqybkblvf89v83j0ypvmgy506r804wq3mlzqghcai27k8bkqql"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq directory old-time QuickCheck tagged time transformers - utility-ht - ]; - testHaskellDepends = [ base random ]; - homepage = "http://hub.darcs.net/thielema/pathtype/"; - description = "Type-safe replacement for System.FilePath etc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pathtype_0_8_1" = callPackage ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck , random, semigroups, tagged, time, transformers, utility-ht }: @@ -154884,7 +154209,6 @@ self: { homepage = "http://hub.darcs.net/thielema/pathtype/"; description = "Type-safe replacement for System.FilePath etc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pathwalk" = callPackage @@ -160131,17 +159455,6 @@ self: { }) {}; "poll" = callPackage - ({ mkDerivation, base, enumset, utility-ht }: - mkDerivation { - pname = "poll"; - version = "0.0"; - sha256 = "0v4cyrr506zqvxqbxkncss2pl2j38skl02p1vj6cjxcvlzb2y43p"; - libraryHaskellDepends = [ base enumset utility-ht ]; - description = "Bindings to poll.h"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "poll_0_0_0_1" = callPackage ({ mkDerivation, base, enumset, utility-ht }: mkDerivation { pname = "poll"; @@ -160150,7 +159463,6 @@ self: { libraryHaskellDepends = [ base enumset utility-ht ]; description = "Bindings to poll.h"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "poly-arity" = callPackage @@ -161706,8 +161018,8 @@ self: { }: mkDerivation { pname = "potoki"; - version = "0.7.2"; - sha256 = "10yl08hcfgn0l15hr6n5ga91cla050lys7jyj4w0j3s3c9k2w3gd"; + version = "0.7.3"; + sha256 = "1wki03b3kfw6sy5fv1zk4dvnprwapqg0bnkr6cmxdl2dvjz61946"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring directory foldl hashable potoki-core profunctors text unagi-chan unordered-containers vector @@ -162826,6 +162138,21 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter-ansi-terminal_1_1_1_2" = callPackage + ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text + }: + mkDerivation { + pname = "prettyprinter-ansi-terminal"; + version = "1.1.1.2"; + sha256 = "0ha6vz707qzb5ky7kdsnw2zgphg2dnxrpbrxy8gaw119vwhb9q6k"; + libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/quchen/prettyprinter"; + description = "ANSI terminal backend for the »prettyprinter« package"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-compat-annotated-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter, text }: mkDerivation { @@ -164576,23 +163903,6 @@ self: { }) {}; "protocol-buffers" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; - version = "2.4.6"; - sha256 = "19709wgz0vcc01hjiyxdf71v9dsz9v910l1328dixpkpjh6iqxls"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers_2_4_7" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string }: @@ -164607,25 +163917,9 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; - version = "2.4.6"; - sha256 = "1jxjahr10wfsywv4g17i6a1x775zrmmahqjd8lqzggy5axisvx79"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "protocol-buffers-descriptor_2_4_7" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; @@ -164638,7 +163932,6 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers-descriptor-fork" = callPackage @@ -166941,6 +166234,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-classes_0_3_3" = callPackage + ({ mkDerivation, aeson, base, containers, prim-array, primitive + , QuickCheck, transformers, vector + }: + mkDerivation { + pname = "quickcheck-classes"; + version = "0.3.3"; + sha256 = "1czppkc56ny7nvfc11wdv96gng4vln7bkx87sgwlpdkw0q73rc14"; + libraryHaskellDepends = [ + aeson base containers prim-array primitive QuickCheck transformers + ]; + testHaskellDepends = [ aeson base primitive QuickCheck vector ]; + homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; + description = "QuickCheck common typeclasses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -170463,6 +169774,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "redland" = callPackage + ({ mkDerivation, base, raptor2, redland }: + mkDerivation { + pname = "redland"; + version = "0.1.0.0"; + sha256 = "0c73rfvgrhwvph3zgn04mk79mhx8pbn0jznmwmb0ansd0mg9piy7"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ raptor2 redland ]; + description = "Redland RDF library bindings"; + license = stdenv.lib.licenses.bsd3; + }) {raptor2 = null; redland = null;}; + "redo" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, pureMD5 @@ -171100,6 +170423,8 @@ self: { pname = "refresht"; version = "0.1.1.0"; sha256 = "0gv3ph1j7j9fgysldh0k6yirya6xhdlzlcwv85k18akdq13hnd87"; + revision = "2"; + editedCabalFile = "141phadslw4iy3fc60ny4qmgh6p6s53f4f81577s9ms5y4w45jhr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default exceptions lens mtl ]; @@ -174166,39 +173491,6 @@ self: { }) {}; "riak" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary - , blaze-builder, bytestring, containers, criterion - , data-default-class, deepseq, enclosed-exceptions, exceptions - , hashable, HUnit, mersenne-random-pure64, monad-control, mtl - , network, process, protocol-buffers, pureMD5, QuickCheck, random - , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, time, transformers - , transformers-base, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "riak"; - version = "1.1.2.3"; - sha256 = "1s1ivg8l2k7mg3qd5hvgdbqp7mhczfkrwcmsnybh1yq276hhj15n"; - libraryHaskellDepends = [ - aeson async attoparsec base bifunctors binary blaze-builder - bytestring containers data-default-class deepseq - enclosed-exceptions exceptions hashable mersenne-random-pure64 - monad-control network protocol-buffers pureMD5 random resource-pool - riak-protobuf semigroups stm text time transformers - transformers-base unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default-class HUnit mtl - process QuickCheck riak-protobuf semigroups tasty tasty-hunit - tasty-quickcheck template-haskell text yaml - ]; - benchmarkHaskellDepends = [ base bytestring criterion semigroups ]; - homepage = "http://github.com/riak-haskell-client/riak-haskell-client"; - description = "A Haskell client for the Riak decentralized data store"; - license = "unknown"; - }) {}; - - "riak_1_1_2_4" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary , blaze-builder, bytestring, containers, criterion , data-default-class, deepseq, enclosed-exceptions, exceptions @@ -174229,7 +173521,6 @@ self: { homepage = "http://github.com/riak-haskell-client/riak-haskell-client"; description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riak-protobuf" = callPackage @@ -180051,28 +179342,29 @@ self: { "serokell-util" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , base64-bytestring, bytestring, clock, containers, deepseq - , directory, exceptions, extra, filepath, formatting, hashable + , directory, exceptions, extra, filepath, fmt, formatting, hashable , hspec, hspec-discover, lens, log-warper, monad-control, mtl - , optparse-applicative, parsec, QuickCheck, quickcheck-instances - , safecopy, scientific, semigroups, stm, template-haskell, text - , text-format, time-units, transformers, universum + , o-clock, optparse-applicative, parsec, QuickCheck + , quickcheck-instances, safecopy, scientific, semigroups, stm + , template-haskell, text, text-format, transformers, universum , unordered-containers, vector, yaml }: mkDerivation { pname = "serokell-util"; - version = "0.6.0"; - sha256 = "1821f6hak3wwjradyzy2zb3pfy153l7yc39i5z2mdxn8b4vh4k88"; + version = "0.8.0"; + sha256 = "0v8vy66pbb37w7vaal42w8z0dld93j3d0bfpp3gc8mkmv12gh49p"; libraryHaskellDepends = [ aeson ansi-terminal base base16-bytestring base64-bytestring bytestring clock containers deepseq directory exceptions extra - filepath formatting hashable lens log-warper monad-control mtl - optparse-applicative parsec QuickCheck quickcheck-instances + filepath fmt formatting hashable lens log-warper monad-control mtl + o-clock optparse-applicative parsec QuickCheck quickcheck-instances scientific semigroups stm template-haskell text text-format - time-units transformers universum unordered-containers vector yaml + transformers universum unordered-containers vector yaml ]; testHaskellDepends = [ aeson base bytestring hspec QuickCheck quickcheck-instances - safecopy scientific text text-format unordered-containers vector + safecopy scientific text text-format universum unordered-containers + vector ]; testToolDepends = [ hspec-discover ]; homepage = "https://github.com/serokell/serokell-util"; @@ -180255,10 +179547,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "servant-auth"; - version = "0.3.0.1"; - sha256 = "1nd7wfkkwwpl7iq3d6vx2nizqsxxh5v030rjpy61phhd7jxgmbyb"; + version = "0.3.1.0"; + sha256 = "0fa8r5rwrihsadzv74npb16yfvw3lzn3faajw660n5vxz36l56ia"; libraryHaskellDepends = [ base ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180272,8 +179564,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.3.1.0"; - sha256 = "0kinczwmr32zasjb3f7csbiv865r4vz7yf6ga4j1yk857zx4zdys"; + version = "0.3.2.0"; + sha256 = "1504cdqcq6fzr8f483662xdxcp99fpsxbizva1gqk248ymrxi2i5"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core text @@ -180284,7 +179576,7 @@ self: { servant-server time transformers wai warp ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -180357,8 +179649,8 @@ self: { }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.8.0"; - sha256 = "1qw0mf3cg8iljynxd7qidxv8m6h41sygh0v6512d3gv6cgkqc5yj"; + version = "0.2.9.0"; + sha256 = "173gmbgyka6hg6hgchkaw96wv4nb7qr3qwypym520k6zi7cn8b9l"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -180368,7 +179660,7 @@ self: { servant-docs template-haskell text ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180420,8 +179712,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.3.1.0"; - sha256 = "1mx8yp7nabnh9ymm6sd5xrb0x8qkx075h5pz7i5fd63k2axi8kbb"; + version = "0.3.2.0"; + sha256 = "1ykjjd1lqivavsxdg8akj9vfh4miblslcwdyhlrgz2ci2f31wify"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180441,7 +179733,7 @@ self: { wreq ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180452,8 +179744,8 @@ self: { }: mkDerivation { pname = "servant-auth-swagger"; - version = "0.2.8.0"; - sha256 = "0g2dyjj401qlpmxf0gk6lvqv5qivyxjp9r3navn0r0c9xf0b513r"; + version = "0.2.9.0"; + sha256 = "10vldaywdjshb21ifw418i68i2nnvm0l89plyk7hkf7br2qnfwjc"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -180462,7 +179754,7 @@ self: { swagger2 text ]; testToolDepends = [ hspec-discover ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; + homepage = "http://github.com/haskell-servant/servant-auth#readme"; description = "servant-swagger/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -181187,30 +180479,6 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover - , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.9.3.1"; - sha256 = "01an3s6xnjng7vwzha658hcf3n28v99dviindqq0qv7dbrf3r1ri"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat charset lens servant servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - QuickCheck servant text - ]; - testToolDepends = [ hspec-discover ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-js_0_9_3_2" = callPackage ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover , hspec-expectations, language-ecmascript, lens, QuickCheck , servant, servant-foreign, text @@ -181232,7 +180500,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-kotlin" = callPackage @@ -182018,34 +181285,6 @@ self: { }) {}; "servant-swagger-ui" = callPackage - ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring - , directory, file-embed, filepath, http-media, lens, servant - , servant-blaze, servant-server, servant-swagger, swagger2 - , template-haskell, text, transformers, transformers-compat, wai - , wai-app-static, warp - }: - mkDerivation { - pname = "servant-swagger-ui"; - version = "0.2.4.3.4.0"; - sha256 = "1vb1bp7hjjyhb1p6x0j7z2ky05n72qm7zcmwgnsmnqalaxdnsvri"; - revision = "1"; - editedCabalFile = "1bd920kkwyfz4jvy57k026nqdjlxla09hb5z2rfc6y9d5qx05rfk"; - libraryHaskellDepends = [ - base blaze-markup bytestring directory file-embed filepath - http-media servant servant-blaze servant-server servant-swagger - swagger2 template-haskell text transformers transformers-compat - wai-app-static - ]; - testHaskellDepends = [ - aeson base base-compat lens servant servant-server servant-swagger - swagger2 text transformers transformers-compat wai warp - ]; - homepage = "https://github.com/phadej/servant-swagger-ui#readme"; - description = "Servant swagger ui"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui_0_2_5_3_9_1" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring , directory, file-embed, filepath, http-media, lens, servant , servant-blaze, servant-server, servant-swagger, swagger2 @@ -182069,7 +181308,6 @@ self: { homepage = "https://github.com/phadej/servant-swagger-ui#readme"; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-websockets" = callPackage @@ -182563,23 +181801,6 @@ self: { }) {}; "set-cover" = callPackage - ({ mkDerivation, base, containers, enummapset, psqueues, utility-ht - }: - mkDerivation { - pname = "set-cover"; - version = "0.0.8"; - sha256 = "1lcmx9c2bi45v01vr44fm75z3afv221psd3rsk8knkl2dqdklv8q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers enummapset psqueues utility-ht - ]; - homepage = "http://hub.darcs.net/thielema/set-cover/"; - description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "set-cover_0_0_9" = callPackage ({ mkDerivation, base, containers, enummapset, psqueues, semigroups , utility-ht }: @@ -182595,7 +181816,6 @@ self: { homepage = "http://hub.darcs.net/thielema/set-cover/"; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "set-extra" = callPackage @@ -183131,39 +182351,6 @@ self: { }) {}; "shake" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, directory - , extra, filepath, hashable, js-flot, js-jquery, primitive, process - , QuickCheck, random, time, transformers, unix - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "shake"; - version = "0.16"; - sha256 = "039b8yrp7nskya30fahzcf8w2rl8jj277hddrcfx3zwbxlcfldcg"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process random time transformers unix - unordered-containers utf8-string - ]; - executableHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process random time transformers unix - unordered-containers utf8-string - ]; - testHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process QuickCheck random time - transformers unix unordered-containers utf8-string - ]; - homepage = "http://shakebuild.com"; - description = "Build system library, like Make, but more accurate dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shake_0_16_2" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, directory , extra, filepath, hashable, js-flot, js-jquery, primitive, process , QuickCheck, random, time, transformers, unix @@ -183194,7 +182381,6 @@ self: { homepage = "http://shakebuild.com"; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-ats" = callPackage @@ -183203,8 +182389,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.5.0.1"; - sha256 = "0gyaysqi2hxa782g34njpsjm6kpxixmqqd7v5pwna5bri9pwykmq"; + version = "1.5.0.3"; + sha256 = "0gyj9v5ls44548zjzmk4bq6q8v9g84zadk5db8j60q14aiv300mb"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats lens shake shake-ext text @@ -184154,6 +183340,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "show-prettyprint_0_2_0_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter + , trifecta + }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.2.0.1"; + sha256 = "0nkp1qjm017j3pmih9qnymi361wq1f45vr2pqi6y3wbspi0gq029"; + libraryHaskellDepends = [ + ansi-wl-pprint base prettyprinter trifecta + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/quchen/show-prettyprint#readme"; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -185234,21 +184438,18 @@ self: { }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, QuickCheck, tasty - , tasty-quickcheck, tasty-th, vector, vector-th-unbox + ({ mkDerivation, base, criterion, doctest, doctest-discover + , QuickCheck, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "simple-vec3"; - version = "0.3.1"; - sha256 = "0csmwaqb3slvh0bqlh2pcjvl5rswaq92lx5d8glzznn0chxnpns4"; - libraryHaskellDepends = [ base QuickCheck vector vector-th-unbox ]; + version = "0.4"; + sha256 = "13qlnpjl5n6rpvhgn0pdnljx0g7nvjk2xr4mds3nvd93d9ciqcxl"; + libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck tasty-th vector - vector-th-unbox - ]; - benchmarkHaskellDepends = [ - base criterion QuickCheck vector vector-th-unbox + base doctest doctest-discover tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion vector ]; homepage = "https://github.com/dzhus/simple-vec3#readme"; description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; @@ -185528,20 +184729,6 @@ self: { }) {inherit (pkgs.xorg) libXft;}; "singleton-bool" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "singleton-bool"; - version = "0.1.2.0"; - sha256 = "17a49mka1h7cd5jmgd3wm0dr45pwmc5i76xjaq7jcqsk193d1frk"; - revision = "1"; - editedCabalFile = "13x8chqhrlmrsca0018p7z5by3przlr9921yhjc072c8433br586"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/phadej/singleton-bool#readme"; - description = "Type level booleans"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "singleton-bool_0_1_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "singleton-bool"; @@ -185551,7 +184738,6 @@ self: { homepage = "https://github.com/phadej/singleton-bool#readme"; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-dict" = callPackage @@ -186280,8 +185466,8 @@ self: { ({ mkDerivation, base, directory, filepath, optparse-applicative }: mkDerivation { pname = "slate"; - version = "0.4.0.0"; - sha256 = "0j2n2wix01ildnpy6k289j5dlf9i7zbi1yd4k5hdvamwlvibqzjl"; + version = "0.5.0.0"; + sha256 = "07cjb3qndsgmjgc890v4g4smdc67gbci4yrqq5m7wa4g6sc5dasl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189156,24 +188342,6 @@ self: { }) {}; "sox" = callPackage - ({ mkDerivation, base, containers, explicit-exception - , extensible-exceptions, process, sample-frame, transformers, unix - , utility-ht - }: - mkDerivation { - pname = "sox"; - version = "0.2.2.7"; - sha256 = "1z6jqrn7n66583pf5gafblh50j82s72w1mx31rj0ii8x70lggkbx"; - libraryHaskellDepends = [ - base containers explicit-exception extensible-exceptions process - sample-frame transformers unix utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Sox"; - description = "Play, write, read, convert audio signals using Sox"; - license = "GPL"; - }) {}; - - "sox_0_2_3" = callPackage ({ mkDerivation, base, containers, explicit-exception , extensible-exceptions, process, sample-frame, semigroups , transformers, unix, utility-ht @@ -189189,7 +188357,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Sox"; description = "Play, write, read, convert audio signals using Sox"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soxlib" = callPackage @@ -189438,29 +188605,6 @@ self: { }) {}; "sparse-linear-algebra" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec - , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck - , scientific, transformers, vector, vector-algorithms - }: - mkDerivation { - pname = "sparse-linear-algebra"; - version = "0.2.9.8"; - sha256 = "19rhcnrlx6nf4yidb119wd3mm4xb5ls99wqk7vdif0cxlpnsycch"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers exceptions hspec mtl primitive QuickCheck - transformers vector vector-algorithms - ]; - testHaskellDepends = [ - base containers exceptions hspec matrix-market-attoparsec mtl - mwc-random primitive QuickCheck scientific - ]; - homepage = "https://github.com/ocramz/sparse-linear-algebra"; - description = "Numerical computation in native Haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "sparse-linear-algebra_0_2_9_9" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck , scientific, transformers, vector, vector-algorithms @@ -189481,7 +188625,6 @@ self: { homepage = "https://github.com/ocramz/sparse-linear-algebra"; description = "Numerical computing in native Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparsebit" = callPackage @@ -193054,20 +192197,6 @@ self: { }) {}; "storable-record" = callPackage - ({ mkDerivation, base, transformers, utility-ht }: - mkDerivation { - pname = "storable-record"; - version = "0.0.3.1"; - sha256 = "1fmdzngikc8bi8bfk04bdd046j3i3v99g5bm2dfn5dz097pcxrbl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base transformers utility-ht ]; - homepage = "http://code.haskell.org/~thielema/storable-record/"; - description = "Elegant definition of Storable instances for records"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "storable-record_0_0_4" = callPackage ({ mkDerivation, base, semigroups, transformers, utility-ht }: mkDerivation { pname = "storable-record"; @@ -193081,7 +192210,6 @@ self: { homepage = "http://code.haskell.org/~thielema/storable-record/"; description = "Elegant definition of Storable instances for records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storable-static-array" = callPackage @@ -193111,30 +192239,6 @@ self: { }) {}; "storablevector" = callPackage - ({ mkDerivation, base, bytestring, deepseq, non-negative - , QuickCheck, random, sample-frame, syb, transformers, unsafe - , utility-ht - }: - mkDerivation { - pname = "storablevector"; - version = "0.2.12.1"; - sha256 = "0y855kfwksrxspd18ppj7x1zyhbi3ackf4p01wsjal84b8ml1qd2"; - libraryHaskellDepends = [ - base deepseq non-negative QuickCheck syb transformers unsafe - utility-ht - ]; - testHaskellDepends = [ - base bytestring QuickCheck random utility-ht - ]; - benchmarkHaskellDepends = [ - base deepseq sample-frame unsafe utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; - description = "Fast, packed, strict storable arrays with a list interface like ByteString"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "storablevector_0_2_13" = callPackage ({ mkDerivation, base, bytestring, deepseq, non-negative , QuickCheck, random, sample-frame, semigroups, syb, transformers , unsafe, utility-ht @@ -193156,7 +192260,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Storable_Vector"; description = "Fast, packed, strict storable arrays with a list interface like ByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storablevector-carray" = callPackage @@ -194113,18 +193216,6 @@ self: { }) {}; "string-class" = callPackage - ({ mkDerivation, base, bytestring, tagged, text }: - mkDerivation { - pname = "string-class"; - version = "0.1.6.5"; - sha256 = "0yi3fagwqkgr8pf6wnl360qikyvfb649qs2y6gp0n7jjw0zc27c2"; - libraryHaskellDepends = [ base bytestring tagged text ]; - homepage = "https://github.com/bairyn/string-class"; - description = "String class library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "string-class_0_1_7_0" = callPackage ({ mkDerivation, base, bytestring, tagged, text }: mkDerivation { pname = "string-class"; @@ -194134,7 +193225,6 @@ self: { homepage = "https://github.com/string-class/string-class"; description = "String class library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-combinators" = callPackage @@ -194337,18 +193427,6 @@ self: { }) {}; "stringbuilder" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: - mkDerivation { - pname = "stringbuilder"; - version = "0.5.0"; - sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "A writer monad for multi-line string literals"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stringbuilder_0_5_1" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "stringbuilder"; @@ -194358,7 +193436,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A writer monad for multi-line string literals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stringlike" = callPackage @@ -194916,8 +193993,8 @@ self: { }: mkDerivation { pname = "stylish-cabal"; - version = "0.1.0.0"; - sha256 = "131qvb6cdfmxzxvz3mxxnapc5826ybxs62zz439cjz29n1r6p0bd"; + version = "0.2.0.0"; + sha256 = "1ldnr0bpl0iaflng2715j02wfk8ksigzms15v7118860wyw2mvyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195693,6 +194770,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "surjective" = callPackage + ({ mkDerivation, base, lens, mtl, template-haskell }: + mkDerivation { + pname = "surjective"; + version = "0.1.0.0"; + sha256 = "1nhq7lfzsbh9ra1m1n7649q35ch6l1lgm110p1qbxgvv6w6xmz41"; + libraryHaskellDepends = [ base lens mtl template-haskell ]; + homepage = "https://github.com/gelisam/surjective"; + description = "An output coverage checker"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "suspend" = callPackage ({ mkDerivation, base, lifted-base, transformers-base }: mkDerivation { @@ -198701,25 +197790,6 @@ self: { }) {}; "tasty-hedgehog" = callPackage - ({ mkDerivation, base, hedgehog, tagged, tasty - , tasty-expected-failure - }: - mkDerivation { - pname = "tasty-hedgehog"; - version = "0.1.0.1"; - sha256 = "1sqwj5vzmc2rcr8yh2pqwmkdr11cwf20fv5z4wr5xsp9qnv3bzl1"; - revision = "1"; - editedCabalFile = "1aq46lrx467r3c6i8figzgyhwkg1n34zq9r39j6144mmmmgh2wpz"; - libraryHaskellDepends = [ base hedgehog tagged tasty ]; - testHaskellDepends = [ - base hedgehog tasty tasty-expected-failure - ]; - homepage = "https://github.com/qfpl/tasty-hedgehog"; - description = "Integrates the hedgehog testing library with the tasty testing framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-hedgehog_0_1_0_2" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty , tasty-expected-failure }: @@ -198734,7 +197804,6 @@ self: { homepage = "https://github.com/qfpl/tasty-hedghog"; description = "Integrates the hedgehog testing library with the tasty testing framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-hspec" = callPackage @@ -201869,16 +200938,16 @@ self: { }) {}; "text1" = callPackage - ({ mkDerivation, base, binary, directory, doctest, filepath, lens - , papa, QuickCheck, semigroups, template-haskell, text + ({ mkDerivation, base, binary, HUnit, lens, QuickCheck, semigroups + , text }: mkDerivation { pname = "text1"; - version = "0.0.5"; - sha256 = "16rz92gvpn1gji6bknilklw397rr118rsdqxysk9wmj10alsxqsp"; - libraryHaskellDepends = [ base binary lens papa semigroups text ]; + version = "0.0.6"; + sha256 = "105y6dbmc3bdbh02v5m6bjsm932d68i262csii1n8kls6rggnfy2"; + libraryHaskellDepends = [ base binary lens semigroups text ]; testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + base HUnit lens QuickCheck semigroups text ]; homepage = "https://github.com/qfpl/text1"; description = "Non-empty values of `Data.Text`."; @@ -202982,31 +202051,6 @@ self: { }) {}; "threepenny-gui" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , data-default, deepseq, exceptions, file-embed, filepath, hashable - , network-uri, safe, snap-core, snap-server, stm, template-haskell - , text, transformers, unordered-containers, vault, vector - , websockets, websockets-snap - }: - mkDerivation { - pname = "threepenny-gui"; - version = "0.8.2.0"; - sha256 = "1qmvrkha68f30kdv8hvdkj25sgsski7rnd6dqmvbhqrn6fpsqm8r"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson async base bytestring containers data-default deepseq - exceptions file-embed filepath hashable network-uri safe snap-core - snap-server stm template-haskell text transformers - unordered-containers vault vector websockets websockets-snap - ]; - homepage = "http://wiki.haskell.org/Threepenny-gui"; - description = "GUI framework that uses the web browser as a display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "threepenny-gui_0_8_2_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deepseq, exceptions, file-embed, filepath, hashable , network-uri, safe, snap-core, snap-server, stm, template-haskell @@ -203029,7 +202073,6 @@ self: { homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui-contextmenu" = callPackage @@ -209062,28 +208105,6 @@ self: { }) {}; "tzdata" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, HUnit - , test-framework, test-framework-hunit, test-framework-th, unix - , vector - }: - mkDerivation { - pname = "tzdata"; - version = "0.1.20170320.0"; - sha256 = "11ffj8ipcvvsm811w1jm23ry7vrmvj2q487640ic4ghq39dx91is"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers deepseq vector - ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit - test-framework-th unix - ]; - homepage = "https://github.com/nilcons/haskell-tzdata"; - description = "Time zone database (as files and as a module)"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "tzdata_0_1_20180122_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, HUnit , test-framework, test-framework-hunit, test-framework-th, unix , vector @@ -209103,7 +208124,6 @@ self: { homepage = "https://github.com/nilcons/haskell-tzdata"; description = "Time zone database (as files and as a module)"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "u2f" = callPackage @@ -209882,21 +208902,6 @@ self: { }) {}; "unicode" = callPackage - ({ mkDerivation, base, containers, utility-ht }: - mkDerivation { - pname = "unicode"; - version = "0.0"; - sha256 = "0fy89j864dy5dzfj15aavm8bqpv2f51zf42dyjvs50qah3shh5yl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers utility-ht ]; - homepage = "http://code.haskell.org/~thielema/unicode/"; - description = "Construct and transform unicode characters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode_0_0_1" = callPackage ({ mkDerivation, base, containers, semigroups, utility-ht }: mkDerivation { pname = "unicode"; @@ -209909,7 +208914,6 @@ self: { homepage = "http://hub.darcs.net/thielema/unicode/"; description = "Construct and transform unicode characters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode-names" = callPackage @@ -210570,21 +209574,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_0_1" = callPackage + "universum_1_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , ghc-prim, hashable, microlens, microlens-mtl, mtl - , safe-exceptions, semigroups, stm, text, text-format, transformers - , type-operators, unordered-containers, utf8-string, vector + , doctest, ghc-prim, Glob, hashable, hedgehog, microlens + , microlens-mtl, mtl, safe-exceptions, semigroups, stm, tasty + , tasty-hedgehog, text, text-format, transformers, type-operators + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.0.1"; - sha256 = "1pa8qnr9px5qfwhpxj15wnqaf5x063ih87mx78fcks95xaqf648k"; + version = "1.1.0"; + sha256 = "0k1gk9dba9f7w852m6y46gq1md3z0w29bgv4qy7xp3pk16h3axhp"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text text-format transformers type-operators unordered-containers utf8-string vector ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; benchmarkHaskellDepends = [ base containers criterion deepseq hashable mtl semigroups text unordered-containers @@ -212222,6 +211231,8 @@ self: { pname = "uuid-crypto"; version = "1.4.0.0"; sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn"; + revision = "1"; + editedCabalFile = "12skd8nifn9nazl1dm3lrlp63qbfc97xkl3dqzcsy848mzifvn9n"; libraryHaskellDepends = [ base binary bytestring cryptoids cryptoids-class cryptoids-types exceptions uuid @@ -212617,18 +211628,6 @@ self: { }) {}; "validity" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "validity"; - version = "0.4.0.3"; - sha256 = "15vp8qd3fvarwd58i69if87kyc7fmf26qgrvacwnis3xwav9nyvs"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Validity typeclass"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity_0_4_0_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "validity"; @@ -212638,7 +211637,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-aeson" = callPackage @@ -212707,18 +211705,6 @@ self: { }) {}; "validity-text" = callPackage - ({ mkDerivation, base, bytestring, text, validity }: - mkDerivation { - pname = "validity-text"; - version = "0.2.0.0"; - sha256 = "1h123s8hbsimd3l05s217lncimfhzvy4xmwqafl4qw9dbmcxnsah"; - libraryHaskellDepends = [ base bytestring text validity ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Validity instances for text"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-text_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { pname = "validity-text"; @@ -212728,7 +211714,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for text"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-time" = callPackage @@ -212932,21 +211917,6 @@ self: { }) {}; "vault" = callPackage - ({ mkDerivation, base, containers, hashable, unordered-containers - }: - mkDerivation { - pname = "vault"; - version = "0.3.0.7"; - sha256 = "1w36ldr5iv0yiqbvibm7b1c66hf1ps5rbassz348zmi113d8k4cy"; - libraryHaskellDepends = [ - base containers hashable unordered-containers - ]; - homepage = "https://github.com/HeinrichApfelmus/vault"; - description = "a persistent store for values of arbitrary types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vault_0_3_1_0" = callPackage ({ mkDerivation, base, containers, hashable, semigroups , unordered-containers }: @@ -212960,7 +211930,6 @@ self: { homepage = "https://github.com/HeinrichApfelmus/vault"; description = "a persistent store for values of arbitrary types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vault-tool" = callPackage @@ -214726,6 +213695,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {vulkan = null;}; + "vulkan-api" = callPackage + ({ mkDerivation, base, ghc-prim, vulkan }: + mkDerivation { + pname = "vulkan-api"; + version = "0.1.0.1"; + sha256 = "192bid9aqndn7lh3vdvk2mhqc76z5fw2z4v362n2bjhdaadwipld"; + libraryHaskellDepends = [ base ghc-prim ]; + librarySystemDepends = [ vulkan ]; + homepage = "https://github.com/achirkin/genvulkan#readme"; + description = "Low-level low-overhead vulkan api bindings"; + license = stdenv.lib.licenses.bsd3; + }) {vulkan = null;}; + "wacom-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, Glob, libnotify, process, select, text, udev @@ -215833,8 +214815,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.8.3"; - sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm"; + version = "0.8.4"; + sha256 = "1yycbkcc7jq8mlv6jslnq2j0w8yhv4859fds34pg2k1fg7ccb1iw"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -220879,21 +219861,6 @@ self: { }) {}; "xml-basic" = callPackage - ({ mkDerivation, base, containers, data-accessor - , explicit-exception, utility-ht - }: - mkDerivation { - pname = "xml-basic"; - version = "0.1.2"; - sha256 = "1s8415gj65zm6mbbrmkav92zkwi0q8mf892ajc2qz9hfmhxab27q"; - libraryHaskellDepends = [ - base containers data-accessor explicit-exception utility-ht - ]; - description = "Basics for XML/HTML representation and processing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xml-basic_0_1_3" = callPackage ({ mkDerivation, base, containers, data-accessor , explicit-exception, semigroups, utility-ht }: @@ -220907,7 +219874,6 @@ self: { ]; description = "Basics for XML/HTML representation and processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-catalog" = callPackage @@ -222836,8 +221802,8 @@ self: { }: mkDerivation { pname = "yampa-sdl2"; - version = "0.0.1.1"; - sha256 = "0p162kaznv4mk8x3zvkb7vnjwsqn8gydblpxijqsjgzc3qbi5mwq"; + version = "0.0.2.1"; + sha256 = "1hbc4b2qlm8hlnk57yf39qgs9c5hja5dpicwca8qm3drhl0yz5y2"; libraryHaskellDepends = [ base colour linear sdl2 sdl2-gfx StateVar text Yampa ]; @@ -223497,6 +222463,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth-hashdb_1_7" = callPackage + ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers + , hspec, http-conduit, http-types, monad-logger, network-uri + , persistent, persistent-sqlite, resourcet, text + , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core + , yesod-form, yesod-persistent, yesod-test + }: + mkDerivation { + pname = "yesod-auth-hashdb"; + version = "1.7"; + sha256 = "072g8c2phhgphj0469qg9chbninxwjkigy2pzhfl51zbm50skfb5"; + libraryHaskellDepends = [ + aeson base bytestring persistent text yesod-auth yesod-core + yesod-form yesod-persistent + ]; + testHaskellDepends = [ + aeson base basic-prelude bytestring containers hspec http-conduit + http-types monad-logger network-uri persistent-sqlite resourcet + text unordered-containers wai-extra yesod yesod-auth yesod-core + yesod-test + ]; + homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; + description = "Authentication plugin for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-hmac-keccak" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, mtl , persistent, random, shakespeare, text, yesod-auth, yesod-core @@ -226115,8 +225108,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.6"; - sha256 = "059mbh2x4i521kg99b2mmgvc2rwbid641ilzc14ri7ym7ljkw1mv"; + version = "0.6.0.1"; + sha256 = "03x6f5zvmgppr1hkg0lxrapgnlk9s7i974d1gzscs1nvsi426bqb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -226835,31 +225828,6 @@ self: { }) {}; "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, unzip, zip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.3.2.2"; - sha256 = "1xyabamc3670r8qjwpyfxcbsxhsnzy6i9n5zx58maq830lwp2m9c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory filepath HUnit old-time process temporary - time unix - ]; - testToolDepends = [ unzip zip ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) unzip; inherit (pkgs) zip;}; - - "zip-archive_0_3_2_3" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty , process, temporary, text, time, unix, unzip, zlib @@ -226883,6 +225851,32 @@ self: { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) unzip;}; + + "zip-archive_0_3_2_4" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , digest, directory, filepath, HUnit, mtl, old-time, pretty + , process, temporary, text, time, unix, unzip, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.3.2.4"; + sha256 = "119p7f9dbims5swf23czyg4r4p0sjmgwfh042bpxw54d9p9jwq90"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl old-time pretty text time unix zlib + ]; + libraryToolDepends = [ unzip ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit old-time process temporary + time unix + ]; + homepage = "http://github.com/jgm/zip-archive"; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) unzip;}; From d87fcc7d43a46805a662a08506af10068130d04c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 20 Feb 2018 18:19:21 +0100 Subject: [PATCH 14/33] haskell-reflect: fix build with GHC 7.10.x --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 56f61fddb33e..286b382e1973 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -198,6 +198,7 @@ self: super: { natural-transformation = addBuildDepend super.natural-transformation self.semigroups; optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail]; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; + reflection = addBuildDepend super.reflection self.semigroups; semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]); texmath = addBuildDepend super.texmath self.network-uri; yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); From d035fc1e76eb93487ef69a49bf190f2922d4d803 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 20 Feb 2018 18:21:47 +0100 Subject: [PATCH 15/33] haskell-parsec: fix build with GHC 7.10.x --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 286b382e1973..c63ec7b70f78 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -197,6 +197,7 @@ self: super: { mono-traversable = addBuildDepend super.mono-traversable self.semigroups; natural-transformation = addBuildDepend super.natural-transformation self.semigroups; optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail]; + parsec = addBuildDepends super.parsec [self.fail self.semigroups]; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; reflection = addBuildDepend super.reflection self.semigroups; semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]); From f7ab1900966a1bf4ef530b9fddcc02c5f5f45d13 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 22 Feb 2018 21:39:50 -0500 Subject: [PATCH 16/33] language-c: remove now-unnecessary overrides --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index acd485e332f6..39897f824059 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -833,7 +833,7 @@ self: super: { rev = "8b79823c32e234c161baec67fdf7907952ca62b8"; sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz"; }; - }).override { language-c = self.language-c_0_7_2; }; + }); # Needs pginit to function and pgrep to verify. tmp-postgres = overrideCabal super.tmp-postgres (drv: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 3e8ff6b73eaa..bd3ad0fe4c63 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -112,12 +112,6 @@ self: super: { ## hspec-discover ==2.4.7 hspec-discover = super.hspec-discover_2_4_8; - ## Needs bump to a versioned attribute - ## Ambiguous occurrence ‘<>’ - ## It could refer to either ‘Prelude.<>’, - ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 - language-c = super.language-c_0_7_2; - ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## free ==4.*, template-haskell >=2.4 && <2.13 From b5454a13806143bd63d9f04c6fb3b61e42324d1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Feb 2018 13:13:04 +0100 Subject: [PATCH 17/33] haskell-doctest: update ghc 8.4.x version to 0.14.1 --- .../haskell-modules/configuration-ghc-8.4.x.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index bd3ad0fe4c63..c9505cd8667c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -62,13 +62,7 @@ self: super: { ## Needs bump to a versioned attribute ## Issue: https://github.com/sol/doctest/issues/189 - doctest = overrideCabal super.doctest_0_14_0 (drv: { - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## - ## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory)) - doCheck = false; - }); + doctest = super.doctest_0_14_1; ## Needs bump to a versioned attribute ## • Could not deduce (Semigroup (IterT m a)) @@ -483,11 +477,6 @@ self: super: { jailbreak = true; }); - doctest_0_14_0 = overrideCabal super.doctest_0_14_0 (drv: { - ## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory)) - doCheck = false; - }); - exception-transformers = overrideCabal super.exception-transformers (drv: { ## Setup: Encountered missing dependencies: ## HUnit >=1.2 && <1.6 From 81a9442fd0a08d87e994bbdb8fda29de75fe585e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Feb 2018 13:17:53 +0100 Subject: [PATCH 18/33] haskell-language-c: drop unused version 0.7.0 --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 82ffa2a64e0c..52fafec10f83 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2697,7 +2697,6 @@ extra-packages: - hoogle == 5.0.14 # required by hie-hoogle - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x - - language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192. - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below From fa6272678db4dd2ffaf845cbcbf3763c41d62dc4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Feb 2018 13:20:12 +0100 Subject: [PATCH 19/33] haskell-stringbuilder: drop obsolete override for GHC 8.4.x --- .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index c9505cd8667c..02922abb9ecd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -119,12 +119,6 @@ self: super: { ## doctest >=0.11.1 && <0.14 semigroupoids = super.semigroupoids_5_2_2; - ## Needs bump to a versioned attribute - ## • No instance for (Semigroup Builder) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid Builder’ - stringbuilder = super.stringbuilder_0_5_1; - ## Needs bump to a versioned attribute ## Issue: https://github.com/haskell/test-framework/issues/35 test-framework = overrideCabal super.test-framework_0_8_2_0 (drv: { From 51c6ca064371e7e27c23408b6d79e3e46d588234 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Feb 2018 17:58:36 +0100 Subject: [PATCH 20/33] hackage: update database snapshot to latest version --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 7f7932d01b4f..02394471b153 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/4c8b3501ea6fc9f41cd192ddc08e2d9583a1e679.tar.gz"; - sha256 = "0aa4pimgllqgn8bcy2p2cdwbpz6s6wk8j41w35jvzaqfj15gysnq"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/46704e06debe8b2c7c875d5e910fe168d7e49827.tar.gz"; + sha256 = "131ga0pz1h7f3zimrd7yn6v8q7j2wh6srjrvl97p9bx1cbg8xqgl"; } From 1c3b6d509d06af14b1858ffa2d27f3c902f549bd Mon Sep 17 00:00:00 2001 From: xeji Date: Fri, 23 Feb 2018 17:59:20 +0100 Subject: [PATCH 21/33] wireguard: 0.0.20180202 -> 0.0.20180218 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index c5461c06e830..0029353ba20c 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180202"; + version = "0.0.20180218"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "ee3415b482265ad9e8721aa746aaffdf311058a2d1a4d80e7b6d11bbbf71c722"; + sha256 = "4ac4c4e4ad4dc2cf9dcb831b0cf347567ccea675ca524528cf5a4d9dccb2fe52"; }; meta = with stdenv.lib; { From 034d3fae3d9cd840831940e57c4bfe110734ebee Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Fri, 23 Feb 2018 11:59:37 -0500 Subject: [PATCH 22/33] tinc: enable invitations --- nixos/modules/services/networking/tinc.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index adb80ea29840..e3c9b5282b8c 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -178,6 +178,8 @@ in preStart = '' mkdir -p /etc/tinc/${network}/hosts chown tinc.${network} /etc/tinc/${network}/hosts + mkdir -p /etc/tinc/${network}/invitations + chown tinc.${network} /etc/tinc/${network}/invitations # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then From 2e45e280cb07bb21da8c302f400a29e11a761642 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Feb 2018 18:08:09 +0100 Subject: [PATCH 23/33] haskell-doctest: the 0.14.1 test suite fails on NixOS --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 02922abb9ecd..7fcab47686d2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -62,7 +62,7 @@ self: super: { ## Needs bump to a versioned attribute ## Issue: https://github.com/sol/doctest/issues/189 - doctest = super.doctest_0_14_1; + doctest = dontCheck super.doctest_0_14_1; # test suite fails in Nix ## Needs bump to a versioned attribute ## • Could not deduce (Semigroup (IterT m a)) From 54371a78f4677f89b2b2a08f566d9ff41151d315 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 23 Feb 2018 13:19:51 +0000 Subject: [PATCH 24/33] ocamlPackages.curses: works with default ncurses --- pkgs/top-level/ocaml-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 10eb72da19eb..03c24de57d4e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -194,9 +194,7 @@ let then callPackage ../development/ocaml-modules/csv { } else callPackage ../development/ocaml-modules/csv/1.5.nix { }; - curses = callPackage ../development/ocaml-modules/curses { - ncurses = pkgs.ncurses5; - }; + curses = callPackage ../development/ocaml-modules/curses { }; custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; From 749d0e7f3a90f31199ae10e0391472b127d028a0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 23 Feb 2018 11:14:27 -0600 Subject: [PATCH 25/33] micro: 1.3.4 -> 1.4.0 --- pkgs/applications/editors/micro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index bea1e18e0612..f1c1e3dcac70 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "micro-${version}"; - version = "1.3.4"; + version = "1.4.0"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "zyedidia"; repo = "micro"; rev = "v${version}"; - sha256 = "1giyp2xk2rb6vdyfnj5wa7qb9fwbcmmwm16wdlnmq7xnp7qamdkw"; + sha256 = "0w1rmh81h28n1jlb05k89i751h498i6p883hrsjr70hvrwq5zjpb"; fetchSubmodules = true; }; From b492e2a16486b44ab1ee71049287f37d814c3fbd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 24 Feb 2018 01:34:32 +0800 Subject: [PATCH 26/33] dnsmasq: Patch CVE-2017-15107 --- pkgs/tools/networking/dnsmasq/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index badf33074465..6205934084e8 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack }: +{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack, fetchpatch }: with stdenv.lib; let @@ -18,6 +18,16 @@ stdenv.mkDerivation rec { sha256 = "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-15107.patch"; + url = "http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=4fe6744a220eddd3f1749b40cac3dfc510787de6"; + sha256 = "0r8grhh1q46z8v6manx1vvfpf2vmchfzsg7l1djh63b1fy1mbjkk"; + # changelog does not apply cleanly but its safe to skip + excludes = [ "CHANGELOG" ]; + }) + ]; + preBuild = '' makeFlagsArray=("COPTS=${copts}") ''; From 998b1ef13b876372b1779a1179affbd34c64f656 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 23 Feb 2018 19:50:54 +0100 Subject: [PATCH 27/33] mupdf: apply patch for CVE-2018-6544 --- pkgs/applications/misc/mupdf/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 75d8463cf7f8..6634f4012245 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -29,6 +29,11 @@ in stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306"; sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk"; }) + (fetchpatch { + name = "CVE-2018-6544.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d"; + sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i"; + }) ] # Use shared libraries to decrease size From 270f99f7bf22eb84491ffde6bdcf86bc6098d4fb Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 23 Feb 2018 19:00:26 +0000 Subject: [PATCH 28/33] nixos/programs.chromium: write policies for google-chrome too Policy configuration files live under /etc/chromium for Chromium, and under /etc/opt/chrome for Google Chrome. --- nixos/modules/programs/chromium.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index e50e06c7a531..41c49db8c71c 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -36,6 +36,7 @@ in "chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet "mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere + "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin ] ''; }; @@ -78,7 +79,11 @@ in ###### implementation config = lib.mkIf cfg.enable { + # for chromium environment.etc."chromium/policies/managed/default.json".text = builtins.toJSON defaultProfile; environment.etc."chromium/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; + # for google-chrome https://www.chromium.org/administrators/linux-quick-start + environment.etc."opt/chrome/policies/managed/default.json".text = builtins.toJSON defaultProfile; + environment.etc."opt/chrome/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; }; } From 49b7fc390826f85e5d746fa4b66454e10862a410 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Feb 2018 21:52:49 +0100 Subject: [PATCH 29/33] android-studio-preview: 3.1.0.11 -> 3.1.0.12 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index bf8a5f15c2f2..4a71153cf911 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -29,9 +29,9 @@ in rec { # linux-beta-bundle preview = mkStudio { pname = "android-studio-preview"; - version = "3.1.0.11"; # "Android Studio 3.1 Beta 3" - build = "173.4595152"; - sha256Hash = "0106ggrf4mkxx3a2dn02km8rdq23sf15ifysykcay29skgdmq6wx"; + version = "3.1.0.12"; # "Android Studio 3.1 Beta 4" + build = "173.4615496"; + sha256Hash = "0rp0vg5hwv7kdrirydvnwznpfwibwwm2dxsbhbxfkyahph10ly72"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; From a6664d8192038c4dc2ad44169dbb76556fe71ac1 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 23 Feb 2018 22:25:37 +0100 Subject: [PATCH 30/33] mupdf: apply patch for CVE-2018-6544 (part 2) This (hopefully) completes 998b1ef. --- pkgs/applications/misc/mupdf/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 6634f4012245..5326f948d894 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -30,10 +30,15 @@ in stdenv.mkDerivation rec { sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk"; }) (fetchpatch { - name = "CVE-2018-6544.patch"; + name = "CVE-2018-6544.1.patch"; url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d"; sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i"; }) + (fetchpatch { + name = "CVE-2018-6544.2.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7"; + sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627"; + }) ] # Use shared libraries to decrease size From ac782ae4e01a32dc375976d67db3c1fe71bd6701 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 23 Feb 2018 09:50:33 -0800 Subject: [PATCH 31/33] mattermost: add build number --- pkgs/servers/mattermost/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index bff973d786a1..f0c1a0fcec55 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,8 +1,13 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage }: +let + version = "4.7.2"; + goPackagePath = "github.com/mattermost/mattermost-server"; + buildFlags = "-ldflags \"-X '${goPackagePath}/model.BuildNumber=nixpkgs-${version}'\""; +in + buildGoPackage rec { name = "mattermost-${version}"; - version = "4.7.2"; src = fetchFromGitHub { owner = "mattermost"; @@ -16,12 +21,12 @@ buildGoPackage rec { sha256 = "14gr7zzx77q862qccjcdwrzd6n8g2z8yngw8aa4g3q6hypsqi4v3"; }; - goPackagePath = "github.com/mattermost/mattermost-server"; + inherit goPackagePath; buildPhase = '' runHook preBuild cd go/src/${goPackagePath}/cmd/platform - go install + go install ${buildFlags} runHook postBuild ''; @@ -35,7 +40,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - description = "Open-Source, self-hosted Slack-alternative"; + description = "Open-source, self-hosted Slack-alternative"; homepage = https://www.mattermost.org; license = with licenses; [ agpl3 asl20 ]; maintainers = with maintainers; [ fpletz ryantm ]; From e349ccc77febd45abbd14be14f7de123ec4a4da2 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Fri, 23 Feb 2018 22:59:19 +0100 Subject: [PATCH 32/33] nixos/alsa: Do not make sound.enable conditional on stateVersion. Eelco Dolstra wrote: Hm, this is not really the intended use of stateVersion. From the description: Every once in a while, a new NixOS release may change configuration defaults in a way incompatible with stateful data. For instance, if the default version of PostgreSQL changes, the new version will probably be unable to read your existing databases. To prevent such breakage, you can set the value of this option to the NixOS release with which you want to be compatible. The effect is that NixOS will option defaults corresponding to the specified release (such as using an older version of PostgreSQL). So this is only intended for options that have some corresponding on-disk state. AFAICT this is not the case for sound. In any case stateVersion is a necessary evil that only exists because we can't just upgrade Postgres databases or change SSH host keys. It's not necessary for things like whether sound is enabled. (If the user discovers that sound is suddenly disabled, they can just enable it.) I had some vague recollection that we also had a configVersion option setting to control the defaults for non-state-related options, but I can't find it so maybe it was only discussed. --- nixos/doc/manual/release-notes/rl-1803.xml | 10 +++++----- nixos/modules/services/audio/alsa.nix | 10 +++------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 7a9c5a2303c2..caf52195ead7 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -80,6 +80,11 @@ has the following highlights: following incompatible changes: + + + sound.enable now defaults to false. + + Dollar signs in options under are @@ -209,11 +214,6 @@ following incompatible changes: For stateVersion = "17.09" or lower the old behavior is preserved. - - - sound.enable now defaults to false. - - matrix-synapse uses postgresql by default instead of sqlite. diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 161d873686a8..e3e8bb28c58b 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; - defaultText = "!versionAtLeast system.stateVersion \"18.03\""; + default = false; description = '' Whether to enable ALSA sound. ''; @@ -78,11 +78,7 @@ in ###### implementation - config = mkMerge [ - ({ - sound.enable = mkDefault (!versionAtLeast config.system.stateVersion "18.03"); - }) - (mkIf config.sound.enable { + config = mkIf config.sound.enable { environment.systemPackages = [ alsaUtils ]; @@ -128,6 +124,6 @@ in ]; }; - })]; + }; } From 835d8e5c21847887b22366b04e3ce495e1b32564 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 23 Feb 2018 22:42:20 +0000 Subject: [PATCH 33/33] direnv: 2.14.0 -> 2.15.0 --- pkgs/tools/misc/direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index b0c0de996e74..4598655092f3 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.14.0"; + version = "2.15.0"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0xgb895dda7q7qyl5lg1jfjfb82daaf133dx0vw8lp7d67xqv9r8"; + sha256 = "09mys14acjbrkvjy9zl2k521k3xcs6b0brg8zlhh8qadhbirfkp3"; }; postConfigure = ''