From de88ff99124dcc15ddef7743b1c6bc1ffd7d36f6 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 18 Sep 2015 02:26:45 -0700 Subject: [PATCH 001/308] synaptics: add palmDetect tuning options --- .../services/x11/hardware/synaptics.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index e50ed08a218..29cc31d70a0 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -122,6 +122,20 @@ in { description = "Whether to enable palm detection (hardware support required)"; }; + palmMinWidth = mkOption { + type = types.nullOr types.int; + default = null; + example = 5; + description = "Minimum finger width at which touch is considered a palm"; + }; + + palmMinZ = mkOption { + type = types.nullOr types.int; + default = null; + example = 20; + description = "Minimum finger pressure at which touch is considered a palm"; + }; + horizontalScroll = mkOption { type = types.bool; default = true; @@ -174,7 +188,9 @@ in { Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}" Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}" Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}" - ${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""} + ${optionalString cfg.palmDetect ''Option "PalmDetect" "1"''} + ${optionalString (cfg.palmMinWidth != null) ''Option "PalmMinWidth" "${toString cfg.palmMinWidth}"''} + ${optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''} ${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''} ${cfg.additionalOptions} EndSection From f8581a5a955cc279e6c951f1b001df49adfaaf73 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 18 Sep 2015 02:42:09 -0700 Subject: [PATCH 002/308] synaptics: add scrollDelta option --- nixos/modules/services/x11/hardware/synaptics.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 29cc31d70a0..2981e7545e8 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -62,6 +62,13 @@ in { description = "Cursor speed factor for highest-speed finger motion."; }; + scrollDelta = mkOption { + type = types.nullOr types.int; + default = null; + example = 75; + description = "Move distance of the finger for a scroll event."; + }; + twoFingerScroll = mkOption { type = types.bool; default = false; @@ -191,7 +198,9 @@ in { ${optionalString cfg.palmDetect ''Option "PalmDetect" "1"''} ${optionalString (cfg.palmMinWidth != null) ''Option "PalmMinWidth" "${toString cfg.palmMinWidth}"''} ${optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''} - ${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''} + ${optionalString (cfg.scrollDelta != null) ''Option "VertScrollDelta" "${toString cfg.scrollDelta}"''} + ${if !cfg.horizontalScroll then ''Option "HorizScrollDelta" "0"'' + else (optionalString (cfg.scrollDelta != null) ''Option "HorizScrollDelta" "${toString cfg.scrollDelta}"'')} ${cfg.additionalOptions} EndSection ''; From fda9d83ddfe833c95ca630064bb6d2cbaad2da6b Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Fri, 16 Oct 2015 22:20:30 +1100 Subject: [PATCH 003/308] initrd: add mmc_block to default available modules mmc_block and sdhci_acpi are both necessary for a Bay Trail Chromebook with an internal eMMC drive. The sdhci_acpi module is detectable but I can not figure out a way to check whether the mmc_block module is needed by just looking at /sys/ --- nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 3 +-- nixos/modules/installer/cd-dvd/system-tarball.nix | 2 +- nixos/modules/system/boot/kernel.nix | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 46dc1c70502..954cc6b2f49 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -86,8 +86,7 @@ in system.boot.loader.kernelFile = "uImage"; boot.initrd.availableKernelModules = - [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ums-cypress" "rtc_mv" - "ext4" ]; + [ "mvsdio" "reiserfs" "ext3" "ums-cypress" "rtc_mv" "ext4" ]; boot.postBootCommands = '' diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix index c24fe97fba4..90e9b98a457 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball.nix @@ -43,7 +43,7 @@ in # so that we don't need to know its device. fileSystems = [ ]; - # boot.initrd.availableKernelModules = [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ext4" ]; + # boot.initrd.availableKernelModules = [ "mvsdio" "reiserfs" "ext3" "ext4" ]; # boot.initrd.kernelModules = [ "rtc_mv" ]; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index ac40e8a49ac..9dcbce30f7b 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -184,6 +184,9 @@ in "ide_disk" "ide_generic" + # SD cards and internal eMMC drives. + "mmc_block" + # Support USB keyboards, in case the boot fails and we only have # a USB keyboard. "uhci_hcd" From fdb5563bcc668b96591fa2649853c4dba771aa24 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Wed, 30 Dec 2015 01:49:56 +0800 Subject: [PATCH 004/308] facetimehd-firmware: init at 1.43 --- .../firmware/facetimehd-firmware/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix new file mode 100644 index 00000000000..05a293083b7 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, cpio, xz, pkgs }: + +let + + version = "1.43"; + + dmgRange = "420107885-421933300"; # the whole download is 1.3GB, this cuts it down to 2MB + + firmwareIn = "./System/Library/Extensions/AppleCameraInterface.kext/Contents/MacOS/AppleCameraInterface"; + firmwareOut = "firmware.bin"; + firmwareOffset = "81920"; + firmwareSize = "603715"; + + # separated this here as the script will fail without the 'exit 0' + unpack = pkgs.writeScriptBin "unpack" '' + xzcat -Q $src | cpio --format odc -i -d ${firmwareIn} + exit 0 + ''; + +in + +stdenv.mkDerivation { + + name = "facetimehd-firmware-${version}"; + + src = fetchurl { + url = "https://support.apple.com/downloads/DL1849/en_US/osxupd10.11.2.dmg"; + sha256 = "1jw6sy9vj27amfak83cs2c7q856y4mk1wix3rl4q10yvd9bl4k9x"; + curlOpts = "-r ${dmgRange}"; + }; + + phases = [ "buildPhase" ]; + + buildInputs = [ cpio xz ]; + + buildPhase = '' + ${unpack}/bin/unpack + dd bs=1 skip=${firmwareOffset} count=${firmwareSize} if=${firmwareIn} of=${firmwareOut}.gz &> /dev/null + mkdir -p $out/lib/firmware/facetimehd + gunzip -c ${firmwareOut}.gz > $out/lib/firmware/facetimehd/${firmwareOut} + ''; + + meta = with stdenv.lib; { + description = "facetimehd firmware"; + homepage = https://support.apple.com/downloads/DL1849; + license = licenses.unfree; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2028d2ff14c..311cbd1f76a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9938,6 +9938,8 @@ let eject = utillinux; + facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; + fanctl = callPackage ../os-specific/linux/fanctl { iproute = iproute.override { enableFan = true; }; }; From 9213916ca7a888f32d06c9220df66e789ecef8b3 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Wed, 30 Dec 2015 02:02:36 +0800 Subject: [PATCH 005/308] facetimehd: init at git-20160127 --- .../hardware/video/webcam/facetimehd.nix | 43 +++++++++++++++++++ nixos/modules/module-list.nix | 1 + pkgs/os-specific/linux/facetimehd/default.nix | 34 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 80 insertions(+) create mode 100644 nixos/modules/hardware/video/webcam/facetimehd.nix create mode 100644 pkgs/os-specific/linux/facetimehd/default.nix diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix new file mode 100644 index 00000000000..83d954a0c03 --- /dev/null +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.hardware.facetimehd; + + kernelPackages = config.boot.kernelPackages; + +in + +{ + + options.hardware.facetimehd.enable = mkEnableOption "facetimehd kernel module"; + + config = mkIf cfg.enable { + + assertions = singleton { + assertion = versionAtLeast kernelPackages.kernel.version "3.19"; + message = "facetimehd is not supported for kernels older than 3.19"; + }; + + boot.kernelModules = [ "facetimehd" ]; + + boot.extraModulePackages = [ kernelPackages.facetimehd ]; + + hardware.firmware = [ pkgs.facetimehd-firmware ]; + + # unload module during suspend/hibernate as it crashes the whole system + powerManagement.powerDownCommands = '' + ${pkgs.module_init_tools}/bin/rmmod -f facetimehd + ''; + + # and load it back on resume + powerManagement.resumeCommands = '' + export MODULE_DIR=/run/current-system/kernel-modules/lib/modules + ${pkgs.module_init_tools}/bin/modprobe -v facetimehd + ''; + + }; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2ff61877c23..48834128d9b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -42,6 +42,7 @@ ./hardware/video/bumblebee.nix ./hardware/video/nvidia.nix ./hardware/video/ati.nix + ./hardware/video/webcam/facetimehd.nix ./installer/tools/auto-upgrade.nix ./installer/tools/nixos-checkout.nix ./installer/tools/tools.nix diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix new file mode 100644 index 00000000000..06e6abfe417 --- /dev/null +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, kernel }: + +# facetimehd is not supported for kernels older than 3.19"; +assert stdenv.lib.versionAtLeast kernel.version "3.19"; + +stdenv.mkDerivation rec { + + name = "facetimehd-${version}-${kernel.version}"; + version = "git-20160127"; + + src = fetchFromGitHub { + owner = "patjak"; + repo = "bcwc_pcie"; + rev = "186e9f9101ed9bbd7cc8d470f840d4a74c585ca7"; + sha256 = "1frsf6z6v94cz9fww9rbnk926jzl36fp3w2d1aw6djhzwm80a5gs"; + }; + + preConfigure = '' + export INSTALL_MOD_PATH="$out" + ''; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/patjak/bcwc_pcie; + description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam"; + license = licenses.gpl2; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 311cbd1f76a..452d12e5a64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10263,6 +10263,8 @@ let openafsClient = callPackage ../servers/openafs-client { }; + facetimehd = callPackage ../os-specific/linux/facetimehd { }; + kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; klibc = callPackage ../os-specific/linux/klibc { }; From ddfb660f7bb2dfc203f9d25be381211271f33238 Mon Sep 17 00:00:00 2001 From: Tony White Date: Fri, 29 Jan 2016 22:08:42 +0000 Subject: [PATCH 006/308] kde5 bluedevil plasmoid : enable bluez5 bluetooth functionality - Fixed a bug in bluedevil (link to a .js file) - Made bluez5 the default bluetooth service except for kde4 - created org.bluez.obex systemd dbus service - Patched bluez5 using bluez-5.37-obexd_without_systemd-1.patch in order to enable obex when using either the bluedevil plasmoid or dolpin file manager within plasma workspaces 5. The functionality was tested using a Sony Xperia Z, the machine and the handset paired and two different files were sent in both directions successfully. --- nixos/modules/services/hardware/bluetooth.nix | 60 ++++++++++++------ pkgs/desktops/plasma-5.5/bluedevil.nix | 2 + .../bluez-5.37-obexd_without_systemd-1.patch | 61 +++++++++++++++++++ pkgs/os-specific/linux/bluez/bluez5.nix | 3 + pkgs/os-specific/linux/bluez/bluez5_28.nix | 1 + 5 files changed, 110 insertions(+), 17 deletions(-) create mode 100644 pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 68d0406e63b..fc95c4910bf 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -1,6 +1,43 @@ { config, lib, pkgs, ... }: with lib; +let + bluez-bluetooth = if config.services.xserver.desktopManager.kde4.enable then pkgs.bluez else pkgs.bluez5; + + configBluez = { + description = "Bluetooth Service"; + serviceConfig = { + Type = "dbus"; + BusName = "org.bluez"; + ExecStart = "${bluez-bluetooth}/sbin/bluetoothd -n"; + }; + wantedBy = [ "bluetooth.target" ]; + }; + + configBluez5 = { + description = "Bluetooth Service"; + serviceConfig = { + Type = "dbus"; + BusName = "org.bluez"; + ExecStart = "${bluez-bluetooth}/sbin/bluetoothd -n"; + NotifyAccess="main"; + CapabilityBoundingSet="CAP_NET_ADMIN CAP_NET_BIND_SERVICE"; + LimitNPROC=1; + }; + wantedBy = [ "bluetooth.target" ]; + }; + + obexConfig = { + description = "Bluetooth OBEX service"; + serviceConfig = { + Type = "dbus"; + BusName = "org.bluez.obex"; + ExecStart = "${bluez-bluetooth}/sbin/obexd"; + }; + }; + + bluezConfig = if config.services.xserver.desktopManager.kde4.enable then configBluez else configBluez5; +in { @@ -16,26 +53,15 @@ with lib; }; - ###### implementation - + config = mkIf config.hardware.bluetooth.enable { - environment.systemPackages = [ pkgs.bluez pkgs.openobex pkgs.obexftp ]; - - services.udev.packages = [ pkgs.bluez ]; - - services.dbus.packages = [ pkgs.bluez ]; - - systemd.services."dbus-org.bluez" = { - description = "Bluetooth Service"; - serviceConfig = { - Type = "dbus"; - BusName = "org.bluez"; - ExecStart = "${pkgs.bluez}/sbin/bluetoothd -n"; - }; - wantedBy = [ "bluetooth.target" ]; - }; + environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; + services.udev.packages = [ bluez-bluetooth ]; + services.dbus.packages = [ bluez-bluetooth ]; + systemd.services."dbus-org.bluez" = bluezConfig; + systemd.services."dbus-org.bluez.obex" = obexConfig; }; diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/plasma-5.5/bluedevil.nix index dc11ee170b3..6596c246202 100644 --- a/pkgs/desktops/plasma-5.5/bluedevil.nix +++ b/pkgs/desktops/plasma-5.5/bluedevil.nix @@ -20,5 +20,7 @@ plasmaPackage { postInstall = '' wrapQtProgram "$out/bin/bluedevil-wizard" wrapQtProgram "$out/bin/bluedevil-sendfile" + # Fix the location of logic.js for the plasmoid + ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js ''; } diff --git a/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch b/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch new file mode 100644 index 00000000000..749787c5b3a --- /dev/null +++ b/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch @@ -0,0 +1,61 @@ +Submitted By: Armin K. +Date: 2013-04-29 +Initial Package Version: 5.17 +Upstream Status: unknown +Origin: Arch Linux (Giovanni Campagna) +Description: Allow using obexd without systemd in the user session + +Not all sessions run systemd --user (actually, the majority +doesn't), so the dbus daemon must be able to spawn obexd +directly, and to do so it needs the full path of the daemon. +--- + Makefile.obexd | 4 ++-- + obexd/src/org.bluez.obex.service | 4 ---- + obexd/src/org.bluez.obex.service.in | 4 ++++ + 3 files changed, 6 insertions(+), 6 deletions(-) + delete mode 100644 obexd/src/org.bluez.obex.service + create mode 100644 obexd/src/org.bluez.obex.service.in + +diff --git a/Makefile.obexd b/Makefile.obexd +index 3760867..142e7c3 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -2,12 +2,12 @@ + if SYSTEMD + systemduserunitdir = @SYSTEMD_USERUNITDIR@ + systemduserunit_DATA = obexd/src/obex.service ++endif + + dbussessionbusdir = @DBUS_SESSIONBUSDIR@ + dbussessionbus_DATA = obexd/src/org.bluez.obex.service +-endif + +-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service ++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in + + obex_plugindir = $(libdir)/obex/plugins + +diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service +deleted file mode 100644 +index a538088..0000000 +--- a/obexd/src/org.bluez.obex.service ++++ /dev/null +@@ -1,4 +0,0 @@ +-[D-BUS Service] +-Name=org.bluez.obex +-Exec=/bin/false +-SystemdService=dbus-org.bluez.obex.service +diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in +new file mode 100644 +index 0000000..9c815f2 +--- /dev/null ++++ b/obexd/src/org.bluez.obex.service.in +@@ -0,0 +1,4 @@ ++[D-BUS Service] ++Name=org.bluez.obex ++Exec=@libexecdir@/obexd ++SystemdService=dbus-org.bluez.obex.service +-- +1.8.3.1 + + diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index cc132ddc397..21925a5e1dd 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { # gstreamer gst_plugins_base ]; + patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ]; + preConfigure = '' substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " @@ -68,6 +70,7 @@ stdenv.mkDerivation rec { # for bluez4 compatibility for NixOS mkdir $out/sbin ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd + ln -s ../libexec/bluetooth/obexd $out/sbin/obexd ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix index 7f5a30144c8..80adc0fd56b 100644 --- a/pkgs/os-specific/linux/bluez/bluez5_28.nix +++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { # for bluez4 compatibility for NixOS mkdir $out/sbin ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd + ln -s ../libexec/bluetooth/obexd $out/sbin/obexd ''; meta = with stdenv.lib; { From 95ed5766d6da53d0786d0d84e7a694d9da4c8b24 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 3 Nov 2015 00:53:10 +0100 Subject: [PATCH 007/308] U-Boot: refactor to allow easier extendability [dezgeg: minor stylistic tweaks, export buildUBoot for out-of-tree users] --- pkgs/misc/uboot/default.nix | 129 +++++++++++++++++++------------- pkgs/top-level/all-packages.nix | 37 ++------- 2 files changed, 85 insertions(+), 81 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 443841363bf..981fbce0a3a 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,62 +1,89 @@ -{ stdenv, fetchurl, bc, dtc -, toolsOnly ? false -, defconfig ? "allnoconfig" -, targetPlatforms -, filesToInstall -}: +{ stdenv, fetchurl, bc, dtc }: let - platform = stdenv.platform; - crossPlatform = stdenv.cross.platform; - makeTarget = if toolsOnly then "tools NO_SDL=1" else "all"; - installDir = if toolsOnly then "$out/bin" else "$out"; - buildFun = kernelArch: - '' - if test -z "$crossConfig"; then - make ${makeTarget} - else - make ${makeTarget} ARCH=${kernelArch} CROSS_COMPILE=$crossConfig- - fi + buildUBoot = { targetPlatforms + , filesToInstall + , installDir ? "$out" + , defconfig + , extraMeta ? {} + , ... } @ args: + stdenv.mkDerivation (rec { + + name = "uboot-${defconfig}-${version}"; + version = "2015.10"; + + nativeBuildInputs = [ bc dtc ]; + + src = fetchurl { + url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; + sha256 = "0m8r08izci0lzzjn5c5g5manp2rc7yc5swww0lxr7bamjigqvimx"; + }; + + configurePhase = '' + make ${defconfig} ''; -in -stdenv.mkDerivation rec { - name = "uboot-${defconfig}-${version}"; - version = "2015.10"; + installPhase = '' + runHook preInstall - src = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0m8r08izci0lzzjn5c5g5manp2rc7yc5swww0lxr7bamjigqvimx"; + mkdir -p ${installDir} + cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir} + + runHook postInstall + ''; + + dontStrip = true; + + crossAttrs = { + makeFlags = [ + "ARCH=${stdenv.cross.platform.kernelArch}" + "CROSS_COMPILE=${stdenv.cross.config}-" + ]; + }; + + meta = with stdenv.lib; { + homepage = "http://www.denx.de/wiki/U-Boot/"; + description = "Boot loader for embedded systems"; + license = licenses.gpl2; + maintainers = [ maintainers.dezgeg ]; + platforms = targetPlatforms; + } // extraMeta; + } // args); + +in rec { + inherit buildUBoot; + + ubootTools = buildUBoot rec { + installDir = "$out/bin"; + buildFlags = "tools NO_SDL=1"; + dontStrip = false; + targetPlatforms = stdenv.lib.platforms.linux; + filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"]; }; - patches = [ ./vexpress-Use-config_distro_bootcmd.patch ]; - - nativeBuildInputs = [ bc dtc ]; - - configurePhase = '' - make ${defconfig} - ''; - - buildPhase = assert (platform ? kernelArch); - buildFun platform.kernelArch; - - installPhase = '' - mkdir -p ${installDir} - cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir} - ''; - - dontStrip = !toolsOnly; - - crossAttrs = { - buildPhase = assert (crossPlatform ? kernelArch); - buildFun crossPlatform.kernelArch; + ubootJetsonTK1 = buildUBoot rec { + defconfig = "jetson-tk1_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"]; }; - meta = with stdenv.lib; { - homepage = "http://www.denx.de/wiki/U-Boot/"; - description = "Boot loader for embedded systems"; - license = licenses.gpl2; - maintainers = [ maintainers.dezgeg ]; - platforms = targetPlatforms; + ubootPcduino3Nano = buildUBoot rec { + defconfig = "Linksprite_pcDuino3_Nano_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + + ubootRaspberryPi = buildUBoot rec { + defconfig = "rpi_defconfig"; + targetPlatforms = ["armv6l-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + + # Intended only for QEMU's vexpress-a9 emulation target! + ubootVersatileExpressCA9 = buildUBoot rec { + defconfig = "vexpress_ca9x4_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot"]; + patches = [ ./vexpress-Use-config_distro_bootcmd.patch ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c283e4acb1..bac0f0dd8b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10574,36 +10574,13 @@ let ubootChooser = name: ubootTools; # Upstream U-Boots: - ubootTools = callPackage ../misc/uboot { - toolsOnly = true; - targetPlatforms = lib.platforms.linux; - filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"]; - }; - - ubootJetsonTK1 = callPackage ../misc/uboot { - defconfig = "jetson-tk1_defconfig"; - targetPlatforms = ["armv7l-linux"]; - filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"]; - }; - - ubootPcduino3Nano = callPackage ../misc/uboot { - defconfig = "Linksprite_pcDuino3_Nano_defconfig"; - targetPlatforms = ["armv7l-linux"]; - filesToInstall = ["u-boot-sunxi-with-spl.bin"]; - }; - - ubootRaspberryPi = callPackage ../misc/uboot { - defconfig = "rpi_defconfig"; - targetPlatforms = ["armv6l-linux"]; - filesToInstall = ["u-boot.bin"]; - }; - - # Intended only for QEMU's vexpress-a9 emulation target! - ubootVersatileExpressCA9 = callPackage ../misc/uboot { - defconfig = "vexpress_ca9x4_defconfig"; - targetPlatforms = ["armv7l-linux"]; - filesToInstall = ["u-boot"]; - }; + inherit (callPackage ../misc/uboot {}) + buildUBoot + ubootJetsonTK1 + ubootPcduino3Nano + ubootRaspberryPi + ubootVersatileExpressCA9 + ; # Non-upstream U-Boots: ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { }; From f80a5634612807befc5c6ea012c7063bb7efed06 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 25 Dec 2015 20:31:43 +0200 Subject: [PATCH 008/308] U-Boot: Build for the Banana Pi board I don't own this board, but someone on IRC reported this as working (and anyway it's practically identical to ubootPcduino3Nano since they're both Allwinner boards) --- pkgs/misc/uboot/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 981fbce0a3a..b592005e794 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -61,6 +61,12 @@ in rec { filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"]; }; + ubootBananaPi = buildUBoot rec { + defconfig = "Bananapi_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootJetsonTK1 = buildUBoot rec { defconfig = "jetson-tk1_defconfig"; targetPlatforms = ["armv7l-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bac0f0dd8b6..2472e129a9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10576,6 +10576,7 @@ let # Upstream U-Boots: inherit (callPackage ../misc/uboot {}) buildUBoot + ubootBananaPi ubootJetsonTK1 ubootPcduino3Nano ubootRaspberryPi From 5d3642eba9e8ea4bebf25aa19b2a7320a3666974 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 26 Dec 2015 07:24:17 +0200 Subject: [PATCH 009/308] U-Boot: 2015.10 -> 2016.01 --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index b592005e794..50b676aff1e 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -10,13 +10,13 @@ let stdenv.mkDerivation (rec { name = "uboot-${defconfig}-${version}"; - version = "2015.10"; + version = "2016.01"; nativeBuildInputs = [ bc dtc ]; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0m8r08izci0lzzjn5c5g5manp2rc7yc5swww0lxr7bamjigqvimx"; + sha256 = "1md5jpq5n9jh08s7sdkjrvg2q7kpzwa7yrpgl9581ncrjfx2yyg5"; }; configurePhase = '' From e9b80f39721965ecbcd384ef6faeb3b661d3a3a7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 25 Dec 2015 20:55:22 +0200 Subject: [PATCH 010/308] U-Boot: Build for the Wandboard board From v2016.01 onwards, the Wandboards boot using the distro bootcmd stuff as well. Tested on a Wandboard Quad. --- pkgs/misc/uboot/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 50b676aff1e..4d1d3d73990 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -92,4 +92,10 @@ in rec { filesToInstall = ["u-boot"]; patches = [ ./vexpress-Use-config_distro_bootcmd.patch ]; }; + + ubootWandboard = buildUBoot rec { + defconfig = "wandboard_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot.img" "SPL"]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2472e129a9a..8fc516621d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10581,6 +10581,7 @@ let ubootPcduino3Nano ubootRaspberryPi ubootVersatileExpressCA9 + ubootWandboard ; # Non-upstream U-Boots: From b6621196e07429ed416ff426cc1e398cfc70a5d6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 25 Dec 2015 20:35:59 +0200 Subject: [PATCH 011/308] sd-image-armv7l-multiplatform.nix: Add ttymxc0 to the list of consoles Needed for the RS-232 port on Wandboard Quad (and presumably other boards using the i.MX6 SoC). --- .../modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 15e22fb50d4..957a8ff9ce6 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -23,7 +23,7 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; + boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; From 4cf9bf9eb00e85ab1b2d117b767aff81cb1c39b2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 26 Dec 2015 07:28:19 +0200 Subject: [PATCH 012/308] sd-image.nix: Move the /boot partition up to 8M Reportedly some ARM boards need some boot code at the start of a SD card that could be larger than a megabyte. Change it to 8M, and while at it reduce the /boot size such that the root partition should now start on a 128M boundary (the flash on SD cards really don't like non-aligned writes these days). --- nixos/modules/installer/cd-dvd/sd-image.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 12b4f304561..9eba542d8c9 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -30,7 +30,7 @@ in bootSize = mkOption { type = types.int; - default = 128; + default = 120; description = '' Size of the /boot partition, in megabytes. ''; @@ -66,10 +66,10 @@ in buildInputs = with pkgs; [ dosfstools e2fsprogs mtools libfaketime utillinux ]; buildCommand = '' - # Create the image file sized to fit /boot and /, plus 4M of slack + # Create the image file sized to fit /boot and /, plus 20M of slack rootSizeBlocks=$(du -B 512 --apparent-size ${rootfsImage} | awk '{ print $1 }') bootSizeBlocks=$((${toString config.sdImage.bootSize} * 1024 * 1024 / 512)) - imageSize=$((rootSizeBlocks * 512 + bootSizeBlocks * 512 + 4096 * 1024)) + imageSize=$((rootSizeBlocks * 512 + bootSizeBlocks * 512 + 20 * 1024 * 1024)) truncate -s $imageSize $out # type=b is 'W95 FAT32', type=83 is 'Linux'. @@ -77,8 +77,8 @@ in label: dos label-id: 0x2178694e - start=1M, size=$bootSizeBlocks, type=b, bootable - type=83 + start=8M, size=$bootSizeBlocks, type=b, bootable + start=${toString (8 + config.sdImage.bootSize)}M, type=83 EOF # Copy the rootfs into the SD image From b2a91caea06ef77bc8bcfd7c77f095984edaefe6 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Tue, 2 Feb 2016 10:14:26 -0500 Subject: [PATCH 013/308] vim_configurable: add configuration option for XIM support --- pkgs/applications/editors/vim/configurable.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index e2715b1499a..2a80f5d42ad 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -154,6 +154,7 @@ composableDerivation { multibyteSupport = config.vim.multibyte or false; cscopeSupport = config.vim.cscope or true; netbeansSupport = config.netbeans or true; # eg envim is using it + ximSupport = config.vim.xim or false; # by default, compile with darwin support if we're compiling on darwin, but # allow this to be disabled by setting config.vim.darwin to false From 46ecb25d68ba94248945ba9dfebe8fafcf70ed15 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Thu, 4 Feb 2016 11:31:28 +0800 Subject: [PATCH 014/308] facetimehd: blacklist bdc_pci when enabled --- nixos/modules/hardware/video/webcam/facetimehd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix index 83d954a0c03..b35709763b9 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -23,6 +23,8 @@ in boot.kernelModules = [ "facetimehd" ]; + boot.blacklistedKernelModules = [ "bdc_pci" ]; + boot.extraModulePackages = [ kernelPackages.facetimehd ]; hardware.firmware = [ pkgs.facetimehd-firmware ]; From b99e339419d92de701cac0e026a6309eccc5674c Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 6 Feb 2016 04:16:48 +0200 Subject: [PATCH 015/308] cairocffi: need some fonts at build time --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 169a2e17514..5c00687ce89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2609,6 +2609,13 @@ in modules // { }; LC_ALL = "en_US.UTF-8"; + + # checkPhase require at least one 'normal' font and one 'monospace', + # otherwise glyph tests fails + FONTCONFIG_FILE = pkgs.makeFontsConf { + fontDirectories = [ pkgs.freefont_ttf ]; + }; + buildInputs = with self; [ pytest pkgs.glibcLocales ]; propagatedBuildInputs = with self; [ pkgs.cairo cffi ]; From 92dc00d0fdbfafa58bb82e9ed8657de5dfed53a6 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 9 Dec 2015 22:07:23 -0500 Subject: [PATCH 016/308] pfixtools: init at 0.9 --- pkgs/servers/mail/postfix/pfixtools.nix | 48 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/servers/mail/postfix/pfixtools.nix diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix new file mode 100644 index 00000000000..f45dd3b7248 --- /dev/null +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -0,0 +1,48 @@ +{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkgconfig, bash, libsrs2 }: + +let + version = "0.9"; + + pfixtoolsSrc = fetchFromGitHub { + owner = "Fruneau"; + repo = "pfixtools"; + rev = "pfixtools-${version}"; + sha256 = "1vmbrw686f41n6xfjphfshn96vl07ynvnsyjdw9yfn9bfnldcjcq"; + }; + + srcRoot = "pfixtools-${pfixtoolsSrc.rev}-src"; + + libCommonSrc = fetchFromGitHub { + owner = "Fruneau"; + repo = "libcommon"; + rev = "b07e6bdea3d24748e0d39783d7d817096d10cc67"; + sha256 = "14fxldp29j4vmfmhfgwwi37pj8cz0flm1aykkxlbgakz92d4pm35"; + }; + +in + +stdenv.mkDerivation { + name = "pfixtools-${version}"; + + src = pfixtoolsSrc; + + buildInputs = [git gperf pcre unbound libev tokyocabinet pkgconfig bash libsrs2]; + + postUnpack = '' + cp -Rp ${libCommonSrc}/* ${srcRoot}/common; + chmod -R +w ${srcRoot}/common; + ''; + + postPatch = '' + substituteInPlace postlicyd/policy_tokens.sh \ + --replace /bin/bash ${bash}/bin/bash; + ''; + + makeFlags = "DESTDIR=$(out) prefix="; + + meta = { + description = "a collection of postfix-related tools"; + license = with lib.licenses; [ bsd3 ]; + homepage = https://github.com/Fruneau/pfixtools; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f9d214bf1b..3103c59b09f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9455,6 +9455,8 @@ let rspamd = callPackage ../servers/mail/rspamd { }; + pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { }; + pshs = callPackage ../servers/http/pshs { }; libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; }; From 12ca23d6500cb787de795fce1f694ead359a01db Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Fri, 5 Feb 2016 18:03:20 +0000 Subject: [PATCH 017/308] linux-testing: 4.4-rc8 -> 4.5-rc2 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index c70d6f79f38..4128edea7c2 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4-rc8"; - modDirVersion = "4.4.0-rc8"; - extraMeta.branch = "4.4"; + version = "4.5-rc2"; + modDirVersion = "4.5.0-rc2"; + extraMeta.branch = "4.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0cwf80lryzhdajd3r97b33ym5njjpf5rbcbjzz7lja0w9xs1dvwj"; + sha256 = "1nq61nimgvl7m7rrimr95ixwkc5sd473m5kvaf5qdyhfnh7m4br3"; }; features.iwlwifi = true; From 20bb296be60feda7741ed680e53761a954f21423 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 7 Feb 2016 18:51:28 +0900 Subject: [PATCH 018/308] cmst: 2014.12.05 -> 2016.01.28 --- pkgs/tools/networking/cmst/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 1b5767653fe..24010e20f37 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, qtbase, makeWrapper, libX11 }: +{ stdenv, fetchFromGitHub, qtbase, makeWrapper, libX11 }: stdenv.mkDerivation rec { - name = "cmst-2014.12.05"; - rev = "refs/tags/${name}"; - src = fetchgit { - url = "git://github.com/andrew-bibb/cmst.git"; - inherit rev; - sha256 = "070rxv3kyn41ra7nnk1wbqvy6fjg38h7hrdv4dn71b201kmzd194"; + name = "cmst-2016.01.28"; + + src = fetchFromGitHub { + sha256 = "1zf4jnrnbi05mrq1fnsji5zx60h1knrkr64pwcz2c7q8p59k4646"; + rev = name; + repo = "cmst"; + owner = "andrew-bibb"; }; buildInputs = [ qtbase makeWrapper ]; @@ -27,7 +28,6 @@ stdenv.mkDerivation rec { substituteInPlace ./apps/rootapp/rootapp.pro \ --replace "/etc" "$out/etc" \ --replace "/usr/share" "$out/share" - ''; buildPhase = '' From f91f99aff827e43c10373e393636e9af12c28f66 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 7 Feb 2016 15:54:49 +0300 Subject: [PATCH 019/308] dwarf-fortress: fix help --- pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in index 1fd6178895d..c5157e82d8a 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in @@ -39,3 +39,4 @@ done forcecopy_path data/index # For some reason, it's needed to be writable... forcecopy_path data/announcement +forcecopy_path data/help From c6e94f9fa0dd88ee4b8c0124b08ce787509c7301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 7 Feb 2016 14:42:22 +0100 Subject: [PATCH 020/308] sc-im: fix download by using fetchFromGitHub Otherwise the hashes would change periodically. Also refactor meta. /cc maintainer @matthiasbeyer. --- pkgs/applications/misc/sc-im/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 29f347522fa..cb18278d1ed 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, ncurses, libxml2 }: +{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }: let version = "0.2.1"; @@ -7,9 +7,11 @@ stdenv.mkDerivation rec { name = "sc-im-${version}"; - src = fetchurl { - url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz"; - sha256 = "08yks8grj5w434r81dy2knzbdhdnkc23r0d9v848mcl706xnjl6j"; + src = fetchFromGitHub { + owner = "andmarti1424"; + repo = "sc-im"; + rev = "v${version}"; + sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb"; }; buildInputs = [ yacc ncurses libxml2 ]; @@ -28,12 +30,12 @@ stdenv.mkDerivation rec { make install prefix= ''; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/andmarti1424/sc-im"; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; - license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; # Cannot test others + license = licenses.bsdOriginal; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; # Cannot test others }; } From 4b4d5c96c8ef976384fd00e67d1e21a1bb818fe7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 7 Feb 2016 12:11:31 +0100 Subject: [PATCH 021/308] bats: init at 4.0.4 --- .../development/interpreters/bats/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/interpreters/bats/default.nix diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix new file mode 100644 index 00000000000..4eb86460be9 --- /dev/null +++ b/pkgs/development/interpreters/bats/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "bats-${version}"; + version = "0.4.0"; + + src = fetchzip { + url = "https://github.com/sstephenson/bats/archive/v${version}.tar.gz"; + sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm"; + }; + + installPhase = "./install.sh $out"; + + meta = with stdenv.lib; { + homepage = https://github.com/sstephenson/bats; + description = "Bash Automated Testing System"; + maintainers = [ maintainers.lnl7 ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdc8acfd494..be51cff6fe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -988,6 +988,8 @@ let bareos = callPackage ../tools/backup/bareos { }; + bats = callPackage ../development/interpreters/bats { }; + beanstalkd = callPackage ../servers/beanstalkd { }; beets = callPackage ../tools/audio/beets { }; From ea85ac9f15a129453b37bb9a6426887a5b767942 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 6 Feb 2016 18:04:11 -0800 Subject: [PATCH 022/308] powerline-fonts: 2015-06-29 -> 2015-12-11 (close #12856) --- pkgs/data/fonts/powerline-fonts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 63b4ad1ea04..6d620c09f06 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "powerline-fonts-2015-06-29"; + name = "powerline-fonts-2015-12-11"; src = fetchFromGitHub { owner = "powerline"; repo = "fonts"; - rev = "97dc451724fb24e1dd9892c988642b239b5dc67c"; - sha256 = "1m0a8k916s74iv2k0kk36dz7d2hfb2zgf8m0b9hg71w4yd3bmj4w"; + rev = "a44abd0e742ad6e7fd8d8bc4c3cad5155c9f3a92"; + sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn"; }; buildPhase = "true"; From 75739fd05b5d646d007e4df3c94bdefb5c12845d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 7 Feb 2016 14:43:10 +0000 Subject: [PATCH 023/308] python3Packages.samplerate: fix revision --- pkgs/top-level/python-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ff7b67d650..04312ca1f23 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7054,15 +7054,15 @@ in modules // { name = "scikits.samplerate-${version}"; version = "0.3.3"; src = pkgs.fetchgit { - url = https://github.com/ThomasLecocq/samplerate; - rev = "7edb22b23f5aa8e7342aea0b538bdd0434988510"; - sha256 = "ec2a09819c38028283505090ee9839963d3557e73f6e8eb3348ff8884d0d67ed"; - }; + url = https://github.com/cournape/samplerate; + rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; + sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg"; + }; + buildInputs = with self; [ pkgs.libsamplerate ]; propagatedBuildInputs = with self; [ numpy ]; - preConfigure = '' cat > site.cfg << END [samplerate] From 66c3f7463b1c2c81ffdd7ebea6b786ea2882808e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 7 Feb 2016 16:12:39 +0000 Subject: [PATCH 024/308] cdk: pin url to a version to prevent hash changes --- pkgs/development/libraries/cdk/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 94edc46fc4c..614d57002cd 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -1,18 +1,23 @@ -{stdenv, fetchurl, ncurses}: +{ stdenv, fetchurl, ncurses }: + let + version = "5.0-20160131"; +in +stdenv.mkDerivation { + name = "cdk-${version}"; + inherit version; + buildInputs = [ ncurses ]; -in -stdenv.mkDerivation { - name = "cdk"; - inherit buildInputs; + src = fetchurl { - url = "http://invisible-island.net/datafiles/release/cdk.tar.gz"; - sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; + url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz"; + sha256 = "08ic2f5rmi8niaxwxwr6l6lhpan7690x52vpldnbjcf20rc0fbf3"; }; + meta = { - description = ''Curses development kit''; + description = "Curses development kit"; license = stdenv.lib.licenses.bsdOriginal ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; From b13e44e094989d3a902f8c73b22e8d3c0cc7acf4 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 6 Feb 2016 09:11:53 +0200 Subject: [PATCH 025/308] cairocffi: Add missing dependencies on gdk_pixbuf Rewrite dlopening stuff in hacky way (due ctypes.util totally brokennes: it attempt to use /sbin/ldconfig, gcc from PATH and other tricks to detect sonames, I replaced it with simple table lookup) Also I add patch to bypass another rounding regression in tests (this patch submitted upstream as well) --- .../cairocffi/dlopen-paths.patch | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 ++++++-- 2 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/cairocffi/dlopen-paths.patch diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch new file mode 100644 index 00000000000..bc5e939ceba --- /dev/null +++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch @@ -0,0 +1,47 @@ +commit 705dc9a55bd160625d9996e63fc7dc532d0ad0ab +Author: Alexander V. Nikolaev +Date: Sat Feb 6 08:09:06 2016 +0200 + + Patch dlopen() to allow direct paths to all required libs + + This patch is NixOS specific + +diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py +index 718aa7f..1a1dcff 100644 +--- a/cairocffi/__init__.py ++++ b/cairocffi/__init__.py +@@ -27,20 +27,22 @@ VERSION = '0.7.2' + version = '1.10.0' + version_info = (1, 10, 0) + ++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime ++_LIBS = { ++ 'cairo': '@cairo@/lib/libcairo.so.2', ++ 'glib-2.0': '@glib@/lib/libglib-2.0.so.0', ++ 'gobject-2.0': '@glib@/lib/libgobject-2.0.so.0', ++ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0', ++} + +-def dlopen(ffi, *names): ++def dlopen(ffi, name, *names): + """Try various names for the same library, for different platforms.""" +- for name in names: +- for lib_name in [name, 'lib' + name]: +- try: +- path = ctypes.util.find_library(lib_name) +- if path: +- lib = ffi.dlopen(path) +- if lib: +- return lib +- except OSError: +- pass +- raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names)) ++ path = _LIBS.get(name, None) ++ if path: ++ lib = ffi.dlopen(path) ++ if lib: ++ return lib ++ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path)) + + + cairo = dlopen(ffi, 'cairo', 'cairo-2') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c00687ce89..19c65f5de4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2623,17 +2623,29 @@ in modules // { py.test $out/${python.sitePackages} ''; - # Marked broken since according to test + # FIXME: make gdk_pixbuf dependency optional (as wel as xcfffi) # Happens with 0.7.1 and 0.7.2 # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 - patchPhase = '' + patches = [ + # This patch from PR substituted upstream + (pkgs.fetchpatch { + url = "https://github.com/avnik/cairocffi/commit/2266882e263c5efc87350cf016d117b2ec6a1d59.patch"; + sha256 = "0gb570z3ivf1b0ixsk526n3h29m8c5rhjsiyam7rr3x80dp65cdl"; + }) + + ../development/python-modules/cairocffi/dlopen-paths.patch + ]; + + postPatch = '' # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py + # FIXME: for closure-size branch all pkgs.foo should be replaced with pkgs.foo.lib + substituteInPlace cairocffi/__init__.py --subst-var-by cairo ${pkgs.cairo} + substituteInPlace cairocffi/__init__.py --subst-var-by glib ${pkgs.glib} + substituteInPlace cairocffi/__init__.py --subst-var-by gdk_pixbuf ${pkgs.gdk_pixbuf} ''; meta = { - broken = true; homepage = https://github.com/SimonSapin/cairocffi; license = "bsd"; description = "cffi-based cairo bindings for Python"; From 23a9b9b88a06923f1afc0eede65f2c0b73125886 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 7 Feb 2016 17:16:30 +0100 Subject: [PATCH 026/308] rrdtool: move perl libraries to the expected place closes #12801 --- pkgs/tools/misc/rrdtool/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 11f9d32b154..524e61dfaf3 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]; postInstall = '' - # for munin support - mv $out/lib/perl/5*/*/*.pm $out/lib/perl/5*/ + # for munin and rrdtool support + mkdir -p $out/lib/perl5/site_perl/ + mv $out/lib/perl/5* $out/lib/perl5/site_perl/ ''; meta = with stdenv.lib; { From 9a5a967d0d7bdaf729679d1e66717a56c106d12f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 7 Feb 2016 16:41:16 +0000 Subject: [PATCH 027/308] nodePackages.oauth: pin url to version --- pkgs/top-level/node-packages-generated.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 6a3cdd9f7de..1c68d1badc8 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -29315,7 +29315,7 @@ version = "0.9.12"; bin = false; src = fetchurl { - url = "https://github.com/ciaranj/node-oauth/tarball/master"; + url = "https://github.com/ciaranj/node-oauth/tarball/0.9.12"; name = "oauth-0.9.12.tgz"; sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7"; }; From 2bd28145876f28891805000ed9efc81bbf6482fc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 7 Feb 2016 22:39:11 +0000 Subject: [PATCH 028/308] nodePackages.oauth: use fetchFromGitHub fixup to 9a5a967 --- pkgs/top-level/node-packages-generated.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 1c68d1badc8..12d0aff2616 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1,4 +1,4 @@ -{ self, fetchurl, fetchgit ? null, lib }: +{ self, fetchurl, fetchgit ? null, fetchFromGitHub, lib }: { by-spec."Base64"."~0.2.0" = @@ -29314,10 +29314,11 @@ name = "oauth-0.9.12"; version = "0.9.12"; bin = false; - src = fetchurl { - url = "https://github.com/ciaranj/node-oauth/tarball/0.9.12"; - name = "oauth-0.9.12.tgz"; - sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7"; + src = fetchFromGitHub { + owner = "ciaranj"; + repo = "node-oauth"; + rev = "0.9.12"; + sha256 = "1c67nq1q5isfcvyp520q02w5c527s1wsfiyknzfvvp22sf2yn7k6"; }; deps = { }; From a708bce08b9ecdc25c53d1bde22be66aba80b772 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 7 Feb 2016 22:55:32 +0100 Subject: [PATCH 029/308] screen-message: add git mirror (darcs fails) in response to #12868 --- pkgs/tools/X11/screen-message/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix index 977a82230a5..87487442ada 100644 --- a/pkgs/tools/X11/screen-message/default.nix +++ b/pkgs/tools/X11/screen-message/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchdarcs, autoreconfHook, pkgconfig, gtk3 }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk3 }: stdenv.mkDerivation { name = "screen-message-0.23"; - src = fetchdarcs { - url = "http://darcs.nomeata.de/screen-message.debian"; - rev = "0.23-1"; + srcs = fetchgit { + url = "git://git.nomeata.de/darcs-mirror-screen-message.debian.git"; + rev = "refs/tags/0_23-1"; + sha256 = "fddddd28703676b2908af71cca7225e6c7bdb15b2fdfd67679cac129028a431c"; }; buildInputs = [ autoreconfHook pkgconfig gtk3 ]; From ce99feec689b5c5832db1e344246110605e0e3b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Feb 2016 00:36:38 +0100 Subject: [PATCH 030/308] zstd: 0.4.7 -> 0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit “New: dictionary builder tool Changed: advanced API for streaming and dictionary compression Improved: better compression of small data.” --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index d60b4b3614a..e095b2d4e07 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { - sha256 = "09l917979qfqk44dbgsa9vs37a2qj4ga43553zcgvnps02wlja8s"; + sha256 = "18jwhvzj3kv8lpr6fgild7a574lsak93fc1z8nvhcdbc1b1n2dsj"; rev = "v${version}"; repo = "zstd"; owner = "Cyan4973"; From e4c9fa40a6712151e1ea65604a18d6e8f2c65c9f Mon Sep 17 00:00:00 2001 From: Ian Grant Jeffries Date: Sun, 7 Feb 2016 01:38:24 -0500 Subject: [PATCH 031/308] vim-plugins: add vinegar --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 59a46ea7bf8..cf3eb8d09f3 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1586,6 +1586,17 @@ rec { }; + vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vinegar-2016-01-30"; + src = fetchgit { + url = "git://github.com/tpope/vim-vinegar"; + rev = "75fc3824bc09053f22735d6726c5cfd614c15642"; + sha256 = "19fc1487169f1d8941ffddda1ffadd842ef4a773de2d32536eae52cf494154a6"; + }; + dependencies = []; + + }; + vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vundle-2015-11-04"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 207eed69160..a4dca009cdd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -122,4 +122,5 @@ "vim-webdevicons" "vim2hs" "vimwiki" +"vinegar" "vundle" From 9a72bf5c0fa8c6d265c3fe0df5f2842b21519cd7 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 5 Feb 2016 14:49:27 +0100 Subject: [PATCH 032/308] udev: sane: fix udev error The new udev checks that no script references any absolute /bin/sh paths, so this patches that out. --- pkgs/applications/graphics/sane/backends/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 8f46e647252..2ee5e1ddcf5 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation { mkdir -p $out/etc/udev/rules.d/ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules + # the created 49-libsane references /bin/sh + substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ + -- replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}" substituteInPlace $out/lib/libsane.la \ --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg" From ae6f06be03af07d216cf9e641a0a0890ef668222 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 8 Feb 2016 09:56:23 +0900 Subject: [PATCH 033/308] oraclejdk: 8u71, 8u72 -> 8u73, 8u74 --- pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 6 +++--- pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index b71c97d5622..48a586ffb0f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "71"; + patchVersion = "73"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "11wcizv4gvlffzn2wj34ffwrq21xwh4ikg2vjv63avdfp2hazjqv"; - sha256_x86_64 = "18jqdrlbv4sdds2hlmp437waq7r9b33f7hdp8kb6l7pkrizr9nwv"; + sha256_i686 = "1bi3yj2ds9w13p2lzvmxffk5gax8syi3bw52w8pam1jr3fmzgwgl"; + sha256_x86_64 = "1rp3nbnhkncyr48m0nn3pf5fr4bp3lzm0ki4gca7mn7rzag19a26"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index f4bb68500d2..0f6c4ad668a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "72"; + patchVersion = "74"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "023rnlm5v7d9w4d7bgcac8j0r1vqkbv6fl20k8354pzpdjg6liaq"; - sha256_x86_64 = "167ca39a6y0n8l87kdm5nv2hrp0wf6g4mw1rbychjc04f5igkrs6"; + sha256_i686 = "1vc3g89fbrmznb10bhh5gs143hcjg4wsy4j4hwnr1djfj83y8188"; + sha256_x86_64 = "1pfx7il1h42w3kigscdvm9vfy616lmsp1d2cqvplim3nyxwmvz8b"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; From b2c658ca1176f8985ea75f10519a5630244b2d87 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 8 Feb 2016 13:29:42 +0900 Subject: [PATCH 034/308] i3: dmenu and i3status as runtime dependencies --- pkgs/applications/window-managers/i3/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 8cd7932a8d1..0833fde8c9e 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl , xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb_run }: +, xorgserver, xvfb_run, dmenu, i3status }: stdenv.mkDerivation rec { name = "i3-${version}"; @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { patchShebangs . ''; + postFixup = '' + substituteInPlace $out/etc/i3/config --replace dmenu_run ${dmenu}/bin/dmenu_run + substituteInPlace $out/etc/i3/config --replace "status_command i3status" "status_command ${i3status}/bin/i3status" + substituteInPlace $out/etc/i3/config.keycodes --replace dmenu_run ${dmenu}/bin/dmenu_run + substituteInPlace $out/etc/i3/config.keycodes --replace "status_command i3status" "status_command ${i3status}/bin/i3status" + ''; + # Tests have been failing (at least for some people in some cases) # and have been disabled until someone wants to fix them. Some # initial digging uncovers that the tests call out to `git`, which From f03ce60bd228734ef64c1ae5eaee639332bb1dc2 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 8 Feb 2016 13:31:03 +0900 Subject: [PATCH 035/308] i3service: remove dmenu and i3 from env packages --- nixos/modules/services/x11/window-managers/i3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index d43dacb1be6..2e2e10cc33b 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -34,6 +34,6 @@ in ''; }]; }; - environment.systemPackages = with pkgs; [ i3 i3status dmenu ]; + environment.systemPackages = with pkgs; [ i3 ]; }; } From 65beea69d75f05aa0ac5f00baec2e2ead4345f15 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 8 Feb 2016 13:20:44 +0900 Subject: [PATCH 036/308] i3status: 2.9 -> 2.10, fixes #12872 --- pkgs/applications/window-managers/i3/status.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 97b200e340e..1693e7ed0fd 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,18 +1,17 @@ -{ fetchurl, stdenv, confuse, yajl, alsaLib, wirelesstools +{ fetchurl, stdenv, confuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig }: stdenv.mkDerivation rec { - name = "i3status-2.9"; + name = "i3status-2.10"; src = fetchurl { url = "http://i3wm.org/i3status/${name}.tar.bz2"; - sha256 = "1qwxbrga2fi5wf742hh9ajwa8b2kpzkjjnhjlz4wlpv21i80kss2"; + sha256 = "1497dsvb32z9xljmxz95dnyvsbayn188ilm3l4ys8m5h25vd1xfs"; }; - buildInputs = [ confuse yajl alsaLib wirelesstools ]; + buildInputs = [ confuse yajl alsaLib libpulseaudio libnl pkgconfig ]; - makeFlags = "all"; - installFlags = "PREFIX=\${out}"; + makeFlags = [ "all" "PREFIX=$(out)" ]; meta = { description = "A tiling window manager"; From 3c168a714e4da8a498ee8a8a4c8bd03e7c70d964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 8 Feb 2016 13:09:29 +0800 Subject: [PATCH 037/308] dvtm: 0.14 -> 0.15 --- pkgs/tools/misc/dvtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 32d6b6fa6ef..5969c956236 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "dvtm-0.14"; + name = "dvtm-0.15"; meta = { description = "Dynamic virtual terminal manager"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "0ykl8dz7ivjgdzhmhlgidnp2ffh5gxq9lbg276w7iid4z10v76wa"; + sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g"; }; buildInputs = [ ncurses ]; From 9afe794f5eac3830c7df932a739520f2d3ecc0bf Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 8 Feb 2016 10:10:38 +0000 Subject: [PATCH 038/308] coqPackages.contribs.Bertrand: fix hash --- pkgs/development/coq-modules/contribs/all.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix index d01c32bdb0a..d2ef82c5587 100644 --- a/pkgs/development/coq-modules/contribs/all.nix +++ b/pkgs/development/coq-modules/contribs/all.nix @@ -11,7 +11,7 @@ AreaMethod = "07d86p5xbnhbrily18hda0hymf3zx8yhw905plmrqyfbcc6x5531"; Automata = "0g75gjdj79ysiq1pwqk658jxs2z1l8pk702iz69008vkjzbzkhvm"; AxiomaticABP = "19x16dgsqyw2pflza8cgv29585a6yy3r8pz4z8ns3r7qhpp1449b"; BDDs = "0s5a67w9v1lklph8dm4d9bkd6f9qzfb377gvisr3hslacn9ya8zy"; -Bertrand = "1ih0zbk3phk0zwms0mwkcikmki25hgbp1l980gpydj5a0s9ildyg"; +Bertrand = "05i6xw9gi5ad78rsw5pfhiqllw9x4q4phfi4ddzlxpsgshiw7d0k"; Buchberger = "1v7zi62ar4inncbcphalsyaggx8im02j81b0fnpvx2x3kyv2pr94"; CCS = "1na7902k05z19a727wa7rz0dbf1fhcl53r4zxvcgvg5dasvwfc97"; CFGV = "13gk597r9n2wcgcbhribsqrp9wb8mmr3qd4zbv2ig8469kng0j4m"; From 37d67b0cdfbf6ce6cb57a4ada70e715275c0410f Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Mon, 8 Feb 2016 14:11:38 +0000 Subject: [PATCH 039/308] haskell.packages.ghc801: Update to RC 2 --- pkgs/development/compilers/ghc/8.0.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 7f337c01953..d24ad4106ee 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "8.0.0.20160111"; + version = "8.0.0.20160204"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.1-rc1/${name}-src.tar.xz"; - sha256 = "0y4nha46mw01ysw90kh8szcbsfdc37rqjm7r5fyk6flqwr8b6pvr"; + url = "https://downloads.haskell.org/~ghc/8.0.1-rc2/${name}-src.tar.xz"; + sha256 = "0v8pciva93i4a6h0l76vq6bbvrg76b1y4awwbxcg3m9gnqkvmy2k"; }; patches = [ From 371b57a716feeaa5309ebb376aceab62371c2348 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 8 Feb 2016 16:28:20 +0000 Subject: [PATCH 040/308] lr: init at 0.2 --- pkgs/tools/system/lr/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/system/lr/default.nix diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix new file mode 100644 index 00000000000..47233532df3 --- /dev/null +++ b/pkgs/tools/system/lr/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +let + version = "0.2"; +in +stdenv.mkDerivation { + name = "lr-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "lr"; + rev = "v${version}"; + sha256 = "1wn1j0cf84r4nli92myf3waackh2p6r2hkavgx6533x15kdyfnf7"; + }; + + makeFlags = "PREFIX=$(out)"; + + meta = { + homepage = "http://github.com/chneukirchen/lr"; + description = "List files recursively"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainers = [stdenv.lib.maintainers.globin]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be51cff6fe5..e103d1e5b53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2236,6 +2236,8 @@ let lout = callPackage ../tools/typesetting/lout { }; + lr = callPackage ../tools/system/lr { }; + lrzip = callPackage ../tools/compression/lrzip { }; # lsh installs `bin/nettle-lfib-stream' and so does Nettle. Give the From 05a8185fdae5d6236c93087f25bca4744881e089 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 8 Feb 2016 12:29:37 +0100 Subject: [PATCH 041/308] icedtea_web: 1.6.1 -> 1.6.2 --- pkgs/development/compilers/icedtea-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index 863c74bc4c1..fb03d98dbdc 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "0869j9jn0z5b5pfspp4v5cj2ksmbqmmmjhqicn4kqc6wr6v6md59"; + sha256 = "004kwrngyxxlrlzby4vzxjr0xcyngcdc9dfgnvi61ffnjr006ryf"; }; nativeBuildInputs = [ pkgconfig bc perl ]; From e5b143a964e3de7f7a4c08f8fe813ae1f9228287 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Feb 2016 19:15:41 +0100 Subject: [PATCH 042/308] geolite-legacy 2016-02-02 -> 2016-02-08 --- pkgs/data/misc/geolite-legacy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index b8d07106565..2be23b0f35c 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2016-02-02"; + version = "2016-02-08"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { "0fnlznn04lpkkd7sy9r9kdl3fcp8ix7msdrncwgz26dh537ml32z"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "1h47n8fn9dfjw672jbw67mn03bidaahwnkra464ggy1q4pwkvncs"; + "0ib93p2fwayqsxwph98rkgln7xpjrwhzzc06sc74876jpaq3g8g5"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "0nnfp8xzrlcdvy8lvsw2mvfmxavj2gmm7bvr0l2pv07n863b873y"; + "1izlxqcvdag66sny5zjjwkmjhai0c9m77b96j117n0x0awrrk4h9"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; From 63cf61e8d37afd46992792a927f263a1ee92c673 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 4 Feb 2016 21:30:39 +0100 Subject: [PATCH 043/308] pythonPackages: new functions to build numpy and scipy --- .../python-modules/numpy-scipy-support.nix | 35 ------- pkgs/development/python-modules/numpy.nix | 51 ++++++++++ pkgs/development/python-modules/scipy.nix | 47 ++++++++++ pkgs/top-level/python-packages.nix | 94 ++++--------------- 4 files changed, 117 insertions(+), 110 deletions(-) delete mode 100644 pkgs/development/python-modules/numpy-scipy-support.nix create mode 100644 pkgs/development/python-modules/numpy.nix create mode 100644 pkgs/development/python-modules/scipy.nix diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix deleted file mode 100644 index 422de794e31..00000000000 --- a/pkgs/development/python-modules/numpy-scipy-support.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - # Python package expression - python, - # Name of package (e.g. numpy or scipy) - pkgName, - # OpenBLAS math library - openblas -}: - -{ - # Re-export openblas here so that it can be sure that the same one will be used - # in the propagatedBuildInputs. - inherit openblas; - - # First "install" the package, then import what was installed, and call the - # .test() function, which will run the test suite. - checkPhase = '' - runHook preCheck - pushd dist - ${python.interpreter} -c 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)' - popd - runHook postCheck - ''; - - # Creates a site.cfg telling the setup script where to find depended-on - # math libraries. - preBuild = '' - echo "Creating site.cfg file..." - cat << EOF > site.cfg - [openblas] - include_dirs = ${openblas}/include - library_dirs = ${openblas}/lib - EOF - ''; -} diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix new file mode 100644 index 00000000000..141c8b14fa6 --- /dev/null +++ b/pkgs/development/python-modules/numpy.nix @@ -0,0 +1,51 @@ +{lib, python, buildPythonPackage, isPyPy, gfortran, nose, blas}: + +args: + +let + inherit (args) version; +in buildPythonPackage (args // rec { + + name = "numpy-${version}"; + + disabled = isPyPy; + buildInputs = args.buildInputs or [ gfortran nose ]; + propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ]; + + preConfigure = '' + sed -i 's/-faltivec//' numpy/distutils/system_info.py + ''; + + preBuild = '' + echo "Creating site.cfg file..." + cat << EOF > site.cfg + [openblas] + include_dirs = ${passthru.blas}/include + library_dirs = ${passthru.blas}/lib + EOF + ''; + + checkPhase = '' + runHook preCheck + pushd dist + ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' + popd + runHook postCheck + ''; + + passthru = { + blas = blas; + }; + + # The large file support test is disabled because it takes forever + # and can cause the machine to run out of disk space when run. + prePatch = '' + sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py + ''; + + meta = { + description = "Scientific tools for Python"; + homepage = "http://numpy.scipy.org/"; + maintainers = with lib.maintainers; [ fridh ]; + } // (args.meta or {}); +}) diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix new file mode 100644 index 00000000000..ae312cd32d5 --- /dev/null +++ b/pkgs/development/python-modules/scipy.nix @@ -0,0 +1,47 @@ +{lib, python, buildPythonPackage, isPyPy, gfortran, nose}: + +args: + +let + inherit (args) version; + inherit (args) numpy; +in buildPythonPackage (args // rec { + + name = "scipy-${version}"; + + buildInputs = (args.buildInputs or [ gfortran nose ]); + propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]); + + preConfigure = '' + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + ''; + + preBuild = '' + echo "Creating site.cfg file..." + cat << EOF > site.cfg + [openblas] + include_dirs = ${passthru.blas}/include + library_dirs = ${passthru.blas}/lib + EOF + ''; + + checkPhase = '' + runHook preCheck + pushd dist + ${python.interpreter} -c 'import scipy; scipy.test("fast", verbose=10)' + popd + runHook postCheck + ''; + + passthru = { + blas = numpy.blas; + }; + + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + + meta = { + description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; + homepage = http://www.scipy.org/; + maintainers = with lib.maintainers; [ fridh ]; + } // (args.meta or {}); +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18671f3b4c7..65a8279ec92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12505,48 +12505,20 @@ in modules // { }; }; - numpy = let - support = import ../development/python-modules/numpy-scipy-support.nix { - inherit python; - openblas = pkgs.openblasCompat; - pkgName = "numpy"; - }; - in buildPythonPackage ( rec { - name = "numpy-${version}"; - version = "1.10.4"; + buildNumpyPackage = callPackage ../development/python-modules/numpy.nix { + gfortran = pkgs.gfortran; + blas = pkgs.openblasCompat; + }; + numpy = self.numpy_1_10; + + numpy_1_10 = self.buildNumpyPackage rec { + version = "1.10.4"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/n/numpy/${name}.tar.gz"; + url = "https://pypi.python.org/packages/source/n/numpy/numpy-${version}.tar.gz"; sha256 = "7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b"; }; - - disabled = isPyPy; # WIP - - preConfigure = '' - sed -i 's/-faltivec//' numpy/distutils/system_info.py - ''; - - inherit (support) preBuild checkPhase; - - buildInputs = [ pkgs.gfortran self.nose ]; - propagatedBuildInputs = [ support.openblas ]; - - # Disable failing test_f2py test. - # f2py couldn't be found by test, - # even though it was used successfully to build numpy - - # The large file support test is disabled because it takes forever - # and can cause the machine to run out of disk space when run. - prePatch = '' - sed -i 's/test_f2py/donttest/' numpy/tests/test_scripts.py - sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py - ''; - - meta = { - description = "Scientific tools for Python"; - homepage = "http://numpy.scipy.org/"; - }; - }); + }; numpydoc = buildPythonPackage rec { name = "numpydoc-${version}"; @@ -18488,47 +18460,19 @@ in modules // { }; }; + buildScipyPackage = callPackage ../development/python-modules/scipy.nix { + gfortran = pkgs.gfortran; + }; - scipy = let - support = import ../development/python-modules/numpy-scipy-support.nix { - inherit python; - openblas = pkgs.openblasCompat; - pkgName = "scipy"; - }; - in buildPythonPackage rec { - name = "scipy-${version}"; + scipy = self.scipy_0_16; + + scipy_0_16 = self.buildScipyPackage rec { version = "0.16.1"; - src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/s/scipy/${name}.tar.gz"; + url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz"; sha256 = "ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260"; }; - - buildInputs = [ pkgs.gfortran self.nose ]; - propagatedBuildInputs = [ self.numpy ]; - - preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py - ''; - - # First test: RuntimeWarning: Mean of empty slice. - # Second: SyntaxError: invalid syntax. Due to wrapper? - # Third: test checks permissions - prePatch = '' - substituteInPlace scipy/stats/tests/test_stats.py --replace "test_chisquare_masked_arrays" "remove_this_one" - rm scipy/linalg/tests/test_lapack.py - substituteInPlace scipy/weave/tests/test_catalog.py --replace "test_user" "remove_this_one" - ''; - - inherit (support) preBuild checkPhase; - - patches = [../development/python-modules/scipy-0.16.1-decorator-fix.patch]; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - - meta = { - description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; - homepage = http://www.scipy.org/; - }; + numpy = self.numpy_1_10; }; scikitimage = buildPythonPackage rec { @@ -18563,7 +18507,7 @@ in modules // { }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ]; + propagatedBuildInputs = with self; [ numpy scipy numpy.blas ]; LC_ALL="en_US.UTF-8"; From 3e476a73ef455484e7b60a36364bd29fd60bfd4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 4 Feb 2016 21:29:25 +0100 Subject: [PATCH 044/308] openblas_2_14: init at 0.2.14 --- .../science/math/openblas/0.2.14.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/libraries/science/math/openblas/0.2.14.nix diff --git a/pkgs/development/libraries/science/math/openblas/0.2.14.nix b/pkgs/development/libraries/science/math/openblas/0.2.14.nix new file mode 100644 index 00000000000..2fac8a4db08 --- /dev/null +++ b/pkgs/development/libraries/science/math/openblas/0.2.14.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchurl, gfortran, perl, which, config, coreutils +# Most packages depending on openblas expect integer width to match pointer width, +# but some expect to use 32-bit integers always (for compatibility with reference BLAS). +, blas64 ? null +}: + +with stdenv.lib; + +let blas64_ = blas64; in + +let local = config.openblas.preferLocalBuild or false; + binary = + { i686-linux = "32"; + x86_64-linux = "64"; + x86_64-darwin = "64"; + }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); + genericFlags = + [ "DYNAMIC_ARCH=1" + "NUM_THREADS=64" + ]; + localFlags = config.openblas.flags or + optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; + blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system; + + version = "0.2.14"; +in +stdenv.mkDerivation { + name = "openblas-${version}"; + src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; + sha256 = "2411c4f56f477b42dff54db2b7ffc0b7cf53bb9778d54982595c64cc69c40fc1"; + name = "openblas-${version}.tar.gz"; + }; + + inherit blas64; + + nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl which]; + + makeFlags = + (if local then localFlags else genericFlags) + ++ + optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"] + ++ + [ + "FC=gfortran" + # Note that clang is available through the stdenv on OSX and + # thus is not an explicit dependency. + "CC=${if stdenv.isDarwin then "clang" else "gcc"}" + ''PREFIX="''$(out)"'' + "BINARY=${binary}" + "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}" + "INTERFACE64=${if blas64 then "1" else "0"}" + ]; + + doCheck = true; + checkTarget = "tests"; + + meta = with stdenv.lib; { + description = "Basic Linear Algebra Subprograms"; + license = licenses.bsd3; + homepage = "https://github.com/xianyi/OpenBLAS"; + platforms = platforms.unix; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e103d1e5b53..2eec8c8d3db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15029,10 +15029,12 @@ let liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; openblas = callPackage ../development/libraries/science/math/openblas { }; + openblas_2_14 = callPackage ../development/libraries/science/math/openblas/0.2.14.nix { }; # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with # standard BLAS and LAPACK. openblasCompat = openblas.override { blas64 = false; }; + openblasCompat_2_14 = openblas_2_14.override { blas64 = false; }; openlibm = callPackage ../development/libraries/science/math/openlibm {}; From 73e9cb9748bdd5e3343972aafd094669d629ff3a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Feb 2016 09:03:11 +0100 Subject: [PATCH 045/308] pythonPackages.numpy: use openblas_2_14 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65a8279ec92..16fc9ad808c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12507,7 +12507,7 @@ in modules // { buildNumpyPackage = callPackage ../development/python-modules/numpy.nix { gfortran = pkgs.gfortran; - blas = pkgs.openblasCompat; + blas = pkgs.openblasCompat_2_14; }; numpy = self.numpy_1_10; From 7fad1bcff7af266d020692f804ae7d3b80a81697 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 20:36:01 +0100 Subject: [PATCH 046/308] pythonPackages.scipy_0_17: init at 0.17.0 --- pkgs/top-level/python-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16fc9ad808c..f4d6bd965a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18475,6 +18475,15 @@ in modules // { numpy = self.numpy_1_10; }; + scipy_0_17 = self.buildScipyPackage rec { + version = "0.17.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz"; + sha256 = "f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089"; + }; + numpy = self.numpy_1_10; + }; + scikitimage = buildPythonPackage rec { name = "scikit-image-${version}"; version = "0.11.3"; From 9123a84fd32071257931a97f708c56603840cc80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Feb 2016 09:00:50 +0100 Subject: [PATCH 047/308] pythonPackages.scipy: 0.16.1 -> 0.17.0 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4d6bd965a0..55e36cbe71e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18464,7 +18464,7 @@ in modules // { gfortran = pkgs.gfortran; }; - scipy = self.scipy_0_16; + scipy = self.scipy_0_17; scipy_0_16 = self.buildScipyPackage rec { version = "0.16.1"; From e552ad11e3159e19904a3221324be660e25db55c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 22 Jan 2016 20:37:07 +0100 Subject: [PATCH 048/308] python bootstrapped-pip: pip 7.1.2 -> 8.0.2 --- .../bootstrapped-pip/default.nix | 10 +- .../bootstrapped-pip/pip-7.0.1-prefix.patch | 151 ------------------ 2 files changed, 2 insertions(+), 159 deletions(-) delete mode 100644 pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 43f8cca4c82..86a46977393 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -11,11 +11,11 @@ let }; in stdenv.mkDerivation rec { name = "python-${python.version}-bootstrapped-pip-${version}"; - version = "7.1.2"; + version = "8.0.2"; src = fetchurl { url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl"; - sha256 = "133hx6jaspm6hd02gza66lng37l65yficc2y2x1gh16fbhxrilxr"; + sha256 = "249a6f3194be8c2e8cb4d4be3f6fd16a9f1e3336218caffa8e7419e3816f9988"; }; unpackPhase = '' @@ -27,12 +27,6 @@ in stdenv.mkDerivation rec { patchPhase = '' mkdir -p $out/bin - - # patch pip to support "pip install --prefix" - # https://github.com/pypa/pip/pull/3252 - pushd $out/${python.sitePackages}/ - patch -p1 < ${./pip-7.0.1-prefix.patch} - popd ''; buildInputs = [ python makeWrapper unzip ]; diff --git a/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch b/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch deleted file mode 100644 index 21936ec99e6..00000000000 --- a/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch +++ /dev/null @@ -1,151 +0,0 @@ -commit e87c83d95bb91acdca92202e94488ca51a70e059 -Author: Domen Kožar -Date: Mon Nov 16 17:39:44 2015 +0100 - - WIP - -diff --git a/pip/commands/install.py b/pip/commands/install.py -index dbcf100..05d5a08 100644 ---- a/pip/commands/install.py -+++ b/pip/commands/install.py -@@ -139,6 +139,13 @@ class InstallCommand(RequirementCommand): - "directory.") - - cmd_opts.add_option( -+ '--prefix', -+ dest='prefix_path', -+ metavar='dir', -+ default=None, -+ help="Installation prefix where lib, bin and other top-level folders are placed") -+ -+ cmd_opts.add_option( - "--compile", - action="store_true", - dest="compile", -@@ -309,6 +316,7 @@ class InstallCommand(RequirementCommand): - install_options, - global_options, - root=options.root_path, -+ prefix=options.prefix_path, - ) - reqs = sorted( - requirement_set.successfully_installed, -diff --git a/pip/locations.py b/pip/locations.py -index 4e6f65d..43aeb1f 100644 ---- a/pip/locations.py -+++ b/pip/locations.py -@@ -163,7 +163,7 @@ site_config_files = [ - - - def distutils_scheme(dist_name, user=False, home=None, root=None, -- isolated=False): -+ isolated=False, prefix=None): - """ - Return a distutils install scheme - """ -@@ -187,6 +187,8 @@ def distutils_scheme(dist_name, user=False, home=None, root=None, - i.user = user or i.user - if user: - i.prefix = "" -+ else: -+ i.prefix = prefix or i.prefix - i.home = home or i.home - i.root = root or i.root - i.finalize_options() -diff --git a/pip/req/req_install.py b/pip/req/req_install.py -index 7c5bf8f..6f80a18 100644 ---- a/pip/req/req_install.py -+++ b/pip/req/req_install.py -@@ -792,7 +792,7 @@ exec(compile( - else: - return True - -- def install(self, install_options, global_options=[], root=None): -+ def install(self, install_options, global_options=[], root=None, prefix=None): - if self.editable: - self.install_editable(install_options, global_options) - return -@@ -800,7 +800,7 @@ exec(compile( - version = pip.wheel.wheel_version(self.source_dir) - pip.wheel.check_compatibility(version, self.name) - -- self.move_wheel_files(self.source_dir, root=root) -+ self.move_wheel_files(self.source_dir, root=root, prefix=prefix) - self.install_succeeded = True - return - -@@ -833,6 +833,8 @@ exec(compile( - - if root is not None: - install_args += ['--root', root] -+ if prefix is not None: -+ install_args += ['--prefix', prefix] - - if self.pycompile: - install_args += ["--compile"] -@@ -988,12 +990,13 @@ exec(compile( - def is_wheel(self): - return self.link and self.link.is_wheel - -- def move_wheel_files(self, wheeldir, root=None): -+ def move_wheel_files(self, wheeldir, root=None, prefix=None): - move_wheel_files( - self.name, self.req, wheeldir, - user=self.use_user_site, - home=self.target_dir, - root=root, -+ prefix=prefix, - pycompile=self.pycompile, - isolated=self.isolated, - ) -diff --git a/pip/wheel.py b/pip/wheel.py -index 403f48b..14eb141 100644 ---- a/pip/wheel.py -+++ b/pip/wheel.py -@@ -234,12 +234,12 @@ def get_entrypoints(filename): - - - def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None, -- pycompile=True, scheme=None, isolated=False): -+ pycompile=True, scheme=None, isolated=False, prefix=None): - """Install a wheel""" - - if not scheme: - scheme = distutils_scheme( -- name, user=user, home=home, root=root, isolated=isolated -+ name, user=user, home=home, root=root, isolated=isolated, prefix=prefix, - ) - - if root_is_purelib(name, wheeldir): -diff --git a/pip/req/req_install.py b/pip/req/req_install.py -index 51bf4a7..e2e285e 100644 ---- a/pip/req/req_install.py -+++ b/pip/req/req_install.py -@@ -795,7 +795,7 @@ exec(compile( - def install(self, install_options, global_options=[], root=None, - prefix=None): - if self.editable: -- self.install_editable(install_options, global_options) -+ self.install_editable(install_options, global_options, prefix=prefix) - return - if self.is_wheel: - version = pip.wheel.wheel_version(self.source_dir) -@@ -929,12 +929,16 @@ exec(compile( - rmtree(self._temp_build_dir) - self._temp_build_dir = None - -- def install_editable(self, install_options, global_options=()): -+ def install_editable(self, install_options, global_options=(), prefix=None): - logger.info('Running setup.py develop for %s', self.name) - - if self.isolated: - global_options = list(global_options) + ["--no-user-cfg"] - -+ if prefix: -+ prefix_param = ['--prefix={0}'.format(prefix)] -+ install_options = list(install_options) + prefix_param -+ - with indent_log(): - # FIXME: should we do --install-headers here too? - cwd = self.source_dir - From 2bec2fa3567d85b5adbde0374284d2f9c1d983e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 22 Jan 2016 20:37:24 +0100 Subject: [PATCH 049/308] pythonPackages.pip: 7.1.2 -> 8.0.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55e36cbe71e..58b6c63a90a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14745,12 +14745,12 @@ in modules // { }; pip = buildPythonPackage rec { - version = "7.1.2"; + version = "8.0.2"; name = "pip-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz"; - sha256 = "0xx4aypfgchxdknxq7gyqghd8wb221zrzyqlbabzm32jy237j16a"; + sha256 = "46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521"; }; buildInputs = with self; [ mock scripttest virtualenv pytest ]; From 2f6d64bc6f1772ab7d69dee6676684c26656f890 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 20:46:35 +0100 Subject: [PATCH 050/308] pythonPackages.wheel: 0.26.0 -> 0.29.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58b6c63a90a..37704f1f50d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21399,11 +21399,11 @@ in modules // { wheel = buildPythonPackage rec { name = "wheel-${version}"; - version = "0.26.0"; + version = "0.29.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/wheel/${name}.tar.gz"; - sha256 = "eaad353805c180a47545a256e6508835b65a8e830ba1093ed8162f19a50a530c"; + sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648"; }; buildInputs = with self; [ pytest pytestcov coverage ]; From 7ddd3a0d303e0bf61b770feabbcaa3cfa83a349f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 20:47:23 +0100 Subject: [PATCH 051/308] python bootstrapped-pip: wheel 0.26.0 -> 0.29.0 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 86a46977393..c0e5ae0ec77 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -2,8 +2,8 @@ let wheel_source = fetchurl { - url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.26.0-py2.py3-none-any.whl"; - sha256 = "1sl642ncvipqx0hzypvl5hsiqngy0sib0kq242g4mic7vnid6bn9"; + url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.29.0-py2.py3-none-any.whl"; + sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd"; }; setuptools_source = fetchurl { url = "https://pypi.python.org/packages/3.5/s/setuptools/setuptools-19.4-py2.py3-none-any.whl"; From bf8550998e89059ebaf277d1fbb8f77ebc27ed7d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Feb 2016 20:48:23 +0100 Subject: [PATCH 052/308] libpsl: 2016-01-15 -> 2016-02-06 --- pkgs/development/libraries/libpsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 1dc4c57e979..d4d24db84b9 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-01-15"; + listVersion = "2016-02-06"; listSources = fetchFromGitHub { - sha256 = "1smn4fl0fhldy7gdn0k1diyghbxdxnr4cj921bjdl2i4wxas41g5"; - rev = "77cb90dce70827bda40384e1ae8bff3c958daef3"; + sha256 = "0jh1fbfyi9zdhw77brfdkw7mcbr03dqww8yv703kp69fqhyf2pln"; + rev = "0efc1a2f0ec93163273f6c5c2f511a19f5cd5805"; repo = "list"; owner = "publicsuffix"; }; From 82e15d9914e25c216ca162b777ac420fa9fbf356 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Feb 2016 21:06:08 +0100 Subject: [PATCH 053/308] pagemon: 0.01.07 -> 0.01.08 Main changes: - Add 'c' key to close pop up windows - Enable -p option to have the PID or name of the process to monitor - Fix zoom scaling on memory view - Don't break on failed seek or read of map info More: https://github.com/ColinIanKing/pagemon/blob/f172bd17e7a11e43131629468e4b2ad191ca9b47/debian/changelog --- pkgs/os-specific/linux/pagemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index dee92419cd1..4246e512321 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.07"; + version = "0.01.08"; src = fetchFromGitHub { - sha256 = "041jqk11sq1qn3avsx4jbfqzvg6rfa5kmgn16q8jnwm5fqfaj037"; + sha256 = "079x8ah33nh4faqcy0jy24x30l40j5m00d57aawaayaq18smqs3f"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; From 5691a2a498f25a967af1d89bdb845eea665b672f Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 8 Feb 2016 16:37:35 -0500 Subject: [PATCH 054/308] xe: init at 0.5 Simple xargs and apply replacement. --- pkgs/tools/system/xe/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/system/xe/default.nix diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix new file mode 100644 index 00000000000..303374942c0 --- /dev/null +++ b/pkgs/tools/system/xe/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "xe-${version}"; + version = "0.5"; + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "xe"; + rev = "v${version}"; + sha256 = "0rv9npgjb695slql39asyp6znv9r3a6jbcsrsa1cmhk82iy4bljc"; + }; + makeFlags = "PREFIX=$(out)"; + meta = with lib; { + description = "Simple xargs and apply replacement"; + homepage = "https://github.com/chneukirchen/xe"; + license = licenses.publicDomain; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2eec8c8d3db..13854052125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3512,6 +3512,8 @@ let xl2tpd = callPackage ../tools/networking/xl2tpd { }; + xe = callPackage ../tools/system/xe { }; + testdisk = callPackage ../tools/misc/testdisk { }; html2text = callPackage ../tools/text/html2text { }; From 4faeca0cbd6104cbc3c39762c11038534a2fe084 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Mon, 8 Feb 2016 17:28:24 -0500 Subject: [PATCH 055/308] nq: init at 0.1 Unix command line queue utility. --- pkgs/tools/system/nq/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/system/nq/default.nix diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix new file mode 100644 index 00000000000..2f34b354d52 --- /dev/null +++ b/pkgs/tools/system/nq/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "nq-${version}"; + version = "0.1"; + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "nq"; + rev = "v${version}"; + sha256 = "17n0yqhpsys3s872ki5rf82ky73ylahz6xi9x0rfrv7fqr5nzsz4"; + }; + makeFlags = "PREFIX=$(out)"; + postPatch = '' + sed -i tq \ + -e 's|\bfq\b|'$out'/bin/fq|g' \ + -e 's|\bnq\b|'$out'/bin/nq|g' + ''; + meta = with lib; { + description = "Unix command line queue utility"; + homepage = "https://github.com/chneukirchen/nq"; + license = licenses.publicDomain; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13854052125..dddbdedf5a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2519,6 +2519,8 @@ let pythonPackages = python3Packages; }; + nq = callPackage ../tools/system/nq { }; + nsjail = callPackage ../tools/security/nsjail {}; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; From 71d01db76fa5c4e62417382e27f6a89f0f8a60a0 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 9 Feb 2016 00:13:07 +0100 Subject: [PATCH 056/308] sane: *really* fix udev error \#12874 tried to patch out the literal /bin/sh, but an additional space sneaked in. --- pkgs/applications/graphics/sane/backends/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 2ee5e1ddcf5..e457ba29d97 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules # the created 49-libsane references /bin/sh substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ - -- replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}" + --replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}" substituteInPlace $out/lib/libsane.la \ --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg" From 7c6771fe26c60d98659c382429dc52c6d00a057a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 9 Feb 2016 05:01:00 +0000 Subject: [PATCH 057/308] python3Packages.zope_testrunner: disable tests --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37704f1f50d..d5066d2da8f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22213,7 +22213,8 @@ in modules // { propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit; - doCheck = !isPy27; + # https://github.com/zopefoundation/zope.testrunner/issues/35 + doCheck = !(isPy27 || isPy34); meta = { description = "A flexible test runner with layer support"; From 2670f9577d4cf2d0273aec6655b20457e44d1a22 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 21:29:40 +0100 Subject: [PATCH 058/308] pythonPackages.blaze: 0.9.0 -> 0.9.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55e36cbe71e..5010dafac84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2037,11 +2037,11 @@ in modules // { blaze = buildPythonPackage rec { name = "blaze-${version}"; - version = "0.9.0"; + version = "0.9.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz"; - sha256 = "07h284n6fr0lvy58a6lvwwfb45sy7lggllx2y2vzzs4xrvf5k1i7"; + sha256 = "fde4fd5733d8574345521581078a4fd89bb51ad3814eda88f1f467faa3a9784a"; }; buildInputs = with self; [ pytest ]; From 4d4b9131ea284eeed330740aa9c2873bed3cd061 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 21:29:53 +0100 Subject: [PATCH 059/308] pythonPackages.datashape: 0.5.0 -> 0.5.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5010dafac84..70aafa5eba2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4202,11 +4202,11 @@ in modules // { datashape = buildPythonPackage rec { name = "datashape-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz"; - sha256 = "13w0rfaqpqkh30bxmx7i7kjfrfkm5maa35gj3c464wah7i2zm9wp"; + sha256 = "21c424f11604873da9a36d4c55ef1d15cc3960cd208d7828b82315c494bff96a"; }; buildInputs = with self; [ pytest mock ]; From 3426f36816073af65d170d9ae04b099c3a7b0d3f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 21:30:09 +0100 Subject: [PATCH 060/308] pythonPackages.ipyparallel: 4.1.1 -> 5.0.0 --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70aafa5eba2..779d166ccc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9952,17 +9952,18 @@ in modules // { }; ipyparallel = buildPythonPackage rec { - version = "4.1.0"; + version = "5.0.0"; name = "ipyparallel-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipyparallel/${name}.tar.gz"; - sha256 = "c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a"; + sha256 = "ffa7e2e29fdc4844b3c1721f46b42eee5a1abe5cbb851ccf79d0f4f89b9fe21a"; }; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel]; + propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + ] ++ optionals (!isPy3k) [ futures ]; # Requires access to cluster doCheck = false; From 4c79c23a0dabd3f11823de3a1e994071fc6408c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 21:30:20 +0100 Subject: [PATCH 061/308] pythonPackages.odo: 0.4.0 -> 0.4.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 779d166ccc2..135b23c7233 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12745,11 +12745,11 @@ in modules // { odo = buildPythonPackage rec { name = "odo-${version}"; - version= "0.4.0"; + version= "0.4.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/o/odo/${name}.tar.gz"; - sha256 = "0xqm4zb7a7a2cbik9kn6yk0kr26n90iqj102h5wb42x6z5v4mn79"; + sha256 = "f793df8b212994ea23ce34e90e2048d0237d3b95ecd066ef2cfbb1c2384b79e9"; }; buildInputs = with self; [ pytest ]; From 2d2cda28748d29aaf104fc66ed41b30b6d4b63f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 21:30:40 +0100 Subject: [PATCH 062/308] pythonPackages.pyzmq: fix tests i686 --- pkgs/top-level/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 135b23c7233..0c12f362b25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22499,8 +22499,11 @@ in modules // { }; buildInputs = with self; [ pkgs.zeromq3 pytest tornado ]; propagatedBuildInputs = [ self.py ]; + + # Disable broken test + # https://github.com/zeromq/pyzmq/issues/799 checkPhase = '' - py.test $out/${python.sitePackages}/zmq/ + py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send" ''; }; From 2ebc0350aae7d3ca53e139042fc145a61fc04194 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 21:35:07 +0100 Subject: [PATCH 063/308] pythonPackages.caldavclientlibrary-asynk: disable py3k --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c12f362b25..43202f15a01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1608,6 +1608,8 @@ in modules // { sha256 = "1i6is7lv4v9by4panrd9w63m4xsmhwlp3rq4jjj3azwg5jm10940"; }; + disabled = isPy3k; + meta = { description = "A Python library and tool for CalDAV"; From f7622389e1b754382d6b687c4676ead00e247ba2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 8 Feb 2016 21:53:45 +0100 Subject: [PATCH 064/308] pythonPackages.et_xmlfile: fix tests --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43202f15a01..007a25c858b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8367,6 +8367,11 @@ in modules // { sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1"; }; + buildInputs = with self; [ lxml pytest ]; + checkPhase = '' + py.test $out + ''; + meta = { description = "An implementation of lxml.xmlfile for the standard library"; longDescription = '' From 93d5f26a0d9d73280759e58777f6c3ce6cc6243c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 8 Feb 2016 17:20:25 +0000 Subject: [PATCH 065/308] sublime3: 3101 -> 3103 --- pkgs/applications/editors/sublime3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 6d0374d042f..ad9fc056757 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let - build = "3101"; + build = "3103"; libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; @@ -20,13 +20,13 @@ in let fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "1klssh79mxm7i6r77p9a6a1rqzssnkv5y4k37bnxv8bilwqhfrcz"; + sha256 = "1qidnczndyhyp9rfzmpqah00lrx7z1a0fy7a13lzwqq3gslhwf1l"; } else fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "0yrhn2mc5f2y4cy2ydya4h97bij0cm51yd4q06l6yjshl6qyc2db"; + sha256 = "1x8kb3prs6wa5s5rj0gfq96zx6k5q3s168yhfsa36x2szi6x6y4x"; }; dontStrip = true; From 55b7f03e3bf5986241655894288b7980000fb6c1 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Wed, 3 Feb 2016 11:05:58 +0100 Subject: [PATCH 066/308] marathon: 0.14.1 -> 0.15.1 --- pkgs/applications/networking/cluster/marathon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 8f343764445..ac666030897 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marathon-${version}"; - version = "0.14.1"; + version = "0.15.1"; src = fetchurl { url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz"; - sha256 = "0vdl7jf7yhb985dj3v46qnqjv1zwfkyizlsyf9c5dq7khvxrp1l4"; + sha256 = "1ch3nvcwj7pzjjqw4k07gdf7nmdbfkks5j07wl3518bagjqrajj2"; }; buildInputs = [ makeWrapper jdk mesos ]; From 23b747e38a02d75158006f2b27dcdd525705cade Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Feb 2016 16:56:30 +0100 Subject: [PATCH 067/308] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/45176e62cac5a125e2766103c6d584ba812da687 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/4eb768170375f9a545c38db20ce635b7291ece78 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e7c362999942041130d6f66c30289bd6be0430a3 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/a84b3a147a5c0bbaa634f2623ad6e679f33751a1 --- .../haskell-modules/configuration-lts-0.0.nix | 22 + .../haskell-modules/configuration-lts-0.1.nix | 22 + .../haskell-modules/configuration-lts-0.2.nix | 22 + .../haskell-modules/configuration-lts-0.3.nix | 22 + .../haskell-modules/configuration-lts-0.4.nix | 22 + .../haskell-modules/configuration-lts-0.5.nix | 22 + .../haskell-modules/configuration-lts-0.6.nix | 22 + .../haskell-modules/configuration-lts-0.7.nix | 22 + .../haskell-modules/configuration-lts-1.0.nix | 22 + .../haskell-modules/configuration-lts-1.1.nix | 22 + .../configuration-lts-1.10.nix | 22 + .../configuration-lts-1.11.nix | 22 + .../configuration-lts-1.12.nix | 22 + .../configuration-lts-1.13.nix | 22 + .../configuration-lts-1.14.nix | 22 + .../configuration-lts-1.15.nix | 22 + .../haskell-modules/configuration-lts-1.2.nix | 22 + .../haskell-modules/configuration-lts-1.4.nix | 22 + .../haskell-modules/configuration-lts-1.5.nix | 22 + .../haskell-modules/configuration-lts-1.7.nix | 22 + .../haskell-modules/configuration-lts-1.8.nix | 22 + .../haskell-modules/configuration-lts-1.9.nix | 22 + .../haskell-modules/configuration-lts-2.0.nix | 23 + .../haskell-modules/configuration-lts-2.1.nix | 23 + .../configuration-lts-2.10.nix | 23 + .../configuration-lts-2.11.nix | 23 + .../configuration-lts-2.12.nix | 23 + .../configuration-lts-2.13.nix | 23 + .../configuration-lts-2.14.nix | 23 + .../configuration-lts-2.15.nix | 23 + .../configuration-lts-2.16.nix | 23 + .../configuration-lts-2.17.nix | 23 + .../configuration-lts-2.18.nix | 23 + .../configuration-lts-2.19.nix | 23 + .../haskell-modules/configuration-lts-2.2.nix | 23 + .../configuration-lts-2.20.nix | 23 + .../configuration-lts-2.21.nix | 23 + .../configuration-lts-2.22.nix | 23 + .../haskell-modules/configuration-lts-2.3.nix | 23 + .../haskell-modules/configuration-lts-2.4.nix | 23 + .../haskell-modules/configuration-lts-2.5.nix | 23 + .../haskell-modules/configuration-lts-2.6.nix | 23 + .../haskell-modules/configuration-lts-2.7.nix | 23 + .../haskell-modules/configuration-lts-2.8.nix | 23 + .../haskell-modules/configuration-lts-2.9.nix | 23 + .../haskell-modules/configuration-lts-3.0.nix | 23 + .../haskell-modules/configuration-lts-3.1.nix | 23 + .../configuration-lts-3.10.nix | 25 + .../configuration-lts-3.11.nix | 25 + .../configuration-lts-3.12.nix | 25 + .../configuration-lts-3.13.nix | 25 + .../configuration-lts-3.14.nix | 25 + .../configuration-lts-3.15.nix | 25 + .../configuration-lts-3.16.nix | 26 + .../configuration-lts-3.17.nix | 26 + .../configuration-lts-3.18.nix | 26 + .../configuration-lts-3.19.nix | 26 + .../haskell-modules/configuration-lts-3.2.nix | 23 + .../configuration-lts-3.20.nix | 26 + .../configuration-lts-3.21.nix | 26 + .../configuration-lts-3.22.nix | 26 + .../haskell-modules/configuration-lts-3.3.nix | 24 + .../haskell-modules/configuration-lts-3.4.nix | 24 + .../haskell-modules/configuration-lts-3.5.nix | 24 + .../haskell-modules/configuration-lts-3.6.nix | 24 + .../haskell-modules/configuration-lts-3.7.nix | 25 + .../haskell-modules/configuration-lts-3.8.nix | 25 + .../haskell-modules/configuration-lts-3.9.nix | 25 + .../haskell-modules/configuration-lts-4.0.nix | 31 + .../haskell-modules/configuration-lts-4.1.nix | 31 + .../haskell-modules/configuration-lts-4.2.nix | 33 + .../haskell-modules/configuration-lts-5.0.nix | 37 + .../haskell-modules/configuration-lts-5.1.nix | 39 + .../haskell-modules/configuration-lts-5.2.nix | 7646 +++++++++++++++++ .../haskell-modules/hackage-packages.nix | 1547 +++- 75 files changed, 10662 insertions(+), 287 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.2.nix diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 5901106668c..4dc205d8973 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -634,6 +634,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -908,6 +909,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1782,6 +1784,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1887,6 +1890,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_5"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2479,6 +2483,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3194,6 +3204,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3753,6 +3764,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3893,6 +3905,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4158,6 +4171,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5092,6 +5106,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5224,11 +5239,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5658,6 +5675,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6582,6 +6600,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6887,6 +6906,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8410,6 +8430,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9045,6 +9066,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index d28644edfbc..6cc26a6686e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -634,6 +634,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -908,6 +909,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1782,6 +1784,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1887,6 +1890,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_5"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2479,6 +2483,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3194,6 +3204,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3753,6 +3764,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3893,6 +3905,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4158,6 +4171,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5092,6 +5106,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5224,11 +5239,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5658,6 +5675,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6582,6 +6600,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6887,6 +6906,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8410,6 +8430,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9045,6 +9066,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index b67eba2b841..063b2a48a5d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -634,6 +634,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -908,6 +909,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1782,6 +1784,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1887,6 +1890,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_5"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2479,6 +2483,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3194,6 +3204,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3753,6 +3764,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3893,6 +3905,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4158,6 +4171,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5092,6 +5106,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5224,11 +5239,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5658,6 +5675,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6582,6 +6600,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6887,6 +6906,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8410,6 +8430,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9045,6 +9066,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 959df8523b8..17c987efd93 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -634,6 +634,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -908,6 +909,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1782,6 +1784,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1887,6 +1890,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_5"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2479,6 +2483,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3194,6 +3204,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3753,6 +3764,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3893,6 +3905,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4158,6 +4171,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5092,6 +5106,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5224,11 +5239,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5658,6 +5675,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6582,6 +6600,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6887,6 +6906,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8410,6 +8430,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9045,6 +9066,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 2a92a40d2e3..c430217eb7e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -634,6 +634,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -908,6 +909,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1782,6 +1784,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1887,6 +1890,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_6"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2479,6 +2483,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3193,6 +3203,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3752,6 +3763,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3890,6 +3902,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4155,6 +4168,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5089,6 +5103,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5221,11 +5236,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5655,6 +5672,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6579,6 +6597,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6884,6 +6903,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8406,6 +8426,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9041,6 +9062,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index c079cffeaa4..8d76c7cfdd7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -634,6 +634,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -908,6 +909,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1782,6 +1784,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1887,6 +1890,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_6"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2479,6 +2483,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3193,6 +3203,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3752,6 +3763,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3890,6 +3902,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4155,6 +4168,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5089,6 +5103,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5221,11 +5236,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5655,6 +5672,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6579,6 +6597,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6884,6 +6903,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8406,6 +8426,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9041,6 +9062,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index db707caa1e8..c52414a8319 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -634,6 +634,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -907,6 +908,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1781,6 +1783,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1886,6 +1889,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_6"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2478,6 +2482,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3192,6 +3202,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3751,6 +3762,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3889,6 +3901,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4153,6 +4166,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5087,6 +5101,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5219,11 +5234,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5653,6 +5670,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6576,6 +6594,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6881,6 +6900,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8402,6 +8422,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9034,6 +9055,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 329df2fafed..1c609caa978 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -634,6 +634,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -907,6 +908,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1781,6 +1783,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1886,6 +1889,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_6"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2478,6 +2482,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3192,6 +3202,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3751,6 +3762,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3889,6 +3901,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4153,6 +4166,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5087,6 +5101,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5219,11 +5234,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5653,6 +5670,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6576,6 +6594,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6881,6 +6900,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8402,6 +8422,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9034,6 +9055,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 76d3d874634..98cab9aaae0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -631,6 +631,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -904,6 +905,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1776,6 +1778,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1879,6 +1882,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_7"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2470,6 +2474,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3183,6 +3193,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3741,6 +3752,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3879,6 +3891,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4144,6 +4157,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5076,6 +5090,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5208,11 +5223,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5642,6 +5659,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6565,6 +6583,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6870,6 +6889,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8388,6 +8408,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9020,6 +9041,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 6c71b070a0f..45096136b7d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -631,6 +631,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -904,6 +905,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1776,6 +1778,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1878,6 +1881,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2468,6 +2472,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3180,6 +3190,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3738,6 +3749,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3876,6 +3888,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4140,6 +4153,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5070,6 +5084,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5202,11 +5217,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5636,6 +5653,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6558,6 +6576,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6863,6 +6882,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8376,6 +8396,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9007,6 +9028,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index bd252393868..c569da0fce6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -630,6 +630,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -903,6 +904,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1775,6 +1777,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1876,6 +1879,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2464,6 +2468,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3173,6 +3183,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3729,6 +3740,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3866,6 +3878,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4129,6 +4142,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5054,6 +5068,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5186,11 +5201,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5619,6 +5636,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6538,6 +6556,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6842,6 +6861,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8349,6 +8369,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8977,6 +8998,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 3ece9fed9a0..3cb13aa1696 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -630,6 +630,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -903,6 +904,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1775,6 +1777,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1876,6 +1879,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2464,6 +2468,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3172,6 +3182,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3728,6 +3739,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3865,6 +3877,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4128,6 +4141,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5051,6 +5065,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5183,11 +5198,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5615,6 +5632,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6534,6 +6552,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6838,6 +6857,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8345,6 +8365,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8973,6 +8994,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 5ba87607ad2..621806b6fb8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -630,6 +630,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -903,6 +904,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1775,6 +1777,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1876,6 +1879,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2464,6 +2468,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3172,6 +3182,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3728,6 +3739,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3865,6 +3877,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4128,6 +4141,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5050,6 +5064,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5182,11 +5197,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5614,6 +5631,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6533,6 +6551,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6837,6 +6856,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8343,6 +8363,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8971,6 +8992,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index dbaccd55b17..652e60c78d8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -630,6 +630,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -903,6 +904,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1775,6 +1777,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1876,6 +1879,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2464,6 +2468,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3172,6 +3182,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3728,6 +3739,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3864,6 +3876,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4127,6 +4140,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5049,6 +5063,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5181,11 +5196,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5613,6 +5630,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6532,6 +6550,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6836,6 +6855,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8341,6 +8361,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8969,6 +8990,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index beeae2259aa..e89537089f3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -629,6 +629,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -902,6 +903,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1773,6 +1775,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1874,6 +1877,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2461,6 +2465,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3169,6 +3179,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3725,6 +3736,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3861,6 +3873,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4124,6 +4137,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5045,6 +5059,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5176,11 +5191,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5608,6 +5625,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6526,6 +6544,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6829,6 +6848,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8334,6 +8354,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8962,6 +8983,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 6bad1e1a7c2..288a2bf2d4e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -629,6 +629,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -901,6 +902,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1772,6 +1774,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1873,6 +1876,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2458,6 +2462,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3165,6 +3175,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3721,6 +3732,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3857,6 +3869,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4120,6 +4133,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5041,6 +5055,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5172,11 +5187,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5604,6 +5621,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6520,6 +6538,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6822,6 +6841,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8325,6 +8345,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8952,6 +8973,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index b1bc7909b29..75b907a5605 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -631,6 +631,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -904,6 +905,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1776,6 +1778,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1878,6 +1881,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2466,6 +2470,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3178,6 +3188,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3735,6 +3746,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3873,6 +3885,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4137,6 +4150,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5067,6 +5081,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5199,11 +5214,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5633,6 +5650,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6554,6 +6572,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6858,6 +6877,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8370,6 +8390,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -9001,6 +9022,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 3a5e684b996..987cbdd2454 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -630,6 +630,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -903,6 +904,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1775,6 +1777,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1877,6 +1880,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2465,6 +2469,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3176,6 +3186,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3733,6 +3744,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3871,6 +3883,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4134,6 +4147,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5064,6 +5078,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5196,11 +5211,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5630,6 +5647,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6550,6 +6568,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6854,6 +6873,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8365,6 +8385,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8996,6 +9017,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index e76d058500e..c3ea5f923c0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -630,6 +630,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -903,6 +904,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1775,6 +1777,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1876,6 +1879,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2464,6 +2468,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3175,6 +3185,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3732,6 +3743,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3870,6 +3882,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4133,6 +4146,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5063,6 +5077,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5195,11 +5210,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5629,6 +5646,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6549,6 +6567,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6853,6 +6872,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8363,6 +8383,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8993,6 +9014,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 067ffa3fad5..fbd3969eaf9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -630,6 +630,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -903,6 +904,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1775,6 +1777,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1876,6 +1879,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2464,6 +2468,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3175,6 +3185,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3732,6 +3743,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3870,6 +3882,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4133,6 +4146,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5058,6 +5072,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5190,11 +5205,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5624,6 +5641,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6544,6 +6562,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6848,6 +6867,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8358,6 +8378,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8988,6 +9009,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index a4128abdf38..c7c05da3ec4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -630,6 +630,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -903,6 +904,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1775,6 +1777,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1876,6 +1879,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2464,6 +2468,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3173,6 +3183,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3730,6 +3741,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3867,6 +3879,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4130,6 +4143,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5055,6 +5069,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5187,11 +5202,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5620,6 +5637,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6540,6 +6558,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6844,6 +6863,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8353,6 +8373,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8983,6 +9004,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index c44591b3c01..56a7a77807d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -630,6 +630,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -903,6 +904,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1775,6 +1777,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1876,6 +1879,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2464,6 +2468,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3173,6 +3183,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3729,6 +3740,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3866,6 +3878,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4129,6 +4142,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5054,6 +5068,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5186,11 +5201,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5619,6 +5636,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6539,6 +6557,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6843,6 +6862,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8352,6 +8372,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8982,6 +9003,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 40414cce15b..2f8fcbf8bb4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -625,6 +625,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -895,6 +896,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1761,6 +1763,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1862,6 +1865,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2443,6 +2447,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3151,6 +3161,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3668,6 +3679,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3701,6 +3713,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3837,6 +3850,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4100,6 +4114,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5009,6 +5024,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5138,11 +5154,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5565,6 +5583,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6467,6 +6486,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6770,6 +6790,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8264,6 +8285,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8885,6 +8907,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 874eb71abfd..3df16eb2617 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -625,6 +625,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -895,6 +896,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1761,6 +1763,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1861,6 +1864,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2442,6 +2446,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3150,6 +3160,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3667,6 +3678,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3700,6 +3712,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3836,6 +3849,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4099,6 +4113,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5008,6 +5023,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5137,11 +5153,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5564,6 +5582,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6466,6 +6485,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6769,6 +6789,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8263,6 +8284,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8883,6 +8905,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index d803e816665..0d6f60e04f6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -624,6 +624,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -892,6 +893,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1752,6 +1754,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1850,6 +1853,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2428,6 +2432,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3131,6 +3141,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3648,6 +3659,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3681,6 +3693,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3815,6 +3828,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4078,6 +4092,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4981,6 +4996,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5110,11 +5126,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5531,6 +5549,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6428,6 +6447,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6730,6 +6750,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8212,6 +8233,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8829,6 +8851,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 5f9110846de..1882dbd6a08 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -624,6 +624,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -892,6 +893,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1751,6 +1753,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1849,6 +1852,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2427,6 +2431,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3130,6 +3140,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3646,6 +3657,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3679,6 +3691,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3813,6 +3826,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4076,6 +4090,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4977,6 +4992,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5106,11 +5122,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5527,6 +5545,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6422,6 +6441,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6724,6 +6744,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8203,6 +8224,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8820,6 +8842,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 17c44fb8935..b731ee68563 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -624,6 +624,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -892,6 +893,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1751,6 +1753,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1849,6 +1852,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2427,6 +2431,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3130,6 +3140,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3646,6 +3657,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3679,6 +3691,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3813,6 +3826,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4076,6 +4090,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4977,6 +4992,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5106,11 +5122,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5527,6 +5545,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6422,6 +6441,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6724,6 +6744,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8202,6 +8223,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8819,6 +8841,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 0cd601e7da6..db5547dc9ef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -624,6 +624,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -892,6 +893,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1751,6 +1753,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1849,6 +1852,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2427,6 +2431,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3130,6 +3140,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3646,6 +3657,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3679,6 +3691,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3812,6 +3825,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4075,6 +4089,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4975,6 +4990,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5104,11 +5120,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5525,6 +5543,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6420,6 +6439,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6722,6 +6742,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8200,6 +8221,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8817,6 +8839,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 20e2c95adc3..0b500291fcf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -624,6 +624,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -892,6 +893,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1750,6 +1752,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1848,6 +1851,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2426,6 +2430,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3128,6 +3138,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3644,6 +3655,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3677,6 +3689,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3810,6 +3823,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4073,6 +4087,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4972,6 +4987,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5101,11 +5117,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5522,6 +5540,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6417,6 +6436,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6719,6 +6739,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8196,6 +8217,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8811,6 +8833,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index f218d7a8e6e..f8c70e4bae8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -624,6 +624,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -892,6 +893,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1750,6 +1752,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1848,6 +1851,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2426,6 +2430,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3127,6 +3137,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3643,6 +3654,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3676,6 +3688,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3809,6 +3822,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4072,6 +4086,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4971,6 +4986,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5100,11 +5116,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5521,6 +5539,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6413,6 +6432,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6715,6 +6735,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8191,6 +8212,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8805,6 +8827,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 8dd4c6d76b2..af59ccac512 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -623,6 +623,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -891,6 +892,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1749,6 +1751,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1847,6 +1850,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2423,6 +2427,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3122,6 +3132,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3638,6 +3649,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3671,6 +3683,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3804,6 +3817,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4067,6 +4081,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4966,6 +4981,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5095,11 +5111,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5515,6 +5533,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6407,6 +6426,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6709,6 +6729,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8185,6 +8206,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8798,6 +8820,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 682e54704f8..bdce43f4533 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -623,6 +623,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -891,6 +892,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1747,6 +1749,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1845,6 +1848,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2421,6 +2425,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3118,6 +3128,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3633,6 +3644,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3666,6 +3678,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3799,6 +3812,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4062,6 +4076,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4961,6 +4976,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5090,11 +5106,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5510,6 +5528,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6401,6 +6420,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6703,6 +6723,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8179,6 +8200,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8792,6 +8814,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index c3e55226d4c..a8b13abbac8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -623,6 +623,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -891,6 +892,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1747,6 +1749,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1844,6 +1847,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2420,6 +2424,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3116,6 +3126,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3631,6 +3642,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3664,6 +3676,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3797,6 +3810,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4060,6 +4074,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4958,6 +4973,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5087,11 +5103,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5507,6 +5525,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6396,6 +6415,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6698,6 +6718,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8173,6 +8194,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8785,6 +8807,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 5dac9460466..7f018681924 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -623,6 +623,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -891,6 +892,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1747,6 +1749,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1844,6 +1847,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2420,6 +2424,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3116,6 +3126,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3630,6 +3641,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3663,6 +3675,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3796,6 +3809,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4059,6 +4073,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4957,6 +4972,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5086,11 +5102,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5505,6 +5523,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6394,6 +6413,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6696,6 +6716,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8169,6 +8190,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8780,6 +8802,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 66263036f4e..c2aa4a3421b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -625,6 +625,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -894,6 +895,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1760,6 +1762,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1858,6 +1861,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2439,6 +2443,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3147,6 +3157,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3664,6 +3675,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3697,6 +3709,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3833,6 +3846,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4096,6 +4110,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5005,6 +5020,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5134,11 +5150,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5561,6 +5579,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6463,6 +6482,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6766,6 +6786,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8260,6 +8281,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8879,6 +8901,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index fd2da300482..f94aa3dd4a6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -623,6 +623,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -891,6 +892,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1747,6 +1749,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1844,6 +1847,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2419,6 +2423,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3115,6 +3125,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3629,6 +3640,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3662,6 +3674,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3795,6 +3808,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4058,6 +4072,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4956,6 +4971,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5085,11 +5101,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5504,6 +5522,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6392,6 +6411,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6694,6 +6714,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8166,6 +8187,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8777,6 +8799,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 51edfea016d..404bb06d597 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -623,6 +623,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -891,6 +892,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1747,6 +1749,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1844,6 +1847,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2419,6 +2423,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3115,6 +3125,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3629,6 +3640,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3662,6 +3674,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3795,6 +3808,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4058,6 +4072,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4956,6 +4971,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5085,11 +5101,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5503,6 +5521,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6391,6 +6410,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6692,6 +6712,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8164,6 +8185,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8772,6 +8794,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 9177bc69949..ae87d1cd488 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -623,6 +623,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -891,6 +892,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1747,6 +1749,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1844,6 +1847,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2419,6 +2423,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3115,6 +3125,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3629,6 +3640,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3662,6 +3674,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3795,6 +3808,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4058,6 +4072,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4955,6 +4970,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5084,11 +5100,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5502,6 +5520,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6389,6 +6408,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6690,6 +6710,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8162,6 +8183,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8770,6 +8792,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 2aac605c9a4..8566604ebe3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -625,6 +625,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -894,6 +895,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1760,6 +1762,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1858,6 +1861,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2439,6 +2443,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3146,6 +3156,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3663,6 +3674,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3696,6 +3708,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3832,6 +3845,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4095,6 +4109,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5003,6 +5018,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5132,11 +5148,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5559,6 +5577,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6461,6 +6480,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6764,6 +6784,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8258,6 +8279,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8877,6 +8899,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 530e2fe3705..9f910c81054 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -625,6 +625,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -894,6 +895,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1759,6 +1761,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1857,6 +1860,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2438,6 +2442,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3145,6 +3155,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3662,6 +3673,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3695,6 +3707,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3831,6 +3844,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4094,6 +4108,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5002,6 +5017,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5131,11 +5147,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5557,6 +5575,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6457,6 +6476,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6760,6 +6780,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8253,6 +8274,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8872,6 +8894,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index bba0619c2a8..7d5e081463d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -625,6 +625,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -894,6 +895,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1759,6 +1761,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1857,6 +1860,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2437,6 +2441,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3144,6 +3154,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3661,6 +3672,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3694,6 +3706,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3830,6 +3843,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4093,6 +4107,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -5001,6 +5016,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5130,11 +5146,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5555,6 +5573,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6455,6 +6474,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6758,6 +6778,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8251,6 +8272,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8870,6 +8892,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 4a87fe9fbcd..a1607e9aeae 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -625,6 +625,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -894,6 +895,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1756,6 +1758,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1854,6 +1857,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2434,6 +2438,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3141,6 +3151,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3658,6 +3669,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3691,6 +3703,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3825,6 +3838,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4088,6 +4102,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4996,6 +5011,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5125,11 +5141,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5550,6 +5568,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6449,6 +6468,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6752,6 +6772,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8243,6 +8264,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8861,6 +8883,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index edf12e27582..123833c374d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -624,6 +624,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -893,6 +894,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1755,6 +1757,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1853,6 +1856,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_0_8"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2433,6 +2437,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3140,6 +3150,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3657,6 +3668,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3690,6 +3702,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3824,6 +3837,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4087,6 +4101,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4995,6 +5010,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5124,11 +5140,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5549,6 +5567,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6448,6 +6467,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6751,6 +6771,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8242,6 +8263,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8860,6 +8882,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index d7c2beee04d..6c391312b27 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -624,6 +624,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -892,6 +893,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1754,6 +1756,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1852,6 +1855,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2432,6 +2436,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3138,6 +3148,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3655,6 +3666,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3688,6 +3700,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3822,6 +3835,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4085,6 +4099,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4993,6 +5008,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5122,11 +5138,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5547,6 +5565,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6446,6 +6465,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6749,6 +6769,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8236,6 +8257,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8854,6 +8876,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index b724cc74d06..7722a893c0f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -624,6 +624,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -892,6 +893,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1752,6 +1754,7 @@ self: super: { "boolexpr" = dontDistribute super."boolexpr"; "bools" = dontDistribute super."bools"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1850,6 +1853,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_18_1_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2429,6 +2433,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3133,6 +3143,7 @@ self: super: { "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3650,6 +3661,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3683,6 +3695,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3817,6 +3830,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -4080,6 +4094,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4986,6 +5001,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -5115,11 +5131,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5538,6 +5556,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6436,6 +6455,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6739,6 +6759,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -8222,6 +8243,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8839,6 +8861,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 266b64b08f2..de0f4fe5fa1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -611,6 +611,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -872,6 +873,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1695,6 +1697,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1786,6 +1789,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2353,6 +2357,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3023,6 +3033,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3533,6 +3544,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3565,6 +3577,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3694,6 +3707,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3955,6 +3969,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4827,6 +4842,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4944,11 +4960,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5350,6 +5368,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6206,6 +6225,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6504,6 +6524,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7945,6 +7966,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8535,6 +8557,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 9a89efadc04..d88256166b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -611,6 +611,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -872,6 +873,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1694,6 +1696,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1785,6 +1788,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2352,6 +2356,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3020,6 +3030,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3530,6 +3541,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3562,6 +3574,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3691,6 +3704,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3952,6 +3966,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4824,6 +4839,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4941,11 +4957,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5346,6 +5364,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6200,6 +6219,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6498,6 +6518,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7938,6 +7959,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8527,6 +8549,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index b319d87396d..c3a43b75622 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -606,6 +606,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -866,6 +867,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1678,6 +1680,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1769,6 +1772,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2332,6 +2336,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2990,6 +3000,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3495,6 +3506,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3527,6 +3539,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3656,6 +3669,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3915,6 +3929,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4074,6 +4089,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4780,6 +4796,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4894,11 +4911,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5296,6 +5315,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6138,6 +6158,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6287,6 +6308,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6427,6 +6449,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7850,6 +7873,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8423,6 +8447,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index efa75da0139..b529c0c648f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -606,6 +606,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -866,6 +867,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1677,6 +1679,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1767,6 +1770,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2330,6 +2334,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2987,6 +2997,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3492,6 +3503,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3524,6 +3536,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3653,6 +3666,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3912,6 +3926,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4071,6 +4086,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4777,6 +4793,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4891,11 +4908,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5293,6 +5312,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6134,6 +6154,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6283,6 +6304,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6423,6 +6445,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7845,6 +7868,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8418,6 +8442,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 2baf81224cd..b89fa70f8b4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -605,6 +605,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -865,6 +866,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1676,6 +1678,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1766,6 +1769,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2325,6 +2329,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2982,6 +2992,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3486,6 +3497,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3518,6 +3530,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3647,6 +3660,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3906,6 +3920,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4065,6 +4080,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4771,6 +4787,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4885,11 +4902,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5287,6 +5306,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6127,6 +6147,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6276,6 +6297,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6416,6 +6438,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7836,6 +7859,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8408,6 +8432,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index 77646f89eff..f6a631e1153 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -605,6 +605,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -865,6 +866,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1676,6 +1678,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1766,6 +1769,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2325,6 +2329,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2982,6 +2992,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3486,6 +3497,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3518,6 +3530,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3647,6 +3660,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3906,6 +3920,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4064,6 +4079,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4770,6 +4786,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4884,11 +4901,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5285,6 +5304,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6124,6 +6144,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6273,6 +6294,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6413,6 +6435,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7833,6 +7856,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8404,6 +8428,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index a797ab5ea2a..571045bdc8f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -605,6 +605,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -865,6 +866,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1674,6 +1676,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1763,6 +1766,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2321,6 +2325,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2975,6 +2985,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3479,6 +3490,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3511,6 +3523,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3640,6 +3653,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3899,6 +3913,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4057,6 +4072,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4762,6 +4778,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4876,11 +4893,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5276,6 +5295,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6114,6 +6134,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6263,6 +6284,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6403,6 +6425,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7823,6 +7846,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8392,6 +8416,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index d9c13c28eb0..cde1bb303ff 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -605,6 +605,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -865,6 +866,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1674,6 +1676,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1763,6 +1766,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2321,6 +2325,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2975,6 +2985,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3478,6 +3489,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3510,6 +3522,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3639,6 +3652,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3897,6 +3911,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4055,6 +4070,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4758,6 +4774,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4872,11 +4889,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5272,6 +5291,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6110,6 +6130,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6259,6 +6280,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6399,6 +6421,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7818,6 +7841,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8387,6 +8411,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 027669a0662..d3c3eecf1ea 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -605,6 +605,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -864,6 +865,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1437,6 +1439,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1672,6 +1675,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1761,6 +1765,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2319,6 +2324,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2972,6 +2983,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3475,6 +3487,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3507,6 +3520,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3635,6 +3649,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3893,6 +3908,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4051,6 +4067,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4754,6 +4771,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4868,11 +4886,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5266,6 +5286,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6103,6 +6124,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6251,6 +6273,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6391,6 +6414,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7804,6 +7828,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8373,6 +8398,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 39ffaa069b0..2f0d9ece96b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -605,6 +605,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -864,6 +865,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1436,6 +1438,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1671,6 +1674,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1760,6 +1764,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2316,6 +2321,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2969,6 +2980,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3472,6 +3484,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3504,6 +3517,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3631,6 +3645,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3889,6 +3904,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4047,6 +4063,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4749,6 +4766,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4863,11 +4881,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5260,6 +5280,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6096,6 +6117,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6244,6 +6266,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6384,6 +6407,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7797,6 +7821,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8364,6 +8389,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index c3e02f0b9a2..208ba6fedff 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -605,6 +605,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -864,6 +865,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1436,6 +1438,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1671,6 +1674,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1760,6 +1764,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2315,6 +2320,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2968,6 +2979,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3469,6 +3481,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3501,6 +3514,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3627,6 +3641,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3884,6 +3899,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4041,6 +4057,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4740,6 +4757,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4854,11 +4872,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5251,6 +5271,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6086,6 +6107,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6232,6 +6254,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6372,6 +6395,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7783,6 +7807,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8349,6 +8374,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index 2b667569026..296a97f41c5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -604,6 +604,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -863,6 +864,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1433,6 +1435,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1668,6 +1671,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1755,6 +1759,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2309,6 +2314,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2962,6 +2973,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3463,6 +3475,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3495,6 +3508,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3621,6 +3635,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3878,6 +3893,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4035,6 +4051,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4731,6 +4748,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4844,11 +4862,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5240,6 +5260,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6072,6 +6093,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6218,6 +6240,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6358,6 +6381,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7768,6 +7792,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8333,6 +8358,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 42808be6db2..c44009d33c0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -609,6 +609,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -870,6 +871,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1691,6 +1693,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1782,6 +1785,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2349,6 +2353,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3016,6 +3026,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3525,6 +3536,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3557,6 +3569,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3686,6 +3699,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3947,6 +3961,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4819,6 +4834,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4935,11 +4951,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5339,6 +5357,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6192,6 +6211,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6489,6 +6509,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7926,6 +7947,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8514,6 +8536,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index a442cad8461..32cd18e64e3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -603,6 +603,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -862,6 +863,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1431,6 +1433,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1666,6 +1669,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1753,6 +1757,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_7_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2307,6 +2312,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2960,6 +2971,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3461,6 +3473,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3493,6 +3506,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3619,6 +3633,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3876,6 +3891,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4033,6 +4049,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4729,6 +4746,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4842,11 +4860,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5237,6 +5257,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6068,6 +6089,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6214,6 +6236,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6354,6 +6377,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7761,6 +7785,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8325,6 +8350,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index c5bb78d3e59..d1ff009a56a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -603,6 +603,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -862,6 +863,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1431,6 +1433,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1665,6 +1668,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1752,6 +1756,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_7_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2304,6 +2309,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2955,6 +2966,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3456,6 +3468,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3488,6 +3501,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3614,6 +3628,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3870,6 +3885,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4027,6 +4043,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4721,6 +4738,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4834,11 +4852,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5229,6 +5249,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6057,6 +6078,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6203,6 +6225,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6343,6 +6366,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7737,6 +7761,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8296,6 +8321,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index 3d3eff509fa..b4f37b347aa 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -603,6 +603,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -862,6 +863,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1431,6 +1433,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1665,6 +1668,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1752,6 +1756,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_7_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2304,6 +2309,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2953,6 +2964,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3454,6 +3466,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3486,6 +3499,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3612,6 +3626,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3868,6 +3883,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4024,6 +4040,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4715,6 +4732,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4828,11 +4846,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5223,6 +5243,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6051,6 +6072,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6197,6 +6219,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6337,6 +6360,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7731,6 +7755,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8289,6 +8314,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index bcaea931ffc..e7f095bac2d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -609,6 +609,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -870,6 +871,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1690,6 +1692,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1781,6 +1784,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2346,6 +2350,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3012,6 +3022,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3521,6 +3532,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3553,6 +3565,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3682,6 +3695,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3943,6 +3957,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4103,6 +4118,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4813,6 +4829,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4929,11 +4946,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5333,6 +5352,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6186,6 +6206,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6483,6 +6504,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7917,6 +7939,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8503,6 +8526,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index e5d13079ed7..be89c0d27b1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -609,6 +609,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -870,6 +871,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1690,6 +1692,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1781,6 +1784,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2346,6 +2350,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3012,6 +3022,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3521,6 +3532,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3553,6 +3565,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3682,6 +3695,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3943,6 +3957,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4103,6 +4118,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4813,6 +4829,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4929,11 +4946,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5333,6 +5352,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6186,6 +6206,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6483,6 +6504,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7916,6 +7938,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8501,6 +8524,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 6ae70cf4341..08e7d4607c1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -609,6 +609,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -870,6 +871,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1689,6 +1691,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1780,6 +1783,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2345,6 +2349,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3010,6 +3020,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3519,6 +3530,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3551,6 +3563,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3680,6 +3693,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3940,6 +3954,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4099,6 +4114,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4806,6 +4822,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4922,11 +4939,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5326,6 +5345,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6176,6 +6196,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6472,6 +6493,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7902,6 +7924,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8484,6 +8507,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 6d6ef3dccd0..75234059ec3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -609,6 +609,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -870,6 +871,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1689,6 +1691,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1780,6 +1783,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2345,6 +2349,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3010,6 +3020,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3516,6 +3527,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3548,6 +3560,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3677,6 +3690,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3937,6 +3951,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4096,6 +4111,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4803,6 +4819,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4917,11 +4934,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5320,6 +5339,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6168,6 +6188,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6464,6 +6485,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7893,6 +7915,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8473,6 +8496,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 497d6a82c12..01f7fab0ca1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -609,6 +609,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -870,6 +871,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1686,6 +1688,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1777,6 +1780,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2341,6 +2345,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -3006,6 +3016,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3512,6 +3523,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3544,6 +3556,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3673,6 +3686,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3932,6 +3946,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4091,6 +4106,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4797,6 +4813,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4911,11 +4928,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5314,6 +5333,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6161,6 +6181,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6313,6 +6334,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6454,6 +6476,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7880,6 +7903,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8458,6 +8482,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 0141eb95d7a..6d7df9e59a9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -609,6 +609,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -870,6 +871,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1684,6 +1686,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1775,6 +1778,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2338,6 +2342,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2998,6 +3008,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3504,6 +3515,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3536,6 +3548,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3665,6 +3678,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3924,6 +3938,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4083,6 +4098,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4789,6 +4805,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4903,11 +4920,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5305,6 +5324,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6151,6 +6171,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6301,6 +6322,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6441,6 +6463,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7866,6 +7889,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8444,6 +8468,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index 8dd1186fcc5..6286cdf3a42 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -608,6 +608,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -868,6 +869,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1681,6 +1683,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomerang" = dontDistribute super."boomerang"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; @@ -1772,6 +1775,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_6_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2335,6 +2339,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2994,6 +3004,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3499,6 +3510,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3531,6 +3543,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3660,6 +3673,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3919,6 +3933,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -4078,6 +4093,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4784,6 +4800,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4898,11 +4915,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -5300,6 +5319,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -6145,6 +6165,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -6295,6 +6316,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6435,6 +6457,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -7860,6 +7883,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "unification-fd" = dontDistribute super."unification-fd"; @@ -8438,6 +8462,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index f13fd1766e9..a11e485c3f1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -587,6 +587,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -843,6 +844,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1200,6 +1202,7 @@ self: super: { "applicative-numbers" = dontDistribute super."applicative-numbers"; "applicative-parsec" = dontDistribute super."applicative-parsec"; "applicative-quoters" = dontDistribute super."applicative-quoters"; + "apply-refact" = doDistribute super."apply-refact_0_1_0_0"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; "approximate-equality" = dontDistribute super."approximate-equality"; @@ -1334,6 +1337,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1556,6 +1560,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; "bot" = dontDistribute super."bot"; @@ -1640,6 +1645,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_7_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2166,6 +2172,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2788,6 +2800,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3275,6 +3288,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3306,6 +3320,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3429,6 +3444,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3675,6 +3691,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -3828,6 +3845,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4473,6 +4491,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4594,11 +4613,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -4975,6 +4996,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -5067,6 +5089,7 @@ self: super: { "moan" = dontDistribute super."moan"; "modbus-tcp" = dontDistribute super."modbus-tcp"; "modelicaparser" = dontDistribute super."modelicaparser"; + "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4"; "modsplit" = dontDistribute super."modsplit"; "modular-arithmetic" = dontDistribute super."modular-arithmetic"; "modular-prelude" = dontDistribute super."modular-prelude"; @@ -5753,6 +5776,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -5894,6 +5918,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6030,6 +6055,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -6173,7 +6199,9 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_7"; "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_37"; "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_19_0_1"; "restful-snap" = dontDistribute super."restful-snap"; "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; @@ -7350,6 +7378,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "uniform-io" = dontDistribute super."uniform-io"; @@ -7817,6 +7846,7 @@ self: super: { "yesod-lucid" = dontDistribute super."yesod-lucid"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5"; "yesod-paginate" = dontDistribute super."yesod-paginate"; "yesod-pagination" = dontDistribute super."yesod-pagination"; "yesod-paginator" = dontDistribute super."yesod-paginator"; @@ -7862,6 +7892,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index 4e06107d7a9..33013dc368a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -587,6 +587,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -843,6 +844,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1198,6 +1200,7 @@ self: super: { "applicative-numbers" = dontDistribute super."applicative-numbers"; "applicative-parsec" = dontDistribute super."applicative-parsec"; "applicative-quoters" = dontDistribute super."applicative-quoters"; + "apply-refact" = doDistribute super."apply-refact_0_1_0_0"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; "approximate-equality" = dontDistribute super."approximate-equality"; @@ -1332,6 +1335,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1554,6 +1558,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; "bot" = dontDistribute super."bot"; @@ -1638,6 +1643,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_7_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2164,6 +2170,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2782,6 +2794,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3269,6 +3282,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3300,6 +3314,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3423,6 +3438,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3669,6 +3685,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -3821,6 +3838,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4461,6 +4479,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4582,11 +4601,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -4960,6 +4981,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -5052,6 +5074,7 @@ self: super: { "moan" = dontDistribute super."moan"; "modbus-tcp" = dontDistribute super."modbus-tcp"; "modelicaparser" = dontDistribute super."modelicaparser"; + "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4"; "modsplit" = dontDistribute super."modsplit"; "modular-arithmetic" = dontDistribute super."modular-arithmetic"; "modular-prelude" = dontDistribute super."modular-prelude"; @@ -5736,6 +5759,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -5877,6 +5901,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6013,6 +6038,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -6155,7 +6181,9 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_7"; "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_37"; "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_19_0_1"; "restful-snap" = dontDistribute super."restful-snap"; "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; @@ -7331,6 +7359,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "uniform-io" = dontDistribute super."uniform-io"; @@ -7797,6 +7826,7 @@ self: super: { "yesod-lucid" = dontDistribute super."yesod-lucid"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5"; "yesod-paginate" = dontDistribute super."yesod-paginate"; "yesod-pagination" = dontDistribute super."yesod-pagination"; "yesod-paginator" = dontDistribute super."yesod-paginator"; @@ -7842,6 +7872,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix index 12a566d954c..05a347b4c96 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix @@ -585,6 +585,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -840,6 +841,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1193,6 +1195,7 @@ self: super: { "applicative-numbers" = dontDistribute super."applicative-numbers"; "applicative-parsec" = dontDistribute super."applicative-parsec"; "applicative-quoters" = dontDistribute super."applicative-quoters"; + "apply-refact" = doDistribute super."apply-refact_0_1_0_0"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; "approximate-equality" = dontDistribute super."approximate-equality"; @@ -1327,6 +1330,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1549,6 +1553,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; "bot" = dontDistribute super."bot"; @@ -1632,6 +1637,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-helper" = doDistribute super."cabal-helper_0_6_3_0"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_7_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2152,6 +2158,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2761,6 +2773,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -3245,6 +3258,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3276,6 +3290,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3398,6 +3413,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3639,6 +3655,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -3789,6 +3806,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4420,6 +4438,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4541,11 +4560,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -4916,6 +4937,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -5002,11 +5024,13 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_5"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; "modbus-tcp" = dontDistribute super."modbus-tcp"; "modelicaparser" = dontDistribute super."modelicaparser"; + "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4"; "modsplit" = dontDistribute super."modsplit"; "modular-arithmetic" = dontDistribute super."modular-arithmetic"; "modular-prelude" = dontDistribute super."modular-prelude"; @@ -5029,6 +5053,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_17"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5687,6 +5712,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -5825,6 +5851,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5961,6 +5988,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -6101,7 +6129,9 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_7"; "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_37"; "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_19_0_1"; "restful-snap" = dontDistribute super."restful-snap"; "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; @@ -7266,6 +7296,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "uniform-io" = dontDistribute super."uniform-io"; @@ -7727,6 +7758,7 @@ self: super: { "yesod-lucid" = dontDistribute super."yesod-lucid"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5"; "yesod-paginate" = dontDistribute super."yesod-paginate"; "yesod-pagination" = dontDistribute super."yesod-pagination"; "yesod-paginator" = dontDistribute super."yesod-paginator"; @@ -7772,6 +7804,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix index 25e558c5e99..7fd213cdf9f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix @@ -576,6 +576,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -828,6 +829,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1178,6 +1180,7 @@ self: super: { "applicative-numbers" = dontDistribute super."applicative-numbers"; "applicative-parsec" = dontDistribute super."applicative-parsec"; "applicative-quoters" = dontDistribute super."applicative-quoters"; + "apply-refact" = doDistribute super."apply-refact_0_1_0_0"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; "approximate-equality" = dontDistribute super."approximate-equality"; @@ -1310,6 +1313,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1526,6 +1530,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; "bot" = dontDistribute super."bot"; @@ -1605,6 +1610,7 @@ self: super: { "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_7_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2114,6 +2120,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2544,6 +2556,7 @@ self: super: { "error-message" = dontDistribute super."error-message"; "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "errors" = doDistribute super."errors_2_1_1"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; @@ -2704,6 +2717,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -2944,6 +2958,7 @@ self: super: { "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -2995,6 +3010,7 @@ self: super: { "gitHUD" = dontDistribute super."gitHUD"; "gitcache" = dontDistribute super."gitcache"; "gitdo" = dontDistribute super."gitdo"; + "github" = doDistribute super."github_0_14_0"; "github-backup" = dontDistribute super."github-backup"; "github-post-receive" = dontDistribute super."github-post-receive"; "github-utils" = dontDistribute super."github-utils"; @@ -3175,6 +3191,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3205,6 +3222,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3325,6 +3343,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3566,6 +3585,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -3716,6 +3736,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4337,6 +4358,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4456,11 +4478,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -4828,6 +4852,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -4903,11 +4928,13 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_5"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; "modbus-tcp" = dontDistribute super."modbus-tcp"; "modelicaparser" = dontDistribute super."modelicaparser"; + "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4"; "modsplit" = dontDistribute super."modsplit"; "modular-arithmetic" = dontDistribute super."modular-arithmetic"; "modular-prelude" = dontDistribute super."modular-prelude"; @@ -4930,6 +4957,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_17"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5574,6 +5602,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -5709,6 +5738,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5841,6 +5871,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -5979,7 +6010,9 @@ self: super: { "resource-simple" = dontDistribute super."resource-simple"; "resourcet" = doDistribute super."resourcet_1_1_7"; "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_37"; "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_19_0_1"; "restful-snap" = dontDistribute super."restful-snap"; "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; @@ -6653,6 +6686,7 @@ self: super: { "svm-light-utils" = dontDistribute super."svm-light-utils"; "svm-simple" = dontDistribute super."svm-simple"; "svndump" = dontDistribute super."svndump"; + "swagger2" = doDistribute super."swagger2_1_2_1"; "swapper" = dontDistribute super."swapper"; "swearjure" = dontDistribute super."swearjure"; "swf" = dontDistribute super."swf"; @@ -7113,6 +7147,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "uniform-io" = dontDistribute super."uniform-io"; @@ -7561,6 +7596,7 @@ self: super: { "yesod-lucid" = dontDistribute super."yesod-lucid"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5"; "yesod-paginate" = dontDistribute super."yesod-paginate"; "yesod-pagination" = dontDistribute super."yesod-pagination"; "yesod-paginator" = dontDistribute super."yesod-paginator"; @@ -7606,6 +7642,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix index 9bd1579f102..b9e13567f85 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix @@ -574,6 +574,7 @@ self: super: { "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; "Lastik" = dontDistribute super."Lastik"; "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; "LazyVault" = dontDistribute super."LazyVault"; "Level0" = dontDistribute super."Level0"; "LibClang" = dontDistribute super."LibClang"; @@ -826,6 +827,7 @@ self: super: { "SimpleGL" = dontDistribute super."SimpleGL"; "SimpleH" = dontDistribute super."SimpleH"; "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; "SizeCompare" = dontDistribute super."SizeCompare"; "Slides" = dontDistribute super."Slides"; "Smooth" = dontDistribute super."Smooth"; @@ -1174,6 +1176,7 @@ self: super: { "applicative-numbers" = dontDistribute super."applicative-numbers"; "applicative-parsec" = dontDistribute super."applicative-parsec"; "applicative-quoters" = dontDistribute super."applicative-quoters"; + "apply-refact" = doDistribute super."apply-refact_0_1_0_0"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; "approximate-equality" = dontDistribute super."approximate-equality"; @@ -1303,6 +1306,7 @@ self: super: { "azure-servicebus" = dontDistribute super."azure-servicebus"; "azurify" = dontDistribute super."azurify"; "b-tree" = dontDistribute super."b-tree"; + "b9" = doDistribute super."b9_0_5_16"; "babylon" = dontDistribute super."babylon"; "backdropper" = dontDistribute super."backdropper"; "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; @@ -1517,6 +1521,7 @@ self: super: { "bools" = dontDistribute super."bools"; "boolsimplifier" = dontDistribute super."boolsimplifier"; "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; "boomslang" = dontDistribute super."boomslang"; "borel" = dontDistribute super."borel"; "bot" = dontDistribute super."bot"; @@ -1595,6 +1600,7 @@ self: super: { "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-info" = dontDistribute super."cabal-info"; "cabal-install" = doDistribute super."cabal-install_1_22_7_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; @@ -2097,6 +2103,12 @@ self: super: { "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; "data-dispersal" = dontDistribute super."data-dispersal"; "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; @@ -2527,6 +2539,7 @@ self: super: { "error-message" = dontDistribute super."error-message"; "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "errors" = doDistribute super."errors_2_1_1"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; "ert" = dontDistribute super."ert"; @@ -2687,6 +2700,7 @@ self: super: { "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; "fixedprec" = dontDistribute super."fixedprec"; "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; "fixhs" = dontDistribute super."fixhs"; "fixplate" = dontDistribute super."fixplate"; "fixpoint" = dontDistribute super."fixpoint"; @@ -2927,6 +2941,7 @@ self: super: { "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -2978,6 +2993,7 @@ self: super: { "gitHUD" = dontDistribute super."gitHUD"; "gitcache" = dontDistribute super."gitcache"; "gitdo" = dontDistribute super."gitdo"; + "github" = doDistribute super."github_0_14_0"; "github-backup" = dontDistribute super."github-backup"; "github-post-receive" = dontDistribute super."github-post-receive"; "github-utils" = dontDistribute super."github-utils"; @@ -3158,6 +3174,7 @@ self: super: { "grapefruit-records" = dontDistribute super."grapefruit-records"; "grapefruit-ui" = dontDistribute super."grapefruit-ui"; "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; "graph-generators" = dontDistribute super."graph-generators"; "graph-matchings" = dontDistribute super."graph-matchings"; "graph-rewriting" = dontDistribute super."graph-rewriting"; @@ -3188,6 +3205,7 @@ self: super: { "greencard-lib" = dontDistribute super."greencard-lib"; "greg-client" = dontDistribute super."greg-client"; "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; "grid" = dontDistribute super."grid"; "gridland" = dontDistribute super."gridland"; "grm" = dontDistribute super."grm"; @@ -3308,6 +3326,7 @@ self: super: { "haeredes" = dontDistribute super."haeredes"; "haggis" = dontDistribute super."haggis"; "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; "haiji" = dontDistribute super."haiji"; "hailgun" = dontDistribute super."hailgun"; "hailgun-send" = dontDistribute super."hailgun-send"; @@ -3547,6 +3566,7 @@ self: super: { "hcheat" = dontDistribute super."hcheat"; "hchesslib" = dontDistribute super."hchesslib"; "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; @@ -3697,6 +3717,7 @@ self: super: { "hjcase" = dontDistribute super."hjcase"; "hjpath" = dontDistribute super."hjpath"; "hjs" = dontDistribute super."hjs"; + "hjsmin" = doDistribute super."hjsmin_0_1_5_1"; "hjson" = dontDistribute super."hjson"; "hjson-query" = dontDistribute super."hjson-query"; "hjsonpointer" = dontDistribute super."hjsonpointer"; @@ -4317,6 +4338,7 @@ self: super: { "json-fu" = dontDistribute super."json-fu"; "json-litobj" = dontDistribute super."json-litobj"; "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; "json-python" = dontDistribute super."json-python"; "json-qq" = dontDistribute super."json-qq"; "json-rpc" = dontDistribute super."json-rpc"; @@ -4436,11 +4458,13 @@ self: super: { "lambdacms-media" = dontDistribute super."lambdacms-media"; "lambdacube" = dontDistribute super."lambdacube"; "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; "lambdacube-core" = dontDistribute super."lambdacube-core"; "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -4805,6 +4829,7 @@ self: super: { "mdapi" = dontDistribute super."mdapi"; "mdcat" = dontDistribute super."mdcat"; "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; "mecab" = dontDistribute super."mecab"; "mecha" = dontDistribute super."mecha"; "mediawiki" = dontDistribute super."mediawiki"; @@ -4880,11 +4905,13 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_5"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; "modbus-tcp" = dontDistribute super."modbus-tcp"; "modelicaparser" = dontDistribute super."modelicaparser"; + "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4"; "modsplit" = dontDistribute super."modsplit"; "modular-arithmetic" = dontDistribute super."modular-arithmetic"; "modular-prelude" = dontDistribute super."modular-prelude"; @@ -4905,6 +4932,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_17"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5549,6 +5577,7 @@ self: super: { "polytypeable" = dontDistribute super."polytypeable"; "polytypeable-utils" = dontDistribute super."polytypeable-utils"; "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; @@ -5684,6 +5713,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5816,6 +5846,7 @@ self: super: { "reactive-balsa" = dontDistribute super."reactive-balsa"; "reactive-banana" = dontDistribute super."reactive-banana"; "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; @@ -5952,7 +5983,9 @@ self: super: { "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_37"; "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_19_0_1"; "restful-snap" = dontDistribute super."restful-snap"; "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; @@ -6190,6 +6223,7 @@ self: super: { "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-swagger" = doDistribute super."servant-swagger_0_1_2"; "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; "sessions" = dontDistribute super."sessions"; "set-cover" = dontDistribute super."set-cover"; @@ -6599,6 +6633,7 @@ self: super: { "subnet" = dontDistribute super."subnet"; "subtitleParser" = dontDistribute super."subtitleParser"; "subtitles" = dontDistribute super."subtitles"; + "success" = doDistribute super."success_0_2_5"; "suffixarray" = dontDistribute super."suffixarray"; "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; @@ -6623,6 +6658,7 @@ self: super: { "svm-light-utils" = dontDistribute super."svm-light-utils"; "svm-simple" = dontDistribute super."svm-simple"; "svndump" = dontDistribute super."svndump"; + "swagger2" = doDistribute super."swagger2_1_2_1"; "swapper" = dontDistribute super."swapper"; "swearjure" = dontDistribute super."swearjure"; "swf" = dontDistribute super."swf"; @@ -7082,6 +7118,7 @@ self: super: { "unicode-normalization" = dontDistribute super."unicode-normalization"; "unicode-prelude" = dontDistribute super."unicode-prelude"; "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; "unicode-symbols" = dontDistribute super."unicode-symbols"; "unicoder" = dontDistribute super."unicoder"; "uniform-io" = dontDistribute super."uniform-io"; @@ -7529,6 +7566,7 @@ self: super: { "yesod-lucid" = dontDistribute super."yesod-lucid"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5"; "yesod-paginate" = dontDistribute super."yesod-paginate"; "yesod-pagination" = dontDistribute super."yesod-pagination"; "yesod-paginator" = dontDistribute super."yesod-paginator"; @@ -7573,6 +7611,7 @@ self: super: { "yjsvg" = dontDistribute super."yjsvg"; "yjtools" = dontDistribute super."yjtools"; "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; "yoko" = dontDistribute super."yoko"; "york-lava" = dontDistribute super."york-lava"; "youtube" = dontDistribute super."youtube"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix new file mode 100644 index 00000000000..8a68bd9a273 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix @@ -0,0 +1,7646 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # core libraries provided by the compiler + Cabal = null; + array = null; + base = null; + bin-package-db = null; + binary = null; + bytestring = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-prim = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + time = null; + transformers = null; + unix = null; + + # lts-5.2 packages + "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; + "3dmodels" = dontDistribute super."3dmodels"; + "4Blocks" = dontDistribute super."4Blocks"; + "AAI" = dontDistribute super."AAI"; + "ABList" = dontDistribute super."ABList"; + "AC-Angle" = dontDistribute super."AC-Angle"; + "AC-Boolean" = dontDistribute super."AC-Boolean"; + "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; + "AC-Colour" = dontDistribute super."AC-Colour"; + "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; + "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; + "AC-MiniTest" = dontDistribute super."AC-MiniTest"; + "AC-PPM" = dontDistribute super."AC-PPM"; + "AC-Random" = dontDistribute super."AC-Random"; + "AC-Terminal" = dontDistribute super."AC-Terminal"; + "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; + "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; + "ACME" = dontDistribute super."ACME"; + "ADPfusion" = dontDistribute super."ADPfusion"; + "AERN-Basics" = dontDistribute super."AERN-Basics"; + "AERN-Net" = dontDistribute super."AERN-Net"; + "AERN-Real" = dontDistribute super."AERN-Real"; + "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; + "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; + "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; + "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; + "AES" = dontDistribute super."AES"; + "AGI" = dontDistribute super."AGI"; + "ALUT" = dontDistribute super."ALUT"; + "AMI" = dontDistribute super."AMI"; + "ANum" = dontDistribute super."ANum"; + "ASN1" = dontDistribute super."ASN1"; + "AVar" = dontDistribute super."AVar"; + "AWin32Console" = dontDistribute super."AWin32Console"; + "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; + "AbortT-mtl" = dontDistribute super."AbortT-mtl"; + "AbortT-transformers" = dontDistribute super."AbortT-transformers"; + "ActionKid" = dontDistribute super."ActionKid"; + "Adaptive" = dontDistribute super."Adaptive"; + "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; + "Advgame" = dontDistribute super."Advgame"; + "AesonBson" = dontDistribute super."AesonBson"; + "Agata" = dontDistribute super."Agata"; + "Agda-executable" = dontDistribute super."Agda-executable"; + "AhoCorasick" = dontDistribute super."AhoCorasick"; + "AlgorithmW" = dontDistribute super."AlgorithmW"; + "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; + "Allure" = dontDistribute super."Allure"; + "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; + "Animas" = dontDistribute super."Animas"; + "Annotations" = dontDistribute super."Annotations"; + "Ansi2Html" = dontDistribute super."Ansi2Html"; + "ApplePush" = dontDistribute super."ApplePush"; + "AppleScript" = dontDistribute super."AppleScript"; + "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; + "ArrayRef" = dontDistribute super."ArrayRef"; + "ArrowVHDL" = dontDistribute super."ArrowVHDL"; + "AspectAG" = dontDistribute super."AspectAG"; + "AttoBencode" = dontDistribute super."AttoBencode"; + "AttoJson" = dontDistribute super."AttoJson"; + "Attrac" = dontDistribute super."Attrac"; + "Aurochs" = dontDistribute super."Aurochs"; + "AutoForms" = dontDistribute super."AutoForms"; + "AvlTree" = dontDistribute super."AvlTree"; + "BASIC" = dontDistribute super."BASIC"; + "BCMtools" = dontDistribute super."BCMtools"; + "BNFC" = dontDistribute super."BNFC"; + "BNFC-meta" = dontDistribute super."BNFC-meta"; + "Baggins" = dontDistribute super."Baggins"; + "Bang" = dontDistribute super."Bang"; + "Barracuda" = dontDistribute super."Barracuda"; + "Befunge93" = dontDistribute super."Befunge93"; + "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; + "BerkeleyDB" = dontDistribute super."BerkeleyDB"; + "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; + "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; + "BigPixel" = dontDistribute super."BigPixel"; + "Binpack" = dontDistribute super."Binpack"; + "Biobase" = dontDistribute super."Biobase"; + "BiobaseBlast" = dontDistribute super."BiobaseBlast"; + "BiobaseDotP" = dontDistribute super."BiobaseDotP"; + "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; + "BiobaseFasta" = dontDistribute super."BiobaseFasta"; + "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; + "BiobaseMAF" = dontDistribute super."BiobaseMAF"; + "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; + "BiobaseTurner" = dontDistribute super."BiobaseTurner"; + "BiobaseTypes" = dontDistribute super."BiobaseTypes"; + "BiobaseVienna" = dontDistribute super."BiobaseVienna"; + "BiobaseXNA" = dontDistribute super."BiobaseXNA"; + "BirdPP" = dontDistribute super."BirdPP"; + "BitSyntax" = dontDistribute super."BitSyntax"; + "Bitly" = dontDistribute super."Bitly"; + "Blobs" = dontDistribute super."Blobs"; + "BluePrintCSS" = dontDistribute super."BluePrintCSS"; + "Blueprint" = dontDistribute super."Blueprint"; + "Bookshelf" = dontDistribute super."Bookshelf"; + "Bravo" = dontDistribute super."Bravo"; + "BufferedSocket" = dontDistribute super."BufferedSocket"; + "Buster" = dontDistribute super."Buster"; + "CBOR" = dontDistribute super."CBOR"; + "CC-delcont" = dontDistribute super."CC-delcont"; + "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; + "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; + "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; + "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; + "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; + "CCA" = dontDistribute super."CCA"; + "CHXHtml" = dontDistribute super."CHXHtml"; + "CLASE" = dontDistribute super."CLASE"; + "CLI" = dontDistribute super."CLI"; + "CMCompare" = dontDistribute super."CMCompare"; + "CMQ" = dontDistribute super."CMQ"; + "COrdering" = dontDistribute super."COrdering"; + "CPBrainfuck" = dontDistribute super."CPBrainfuck"; + "CPL" = dontDistribute super."CPL"; + "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; + "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; + "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; + "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; + "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; + "CSPM-cspm" = dontDistribute super."CSPM-cspm"; + "CTRex" = dontDistribute super."CTRex"; + "CV" = dontDistribute super."CV"; + "CabalSearch" = dontDistribute super."CabalSearch"; + "Capabilities" = dontDistribute super."Capabilities"; + "Cardinality" = dontDistribute super."Cardinality"; + "CarneadesDSL" = dontDistribute super."CarneadesDSL"; + "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; + "Cartesian" = dontDistribute super."Cartesian"; + "Cascade" = dontDistribute super."Cascade"; + "Catana" = dontDistribute super."Catana"; + "ChannelT" = dontDistribute super."ChannelT"; + "Chart-diagrams" = dontDistribute super."Chart-diagrams"; + "Chart-gtk" = dontDistribute super."Chart-gtk"; + "Chart-simple" = dontDistribute super."Chart-simple"; + "CheatSheet" = dontDistribute super."CheatSheet"; + "Checked" = dontDistribute super."Checked"; + "Chitra" = dontDistribute super."Chitra"; + "ChristmasTree" = dontDistribute super."ChristmasTree"; + "CirruParser" = dontDistribute super."CirruParser"; + "ClassLaws" = dontDistribute super."ClassLaws"; + "ClassyPrelude" = dontDistribute super."ClassyPrelude"; + "Clean" = dontDistribute super."Clean"; + "Clipboard" = dontDistribute super."Clipboard"; + "Coadjute" = dontDistribute super."Coadjute"; + "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; + "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; + "Combinatorrent" = dontDistribute super."Combinatorrent"; + "Command" = dontDistribute super."Command"; + "Commando" = dontDistribute super."Commando"; + "ComonadSheet" = dontDistribute super."ComonadSheet"; + "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; + "Concurrential" = dontDistribute super."Concurrential"; + "Condor" = dontDistribute super."Condor"; + "ConfigFileTH" = dontDistribute super."ConfigFileTH"; + "Configger" = dontDistribute super."Configger"; + "Configurable" = dontDistribute super."Configurable"; + "ConsStream" = dontDistribute super."ConsStream"; + "Conscript" = dontDistribute super."Conscript"; + "ConstraintKinds" = dontDistribute super."ConstraintKinds"; + "Consumer" = dontDistribute super."Consumer"; + "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; + "Contract" = dontDistribute super."Contract"; + "Control-Engine" = dontDistribute super."Control-Engine"; + "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; + "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; + "CoreDump" = dontDistribute super."CoreDump"; + "CoreErlang" = dontDistribute super."CoreErlang"; + "CoreFoundation" = dontDistribute super."CoreFoundation"; + "Coroutine" = dontDistribute super."Coroutine"; + "CouchDB" = dontDistribute super."CouchDB"; + "Craft3e" = dontDistribute super."Craft3e"; + "Crypto" = dontDistribute super."Crypto"; + "CurryDB" = dontDistribute super."CurryDB"; + "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DBlimited" = dontDistribute super."DBlimited"; + "DBus" = dontDistribute super."DBus"; + "DCFL" = dontDistribute super."DCFL"; + "DMuCheck" = dontDistribute super."DMuCheck"; + "DOM" = dontDistribute super."DOM"; + "DP" = dontDistribute super."DP"; + "DPM" = dontDistribute super."DPM"; + "DSA" = dontDistribute super."DSA"; + "DSH" = dontDistribute super."DSH"; + "DSTM" = dontDistribute super."DSTM"; + "DTC" = dontDistribute super."DTC"; + "Dangerous" = dontDistribute super."Dangerous"; + "Dao" = dontDistribute super."Dao"; + "DarcsHelpers" = dontDistribute super."DarcsHelpers"; + "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; + "Data-Rope" = dontDistribute super."Data-Rope"; + "DataTreeView" = dontDistribute super."DataTreeView"; + "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; + "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; + "DecisionTree" = dontDistribute super."DecisionTree"; + "DeepArrow" = dontDistribute super."DeepArrow"; + "DefendTheKing" = dontDistribute super."DefendTheKing"; + "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; + "Dflow" = dontDistribute super."Dflow"; + "DifferenceLogic" = dontDistribute super."DifferenceLogic"; + "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; + "Digit" = dontDistribute super."Digit"; + "DigitalOcean" = dontDistribute super."DigitalOcean"; + "DimensionalHash" = dontDistribute super."DimensionalHash"; + "DirectSound" = dontDistribute super."DirectSound"; + "DisTract" = dontDistribute super."DisTract"; + "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; + "Dish" = dontDistribute super."Dish"; + "Dist" = dontDistribute super."Dist"; + "DistanceTransform" = dontDistribute super."DistanceTransform"; + "DistanceUnits" = dontDistribute super."DistanceUnits"; + "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; + "DocTest" = dontDistribute super."DocTest"; + "Docs" = dontDistribute super."Docs"; + "DrHylo" = dontDistribute super."DrHylo"; + "DrIFT" = dontDistribute super."DrIFT"; + "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; + "Dung" = dontDistribute super."Dung"; + "Dust" = dontDistribute super."Dust"; + "Dust-crypto" = dontDistribute super."Dust-crypto"; + "Dust-tools" = dontDistribute super."Dust-tools"; + "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; + "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; + "DysFRP" = dontDistribute super."DysFRP"; + "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; + "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; + "EEConfig" = dontDistribute super."EEConfig"; + "EdisonAPI" = dontDistribute super."EdisonAPI"; + "EdisonCore" = dontDistribute super."EdisonCore"; + "EditTimeReport" = dontDistribute super."EditTimeReport"; + "EitherT" = dontDistribute super."EitherT"; + "Elm" = dontDistribute super."Elm"; + "Emping" = dontDistribute super."Emping"; + "Encode" = dontDistribute super."Encode"; + "EnumContainers" = dontDistribute super."EnumContainers"; + "EnumMap" = dontDistribute super."EnumMap"; + "Eq" = dontDistribute super."Eq"; + "EqualitySolver" = dontDistribute super."EqualitySolver"; + "EsounD" = dontDistribute super."EsounD"; + "EstProgress" = dontDistribute super."EstProgress"; + "EtaMOO" = dontDistribute super."EtaMOO"; + "Etage" = dontDistribute super."Etage"; + "Etage-Graph" = dontDistribute super."Etage-Graph"; + "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; + "Etherbunny" = dontDistribute super."Etherbunny"; + "EuroIT" = dontDistribute super."EuroIT"; + "Euterpea" = dontDistribute super."Euterpea"; + "EventSocket" = dontDistribute super."EventSocket"; + "Extra" = dontDistribute super."Extra"; + "FComp" = dontDistribute super."FComp"; + "FM-SBLEX" = dontDistribute super."FM-SBLEX"; + "FModExRaw" = dontDistribute super."FModExRaw"; + "FPretty" = dontDistribute super."FPretty"; + "FTGL" = dontDistribute super."FTGL"; + "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; + "FTPLine" = dontDistribute super."FTPLine"; + "Facts" = dontDistribute super."Facts"; + "FailureT" = dontDistribute super."FailureT"; + "FastxPipe" = dontDistribute super."FastxPipe"; + "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; + "FerryCore" = dontDistribute super."FerryCore"; + "Feval" = dontDistribute super."Feval"; + "FieldTrip" = dontDistribute super."FieldTrip"; + "FileManip" = dontDistribute super."FileManip"; + "FileManipCompat" = dontDistribute super."FileManipCompat"; + "FilePather" = dontDistribute super."FilePather"; + "FileSystem" = dontDistribute super."FileSystem"; + "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; + "Finance-Treasury" = dontDistribute super."Finance-Treasury"; + "FiniteMap" = dontDistribute super."FiniteMap"; + "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; + "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; + "Flippi" = dontDistribute super."Flippi"; + "Focus" = dontDistribute super."Focus"; + "Folly" = dontDistribute super."Folly"; + "ForSyDe" = dontDistribute super."ForSyDe"; + "ForkableT" = dontDistribute super."ForkableT"; + "FormalGrammars" = dontDistribute super."FormalGrammars"; + "Foster" = dontDistribute super."Foster"; + "FpMLv53" = dontDistribute super."FpMLv53"; + "FractalArt" = dontDistribute super."FractalArt"; + "Fractaler" = dontDistribute super."Fractaler"; + "Frank" = dontDistribute super."Frank"; + "FreeTypeGL" = dontDistribute super."FreeTypeGL"; + "FunGEn" = dontDistribute super."FunGEn"; + "Fungi" = dontDistribute super."Fungi"; + "GA" = dontDistribute super."GA"; + "GGg" = dontDistribute super."GGg"; + "GHood" = dontDistribute super."GHood"; + "GLFW" = dontDistribute super."GLFW"; + "GLFW-OGL" = dontDistribute super."GLFW-OGL"; + "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; + "GTALib" = dontDistribute super."GTALib"; + "Gamgine" = dontDistribute super."Gamgine"; + "Ganymede" = dontDistribute super."Ganymede"; + "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; + "GeBoP" = dontDistribute super."GeBoP"; + "GenI" = dontDistribute super."GenI"; + "GenSmsPdu" = dontDistribute super."GenSmsPdu"; + "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; + "GenussFold" = dontDistribute super."GenussFold"; + "GeoIp" = dontDistribute super."GeoIp"; + "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage"; + "Geodetic" = dontDistribute super."Geodetic"; + "GeomPredicates" = dontDistribute super."GeomPredicates"; + "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; + "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; + "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "GlomeTrace" = dontDistribute super."GlomeTrace"; + "GlomeVec" = dontDistribute super."GlomeVec"; + "GlomeView" = dontDistribute super."GlomeView"; + "GoogleChart" = dontDistribute super."GoogleChart"; + "GoogleDirections" = dontDistribute super."GoogleDirections"; + "GoogleSB" = dontDistribute super."GoogleSB"; + "GoogleSuggest" = dontDistribute super."GoogleSuggest"; + "GoogleTranslate" = dontDistribute super."GoogleTranslate"; + "GotoT-transformers" = dontDistribute super."GotoT-transformers"; + "GrammarProducts" = dontDistribute super."GrammarProducts"; + "Graph500" = dontDistribute super."Graph500"; + "GraphHammer" = dontDistribute super."GraphHammer"; + "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; + "Graphalyze" = dontDistribute super."Graphalyze"; + "Grempa" = dontDistribute super."Grempa"; + "GroteTrap" = dontDistribute super."GroteTrap"; + "Grow" = dontDistribute super."Grow"; + "GrowlNotify" = dontDistribute super."GrowlNotify"; + "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; + "GtkGLTV" = dontDistribute super."GtkGLTV"; + "GtkTV" = dontDistribute super."GtkTV"; + "GuiHaskell" = dontDistribute super."GuiHaskell"; + "GuiTV" = dontDistribute super."GuiTV"; + "HARM" = dontDistribute super."HARM"; + "HAppS-Data" = dontDistribute super."HAppS-Data"; + "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; + "HAppS-Server" = dontDistribute super."HAppS-Server"; + "HAppS-State" = dontDistribute super."HAppS-State"; + "HAppS-Util" = dontDistribute super."HAppS-Util"; + "HAppSHelpers" = dontDistribute super."HAppSHelpers"; + "HCL" = dontDistribute super."HCL"; + "HCard" = dontDistribute super."HCard"; + "HDBC-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "HDRUtils" = dontDistribute super."HDRUtils"; + "HERA" = dontDistribute super."HERA"; + "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; + "HFuse" = dontDistribute super."HFuse"; + "HGL" = dontDistribute super."HGL"; + "HGamer3D" = dontDistribute super."HGamer3D"; + "HGamer3D-API" = dontDistribute super."HGamer3D-API"; + "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; + "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; + "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; + "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; + "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; + "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; + "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; + "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; + "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; + "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; + "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; + "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; + "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; + "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; + "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; + "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; + "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; + "HGraphStorage" = dontDistribute super."HGraphStorage"; + "HHDL" = dontDistribute super."HHDL"; + "HJScript" = dontDistribute super."HJScript"; + "HJVM" = dontDistribute super."HJVM"; + "HJavaScript" = dontDistribute super."HJavaScript"; + "HLearn-algebra" = dontDistribute super."HLearn-algebra"; + "HLearn-approximation" = dontDistribute super."HLearn-approximation"; + "HLearn-classification" = dontDistribute super."HLearn-classification"; + "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; + "HLearn-distributions" = dontDistribute super."HLearn-distributions"; + "HListPP" = dontDistribute super."HListPP"; + "HLogger" = dontDistribute super."HLogger"; + "HMM" = dontDistribute super."HMM"; + "HMap" = dontDistribute super."HMap"; + "HNM" = dontDistribute super."HNM"; + "HODE" = dontDistribute super."HODE"; + "HOpenCV" = dontDistribute super."HOpenCV"; + "HPath" = dontDistribute super."HPath"; + "HPi" = dontDistribute super."HPi"; + "HPlot" = dontDistribute super."HPlot"; + "HPong" = dontDistribute super."HPong"; + "HROOT" = dontDistribute super."HROOT"; + "HROOT-core" = dontDistribute super."HROOT-core"; + "HROOT-graf" = dontDistribute super."HROOT-graf"; + "HROOT-hist" = dontDistribute super."HROOT-hist"; + "HROOT-io" = dontDistribute super."HROOT-io"; + "HROOT-math" = dontDistribute super."HROOT-math"; + "HRay" = dontDistribute super."HRay"; + "HSFFIG" = dontDistribute super."HSFFIG"; + "HSGEP" = dontDistribute super."HSGEP"; + "HSH" = dontDistribute super."HSH"; + "HSHHelpers" = dontDistribute super."HSHHelpers"; + "HSlippyMap" = dontDistribute super."HSlippyMap"; + "HSmarty" = dontDistribute super."HSmarty"; + "HSoundFile" = dontDistribute super."HSoundFile"; + "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; + "HSvm" = dontDistribute super."HSvm"; + "HTTP-Simple" = dontDistribute super."HTTP-Simple"; + "HTab" = dontDistribute super."HTab"; + "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit-Diff" = dontDistribute super."HUnit-Diff"; + "HUnit-Plus" = dontDistribute super."HUnit-Plus"; + "HUnit-approx" = dontDistribute super."HUnit-approx"; + "HXMPP" = dontDistribute super."HXMPP"; + "HXQ" = dontDistribute super."HXQ"; + "HaLeX" = dontDistribute super."HaLeX"; + "HaMinitel" = dontDistribute super."HaMinitel"; + "HaPy" = dontDistribute super."HaPy"; + "HaTeX-meta" = dontDistribute super."HaTeX-meta"; + "HaTeX-qq" = dontDistribute super."HaTeX-qq"; + "HaVSA" = dontDistribute super."HaVSA"; + "Hach" = dontDistribute super."Hach"; + "HackMail" = dontDistribute super."HackMail"; + "Haggressive" = dontDistribute super."Haggressive"; + "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; + "Hangman" = dontDistribute super."Hangman"; + "HarmTrace" = dontDistribute super."HarmTrace"; + "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; + "HasGP" = dontDistribute super."HasGP"; + "Haschoo" = dontDistribute super."Haschoo"; + "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; + "HaskellForMaths" = dontDistribute super."HaskellForMaths"; + "HaskellLM" = dontDistribute super."HaskellLM"; + "HaskellNN" = dontDistribute super."HaskellNN"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hate" = dontDistribute super."Hate"; + "Hawk" = dontDistribute super."Hawk"; + "Hayoo" = dontDistribute super."Hayoo"; + "Hclip" = dontDistribute super."Hclip"; + "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; + "Hermes" = dontDistribute super."Hermes"; + "Hieroglyph" = dontDistribute super."Hieroglyph"; + "HiggsSet" = dontDistribute super."HiggsSet"; + "Hipmunk" = dontDistribute super."Hipmunk"; + "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; + "Hish" = dontDistribute super."Hish"; + "Histogram" = dontDistribute super."Histogram"; + "Hmpf" = dontDistribute super."Hmpf"; + "Hoed" = dontDistribute super."Hoed"; + "HoleyMonoid" = dontDistribute super."HoleyMonoid"; + "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; + "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; + "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; + "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; + "Homology" = dontDistribute super."Homology"; + "HongoDB" = dontDistribute super."HongoDB"; + "HostAndPort" = dontDistribute super."HostAndPort"; + "Hricket" = dontDistribute super."Hricket"; + "Hs2lib" = dontDistribute super."Hs2lib"; + "HsASA" = dontDistribute super."HsASA"; + "HsHaruPDF" = dontDistribute super."HsHaruPDF"; + "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; + "HsJudy" = dontDistribute super."HsJudy"; + "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; + "HsParrot" = dontDistribute super."HsParrot"; + "HsPerl5" = dontDistribute super."HsPerl5"; + "HsSVN" = dontDistribute super."HsSVN"; + "HsTools" = dontDistribute super."HsTools"; + "Hsed" = dontDistribute super."Hsed"; + "Hsmtlib" = dontDistribute super."Hsmtlib"; + "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; + "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; + "IDynamic" = dontDistribute super."IDynamic"; + "IFS" = dontDistribute super."IFS"; + "INblobs" = dontDistribute super."INblobs"; + "IOR" = dontDistribute super."IOR"; + "IORefCAS" = dontDistribute super."IORefCAS"; + "IOSpec" = dontDistribute super."IOSpec"; + "IcoGrid" = dontDistribute super."IcoGrid"; + "Imlib" = dontDistribute super."Imlib"; + "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; + "IndentParser" = dontDistribute super."IndentParser"; + "IndexedList" = dontDistribute super."IndexedList"; + "InfixApplicative" = dontDistribute super."InfixApplicative"; + "Interpolation" = dontDistribute super."Interpolation"; + "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "Irc" = dontDistribute super."Irc"; + "IrrHaskell" = dontDistribute super."IrrHaskell"; + "IsNull" = dontDistribute super."IsNull"; + "JSON-Combinator" = dontDistribute super."JSON-Combinator"; + "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; + "JSONb" = dontDistribute super."JSONb"; + "JYU-Utils" = dontDistribute super."JYU-Utils"; + "JackMiniMix" = dontDistribute super."JackMiniMix"; + "Javasf" = dontDistribute super."Javasf"; + "Javav" = dontDistribute super."Javav"; + "JsContracts" = dontDistribute super."JsContracts"; + "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; + "JunkDB" = dontDistribute super."JunkDB"; + "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; + "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; + "JustParse" = dontDistribute super."JustParse"; + "KMP" = dontDistribute super."KMP"; + "KSP" = dontDistribute super."KSP"; + "Kalman" = dontDistribute super."Kalman"; + "KdTree" = dontDistribute super."KdTree"; + "Ketchup" = dontDistribute super."Ketchup"; + "KiCS" = dontDistribute super."KiCS"; + "KiCS-debugger" = dontDistribute super."KiCS-debugger"; + "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; + "Kleislify" = dontDistribute super."Kleislify"; + "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; + "KyotoCabinet" = dontDistribute super."KyotoCabinet"; + "L-seed" = dontDistribute super."L-seed"; + "LDAP" = dontDistribute super."LDAP"; + "LRU" = dontDistribute super."LRU"; + "LTree" = dontDistribute super."LTree"; + "LambdaCalculator" = dontDistribute super."LambdaCalculator"; + "LambdaHack" = dontDistribute super."LambdaHack"; + "LambdaINet" = dontDistribute super."LambdaINet"; + "LambdaNet" = dontDistribute super."LambdaNet"; + "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; + "LambdaShell" = dontDistribute super."LambdaShell"; + "Lambdajudge" = dontDistribute super."Lambdajudge"; + "Lambdaya" = dontDistribute super."Lambdaya"; + "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; + "Lastik" = dontDistribute super."Lastik"; + "Lattices" = dontDistribute super."Lattices"; + "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; + "LazyVault" = dontDistribute super."LazyVault"; + "Level0" = dontDistribute super."Level0"; + "LibClang" = dontDistribute super."LibClang"; + "Limit" = dontDistribute super."Limit"; + "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; + "LinkChecker" = dontDistribute super."LinkChecker"; + "ListTree" = dontDistribute super."ListTree"; + "ListWriter" = dontDistribute super."ListWriter"; + "ListZipper" = dontDistribute super."ListZipper"; + "Logic" = dontDistribute super."Logic"; + "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; + "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; + "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; + "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; + "LslPlus" = dontDistribute super."LslPlus"; + "Lucu" = dontDistribute super."Lucu"; + "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; + "MHask" = dontDistribute super."MHask"; + "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; + "MagicHaskeller" = dontDistribute super."MagicHaskeller"; + "MailchimpSimple" = dontDistribute super."MailchimpSimple"; + "MaybeT" = dontDistribute super."MaybeT"; + "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; + "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; + "MazesOfMonad" = dontDistribute super."MazesOfMonad"; + "MeanShift" = dontDistribute super."MeanShift"; + "Measure" = dontDistribute super."Measure"; + "MetaHDBC" = dontDistribute super."MetaHDBC"; + "MetaObject" = dontDistribute super."MetaObject"; + "Metrics" = dontDistribute super."Metrics"; + "Mhailist" = dontDistribute super."Mhailist"; + "Michelangelo" = dontDistribute super."Michelangelo"; + "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; + "MiniAgda" = dontDistribute super."MiniAgda"; + "MissingK" = dontDistribute super."MissingK"; + "MissingM" = dontDistribute super."MissingM"; + "MissingPy" = dontDistribute super."MissingPy"; + "Modulo" = dontDistribute super."Modulo"; + "Moe" = dontDistribute super."Moe"; + "MoeDict" = dontDistribute super."MoeDict"; + "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; + "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; + "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; + "MonadCompose" = dontDistribute super."MonadCompose"; + "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; + "MonadStack" = dontDistribute super."MonadStack"; + "Monadius" = dontDistribute super."Monadius"; + "Monaris" = dontDistribute super."Monaris"; + "Monatron" = dontDistribute super."Monatron"; + "Monatron-IO" = dontDistribute super."Monatron-IO"; + "Monocle" = dontDistribute super."Monocle"; + "MorseCode" = dontDistribute super."MorseCode"; + "MuCheck" = dontDistribute super."MuCheck"; + "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; + "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; + "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; + "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; + "Munkres" = dontDistribute super."Munkres"; + "Munkres-simple" = dontDistribute super."Munkres-simple"; + "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; + "MyPrimes" = dontDistribute super."MyPrimes"; + "NGrams" = dontDistribute super."NGrams"; + "NTRU" = dontDistribute super."NTRU"; + "NXT" = dontDistribute super."NXT"; + "NXTDSL" = dontDistribute super."NXTDSL"; + "NanoProlog" = dontDistribute super."NanoProlog"; + "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; + "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; + "Neks" = dontDistribute super."Neks"; + "NestedFunctor" = dontDistribute super."NestedFunctor"; + "NestedSampling" = dontDistribute super."NestedSampling"; + "NetSNMP" = dontDistribute super."NetSNMP"; + "NewBinary" = dontDistribute super."NewBinary"; + "Ninjas" = dontDistribute super."Ninjas"; + "NoSlow" = dontDistribute super."NoSlow"; + "NoTrace" = dontDistribute super."NoTrace"; + "Noise" = dontDistribute super."Noise"; + "Nomyx" = dontDistribute super."Nomyx"; + "Nomyx-Core" = dontDistribute super."Nomyx-Core"; + "Nomyx-Language" = dontDistribute super."Nomyx-Language"; + "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; + "Nomyx-Web" = dontDistribute super."Nomyx-Web"; + "NonEmpty" = dontDistribute super."NonEmpty"; + "NonEmptyList" = dontDistribute super."NonEmptyList"; + "NumLazyByteString" = dontDistribute super."NumLazyByteString"; + "NumberSieves" = dontDistribute super."NumberSieves"; + "Numbers" = dontDistribute super."Numbers"; + "Nussinov78" = dontDistribute super."Nussinov78"; + "Nutri" = dontDistribute super."Nutri"; + "OGL" = dontDistribute super."OGL"; + "OSM" = dontDistribute super."OSM"; + "OTP" = dontDistribute super."OTP"; + "Object" = dontDistribute super."Object"; + "ObjectIO" = dontDistribute super."ObjectIO"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OneTuple" = dontDistribute super."OneTuple"; + "OpenAFP" = dontDistribute super."OpenAFP"; + "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; + "OpenAL" = dontDistribute super."OpenAL"; + "OpenCL" = dontDistribute super."OpenCL"; + "OpenCLRaw" = dontDistribute super."OpenCLRaw"; + "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; + "OpenSCAD" = dontDistribute super."OpenSCAD"; + "OpenVG" = dontDistribute super."OpenVG"; + "OpenVGRaw" = dontDistribute super."OpenVGRaw"; + "Operads" = dontDistribute super."Operads"; + "OptDir" = dontDistribute super."OptDir"; + "OrPatterns" = dontDistribute super."OrPatterns"; + "OrchestrateDB" = dontDistribute super."OrchestrateDB"; + "OrderedBits" = dontDistribute super."OrderedBits"; + "Ordinals" = dontDistribute super."Ordinals"; + "PArrows" = dontDistribute super."PArrows"; + "PBKDF2" = dontDistribute super."PBKDF2"; + "PCLT" = dontDistribute super."PCLT"; + "PCLT-DB" = dontDistribute super."PCLT-DB"; + "PDBtools" = dontDistribute super."PDBtools"; + "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; + "PageIO" = dontDistribute super."PageIO"; + "Paillier" = dontDistribute super."Paillier"; + "PandocAgda" = dontDistribute super."PandocAgda"; + "Paraiso" = dontDistribute super."Paraiso"; + "Parry" = dontDistribute super."Parry"; + "ParsecTools" = dontDistribute super."ParsecTools"; + "ParserFunction" = dontDistribute super."ParserFunction"; + "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; + "PasswordGenerator" = dontDistribute super."PasswordGenerator"; + "PastePipe" = dontDistribute super."PastePipe"; + "Pathfinder" = dontDistribute super."Pathfinder"; + "Peano" = dontDistribute super."Peano"; + "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; + "PerfectHash" = dontDistribute super."PerfectHash"; + "PermuteEffects" = dontDistribute super."PermuteEffects"; + "Phsu" = dontDistribute super."Phsu"; + "Pipe" = dontDistribute super."Pipe"; + "Piso" = dontDistribute super."Piso"; + "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; + "PlayingCards" = dontDistribute super."PlayingCards"; + "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; + "PlslTools" = dontDistribute super."PlslTools"; + "Plural" = dontDistribute super."Plural"; + "Pollutocracy" = dontDistribute super."Pollutocracy"; + "PortFusion" = dontDistribute super."PortFusion"; + "PortMidi" = dontDistribute super."PortMidi"; + "PostgreSQL" = dontDistribute super."PostgreSQL"; + "PrimitiveArray" = dontDistribute super."PrimitiveArray"; + "Printf-TH" = dontDistribute super."Printf-TH"; + "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; + "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; + "PropLogic" = dontDistribute super."PropLogic"; + "Proper" = dontDistribute super."Proper"; + "ProxN" = dontDistribute super."ProxN"; + "Pugs" = dontDistribute super."Pugs"; + "Pup-Events" = dontDistribute super."Pup-Events"; + "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; + "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; + "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; + "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; + "QIO" = dontDistribute super."QIO"; + "QuadEdge" = dontDistribute super."QuadEdge"; + "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "Quickson" = dontDistribute super."Quickson"; + "R-pandoc" = dontDistribute super."R-pandoc"; + "RANSAC" = dontDistribute super."RANSAC"; + "RBTree" = dontDistribute super."RBTree"; + "RESTng" = dontDistribute super."RESTng"; + "RFC1751" = dontDistribute super."RFC1751"; + "RJson" = dontDistribute super."RJson"; + "RMP" = dontDistribute super."RMP"; + "RNAFold" = dontDistribute super."RNAFold"; + "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; + "RNAdesign" = dontDistribute super."RNAdesign"; + "RNAdraw" = dontDistribute super."RNAdraw"; + "RNAwolf" = dontDistribute super."RNAwolf"; + "Raincat" = dontDistribute super."Raincat"; + "Random123" = dontDistribute super."Random123"; + "RandomDotOrg" = dontDistribute super."RandomDotOrg"; + "Randometer" = dontDistribute super."Randometer"; + "Range" = dontDistribute super."Range"; + "Ranged-sets" = dontDistribute super."Ranged-sets"; + "Ranka" = dontDistribute super."Ranka"; + "Rasenschach" = dontDistribute super."Rasenschach"; + "Redmine" = dontDistribute super."Redmine"; + "Ref" = dontDistribute super."Ref"; + "Referees" = dontDistribute super."Referees"; + "RepLib" = dontDistribute super."RepLib"; + "ReplicateEffects" = dontDistribute super."ReplicateEffects"; + "ReviewBoard" = dontDistribute super."ReviewBoard"; + "RichConditional" = dontDistribute super."RichConditional"; + "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; + "RxHaskell" = dontDistribute super."RxHaskell"; + "SBench" = dontDistribute super."SBench"; + "SConfig" = dontDistribute super."SConfig"; + "SDL" = dontDistribute super."SDL"; + "SDL-gfx" = dontDistribute super."SDL-gfx"; + "SDL-image" = dontDistribute super."SDL-image"; + "SDL-mixer" = dontDistribute super."SDL-mixer"; + "SDL-mpeg" = dontDistribute super."SDL-mpeg"; + "SDL-ttf" = dontDistribute super."SDL-ttf"; + "SDL2-ttf" = dontDistribute super."SDL2-ttf"; + "SFML" = dontDistribute super."SFML"; + "SFML-control" = dontDistribute super."SFML-control"; + "SFont" = dontDistribute super."SFont"; + "SG" = dontDistribute super."SG"; + "SGdemo" = dontDistribute super."SGdemo"; + "SHA2" = dontDistribute super."SHA2"; + "SMTPClient" = dontDistribute super."SMTPClient"; + "SNet" = dontDistribute super."SNet"; + "SQLDeps" = dontDistribute super."SQLDeps"; + "STL" = dontDistribute super."STL"; + "SVG2Q" = dontDistribute super."SVG2Q"; + "SVGFonts" = dontDistribute super."SVGFonts"; + "SVGPath" = dontDistribute super."SVGPath"; + "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; + "SableCC2Hs" = dontDistribute super."SableCC2Hs"; + "Safe" = dontDistribute super."Safe"; + "Salsa" = dontDistribute super."Salsa"; + "Saturnin" = dontDistribute super."Saturnin"; + "SciFlow" = dontDistribute super."SciFlow"; + "ScratchFs" = dontDistribute super."ScratchFs"; + "Scurry" = dontDistribute super."Scurry"; + "Semantique" = dontDistribute super."Semantique"; + "Semigroup" = dontDistribute super."Semigroup"; + "SeqAlign" = dontDistribute super."SeqAlign"; + "SessionLogger" = dontDistribute super."SessionLogger"; + "ShellCheck" = dontDistribute super."ShellCheck"; + "Shellac" = dontDistribute super."Shellac"; + "Shellac-compatline" = dontDistribute super."Shellac-compatline"; + "Shellac-editline" = dontDistribute super."Shellac-editline"; + "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; + "Shellac-readline" = dontDistribute super."Shellac-readline"; + "ShowF" = dontDistribute super."ShowF"; + "Shrub" = dontDistribute super."Shrub"; + "Shu-thing" = dontDistribute super."Shu-thing"; + "SimpleAES" = dontDistribute super."SimpleAES"; + "SimpleEA" = dontDistribute super."SimpleEA"; + "SimpleGL" = dontDistribute super."SimpleGL"; + "SimpleH" = dontDistribute super."SimpleH"; + "SimpleLog" = dontDistribute super."SimpleLog"; + "SimpleServer" = dontDistribute super."SimpleServer"; + "SizeCompare" = dontDistribute super."SizeCompare"; + "Slides" = dontDistribute super."Slides"; + "Smooth" = dontDistribute super."Smooth"; + "SmtLib" = dontDistribute super."SmtLib"; + "Snusmumrik" = dontDistribute super."Snusmumrik"; + "SoOSiM" = dontDistribute super."SoOSiM"; + "SoccerFun" = dontDistribute super."SoccerFun"; + "SoccerFunGL" = dontDistribute super."SoccerFunGL"; + "Sonnex" = dontDistribute super."Sonnex"; + "SourceGraph" = dontDistribute super."SourceGraph"; + "Southpaw" = dontDistribute super."Southpaw"; + "SpaceInvaders" = dontDistribute super."SpaceInvaders"; + "SpacePrivateers" = dontDistribute super."SpacePrivateers"; + "SpinCounter" = dontDistribute super."SpinCounter"; + "Spock-auth" = dontDistribute super."Spock-auth"; + "SpreadsheetML" = dontDistribute super."SpreadsheetML"; + "Sprig" = dontDistribute super."Sprig"; + "Stasis" = dontDistribute super."Stasis"; + "StateVar-transformer" = dontDistribute super."StateVar-transformer"; + "StatisticalMethods" = dontDistribute super."StatisticalMethods"; + "Stomp" = dontDistribute super."Stomp"; + "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; + "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "Stream" = dontDistribute super."Stream"; + "StrictBench" = dontDistribute super."StrictBench"; + "SuffixStructures" = dontDistribute super."SuffixStructures"; + "SybWidget" = dontDistribute super."SybWidget"; + "SyntaxMacros" = dontDistribute super."SyntaxMacros"; + "Sysmon" = dontDistribute super."Sysmon"; + "TBC" = dontDistribute super."TBC"; + "TBit" = dontDistribute super."TBit"; + "THEff" = dontDistribute super."THEff"; + "TTTAS" = dontDistribute super."TTTAS"; + "TV" = dontDistribute super."TV"; + "TYB" = dontDistribute super."TYB"; + "TableAlgebra" = dontDistribute super."TableAlgebra"; + "Tables" = dontDistribute super."Tables"; + "Tablify" = dontDistribute super."Tablify"; + "Tainted" = dontDistribute super."Tainted"; + "Takusen" = dontDistribute super."Takusen"; + "Tape" = dontDistribute super."Tape"; + "TeaHS" = dontDistribute super."TeaHS"; + "Tensor" = dontDistribute super."Tensor"; + "TernaryTrees" = dontDistribute super."TernaryTrees"; + "TestExplode" = dontDistribute super."TestExplode"; + "Theora" = dontDistribute super."Theora"; + "Thingie" = dontDistribute super."Thingie"; + "ThreadObjects" = dontDistribute super."ThreadObjects"; + "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; + "TicTacToe" = dontDistribute super."TicTacToe"; + "TigerHash" = dontDistribute super."TigerHash"; + "TimePiece" = dontDistribute super."TimePiece"; + "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; + "TinyURL" = dontDistribute super."TinyURL"; + "Titim" = dontDistribute super."Titim"; + "Top" = dontDistribute super."Top"; + "Tournament" = dontDistribute super."Tournament"; + "TraceUtils" = dontDistribute super."TraceUtils"; + "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; + "Transhare" = dontDistribute super."Transhare"; + "TreeCounter" = dontDistribute super."TreeCounter"; + "TreeStructures" = dontDistribute super."TreeStructures"; + "TreeT" = dontDistribute super."TreeT"; + "Treiber" = dontDistribute super."Treiber"; + "TrendGraph" = dontDistribute super."TrendGraph"; + "TrieMap" = dontDistribute super."TrieMap"; + "Twofish" = dontDistribute super."Twofish"; + "TypeClass" = dontDistribute super."TypeClass"; + "TypeCompose" = dontDistribute super."TypeCompose"; + "TypeIlluminator" = dontDistribute super."TypeIlluminator"; + "TypeNat" = dontDistribute super."TypeNat"; + "TypingTester" = dontDistribute super."TypingTester"; + "UISF" = dontDistribute super."UISF"; + "UMM" = dontDistribute super."UMM"; + "URLT" = dontDistribute super."URLT"; + "URLb" = dontDistribute super."URLb"; + "UTFTConverter" = dontDistribute super."UTFTConverter"; + "Unique" = dontDistribute super."Unique"; + "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; + "Updater" = dontDistribute super."Updater"; + "UrlDisp" = dontDistribute super."UrlDisp"; + "Useful" = dontDistribute super."Useful"; + "UtilityTM" = dontDistribute super."UtilityTM"; + "VKHS" = dontDistribute super."VKHS"; + "Validation" = dontDistribute super."Validation"; + "Vec" = dontDistribute super."Vec"; + "Vec-Boolean" = dontDistribute super."Vec-Boolean"; + "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; + "Vec-Transform" = dontDistribute super."Vec-Transform"; + "VecN" = dontDistribute super."VecN"; + "Verba" = dontDistribute super."Verba"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "Vulkan" = dontDistribute super."Vulkan"; + "WAVE" = dontDistribute super."WAVE"; + "WL500gPControl" = dontDistribute super."WL500gPControl"; + "WL500gPLib" = dontDistribute super."WL500gPLib"; + "WMSigner" = dontDistribute super."WMSigner"; + "WURFL" = dontDistribute super."WURFL"; + "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; + "WashNGo" = dontDistribute super."WashNGo"; + "WaveFront" = dontDistribute super."WaveFront"; + "Weather" = dontDistribute super."Weather"; + "WebBits" = dontDistribute super."WebBits"; + "WebBits-Html" = dontDistribute super."WebBits-Html"; + "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; + "WebCont" = dontDistribute super."WebCont"; + "WeberLogic" = dontDistribute super."WeberLogic"; + "Webrexp" = dontDistribute super."Webrexp"; + "Wheb" = dontDistribute super."Wheb"; + "WikimediaParser" = dontDistribute super."WikimediaParser"; + "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; + "Win32-errors" = dontDistribute super."Win32-errors"; + "Win32-junction-point" = dontDistribute super."Win32-junction-point"; + "Win32-security" = dontDistribute super."Win32-security"; + "Win32-services" = dontDistribute super."Win32-services"; + "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; + "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; + "WordNet" = dontDistribute super."WordNet"; + "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; + "Wordlint" = dontDistribute super."Wordlint"; + "WxGeneric" = dontDistribute super."WxGeneric"; + "X11-extras" = dontDistribute super."X11-extras"; + "X11-rm" = dontDistribute super."X11-rm"; + "X11-xdamage" = dontDistribute super."X11-xdamage"; + "X11-xfixes" = dontDistribute super."X11-xfixes"; + "X11-xft" = dontDistribute super."X11-xft"; + "X11-xshape" = dontDistribute super."X11-xshape"; + "XAttr" = dontDistribute super."XAttr"; + "XInput" = dontDistribute super."XInput"; + "XMMS" = dontDistribute super."XMMS"; + "XMPP" = dontDistribute super."XMPP"; + "XSaiga" = dontDistribute super."XSaiga"; + "Xec" = dontDistribute super."Xec"; + "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; + "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; + "YACPong" = dontDistribute super."YACPong"; + "YFrob" = dontDistribute super."YFrob"; + "Yablog" = dontDistribute super."Yablog"; + "YamlReference" = dontDistribute super."YamlReference"; + "Yampa-core" = dontDistribute super."Yampa-core"; + "Yocto" = dontDistribute super."Yocto"; + "Yogurt" = dontDistribute super."Yogurt"; + "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; + "ZEBEDDE" = dontDistribute super."ZEBEDDE"; + "ZFS" = dontDistribute super."ZFS"; + "ZMachine" = dontDistribute super."ZMachine"; + "ZipFold" = dontDistribute super."ZipFold"; + "ZipperAG" = dontDistribute super."ZipperAG"; + "Zora" = dontDistribute super."Zora"; + "Zwaluw" = dontDistribute super."Zwaluw"; + "a50" = dontDistribute super."a50"; + "abacate" = dontDistribute super."abacate"; + "abc-puzzle" = dontDistribute super."abc-puzzle"; + "abcBridge" = dontDistribute super."abcBridge"; + "abcnotation" = dontDistribute super."abcnotation"; + "abeson" = dontDistribute super."abeson"; + "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; + "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; + "abt" = dontDistribute super."abt"; + "ac-machine" = dontDistribute super."ac-machine"; + "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; + "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; + "accelerate-cublas" = dontDistribute super."accelerate-cublas"; + "accelerate-cuda" = dontDistribute super."accelerate-cuda"; + "accelerate-cufft" = dontDistribute super."accelerate-cufft"; + "accelerate-examples" = dontDistribute super."accelerate-examples"; + "accelerate-fft" = dontDistribute super."accelerate-fft"; + "accelerate-fftw" = dontDistribute super."accelerate-fftw"; + "accelerate-fourier" = dontDistribute super."accelerate-fourier"; + "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; + "accelerate-io" = dontDistribute super."accelerate-io"; + "accelerate-random" = dontDistribute super."accelerate-random"; + "accelerate-utility" = dontDistribute super."accelerate-utility"; + "accentuateus" = dontDistribute super."accentuateus"; + "access-time" = dontDistribute super."access-time"; + "acid-state-dist" = dontDistribute super."acid-state-dist"; + "acid-state-tls" = dontDistribute super."acid-state-tls"; + "acl2" = dontDistribute super."acl2"; + "acme-all-monad" = dontDistribute super."acme-all-monad"; + "acme-box" = dontDistribute super."acme-box"; + "acme-cadre" = dontDistribute super."acme-cadre"; + "acme-cofunctor" = dontDistribute super."acme-cofunctor"; + "acme-colosson" = dontDistribute super."acme-colosson"; + "acme-comonad" = dontDistribute super."acme-comonad"; + "acme-cutegirl" = dontDistribute super."acme-cutegirl"; + "acme-dont" = dontDistribute super."acme-dont"; + "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; + "acme-grawlix" = dontDistribute super."acme-grawlix"; + "acme-hq9plus" = dontDistribute super."acme-hq9plus"; + "acme-http" = dontDistribute super."acme-http"; + "acme-inator" = dontDistribute super."acme-inator"; + "acme-io" = dontDistribute super."acme-io"; + "acme-lolcat" = dontDistribute super."acme-lolcat"; + "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; + "acme-memorandom" = dontDistribute super."acme-memorandom"; + "acme-microwave" = dontDistribute super."acme-microwave"; + "acme-miscorder" = dontDistribute super."acme-miscorder"; + "acme-missiles" = dontDistribute super."acme-missiles"; + "acme-now" = dontDistribute super."acme-now"; + "acme-numbersystem" = dontDistribute super."acme-numbersystem"; + "acme-omitted" = dontDistribute super."acme-omitted"; + "acme-one" = dontDistribute super."acme-one"; + "acme-operators" = dontDistribute super."acme-operators"; + "acme-php" = dontDistribute super."acme-php"; + "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; + "acme-realworld" = dontDistribute super."acme-realworld"; + "acme-safe" = dontDistribute super."acme-safe"; + "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; + "acme-strfry" = dontDistribute super."acme-strfry"; + "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; + "acme-strtok" = dontDistribute super."acme-strtok"; + "acme-timemachine" = dontDistribute super."acme-timemachine"; + "acme-year" = dontDistribute super."acme-year"; + "acme-zero" = dontDistribute super."acme-zero"; + "activehs" = dontDistribute super."activehs"; + "activehs-base" = dontDistribute super."activehs-base"; + "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; + "actor" = dontDistribute super."actor"; + "adaptive-containers" = dontDistribute super."adaptive-containers"; + "adaptive-tuple" = dontDistribute super."adaptive-tuple"; + "adb" = dontDistribute super."adb"; + "adblock2privoxy" = dontDistribute super."adblock2privoxy"; + "addLicenseInfo" = dontDistribute super."addLicenseInfo"; + "adhoc-network" = dontDistribute super."adhoc-network"; + "adict" = dontDistribute super."adict"; + "adler32" = dontDistribute super."adler32"; + "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; + "adp-multi" = dontDistribute super."adp-multi"; + "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; + "aeson-lens" = dontDistribute super."aeson-lens"; + "aeson-native" = dontDistribute super."aeson-native"; + "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; + "aeson-schema" = dontDistribute super."aeson-schema"; + "aeson-serialize" = dontDistribute super."aeson-serialize"; + "aeson-smart" = dontDistribute super."aeson-smart"; + "aeson-streams" = dontDistribute super."aeson-streams"; + "aeson-t" = dontDistribute super."aeson-t"; + "aeson-toolkit" = dontDistribute super."aeson-toolkit"; + "aeson-value-parser" = dontDistribute super."aeson-value-parser"; + "aeson-yak" = dontDistribute super."aeson-yak"; + "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; + "afis" = dontDistribute super."afis"; + "afv" = dontDistribute super."afv"; + "ag-pictgen" = dontDistribute super."ag-pictgen"; + "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; + "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll"; + "agum" = dontDistribute super."agum"; + "aig" = dontDistribute super."aig"; + "air" = dontDistribute super."air"; + "air-extra" = dontDistribute super."air-extra"; + "air-spec" = dontDistribute super."air-spec"; + "air-th" = dontDistribute super."air-th"; + "airbrake" = dontDistribute super."airbrake"; + "aivika" = dontDistribute super."aivika"; + "aivika-branches" = dontDistribute super."aivika-branches"; + "aivika-experiment" = dontDistribute super."aivika-experiment"; + "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; + "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; + "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; + "aivika-transformers" = dontDistribute super."aivika-transformers"; + "ajhc" = dontDistribute super."ajhc"; + "al" = dontDistribute super."al"; + "alea" = dontDistribute super."alea"; + "alex-meta" = dontDistribute super."alex-meta"; + "alfred" = dontDistribute super."alfred"; + "alga" = dontDistribute super."alga"; + "algebra" = dontDistribute super."algebra"; + "algebra-dag" = dontDistribute super."algebra-dag"; + "algebra-sql" = dontDistribute super."algebra-sql"; + "algebraic" = dontDistribute super."algebraic"; + "algebraic-classes" = dontDistribute super."algebraic-classes"; + "align" = dontDistribute super."align"; + "align-text" = dontDistribute super."align-text"; + "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; + "allocated-processor" = dontDistribute super."allocated-processor"; + "alloy" = dontDistribute super."alloy"; + "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; + "almost-fix" = dontDistribute super."almost-fix"; + "alms" = dontDistribute super."alms"; + "alpha" = dontDistribute super."alpha"; + "alpino-tools" = dontDistribute super."alpino-tools"; + "alsa" = dontDistribute super."alsa"; + "alsa-core" = dontDistribute super."alsa-core"; + "alsa-gui" = dontDistribute super."alsa-gui"; + "alsa-midi" = dontDistribute super."alsa-midi"; + "alsa-mixer" = dontDistribute super."alsa-mixer"; + "alsa-pcm" = dontDistribute super."alsa-pcm"; + "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; + "alsa-seq" = dontDistribute super."alsa-seq"; + "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; + "altcomposition" = dontDistribute super."altcomposition"; + "alternative-io" = dontDistribute super."alternative-io"; + "altfloat" = dontDistribute super."altfloat"; + "alure" = dontDistribute super."alure"; + "amazon-emailer" = dontDistribute super."amazon-emailer"; + "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; + "amazon-products" = dontDistribute super."amazon-products"; + "ampersand" = dontDistribute super."ampersand"; + "amqp-conduit" = dontDistribute super."amqp-conduit"; + "amrun" = dontDistribute super."amrun"; + "analyze-client" = dontDistribute super."analyze-client"; + "anansi" = dontDistribute super."anansi"; + "anansi-hscolour" = dontDistribute super."anansi-hscolour"; + "anansi-pandoc" = dontDistribute super."anansi-pandoc"; + "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; + "android-lint-summary" = dontDistribute super."android-lint-summary"; + "animalcase" = dontDistribute super."animalcase"; + "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; + "ansi-pretty" = dontDistribute super."ansi-pretty"; + "ansigraph" = dontDistribute super."ansigraph"; + "antagonist" = dontDistribute super."antagonist"; + "antfarm" = dontDistribute super."antfarm"; + "anticiv" = dontDistribute super."anticiv"; + "antigate" = dontDistribute super."antigate"; + "antimirov" = dontDistribute super."antimirov"; + "antiquoter" = dontDistribute super."antiquoter"; + "antisplice" = dontDistribute super."antisplice"; + "antlrc" = dontDistribute super."antlrc"; + "anydbm" = dontDistribute super."anydbm"; + "aosd" = dontDistribute super."aosd"; + "ap-reflect" = dontDistribute super."ap-reflect"; + "apache-md5" = dontDistribute super."apache-md5"; + "apelsin" = dontDistribute super."apelsin"; + "api-builder" = dontDistribute super."api-builder"; + "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; + "api-tools" = dontDistribute super."api-tools"; + "apiary-helics" = dontDistribute super."apiary-helics"; + "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apis" = dontDistribute super."apis"; + "apotiki" = dontDistribute super."apotiki"; + "app-lens" = dontDistribute super."app-lens"; + "appc" = dontDistribute super."appc"; + "applicative-extras" = dontDistribute super."applicative-extras"; + "applicative-fail" = dontDistribute super."applicative-fail"; + "applicative-numbers" = dontDistribute super."applicative-numbers"; + "applicative-parsec" = dontDistribute super."applicative-parsec"; + "applicative-quoters" = dontDistribute super."applicative-quoters"; + "apply-refact" = doDistribute super."apply-refact_0_1_0_0"; + "apportionment" = dontDistribute super."apportionment"; + "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate-equality" = dontDistribute super."approximate-equality"; + "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; + "arb-fft" = dontDistribute super."arb-fft"; + "arbb-vm" = dontDistribute super."arbb-vm"; + "archive" = dontDistribute super."archive"; + "archiver" = dontDistribute super."archiver"; + "archlinux" = dontDistribute super."archlinux"; + "archlinux-web" = dontDistribute super."archlinux-web"; + "archnews" = dontDistribute super."archnews"; + "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; + "argon2" = dontDistribute super."argon2"; + "argparser" = dontDistribute super."argparser"; + "arguedit" = dontDistribute super."arguedit"; + "ariadne" = dontDistribute super."ariadne"; + "arion" = dontDistribute super."arion"; + "arith-encode" = dontDistribute super."arith-encode"; + "arithmatic" = dontDistribute super."arithmatic"; + "arithmetic" = dontDistribute super."arithmetic"; + "arithmoi" = dontDistribute super."arithmoi"; + "armada" = dontDistribute super."armada"; + "arpa" = dontDistribute super."arpa"; + "array-forth" = dontDistribute super."array-forth"; + "array-memoize" = dontDistribute super."array-memoize"; + "array-primops" = dontDistribute super."array-primops"; + "array-utils" = dontDistribute super."array-utils"; + "arrow-improve" = dontDistribute super."arrow-improve"; + "arrowapply-utils" = dontDistribute super."arrowapply-utils"; + "arrowp" = dontDistribute super."arrowp"; + "arrows" = dontDistribute super."arrows"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; + "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asic" = dontDistribute super."asic"; + "asil" = dontDistribute super."asil"; + "asn1-data" = dontDistribute super."asn1-data"; + "asn1dump" = dontDistribute super."asn1dump"; + "assembler" = dontDistribute super."assembler"; + "assert" = dontDistribute super."assert"; + "assert-failure" = dontDistribute super."assert-failure"; + "assertions" = dontDistribute super."assertions"; + "assimp" = dontDistribute super."assimp"; + "astar" = dontDistribute super."astar"; + "astrds" = dontDistribute super."astrds"; + "astview" = dontDistribute super."astview"; + "astview-utils" = dontDistribute super."astview-utils"; + "async-extras" = dontDistribute super."async-extras"; + "async-manager" = dontDistribute super."async-manager"; + "async-pool" = dontDistribute super."async-pool"; + "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; + "aterm" = dontDistribute super."aterm"; + "aterm-utils" = dontDistribute super."aterm-utils"; + "atl" = dontDistribute super."atl"; + "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; + "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; + "atmos" = dontDistribute super."atmos"; + "atmos-dimensional" = dontDistribute super."atmos-dimensional"; + "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; + "atom" = dontDistribute super."atom"; + "atom-basic" = dontDistribute super."atom-basic"; + "atom-conduit" = dontDistribute super."atom-conduit"; + "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; + "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; + "atomic-write" = dontDistribute super."atomic-write"; + "atomo" = dontDistribute super."atomo"; + "atp-haskell" = dontDistribute super."atp-haskell"; + "atrans" = dontDistribute super."atrans"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "attoparsec-arff" = dontDistribute super."attoparsec-arff"; + "attoparsec-binary" = dontDistribute super."attoparsec-binary"; + "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; + "attoparsec-csv" = dontDistribute super."attoparsec-csv"; + "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; + "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; + "attoparsec-text" = dontDistribute super."attoparsec-text"; + "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; + "attosplit" = dontDistribute super."attosplit"; + "atuin" = dontDistribute super."atuin"; + "audacity" = dontDistribute super."audacity"; + "audiovisual" = dontDistribute super."audiovisual"; + "augeas" = dontDistribute super."augeas"; + "augur" = dontDistribute super."augur"; + "aur" = dontDistribute super."aur"; + "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; + "authenticate-ldap" = dontDistribute super."authenticate-ldap"; + "authinfo-hs" = dontDistribute super."authinfo-hs"; + "authoring" = dontDistribute super."authoring"; + "autonix-deps" = dontDistribute super."autonix-deps"; + "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; + "autoproc" = dontDistribute super."autoproc"; + "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; + "average" = dontDistribute super."average"; + "avl-static" = dontDistribute super."avl-static"; + "avr-shake" = dontDistribute super."avr-shake"; + "awesomium" = dontDistribute super."awesomium"; + "awesomium-glut" = dontDistribute super."awesomium-glut"; + "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; + "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; + "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; + "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; + "aws-ec2" = dontDistribute super."aws-ec2"; + "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; + "aws-general" = dontDistribute super."aws-general"; + "aws-kinesis" = dontDistribute super."aws-kinesis"; + "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; + "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; + "aws-lambda" = dontDistribute super."aws-lambda"; + "aws-performance-tests" = dontDistribute super."aws-performance-tests"; + "aws-route53" = dontDistribute super."aws-route53"; + "aws-sdk" = dontDistribute super."aws-sdk"; + "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; + "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; + "aws-sign4" = dontDistribute super."aws-sign4"; + "aws-sns" = dontDistribute super."aws-sns"; + "azure-acs" = dontDistribute super."azure-acs"; + "azure-service-api" = dontDistribute super."azure-service-api"; + "azure-servicebus" = dontDistribute super."azure-servicebus"; + "azurify" = dontDistribute super."azurify"; + "b-tree" = dontDistribute super."b-tree"; + "babylon" = dontDistribute super."babylon"; + "backdropper" = dontDistribute super."backdropper"; + "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; + "backward-state" = dontDistribute super."backward-state"; + "bacteria" = dontDistribute super."bacteria"; + "bag" = dontDistribute super."bag"; + "bamboo" = dontDistribute super."bamboo"; + "bamboo-launcher" = dontDistribute super."bamboo-launcher"; + "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; + "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; + "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; + "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; + "bamse" = dontDistribute super."bamse"; + "bamstats" = dontDistribute super."bamstats"; + "bank-holiday-usa" = dontDistribute super."bank-holiday-usa"; + "banwords" = dontDistribute super."banwords"; + "barchart" = dontDistribute super."barchart"; + "barcodes-code128" = dontDistribute super."barcodes-code128"; + "barecheck" = dontDistribute super."barecheck"; + "barley" = dontDistribute super."barley"; + "barrie" = dontDistribute super."barrie"; + "barrier-monad" = dontDistribute super."barrier-monad"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base32-bytestring" = dontDistribute super."base32-bytestring"; + "base58-bytestring" = dontDistribute super."base58-bytestring"; + "base58address" = dontDistribute super."base58address"; + "base64-conduit" = dontDistribute super."base64-conduit"; + "base91" = dontDistribute super."base91"; + "basex-client" = dontDistribute super."basex-client"; + "bash" = dontDistribute super."bash"; + "basic-lens" = dontDistribute super."basic-lens"; + "basic-sop" = dontDistribute super."basic-sop"; + "baskell" = dontDistribute super."baskell"; + "battlenet" = dontDistribute super."battlenet"; + "battlenet-yesod" = dontDistribute super."battlenet-yesod"; + "battleships" = dontDistribute super."battleships"; + "bayes-stack" = dontDistribute super."bayes-stack"; + "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; + "bdd" = dontDistribute super."bdd"; + "bdelta" = dontDistribute super."bdelta"; + "bdo" = dontDistribute super."bdo"; + "beam" = dontDistribute super."beam"; + "beamable" = dontDistribute super."beamable"; + "beautifHOL" = dontDistribute super."beautifHOL"; + "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; + "bein" = dontDistribute super."bein"; + "benchmark-function" = dontDistribute super."benchmark-function"; + "bencoding" = dontDistribute super."bencoding"; + "berkeleydb" = dontDistribute super."berkeleydb"; + "berp" = dontDistribute super."berp"; + "bert" = dontDistribute super."bert"; + "besout" = dontDistribute super."besout"; + "bet" = dontDistribute super."bet"; + "betacode" = dontDistribute super."betacode"; + "between" = dontDistribute super."between"; + "bf-cata" = dontDistribute super."bf-cata"; + "bff" = dontDistribute super."bff"; + "bff-mono" = dontDistribute super."bff-mono"; + "bgmax" = dontDistribute super."bgmax"; + "bgzf" = dontDistribute super."bgzf"; + "bibtex" = dontDistribute super."bibtex"; + "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; + "bidispec" = dontDistribute super."bidispec"; + "bidispec-extras" = dontDistribute super."bidispec-extras"; + "bighugethesaurus" = dontDistribute super."bighugethesaurus"; + "billboard-parser" = dontDistribute super."billboard-parser"; + "billeksah-forms" = dontDistribute super."billeksah-forms"; + "billeksah-main" = dontDistribute super."billeksah-main"; + "billeksah-main-static" = dontDistribute super."billeksah-main-static"; + "billeksah-pane" = dontDistribute super."billeksah-pane"; + "billeksah-services" = dontDistribute super."billeksah-services"; + "bimaps" = dontDistribute super."bimaps"; + "binary-bits" = dontDistribute super."binary-bits"; + "binary-communicator" = dontDistribute super."binary-communicator"; + "binary-derive" = dontDistribute super."binary-derive"; + "binary-enum" = dontDistribute super."binary-enum"; + "binary-file" = dontDistribute super."binary-file"; + "binary-generic" = dontDistribute super."binary-generic"; + "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; + "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-protocol" = dontDistribute super."binary-protocol"; + "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-shared" = dontDistribute super."binary-shared"; + "binary-state" = dontDistribute super."binary-state"; + "binary-store" = dontDistribute super."binary-store"; + "binary-streams" = dontDistribute super."binary-streams"; + "binary-strict" = dontDistribute super."binary-strict"; + "binarydefer" = dontDistribute super."binarydefer"; + "bind-marshal" = dontDistribute super."bind-marshal"; + "binding-core" = dontDistribute super."binding-core"; + "binding-gtk" = dontDistribute super."binding-gtk"; + "binding-wx" = dontDistribute super."binding-wx"; + "bindings" = dontDistribute super."bindings"; + "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-K8055" = dontDistribute super."bindings-K8055"; + "bindings-apr" = dontDistribute super."bindings-apr"; + "bindings-apr-util" = dontDistribute super."bindings-apr-util"; + "bindings-audiofile" = dontDistribute super."bindings-audiofile"; + "bindings-bfd" = dontDistribute super."bindings-bfd"; + "bindings-cctools" = dontDistribute super."bindings-cctools"; + "bindings-codec2" = dontDistribute super."bindings-codec2"; + "bindings-common" = dontDistribute super."bindings-common"; + "bindings-dc1394" = dontDistribute super."bindings-dc1394"; + "bindings-directfb" = dontDistribute super."bindings-directfb"; + "bindings-eskit" = dontDistribute super."bindings-eskit"; + "bindings-fann" = dontDistribute super."bindings-fann"; + "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; + "bindings-friso" = dontDistribute super."bindings-friso"; + "bindings-glib" = dontDistribute super."bindings-glib"; + "bindings-gobject" = dontDistribute super."bindings-gobject"; + "bindings-gpgme" = dontDistribute super."bindings-gpgme"; + "bindings-gsl" = dontDistribute super."bindings-gsl"; + "bindings-gts" = dontDistribute super."bindings-gts"; + "bindings-hamlib" = dontDistribute super."bindings-hamlib"; + "bindings-hdf5" = dontDistribute super."bindings-hdf5"; + "bindings-levmar" = dontDistribute super."bindings-levmar"; + "bindings-libcddb" = dontDistribute super."bindings-libcddb"; + "bindings-libffi" = dontDistribute super."bindings-libffi"; + "bindings-libftdi" = dontDistribute super."bindings-libftdi"; + "bindings-librrd" = dontDistribute super."bindings-librrd"; + "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; + "bindings-libusb" = dontDistribute super."bindings-libusb"; + "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; + "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; + "bindings-lxc" = dontDistribute super."bindings-lxc"; + "bindings-mmap" = dontDistribute super."bindings-mmap"; + "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; + "bindings-nettle" = dontDistribute super."bindings-nettle"; + "bindings-parport" = dontDistribute super."bindings-parport"; + "bindings-portaudio" = dontDistribute super."bindings-portaudio"; + "bindings-potrace" = dontDistribute super."bindings-potrace"; + "bindings-ppdev" = dontDistribute super."bindings-ppdev"; + "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; + "bindings-sane" = dontDistribute super."bindings-sane"; + "bindings-sc3" = dontDistribute super."bindings-sc3"; + "bindings-sipc" = dontDistribute super."bindings-sipc"; + "bindings-sophia" = dontDistribute super."bindings-sophia"; + "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; + "bindings-svm" = dontDistribute super."bindings-svm"; + "bindings-uname" = dontDistribute super."bindings-uname"; + "bindings-yices" = dontDistribute super."bindings-yices"; + "bindynamic" = dontDistribute super."bindynamic"; + "binembed" = dontDistribute super."binembed"; + "binembed-example" = dontDistribute super."binembed-example"; + "bini" = dontDistribute super."bini"; + "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; + "biosff" = dontDistribute super."biosff"; + "biostockholm" = dontDistribute super."biostockholm"; + "bird" = dontDistribute super."bird"; + "bit-array" = dontDistribute super."bit-array"; + "bit-vector" = dontDistribute super."bit-vector"; + "bitarray" = dontDistribute super."bitarray"; + "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; + "bitly-cli" = dontDistribute super."bitly-cli"; + "bitmap" = dontDistribute super."bitmap"; + "bitmap-opengl" = dontDistribute super."bitmap-opengl"; + "bitmaps" = dontDistribute super."bitmaps"; + "bits-atomic" = dontDistribute super."bits-atomic"; + "bits-conduit" = dontDistribute super."bits-conduit"; + "bits-extras" = dontDistribute super."bits-extras"; + "bitset" = dontDistribute super."bitset"; + "bitspeak" = dontDistribute super."bitspeak"; + "bitstream" = dontDistribute super."bitstream"; + "bitstring" = dontDistribute super."bitstring"; + "bittorrent" = dontDistribute super."bittorrent"; + "bitvec" = dontDistribute super."bitvec"; + "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; + "bk-tree" = dontDistribute super."bk-tree"; + "bkr" = dontDistribute super."bkr"; + "bktrees" = dontDistribute super."bktrees"; + "bla" = dontDistribute super."bla"; + "black-jewel" = dontDistribute super."black-jewel"; + "blacktip" = dontDistribute super."blacktip"; + "blakesum" = dontDistribute super."blakesum"; + "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blas" = dontDistribute super."blas"; + "blas-hs" = dontDistribute super."blas-hs"; + "blatex" = dontDistribute super."blatex"; + "blaze" = dontDistribute super."blaze"; + "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; + "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; + "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; + "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; + "blaze-json" = dontDistribute super."blaze-json"; + "blaze-shields" = dontDistribute super."blaze-shields"; + "blaze-textual-native" = dontDistribute super."blaze-textual-native"; + "blazeMarker" = dontDistribute super."blazeMarker"; + "blink1" = dontDistribute super."blink1"; + "blip" = dontDistribute super."blip"; + "bliplib" = dontDistribute super."bliplib"; + "blocking-transactions" = dontDistribute super."blocking-transactions"; + "blogination" = dontDistribute super."blogination"; + "bloodhound" = dontDistribute super."bloodhound"; + "bloxorz" = dontDistribute super."bloxorz"; + "blubber" = dontDistribute super."blubber"; + "blubber-server" = dontDistribute super."blubber-server"; + "bluetile" = dontDistribute super."bluetile"; + "bluetileutils" = dontDistribute super."bluetileutils"; + "blunt" = dontDistribute super."blunt"; + "board-games" = dontDistribute super."board-games"; + "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; + "boolean-list" = dontDistribute super."boolean-list"; + "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; + "boolexpr" = dontDistribute super."boolexpr"; + "bools" = dontDistribute super."bools"; + "boolsimplifier" = dontDistribute super."boolsimplifier"; + "boomange" = dontDistribute super."boomange"; + "boombox" = dontDistribute super."boombox"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bowntz" = dontDistribute super."bowntz"; + "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; + "brainfuck" = dontDistribute super."brainfuck"; + "brainfuck-monad" = dontDistribute super."brainfuck-monad"; + "brainfuck-tut" = dontDistribute super."brainfuck-tut"; + "break" = dontDistribute super."break"; + "breakout" = dontDistribute super."breakout"; + "breve" = dontDistribute super."breve"; + "brians-brain" = dontDistribute super."brians-brain"; + "brillig" = dontDistribute super."brillig"; + "broccoli" = dontDistribute super."broccoli"; + "broker-haskell" = dontDistribute super."broker-haskell"; + "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson-generic" = dontDistribute super."bson-generic"; + "bson-generics" = dontDistribute super."bson-generics"; + "bson-mapping" = dontDistribute super."bson-mapping"; + "bspack" = dontDistribute super."bspack"; + "bsparse" = dontDistribute super."bsparse"; + "btree-concurrent" = dontDistribute super."btree-concurrent"; + "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; + "buffer-pipe" = dontDistribute super."buffer-pipe"; + "buffon" = dontDistribute super."buffon"; + "bugzilla" = dontDistribute super."bugzilla"; + "buildable" = dontDistribute super."buildable"; + "buildbox" = dontDistribute super."buildbox"; + "buildbox-tools" = dontDistribute super."buildbox-tools"; + "buildwrapper" = dontDistribute super."buildwrapper"; + "bullet" = dontDistribute super."bullet"; + "burst-detection" = dontDistribute super."burst-detection"; + "bus-pirate" = dontDistribute super."bus-pirate"; + "buster" = dontDistribute super."buster"; + "buster-gtk" = dontDistribute super."buster-gtk"; + "buster-network" = dontDistribute super."buster-network"; + "butterflies" = dontDistribute super."butterflies"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; + "bytestring-class" = dontDistribute super."bytestring-class"; + "bytestring-csv" = dontDistribute super."bytestring-csv"; + "bytestring-delta" = dontDistribute super."bytestring-delta"; + "bytestring-from" = dontDistribute super."bytestring-from"; + "bytestring-nums" = dontDistribute super."bytestring-nums"; + "bytestring-plain" = dontDistribute super."bytestring-plain"; + "bytestring-rematch" = dontDistribute super."bytestring-rematch"; + "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; + "bytestringparser" = dontDistribute super."bytestringparser"; + "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; + "bytestringreadp" = dontDistribute super."bytestringreadp"; + "c-dsl" = dontDistribute super."c-dsl"; + "c-io" = dontDistribute super."c-io"; + "c-storable-deriving" = dontDistribute super."c-storable-deriving"; + "c0check" = dontDistribute super."c0check"; + "c0parser" = dontDistribute super."c0parser"; + "c10k" = dontDistribute super."c10k"; + "c2hsc" = dontDistribute super."c2hsc"; + "cab" = dontDistribute super."cab"; + "cabal-audit" = dontDistribute super."cabal-audit"; + "cabal-bounds" = dontDistribute super."cabal-bounds"; + "cabal-cargs" = dontDistribute super."cabal-cargs"; + "cabal-constraints" = dontDistribute super."cabal-constraints"; + "cabal-db" = dontDistribute super."cabal-db"; + "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; + "cabal-dev" = dontDistribute super."cabal-dev"; + "cabal-dir" = dontDistribute super."cabal-dir"; + "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; + "cabal-ghci" = dontDistribute super."cabal-ghci"; + "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-info" = dontDistribute super."cabal-info"; + "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; + "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; + "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; + "cabal-lenses" = dontDistribute super."cabal-lenses"; + "cabal-macosx" = dontDistribute super."cabal-macosx"; + "cabal-meta" = dontDistribute super."cabal-meta"; + "cabal-mon" = dontDistribute super."cabal-mon"; + "cabal-nirvana" = dontDistribute super."cabal-nirvana"; + "cabal-progdeps" = dontDistribute super."cabal-progdeps"; + "cabal-query" = dontDistribute super."cabal-query"; + "cabal-scripts" = dontDistribute super."cabal-scripts"; + "cabal-setup" = dontDistribute super."cabal-setup"; + "cabal-sign" = dontDistribute super."cabal-sign"; + "cabal-test" = dontDistribute super."cabal-test"; + "cabal-test-bin" = dontDistribute super."cabal-test-bin"; + "cabal-test-compat" = dontDistribute super."cabal-test-compat"; + "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; + "cabal-uninstall" = dontDistribute super."cabal-uninstall"; + "cabal-upload" = dontDistribute super."cabal-upload"; + "cabal2arch" = dontDistribute super."cabal2arch"; + "cabal2doap" = dontDistribute super."cabal2doap"; + "cabal2ebuild" = dontDistribute super."cabal2ebuild"; + "cabal2ghci" = dontDistribute super."cabal2ghci"; + "cabal2nix" = dontDistribute super."cabal2nix"; + "cabal2spec" = dontDistribute super."cabal2spec"; + "cabalQuery" = dontDistribute super."cabalQuery"; + "cabalg" = dontDistribute super."cabalg"; + "cabalgraph" = dontDistribute super."cabalgraph"; + "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; + "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; + "cabalvchk" = dontDistribute super."cabalvchk"; + "cabin" = dontDistribute super."cabin"; + "cabocha" = dontDistribute super."cabocha"; + "cached-io" = dontDistribute super."cached-io"; + "cached-traversable" = dontDistribute super."cached-traversable"; + "caf" = dontDistribute super."caf"; + "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; + "caffegraph" = dontDistribute super."caffegraph"; + "cairo-appbase" = dontDistribute super."cairo-appbase"; + "cake" = dontDistribute super."cake"; + "cake3" = dontDistribute super."cake3"; + "cakyrespa" = dontDistribute super."cakyrespa"; + "cal3d" = dontDistribute super."cal3d"; + "cal3d-examples" = dontDistribute super."cal3d-examples"; + "cal3d-opengl" = dontDistribute super."cal3d-opengl"; + "calc" = dontDistribute super."calc"; + "caldims" = dontDistribute super."caldims"; + "caledon" = dontDistribute super."caledon"; + "call" = dontDistribute super."call"; + "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; + "camh" = dontDistribute super."camh"; + "campfire" = dontDistribute super."campfire"; + "canonical-filepath" = dontDistribute super."canonical-filepath"; + "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; + "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; + "cantor" = dontDistribute super."cantor"; + "cao" = dontDistribute super."cao"; + "cap" = dontDistribute super."cap"; + "capped-list" = dontDistribute super."capped-list"; + "capri" = dontDistribute super."capri"; + "car-pool" = dontDistribute super."car-pool"; + "caramia" = dontDistribute super."caramia"; + "carboncopy" = dontDistribute super."carboncopy"; + "carettah" = dontDistribute super."carettah"; + "cartel" = doDistribute super."cartel_0_14_2_8"; + "casadi-bindings" = dontDistribute super."casadi-bindings"; + "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; + "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; + "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; + "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; + "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; + "cascading" = dontDistribute super."cascading"; + "case-conversion" = dontDistribute super."case-conversion"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "cassandra-cql" = dontDistribute super."cassandra-cql"; + "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava-conduit" = dontDistribute super."cassava-conduit"; + "cassava-streams" = dontDistribute super."cassava-streams"; + "cassette" = dontDistribute super."cassette"; + "cassy" = dontDistribute super."cassy"; + "castle" = dontDistribute super."castle"; + "casui" = dontDistribute super."casui"; + "catamorphism" = dontDistribute super."catamorphism"; + "catch-fd" = dontDistribute super."catch-fd"; + "categorical-algebra" = dontDistribute super."categorical-algebra"; + "categories" = dontDistribute super."categories"; + "category-extras" = dontDistribute super."category-extras"; + "cayley-dickson" = dontDistribute super."cayley-dickson"; + "cblrepo" = dontDistribute super."cblrepo"; + "cci" = dontDistribute super."cci"; + "ccnx" = dontDistribute super."ccnx"; + "cctools-workqueue" = dontDistribute super."cctools-workqueue"; + "cedict" = dontDistribute super."cedict"; + "cef" = dontDistribute super."cef"; + "ceilometer-common" = dontDistribute super."ceilometer-common"; + "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cerberus" = dontDistribute super."cerberus"; + "cereal-derive" = dontDistribute super."cereal-derive"; + "cereal-enumerator" = dontDistribute super."cereal-enumerator"; + "cereal-ieee754" = dontDistribute super."cereal-ieee754"; + "cereal-plus" = dontDistribute super."cereal-plus"; + "cereal-text" = dontDistribute super."cereal-text"; + "certificate" = dontDistribute super."certificate"; + "cf" = dontDistribute super."cf"; + "cfipu" = dontDistribute super."cfipu"; + "cflp" = dontDistribute super."cflp"; + "cfopu" = dontDistribute super."cfopu"; + "cg" = dontDistribute super."cg"; + "cgen" = dontDistribute super."cgen"; + "cgi-undecidable" = dontDistribute super."cgi-undecidable"; + "cgi-utils" = dontDistribute super."cgi-utils"; + "cgrep" = dontDistribute super."cgrep"; + "chain-codes" = dontDistribute super."chain-codes"; + "chalk" = dontDistribute super."chalk"; + "chalkboard" = dontDistribute super."chalkboard"; + "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; + "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; + "chan-split" = dontDistribute super."chan-split"; + "change-monger" = dontDistribute super."change-monger"; + "charade" = dontDistribute super."charade"; + "charsetdetect" = dontDistribute super."charsetdetect"; + "chart-histogram" = dontDistribute super."chart-histogram"; + "chaselev-deque" = dontDistribute super."chaselev-deque"; + "chatter" = dontDistribute super."chatter"; + "chatty" = dontDistribute super."chatty"; + "chatty-text" = dontDistribute super."chatty-text"; + "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; + "check-pvp" = dontDistribute super."check-pvp"; + "checked" = dontDistribute super."checked"; + "chell-hunit" = dontDistribute super."chell-hunit"; + "chesshs" = dontDistribute super."chesshs"; + "chevalier-common" = dontDistribute super."chevalier-common"; + "chp" = dontDistribute super."chp"; + "chp-mtl" = dontDistribute super."chp-mtl"; + "chp-plus" = dontDistribute super."chp-plus"; + "chp-spec" = dontDistribute super."chp-spec"; + "chp-transformers" = dontDistribute super."chp-transformers"; + "chronograph" = dontDistribute super."chronograph"; + "chu2" = dontDistribute super."chu2"; + "chuchu" = dontDistribute super."chuchu"; + "chunks" = dontDistribute super."chunks"; + "chunky" = dontDistribute super."chunky"; + "church-list" = dontDistribute super."church-list"; + "cil" = dontDistribute super."cil"; + "cinvoke" = dontDistribute super."cinvoke"; + "cio" = dontDistribute super."cio"; + "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; + "circ" = dontDistribute super."circ"; + "cirru-parser" = dontDistribute super."cirru-parser"; + "citation-resolve" = dontDistribute super."citation-resolve"; + "citeproc-hs" = dontDistribute super."citeproc-hs"; + "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; + "cityhash" = dontDistribute super."cityhash"; + "cjk" = dontDistribute super."cjk"; + "clac" = dontDistribute super."clac"; + "clafer" = dontDistribute super."clafer"; + "claferIG" = dontDistribute super."claferIG"; + "claferwiki" = dontDistribute super."claferwiki"; + "clang-pure" = dontDistribute super."clang-pure"; + "clanki" = dontDistribute super."clanki"; + "clarifai" = dontDistribute super."clarifai"; + "clash" = dontDistribute super."clash"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; + "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; + "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; + "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; + "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; + "cld2" = dontDistribute super."cld2"; + "clean-home" = dontDistribute super."clean-home"; + "clean-unions" = dontDistribute super."clean-unions"; + "cless" = dontDistribute super."cless"; + "clevercss" = dontDistribute super."clevercss"; + "cli" = dontDistribute super."cli"; + "click-clack" = dontDistribute super."click-clack"; + "clifford" = dontDistribute super."clifford"; + "clippard" = dontDistribute super."clippard"; + "clipper" = dontDistribute super."clipper"; + "clippings" = dontDistribute super."clippings"; + "clist" = dontDistribute super."clist"; + "clocked" = dontDistribute super."clocked"; + "clogparse" = dontDistribute super."clogparse"; + "clone-all" = dontDistribute super."clone-all"; + "closure" = dontDistribute super."closure"; + "cloud-haskell" = dontDistribute super."cloud-haskell"; + "cloudfront-signer" = dontDistribute super."cloudfront-signer"; + "cloudyfs" = dontDistribute super."cloudyfs"; + "cltw" = dontDistribute super."cltw"; + "clua" = dontDistribute super."clua"; + "cluss" = dontDistribute super."cluss"; + "clustertools" = dontDistribute super."clustertools"; + "clutterhs" = dontDistribute super."clutterhs"; + "cmaes" = dontDistribute super."cmaes"; + "cmath" = dontDistribute super."cmath"; + "cmathml3" = dontDistribute super."cmathml3"; + "cmd-item" = dontDistribute super."cmd-item"; + "cmdargs-browser" = dontDistribute super."cmdargs-browser"; + "cmdlib" = dontDistribute super."cmdlib"; + "cmdtheline" = dontDistribute super."cmdtheline"; + "cml" = dontDistribute super."cml"; + "cmonad" = dontDistribute super."cmonad"; + "cmu" = dontDistribute super."cmu"; + "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; + "cndict" = dontDistribute super."cndict"; + "codec" = dontDistribute super."codec"; + "codec-libevent" = dontDistribute super."codec-libevent"; + "codec-mbox" = dontDistribute super."codec-mbox"; + "codecov-haskell" = dontDistribute super."codecov-haskell"; + "codemonitor" = dontDistribute super."codemonitor"; + "codepad" = dontDistribute super."codepad"; + "codo-notation" = dontDistribute super."codo-notation"; + "cofunctor" = dontDistribute super."cofunctor"; + "cognimeta-utils" = dontDistribute super."cognimeta-utils"; + "coinbase-exchange" = dontDistribute super."coinbase-exchange"; + "colada" = dontDistribute super."colada"; + "colchis" = dontDistribute super."colchis"; + "collada-output" = dontDistribute super."collada-output"; + "collada-types" = dontDistribute super."collada-types"; + "collapse-util" = dontDistribute super."collapse-util"; + "collection-json" = dontDistribute super."collection-json"; + "collections" = dontDistribute super."collections"; + "collections-api" = dontDistribute super."collections-api"; + "collections-base-instances" = dontDistribute super."collections-base-instances"; + "colock" = dontDistribute super."colock"; + "colorize-haskell" = dontDistribute super."colorize-haskell"; + "colors" = dontDistribute super."colors"; + "coltrane" = dontDistribute super."coltrane"; + "com" = dontDistribute super."com"; + "combinat" = dontDistribute super."combinat"; + "combinat-diagrams" = dontDistribute super."combinat-diagrams"; + "combinator-interactive" = dontDistribute super."combinator-interactive"; + "combinatorial-problems" = dontDistribute super."combinatorial-problems"; + "combinatorics" = dontDistribute super."combinatorics"; + "combobuffer" = dontDistribute super."combobuffer"; + "comfort-graph" = dontDistribute super."comfort-graph"; + "command" = dontDistribute super."command"; + "command-qq" = dontDistribute super."command-qq"; + "commodities" = dontDistribute super."commodities"; + "commsec" = dontDistribute super."commsec"; + "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; + "comonad-extras" = dontDistribute super."comonad-extras"; + "comonad-random" = dontDistribute super."comonad-random"; + "compact-map" = dontDistribute super."compact-map"; + "compact-socket" = dontDistribute super."compact-socket"; + "compact-string" = dontDistribute super."compact-string"; + "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compare-type" = dontDistribute super."compare-type"; + "compdata-automata" = dontDistribute super."compdata-automata"; + "compdata-dags" = dontDistribute super."compdata-dags"; + "compdata-param" = dontDistribute super."compdata-param"; + "compensated" = dontDistribute super."compensated"; + "competition" = dontDistribute super."competition"; + "compilation" = dontDistribute super."compilation"; + "complex-generic" = dontDistribute super."complex-generic"; + "complex-integrate" = dontDistribute super."complex-integrate"; + "complexity" = dontDistribute super."complexity"; + "compose-ltr" = dontDistribute super."compose-ltr"; + "compose-trans" = dontDistribute super."compose-trans"; + "compression" = dontDistribute super."compression"; + "compstrat" = dontDistribute super."compstrat"; + "comptrans" = dontDistribute super."comptrans"; + "computational-algebra" = dontDistribute super."computational-algebra"; + "computations" = dontDistribute super."computations"; + "conceit" = dontDistribute super."conceit"; + "concorde" = dontDistribute super."concorde"; + "concraft" = dontDistribute super."concraft"; + "concraft-hr" = dontDistribute super."concraft-hr"; + "concraft-pl" = dontDistribute super."concraft-pl"; + "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; + "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrent-barrier" = dontDistribute super."concurrent-barrier"; + "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; + "concurrent-extra" = dontDistribute super."concurrent-extra"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "concurrent-sa" = dontDistribute super."concurrent-sa"; + "concurrent-split" = dontDistribute super."concurrent-split"; + "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-utilities" = dontDistribute super."concurrent-utilities"; + "concurrentoutput" = dontDistribute super."concurrentoutput"; + "cond" = dontDistribute super."cond"; + "condor" = dontDistribute super."condor"; + "condorcet" = dontDistribute super."condorcet"; + "conductive-base" = dontDistribute super."conductive-base"; + "conductive-clock" = dontDistribute super."conductive-clock"; + "conductive-hsc3" = dontDistribute super."conductive-hsc3"; + "conductive-song" = dontDistribute super."conductive-song"; + "conduit-audio" = dontDistribute super."conduit-audio"; + "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; + "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; + "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-network-stream" = dontDistribute super."conduit-network-stream"; + "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; + "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; + "conf" = dontDistribute super."conf"; + "config-select" = dontDistribute super."config-select"; + "config-value" = dontDistribute super."config-value"; + "configifier" = dontDistribute super."configifier"; + "configuration" = dontDistribute super."configuration"; + "configuration-tools" = dontDistribute super."configuration-tools"; + "confsolve" = dontDistribute super."confsolve"; + "congruence-relation" = dontDistribute super."congruence-relation"; + "conjugateGradient" = dontDistribute super."conjugateGradient"; + "conjure" = dontDistribute super."conjure"; + "conlogger" = dontDistribute super."conlogger"; + "connection-pool" = dontDistribute super."connection-pool"; + "consistent" = dontDistribute super."consistent"; + "console-program" = dontDistribute super."console-program"; + "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; + "constrained-categories" = dontDistribute super."constrained-categories"; + "constrained-normal" = dontDistribute super."constrained-normal"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "consumers" = dontDistribute super."consumers"; + "container" = dontDistribute super."container"; + "container-classes" = dontDistribute super."container-classes"; + "containers-benchmark" = dontDistribute super."containers-benchmark"; + "containers-deepseq" = dontDistribute super."containers-deepseq"; + "context-free-grammar" = dontDistribute super."context-free-grammar"; + "context-stack" = dontDistribute super."context-stack"; + "continue" = dontDistribute super."continue"; + "continued-fractions" = dontDistribute super."continued-fractions"; + "continuum" = dontDistribute super."continuum"; + "continuum-client" = dontDistribute super."continuum-client"; + "control-event" = dontDistribute super."control-event"; + "control-monad-attempt" = dontDistribute super."control-monad-attempt"; + "control-monad-exception" = dontDistribute super."control-monad-exception"; + "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; + "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; + "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; + "control-monad-failure" = dontDistribute super."control-monad-failure"; + "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; + "control-monad-omega" = dontDistribute super."control-monad-omega"; + "control-monad-queue" = dontDistribute super."control-monad-queue"; + "control-timeout" = dontDistribute super."control-timeout"; + "contstuff" = dontDistribute super."contstuff"; + "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; + "contstuff-transformers" = dontDistribute super."contstuff-transformers"; + "converge" = dontDistribute super."converge"; + "conversion" = dontDistribute super."conversion"; + "conversion-bytestring" = dontDistribute super."conversion-bytestring"; + "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; + "conversion-text" = dontDistribute super."conversion-text"; + "convert" = dontDistribute super."convert"; + "convertible-ascii" = dontDistribute super."convertible-ascii"; + "convertible-text" = dontDistribute super."convertible-text"; + "cookbook" = dontDistribute super."cookbook"; + "coordinate" = dontDistribute super."coordinate"; + "copilot" = dontDistribute super."copilot"; + "copilot-c99" = dontDistribute super."copilot-c99"; + "copilot-cbmc" = dontDistribute super."copilot-cbmc"; + "copilot-core" = dontDistribute super."copilot-core"; + "copilot-language" = dontDistribute super."copilot-language"; + "copilot-libraries" = dontDistribute super."copilot-libraries"; + "copilot-sbv" = dontDistribute super."copilot-sbv"; + "copilot-theorem" = dontDistribute super."copilot-theorem"; + "copr" = dontDistribute super."copr"; + "core" = dontDistribute super."core"; + "core-haskell" = dontDistribute super."core-haskell"; + "corebot-bliki" = dontDistribute super."corebot-bliki"; + "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; + "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; + "coroutine-object" = dontDistribute super."coroutine-object"; + "couch-hs" = dontDistribute super."couch-hs"; + "couch-simple" = dontDistribute super."couch-simple"; + "couchdb-conduit" = dontDistribute super."couchdb-conduit"; + "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; + "count" = dontDistribute super."count"; + "countable" = dontDistribute super."countable"; + "counter" = dontDistribute super."counter"; + "court" = dontDistribute super."court"; + "coverage" = dontDistribute super."coverage"; + "cpio-conduit" = dontDistribute super."cpio-conduit"; + "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; + "cpsa" = dontDistribute super."cpsa"; + "cpuid" = dontDistribute super."cpuid"; + "cpuperf" = dontDistribute super."cpuperf"; + "cpython" = dontDistribute super."cpython"; + "cqrs" = dontDistribute super."cqrs"; + "cqrs-core" = dontDistribute super."cqrs-core"; + "cqrs-example" = dontDistribute super."cqrs-example"; + "cqrs-memory" = dontDistribute super."cqrs-memory"; + "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; + "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; + "cqrs-test" = dontDistribute super."cqrs-test"; + "cqrs-testkit" = dontDistribute super."cqrs-testkit"; + "cqrs-types" = dontDistribute super."cqrs-types"; + "cr" = dontDistribute super."cr"; + "crack" = dontDistribute super."crack"; + "craftwerk" = dontDistribute super."craftwerk"; + "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; + "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; + "crc16" = dontDistribute super."crc16"; + "crc16-table" = dontDistribute super."crc16-table"; + "creatur" = dontDistribute super."creatur"; + "crf-chain1" = dontDistribute super."crf-chain1"; + "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; + "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; + "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; + "critbit" = dontDistribute super."critbit"; + "criterion-plus" = dontDistribute super."criterion-plus"; + "criterion-to-html" = dontDistribute super."criterion-to-html"; + "crockford" = dontDistribute super."crockford"; + "crocodile" = dontDistribute super."crocodile"; + "cron-compat" = dontDistribute super."cron-compat"; + "cruncher-types" = dontDistribute super."cruncher-types"; + "crunghc" = dontDistribute super."crunghc"; + "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; + "crypto-classical" = dontDistribute super."crypto-classical"; + "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; + "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; + "crypto-random-effect" = dontDistribute super."crypto-random-effect"; + "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptsy-api" = dontDistribute super."cryptsy-api"; + "crystalfontz" = dontDistribute super."crystalfontz"; + "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; + "csound-catalog" = dontDistribute super."csound-catalog"; + "csound-expression" = dontDistribute super."csound-expression"; + "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; + "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; + "csound-expression-typed" = dontDistribute super."csound-expression-typed"; + "csound-sampler" = dontDistribute super."csound-sampler"; + "csp" = dontDistribute super."csp"; + "cspmchecker" = dontDistribute super."cspmchecker"; + "css" = dontDistribute super."css"; + "csv-enumerator" = dontDistribute super."csv-enumerator"; + "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-to-qif" = dontDistribute super."csv-to-qif"; + "ctemplate" = dontDistribute super."ctemplate"; + "ctkl" = dontDistribute super."ctkl"; + "ctpl" = dontDistribute super."ctpl"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "cublas" = dontDistribute super."cublas"; + "cuboid" = dontDistribute super."cuboid"; + "cuda" = dontDistribute super."cuda"; + "cudd" = dontDistribute super."cudd"; + "cufft" = dontDistribute super."cufft"; + "curl-aeson" = dontDistribute super."curl-aeson"; + "curlhs" = dontDistribute super."curlhs"; + "currency" = dontDistribute super."currency"; + "current-locale" = dontDistribute super."current-locale"; + "curry-base" = dontDistribute super."curry-base"; + "curry-frontend" = dontDistribute super."curry-frontend"; + "cursedcsv" = dontDistribute super."cursedcsv"; + "curve25519" = dontDistribute super."curve25519"; + "curves" = dontDistribute super."curves"; + "custom-prelude" = dontDistribute super."custom-prelude"; + "cv-combinators" = dontDistribute super."cv-combinators"; + "cyclotomic" = dontDistribute super."cyclotomic"; + "cypher" = dontDistribute super."cypher"; + "d-bus" = dontDistribute super."d-bus"; + "d3js" = dontDistribute super."d3js"; + "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; + "daemons" = dontDistribute super."daemons"; + "dag" = dontDistribute super."dag"; + "damnpacket" = dontDistribute super."damnpacket"; + "dao" = dontDistribute super."dao"; + "dapi" = dontDistribute super."dapi"; + "darcs-benchmark" = dontDistribute super."darcs-benchmark"; + "darcs-beta" = dontDistribute super."darcs-beta"; + "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; + "darcs-cabalized" = dontDistribute super."darcs-cabalized"; + "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; + "darcs-graph" = dontDistribute super."darcs-graph"; + "darcs-monitor" = dontDistribute super."darcs-monitor"; + "darcs-scripts" = dontDistribute super."darcs-scripts"; + "darcs2dot" = dontDistribute super."darcs2dot"; + "darcsden" = dontDistribute super."darcsden"; + "darcswatch" = dontDistribute super."darcswatch"; + "darkplaces-demo" = dontDistribute super."darkplaces-demo"; + "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; + "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; + "darkplaces-text" = dontDistribute super."darkplaces-text"; + "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; + "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; + "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; + "data-accessor-template" = dontDistribute super."data-accessor-template"; + "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; + "data-aviary" = dontDistribute super."data-aviary"; + "data-base" = dontDistribute super."data-base"; + "data-bword" = dontDistribute super."data-bword"; + "data-carousel" = dontDistribute super."data-carousel"; + "data-category" = dontDistribute super."data-category"; + "data-cell" = dontDistribute super."data-cell"; + "data-checked" = dontDistribute super."data-checked"; + "data-clist" = dontDistribute super."data-clist"; + "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; + "data-construction" = dontDistribute super."data-construction"; + "data-cycle" = dontDistribute super."data-cycle"; + "data-default-generics" = dontDistribute super."data-default-generics"; + "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; + "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; + "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; + "data-default-instances-text" = dontDistribute super."data-default-instances-text"; + "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; + "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; + "data-dispersal" = dontDistribute super."data-dispersal"; + "data-dword" = dontDistribute super."data-dword"; + "data-easy" = dontDistribute super."data-easy"; + "data-embed" = dontDistribute super."data-embed"; + "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; + "data-extra" = dontDistribute super."data-extra"; + "data-filepath" = dontDistribute super."data-filepath"; + "data-fin" = dontDistribute super."data-fin"; + "data-fin-simple" = dontDistribute super."data-fin-simple"; + "data-fix" = dontDistribute super."data-fix"; + "data-fix-cse" = dontDistribute super."data-fix-cse"; + "data-flags" = dontDistribute super."data-flags"; + "data-flagset" = dontDistribute super."data-flagset"; + "data-fresh" = dontDistribute super."data-fresh"; + "data-interval" = dontDistribute super."data-interval"; + "data-ivar" = dontDistribute super."data-ivar"; + "data-json-token" = dontDistribute super."data-json-token"; + "data-kiln" = dontDistribute super."data-kiln"; + "data-layer" = dontDistribute super."data-layer"; + "data-layout" = dontDistribute super."data-layout"; + "data-lens" = dontDistribute super."data-lens"; + "data-lens-fd" = dontDistribute super."data-lens-fd"; + "data-lens-ixset" = dontDistribute super."data-lens-ixset"; + "data-lens-template" = dontDistribute super."data-lens-template"; + "data-list-sequences" = dontDistribute super."data-list-sequences"; + "data-map-multikey" = dontDistribute super."data-map-multikey"; + "data-named" = dontDistribute super."data-named"; + "data-nat" = dontDistribute super."data-nat"; + "data-object" = dontDistribute super."data-object"; + "data-object-json" = dontDistribute super."data-object-json"; + "data-object-yaml" = dontDistribute super."data-object-yaml"; + "data-or" = dontDistribute super."data-or"; + "data-partition" = dontDistribute super."data-partition"; + "data-pprint" = dontDistribute super."data-pprint"; + "data-quotientref" = dontDistribute super."data-quotientref"; + "data-r-tree" = dontDistribute super."data-r-tree"; + "data-ref" = dontDistribute super."data-ref"; + "data-reify-cse" = dontDistribute super."data-reify-cse"; + "data-repr" = dontDistribute super."data-repr"; + "data-result" = dontDistribute super."data-result"; + "data-rev" = dontDistribute super."data-rev"; + "data-rope" = dontDistribute super."data-rope"; + "data-rtuple" = dontDistribute super."data-rtuple"; + "data-size" = dontDistribute super."data-size"; + "data-spacepart" = dontDistribute super."data-spacepart"; + "data-store" = dontDistribute super."data-store"; + "data-stringmap" = dontDistribute super."data-stringmap"; + "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; + "data-tensor" = dontDistribute super."data-tensor"; + "data-textual" = dontDistribute super."data-textual"; + "data-timeout" = dontDistribute super."data-timeout"; + "data-transform" = dontDistribute super."data-transform"; + "data-treify" = dontDistribute super."data-treify"; + "data-type" = dontDistribute super."data-type"; + "data-util" = dontDistribute super."data-util"; + "data-variant" = dontDistribute super."data-variant"; + "database-migrate" = dontDistribute super."database-migrate"; + "database-study" = dontDistribute super."database-study"; + "dataenc" = dontDistribute super."dataenc"; + "dataflow" = dontDistribute super."dataflow"; + "datalog" = dontDistribute super."datalog"; + "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; + "date-cache" = dontDistribute super."date-cache"; + "dates" = dontDistribute super."dates"; + "datetime" = dontDistribute super."datetime"; + "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; + "dawg" = dontDistribute super."dawg"; + "dbcleaner" = dontDistribute super."dbcleaner"; + "dbf" = dontDistribute super."dbf"; + "dbjava" = dontDistribute super."dbjava"; + "dbus-client" = dontDistribute super."dbus-client"; + "dbus-core" = dontDistribute super."dbus-core"; + "dbus-qq" = dontDistribute super."dbus-qq"; + "dbus-th" = dontDistribute super."dbus-th"; + "dclabel" = dontDistribute super."dclabel"; + "dclabel-eci11" = dontDistribute super."dclabel-eci11"; + "ddc-base" = dontDistribute super."ddc-base"; + "ddc-build" = dontDistribute super."ddc-build"; + "ddc-code" = dontDistribute super."ddc-code"; + "ddc-core" = dontDistribute super."ddc-core"; + "ddc-core-eval" = dontDistribute super."ddc-core-eval"; + "ddc-core-flow" = dontDistribute super."ddc-core-flow"; + "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; + "ddc-core-salt" = dontDistribute super."ddc-core-salt"; + "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; + "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; + "ddc-driver" = dontDistribute super."ddc-driver"; + "ddc-interface" = dontDistribute super."ddc-interface"; + "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; + "ddc-tools" = dontDistribute super."ddc-tools"; + "ddc-war" = dontDistribute super."ddc-war"; + "ddci-core" = dontDistribute super."ddci-core"; + "dead-code-detection" = dontDistribute super."dead-code-detection"; + "dead-simple-json" = dontDistribute super."dead-simple-json"; + "debian-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "debug-time" = dontDistribute super."debug-time"; + "decepticons" = dontDistribute super."decepticons"; + "decode-utf8" = dontDistribute super."decode-utf8"; + "decoder-conduit" = dontDistribute super."decoder-conduit"; + "dedukti" = dontDistribute super."dedukti"; + "deepcontrol" = dontDistribute super."deepcontrol"; + "deeplearning-hs" = dontDistribute super."deeplearning-hs"; + "deepseq-bounded" = dontDistribute super."deepseq-bounded"; + "deepseq-magic" = dontDistribute super."deepseq-magic"; + "deepseq-th" = dontDistribute super."deepseq-th"; + "deepzoom" = dontDistribute super."deepzoom"; + "defargs" = dontDistribute super."defargs"; + "definitive-base" = dontDistribute super."definitive-base"; + "definitive-filesystem" = dontDistribute super."definitive-filesystem"; + "definitive-graphics" = dontDistribute super."definitive-graphics"; + "definitive-parser" = dontDistribute super."definitive-parser"; + "definitive-reactive" = dontDistribute super."definitive-reactive"; + "definitive-sound" = dontDistribute super."definitive-sound"; + "deiko-config" = dontDistribute super."deiko-config"; + "deka" = dontDistribute super."deka"; + "deka-tests" = dontDistribute super."deka-tests"; + "delaunay" = dontDistribute super."delaunay"; + "delicious" = dontDistribute super."delicious"; + "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; + "delta" = dontDistribute super."delta"; + "delta-h" = dontDistribute super."delta-h"; + "demarcate" = dontDistribute super."demarcate"; + "denominate" = dontDistribute super."denominate"; + "dependent-state" = dontDistribute super."dependent-state"; + "depends" = dontDistribute super."depends"; + "dephd" = dontDistribute super."dephd"; + "dequeue" = dontDistribute super."dequeue"; + "derangement" = dontDistribute super."derangement"; + "derivation-trees" = dontDistribute super."derivation-trees"; + "derive-IG" = dontDistribute super."derive-IG"; + "derive-enumerable" = dontDistribute super."derive-enumerable"; + "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; + "derive-topdown" = dontDistribute super."derive-topdown"; + "derive-trie" = dontDistribute super."derive-trie"; + "deriving-compat" = dontDistribute super."deriving-compat"; + "derp" = dontDistribute super."derp"; + "derp-lib" = dontDistribute super."derp-lib"; + "descrilo" = dontDistribute super."descrilo"; + "despair" = dontDistribute super."despair"; + "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; + "detrospector" = dontDistribute super."detrospector"; + "deunicode" = dontDistribute super."deunicode"; + "devil" = dontDistribute super."devil"; + "dewdrop" = dontDistribute super."dewdrop"; + "dfrac" = dontDistribute super."dfrac"; + "dfsbuild" = dontDistribute super."dfsbuild"; + "dgim" = dontDistribute super."dgim"; + "dgs" = dontDistribute super."dgs"; + "dia-base" = dontDistribute super."dia-base"; + "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; + "diagrams-pdf" = dontDistribute super."diagrams-pdf"; + "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "dialog" = dontDistribute super."dialog"; + "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; + "dicom" = dontDistribute super."dicom"; + "dictparser" = dontDistribute super."dictparser"; + "diet" = dontDistribute super."diet"; + "diff-gestalt" = dontDistribute super."diff-gestalt"; + "diff-parse" = dontDistribute super."diff-parse"; + "diffarray" = dontDistribute super."diffarray"; + "diffcabal" = dontDistribute super."diffcabal"; + "diffdump" = dontDistribute super."diffdump"; + "digamma" = dontDistribute super."digamma"; + "digest-pure" = dontDistribute super."digest-pure"; + "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; + "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; + "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; + "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; + "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; + "digit" = dontDistribute super."digit"; + "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; + "dimensional-tf" = dontDistribute super."dimensional-tf"; + "dingo-core" = dontDistribute super."dingo-core"; + "dingo-example" = dontDistribute super."dingo-example"; + "dingo-widgets" = dontDistribute super."dingo-widgets"; + "diophantine" = dontDistribute super."diophantine"; + "diplomacy" = dontDistribute super."diplomacy"; + "diplomacy-server" = dontDistribute super."diplomacy-server"; + "direct-binary-files" = dontDistribute super."direct-binary-files"; + "direct-daemonize" = dontDistribute super."direct-daemonize"; + "direct-fastcgi" = dontDistribute super."direct-fastcgi"; + "direct-http" = dontDistribute super."direct-http"; + "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; + "direct-plugins" = dontDistribute super."direct-plugins"; + "directed-cubical" = dontDistribute super."directed-cubical"; + "directory-layout" = dontDistribute super."directory-layout"; + "dirfiles" = dontDistribute super."dirfiles"; + "dirstream" = dontDistribute super."dirstream"; + "disassembler" = dontDistribute super."disassembler"; + "discordian-calendar" = dontDistribute super."discordian-calendar"; + "discount" = dontDistribute super."discount"; + "discrete-space-map" = dontDistribute super."discrete-space-map"; + "discrimination" = dontDistribute super."discrimination"; + "disjoint-set" = dontDistribute super."disjoint-set"; + "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; + "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; + "distributed-process-async" = dontDistribute super."distributed-process-async"; + "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; + "distributed-process-lifted" = dontDistribute super."distributed-process-lifted"; + "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; + "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; + "distributed-process-platform" = dontDistribute super."distributed-process-platform"; + "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; + "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; + "distributed-process-task" = dontDistribute super."distributed-process-task"; + "distributed-process-tests" = dontDistribute super."distributed-process-tests"; + "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "djembe" = dontDistribute super."djembe"; + "djinn" = dontDistribute super."djinn"; + "djinn-th" = dontDistribute super."djinn-th"; + "dnscache" = dontDistribute super."dnscache"; + "dnsrbl" = dontDistribute super."dnsrbl"; + "dnssd" = dontDistribute super."dnssd"; + "doc-review" = dontDistribute super."doc-review"; + "doccheck" = dontDistribute super."doccheck"; + "docidx" = dontDistribute super."docidx"; + "docker" = dontDistribute super."docker"; + "dockercook" = dontDistribute super."dockercook"; + "doctest-discover" = dontDistribute super."doctest-discover"; + "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; + "doctest-prop" = dontDistribute super."doctest-prop"; + "dom-lt" = dontDistribute super."dom-lt"; + "dom-parser" = dontDistribute super."dom-parser"; + "dom-selector" = dontDistribute super."dom-selector"; + "domain-auth" = dontDistribute super."domain-auth"; + "dominion" = dontDistribute super."dominion"; + "domplate" = dontDistribute super."domplate"; + "dot2graphml" = dontDistribute super."dot2graphml"; + "dotfs" = dontDistribute super."dotfs"; + "dotgen" = dontDistribute super."dotgen"; + "double-metaphone" = dontDistribute super."double-metaphone"; + "dove" = dontDistribute super."dove"; + "dow" = dontDistribute super."dow"; + "download" = dontDistribute super."download"; + "download-curl" = dontDistribute super."download-curl"; + "download-media-content" = dontDistribute super."download-media-content"; + "dozenal" = dontDistribute super."dozenal"; + "dozens" = dontDistribute super."dozens"; + "dph-base" = dontDistribute super."dph-base"; + "dph-examples" = dontDistribute super."dph-examples"; + "dph-lifted-base" = dontDistribute super."dph-lifted-base"; + "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; + "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; + "dph-par" = dontDistribute super."dph-par"; + "dph-prim-interface" = dontDistribute super."dph-prim-interface"; + "dph-prim-par" = dontDistribute super."dph-prim-par"; + "dph-prim-seq" = dontDistribute super."dph-prim-seq"; + "dph-seq" = dontDistribute super."dph-seq"; + "dpkg" = dontDistribute super."dpkg"; + "drClickOn" = dontDistribute super."drClickOn"; + "draw-poker" = dontDistribute super."draw-poker"; + "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe"; + "dropbox-sdk" = dontDistribute super."dropbox-sdk"; + "dropsolve" = dontDistribute super."dropsolve"; + "ds-kanren" = dontDistribute super."ds-kanren"; + "dsh-sql" = dontDistribute super."dsh-sql"; + "dsmc" = dontDistribute super."dsmc"; + "dsmc-tools" = dontDistribute super."dsmc-tools"; + "dson" = dontDistribute super."dson"; + "dson-parsec" = dontDistribute super."dson-parsec"; + "dsp" = dontDistribute super."dsp"; + "dstring" = dontDistribute super."dstring"; + "dtab" = dontDistribute super."dtab"; + "dtd" = dontDistribute super."dtd"; + "dtd-text" = dontDistribute super."dtd-text"; + "dtd-types" = dontDistribute super."dtd-types"; + "dtrace" = dontDistribute super."dtrace"; + "dtw" = dontDistribute super."dtw"; + "dump" = dontDistribute super."dump"; + "duplo" = dontDistribute super."duplo"; + "dvda" = dontDistribute super."dvda"; + "dvdread" = dontDistribute super."dvdread"; + "dvi-processing" = dontDistribute super."dvi-processing"; + "dvorak" = dontDistribute super."dvorak"; + "dwarf" = dontDistribute super."dwarf"; + "dwarf-el" = dontDistribute super."dwarf-el"; + "dwarfadt" = dontDistribute super."dwarfadt"; + "dx9base" = dontDistribute super."dx9base"; + "dx9d3d" = dontDistribute super."dx9d3d"; + "dx9d3dx" = dontDistribute super."dx9d3dx"; + "dynamic-cabal" = dontDistribute super."dynamic-cabal"; + "dynamic-graph" = dontDistribute super."dynamic-graph"; + "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; + "dynamic-loader" = dontDistribute super."dynamic-loader"; + "dynamic-mvector" = dontDistribute super."dynamic-mvector"; + "dynamic-object" = dontDistribute super."dynamic-object"; + "dynamic-plot" = dontDistribute super."dynamic-plot"; + "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynobud" = dontDistribute super."dynobud"; + "dywapitchtrack" = dontDistribute super."dywapitchtrack"; + "dzen-utils" = dontDistribute super."dzen-utils"; + "eager-sockets" = dontDistribute super."eager-sockets"; + "easy-api" = dontDistribute super."easy-api"; + "easy-bitcoin" = dontDistribute super."easy-bitcoin"; + "easyjson" = dontDistribute super."easyjson"; + "easyplot" = dontDistribute super."easyplot"; + "easyrender" = dontDistribute super."easyrender"; + "ebeats" = dontDistribute super."ebeats"; + "ebnf-bff" = dontDistribute super."ebnf-bff"; + "ec2-signature" = dontDistribute super."ec2-signature"; + "ecdsa" = dontDistribute super."ecdsa"; + "ecma262" = dontDistribute super."ecma262"; + "ecu" = dontDistribute super."ecu"; + "ed25519" = dontDistribute super."ed25519"; + "ed25519-donna" = dontDistribute super."ed25519-donna"; + "eddie" = dontDistribute super."eddie"; + "edenmodules" = dontDistribute super."edenmodules"; + "edenskel" = dontDistribute super."edenskel"; + "edentv" = dontDistribute super."edentv"; + "edge" = dontDistribute super."edge"; + "edis" = dontDistribute super."edis"; + "edit-lenses" = dontDistribute super."edit-lenses"; + "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; + "editable" = dontDistribute super."editable"; + "editline" = dontDistribute super."editline"; + "effect-monad" = dontDistribute super."effect-monad"; + "effective-aspects" = dontDistribute super."effective-aspects"; + "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; + "effects" = dontDistribute super."effects"; + "effects-parser" = dontDistribute super."effects-parser"; + "effin" = dontDistribute super."effin"; + "egison" = dontDistribute super."egison"; + "egison-quote" = dontDistribute super."egison-quote"; + "egison-tutorial" = dontDistribute super."egison-tutorial"; + "ehaskell" = dontDistribute super."ehaskell"; + "ehs" = dontDistribute super."ehs"; + "eibd-client-simple" = dontDistribute super."eibd-client-simple"; + "eigen" = dontDistribute super."eigen"; + "eithers" = dontDistribute super."eithers"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-log" = dontDistribute super."ekg-log"; + "ekg-push" = dontDistribute super."ekg-push"; + "ekg-rrd" = dontDistribute super."ekg-rrd"; + "ekg-statsd" = dontDistribute super."ekg-statsd"; + "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; + "elerea" = dontDistribute super."elerea"; + "elerea-examples" = dontDistribute super."elerea-examples"; + "elerea-sdl" = dontDistribute super."elerea-sdl"; + "elevator" = dontDistribute super."elevator"; + "elf" = dontDistribute super."elf"; + "elision" = dontDistribute super."elision"; + "elm-build-lib" = dontDistribute super."elm-build-lib"; + "elm-compiler" = dontDistribute super."elm-compiler"; + "elm-get" = dontDistribute super."elm-get"; + "elm-init" = dontDistribute super."elm-init"; + "elm-make" = dontDistribute super."elm-make"; + "elm-package" = dontDistribute super."elm-package"; + "elm-reactor" = dontDistribute super."elm-reactor"; + "elm-repl" = dontDistribute super."elm-repl"; + "elm-server" = dontDistribute super."elm-server"; + "elm-yesod" = dontDistribute super."elm-yesod"; + "elo" = dontDistribute super."elo"; + "elocrypt" = dontDistribute super."elocrypt"; + "emacs-keys" = dontDistribute super."emacs-keys"; + "email" = dontDistribute super."email"; + "email-header" = dontDistribute super."email-header"; + "email-postmark" = dontDistribute super."email-postmark"; + "email-validator" = dontDistribute super."email-validator"; + "embeddock" = dontDistribute super."embeddock"; + "embeddock-example" = dontDistribute super."embeddock-example"; + "embroidery" = dontDistribute super."embroidery"; + "emgm" = dontDistribute super."emgm"; + "empty" = dontDistribute super."empty"; + "encoding" = dontDistribute super."encoding"; + "endo" = dontDistribute super."endo"; + "engine-io-growler" = dontDistribute super."engine-io-growler"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "engineering-units" = dontDistribute super."engineering-units"; + "enumerable" = dontDistribute super."enumerable"; + "enumerate" = dontDistribute super."enumerate"; + "enumeration" = dontDistribute super."enumeration"; + "enumerator-fd" = dontDistribute super."enumerator-fd"; + "enumerator-tf" = dontDistribute super."enumerator-tf"; + "enumfun" = dontDistribute super."enumfun"; + "enummapmap" = dontDistribute super."enummapmap"; + "enummapset" = dontDistribute super."enummapset"; + "enummapset-th" = dontDistribute super."enummapset-th"; + "enumset" = dontDistribute super."enumset"; + "env-parser" = dontDistribute super."env-parser"; + "envparse" = dontDistribute super."envparse"; + "epanet-haskell" = dontDistribute super."epanet-haskell"; + "epass" = dontDistribute super."epass"; + "epic" = dontDistribute super."epic"; + "epoll" = dontDistribute super."epoll"; + "eprocess" = dontDistribute super."eprocess"; + "epub" = dontDistribute super."epub"; + "epub-metadata" = dontDistribute super."epub-metadata"; + "epub-tools" = dontDistribute super."epub-tools"; + "epubname" = dontDistribute super."epubname"; + "equal-files" = dontDistribute super."equal-files"; + "equational-reasoning" = dontDistribute super."equational-reasoning"; + "erd" = dontDistribute super."erd"; + "erf-native" = dontDistribute super."erf-native"; + "erlang" = dontDistribute super."erlang"; + "eros" = dontDistribute super."eros"; + "eros-client" = dontDistribute super."eros-client"; + "eros-http" = dontDistribute super."eros-http"; + "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; + "error-continuations" = dontDistribute super."error-continuations"; + "error-list" = dontDistribute super."error-list"; + "error-loc" = dontDistribute super."error-loc"; + "error-location" = dontDistribute super."error-location"; + "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; + "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "ersatz" = dontDistribute super."ersatz"; + "ersatz-toysat" = dontDistribute super."ersatz-toysat"; + "ert" = dontDistribute super."ert"; + "esotericbot" = dontDistribute super."esotericbot"; + "ess" = dontDistribute super."ess"; + "estimator" = dontDistribute super."estimator"; + "estimators" = dontDistribute super."estimators"; + "estreps" = dontDistribute super."estreps"; + "eternal" = dontDistribute super."eternal"; + "ether" = doDistribute super."ether_0_3_1_1"; + "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; + "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; + "ethereum-rlp" = dontDistribute super."ethereum-rlp"; + "ety" = dontDistribute super."ety"; + "euler" = dontDistribute super."euler"; + "euphoria" = dontDistribute super."euphoria"; + "eurofxref" = dontDistribute super."eurofxref"; + "event-driven" = dontDistribute super."event-driven"; + "event-handlers" = dontDistribute super."event-handlers"; + "event-list" = dontDistribute super."event-list"; + "event-monad" = dontDistribute super."event-monad"; + "eventloop" = dontDistribute super."eventloop"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = doDistribute super."exact-pi_0_4_1_1"; + "exception-hierarchy" = dontDistribute super."exception-hierarchy"; + "exception-mailer" = dontDistribute super."exception-mailer"; + "exception-monads-fd" = dontDistribute super."exception-monads-fd"; + "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-mtl" = dontDistribute super."exception-mtl"; + "exherbo-cabal" = dontDistribute super."exherbo-cabal"; + "exif" = dontDistribute super."exif"; + "exinst" = dontDistribute super."exinst"; + "exinst-aeson" = dontDistribute super."exinst-aeson"; + "exinst-bytes" = dontDistribute super."exinst-bytes"; + "exinst-deepseq" = dontDistribute super."exinst-deepseq"; + "exinst-hashable" = dontDistribute super."exinst-hashable"; + "existential" = dontDistribute super."existential"; + "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; + "exp-extended" = dontDistribute super."exp-extended"; + "exp-pairs" = dontDistribute super."exp-pairs"; + "expand" = dontDistribute super."expand"; + "expat-enumerator" = dontDistribute super."expat-enumerator"; + "expiring-mvar" = dontDistribute super."expiring-mvar"; + "explain" = dontDistribute super."explain"; + "explicit-determinant" = dontDistribute super."explicit-determinant"; + "explicit-iomodes" = dontDistribute super."explicit-iomodes"; + "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; + "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; + "explicit-sharing" = dontDistribute super."explicit-sharing"; + "explore" = dontDistribute super."explore"; + "exposed-containers" = dontDistribute super."exposed-containers"; + "expression-parser" = dontDistribute super."expression-parser"; + "extcore" = dontDistribute super."extcore"; + "extemp" = dontDistribute super."extemp"; + "extended-categories" = dontDistribute super."extended-categories"; + "extended-reals" = dontDistribute super."extended-reals"; + "extensible" = dontDistribute super."extensible"; + "extensible-data" = dontDistribute super."extensible-data"; + "external-sort" = dontDistribute super."external-sort"; + "extractelf" = dontDistribute super."extractelf"; + "ez-couch" = dontDistribute super."ez-couch"; + "faceted" = dontDistribute super."faceted"; + "factory" = dontDistribute super."factory"; + "factual-api" = dontDistribute super."factual-api"; + "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "fake-type" = dontDistribute super."fake-type"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "fast-digits" = dontDistribute super."fast-digits"; + "fast-math" = dontDistribute super."fast-math"; + "fast-tags" = dontDistribute super."fast-tags"; + "fast-tagsoup" = dontDistribute super."fast-tagsoup"; + "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; + "fastbayes" = dontDistribute super."fastbayes"; + "fastcgi" = dontDistribute super."fastcgi"; + "fastedit" = dontDistribute super."fastedit"; + "fastirc" = dontDistribute super."fastirc"; + "fault-tree" = dontDistribute super."fault-tree"; + "fay-geoposition" = dontDistribute super."fay-geoposition"; + "fay-hsx" = dontDistribute super."fay-hsx"; + "fay-ref" = dontDistribute super."fay-ref"; + "fca" = dontDistribute super."fca"; + "fcache" = dontDistribute super."fcache"; + "fcd" = dontDistribute super."fcd"; + "fckeditor" = dontDistribute super."fckeditor"; + "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; + "fdo-trash" = dontDistribute super."fdo-trash"; + "fec" = dontDistribute super."fec"; + "fedora-packages" = dontDistribute super."fedora-packages"; + "feed-cli" = dontDistribute super."feed-cli"; + "feed-collect" = dontDistribute super."feed-collect"; + "feed-crawl" = dontDistribute super."feed-crawl"; + "feed-translator" = dontDistribute super."feed-translator"; + "feed2lj" = dontDistribute super."feed2lj"; + "feed2twitter" = dontDistribute super."feed2twitter"; + "feldspar-compiler" = dontDistribute super."feldspar-compiler"; + "feldspar-language" = dontDistribute super."feldspar-language"; + "feldspar-signal" = dontDistribute super."feldspar-signal"; + "fen2s" = dontDistribute super."fen2s"; + "fences" = dontDistribute super."fences"; + "fenfire" = dontDistribute super."fenfire"; + "fez-conf" = dontDistribute super."fez-conf"; + "ffeed" = dontDistribute super."ffeed"; + "fficxx" = dontDistribute super."fficxx"; + "fficxx-runtime" = dontDistribute super."fficxx-runtime"; + "ffmpeg-light" = dontDistribute super."ffmpeg-light"; + "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; + "fgl-visualize" = dontDistribute super."fgl-visualize"; + "fibon" = dontDistribute super."fibon"; + "fibonacci" = dontDistribute super."fibonacci"; + "fields" = dontDistribute super."fields"; + "fields-json" = dontDistribute super."fields-json"; + "fieldwise" = dontDistribute super."fieldwise"; + "fig" = dontDistribute super."fig"; + "file-collection" = dontDistribute super."file-collection"; + "file-command-qq" = dontDistribute super."file-command-qq"; + "filediff" = dontDistribute super."filediff"; + "filepath-io-access" = dontDistribute super."filepath-io-access"; + "filepather" = dontDistribute super."filepather"; + "filestore" = dontDistribute super."filestore"; + "filesystem-conduit" = dontDistribute super."filesystem-conduit"; + "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; + "filesystem-trees" = dontDistribute super."filesystem-trees"; + "filtrable" = dontDistribute super."filtrable"; + "final" = dontDistribute super."final"; + "find-conduit" = dontDistribute super."find-conduit"; + "fingertree-tf" = dontDistribute super."fingertree-tf"; + "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; + "first-and-last" = dontDistribute super."first-and-last"; + "first-class-patterns" = dontDistribute super."first-class-patterns"; + "firstify" = dontDistribute super."firstify"; + "fishfood" = dontDistribute super."fishfood"; + "fit" = dontDistribute super."fit"; + "fitsio" = dontDistribute super."fitsio"; + "fix-imports" = dontDistribute super."fix-imports"; + "fix-parser-simple" = dontDistribute super."fix-parser-simple"; + "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; + "fixed-length" = dontDistribute super."fixed-length"; + "fixed-point" = dontDistribute super."fixed-point"; + "fixed-point-vector" = dontDistribute super."fixed-point-vector"; + "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; + "fixed-precision" = dontDistribute super."fixed-precision"; + "fixed-storable-array" = dontDistribute super."fixed-storable-array"; + "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; + "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; + "fixedprec" = dontDistribute super."fixedprec"; + "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixfile" = dontDistribute super."fixfile"; + "fixhs" = dontDistribute super."fixhs"; + "fixplate" = dontDistribute super."fixplate"; + "fixpoint" = dontDistribute super."fixpoint"; + "fixtime" = dontDistribute super."fixtime"; + "fizz-buzz" = dontDistribute super."fizz-buzz"; + "flaccuraterip" = dontDistribute super."flaccuraterip"; + "flamethrower" = dontDistribute super."flamethrower"; + "flamingra" = dontDistribute super."flamingra"; + "flat-maybe" = dontDistribute super."flat-maybe"; + "flat-mcmc" = dontDistribute super."flat-mcmc"; + "flat-tex" = dontDistribute super."flat-tex"; + "flexible-time" = dontDistribute super."flexible-time"; + "flexible-unlit" = dontDistribute super."flexible-unlit"; + "flexiwrap" = dontDistribute super."flexiwrap"; + "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; + "flickr" = dontDistribute super."flickr"; + "flippers" = dontDistribute super."flippers"; + "flite" = dontDistribute super."flite"; + "flo" = dontDistribute super."flo"; + "float-binstring" = dontDistribute super."float-binstring"; + "floating-bits" = dontDistribute super."floating-bits"; + "floatshow" = dontDistribute super."floatshow"; + "flow2dot" = dontDistribute super."flow2dot"; + "flowdock-api" = dontDistribute super."flowdock-api"; + "flowdock-rest" = dontDistribute super."flowdock-rest"; + "flower" = dontDistribute super."flower"; + "flowlocks-framework" = dontDistribute super."flowlocks-framework"; + "flowsim" = dontDistribute super."flowsim"; + "fltkhs" = dontDistribute super."fltkhs"; + "fltkhs-demos" = dontDistribute super."fltkhs-demos"; + "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl-incremental" = dontDistribute super."foldl-incremental"; + "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; + "folds" = dontDistribute super."folds"; + "folds-common" = dontDistribute super."folds-common"; + "follower" = dontDistribute super."follower"; + "foma" = dontDistribute super."foma"; + "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; + "foo" = dontDistribute super."foo"; + "for-free" = dontDistribute super."for-free"; + "forbidden-fruit" = dontDistribute super."forbidden-fruit"; + "fordo" = dontDistribute super."fordo"; + "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; + "foreign-var" = dontDistribute super."foreign-var"; + "forger" = dontDistribute super."forger"; + "forkable-monad" = dontDistribute super."forkable-monad"; + "formal" = dontDistribute super."formal"; + "format" = dontDistribute super."format"; + "format-status" = dontDistribute super."format-status"; + "formattable" = dontDistribute super."formattable"; + "forml" = dontDistribute super."forml"; + "formlets" = dontDistribute super."formlets"; + "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; + "forth-hll" = dontDistribute super."forth-hll"; + "foscam-directory" = dontDistribute super."foscam-directory"; + "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; + "fountain" = dontDistribute super."fountain"; + "fpco-api" = dontDistribute super."fpco-api"; + "fpipe" = dontDistribute super."fpipe"; + "fpnla" = dontDistribute super."fpnla"; + "fpnla-examples" = dontDistribute super."fpnla-examples"; + "fptest" = dontDistribute super."fptest"; + "fquery" = dontDistribute super."fquery"; + "fractal" = dontDistribute super."fractal"; + "fractals" = dontDistribute super."fractals"; + "fraction" = dontDistribute super."fraction"; + "frag" = dontDistribute super."frag"; + "frame" = dontDistribute super."frame"; + "frame-markdown" = dontDistribute super."frame-markdown"; + "franchise" = dontDistribute super."franchise"; + "free-concurrent" = dontDistribute super."free-concurrent"; + "free-functors" = dontDistribute super."free-functors"; + "free-game" = dontDistribute super."free-game"; + "free-http" = dontDistribute super."free-http"; + "free-operational" = dontDistribute super."free-operational"; + "free-theorems" = dontDistribute super."free-theorems"; + "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; + "free-theorems-seq" = dontDistribute super."free-theorems-seq"; + "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; + "free-theorems-webui" = dontDistribute super."free-theorems-webui"; + "free-vl" = dontDistribute super."free-vl"; + "freekick2" = dontDistribute super."freekick2"; + "freer" = dontDistribute super."freer"; + "freesect" = dontDistribute super."freesect"; + "freesound" = dontDistribute super."freesound"; + "freetype-simple" = dontDistribute super."freetype-simple"; + "freetype2" = dontDistribute super."freetype2"; + "fresh" = dontDistribute super."fresh"; + "friday" = dontDistribute super."friday"; + "friday-devil" = dontDistribute super."friday-devil"; + "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; + "friendly-time" = dontDistribute super."friendly-time"; + "frown" = dontDistribute super."frown"; + "frp-arduino" = dontDistribute super."frp-arduino"; + "frpnow" = dontDistribute super."frpnow"; + "frpnow-gloss" = dontDistribute super."frpnow-gloss"; + "frpnow-gtk" = dontDistribute super."frpnow-gtk"; + "frquotes" = dontDistribute super."frquotes"; + "fs-events" = dontDistribute super."fs-events"; + "fsharp" = dontDistribute super."fsharp"; + "fsmActions" = dontDistribute super."fsmActions"; + "fst" = dontDistribute super."fst"; + "fsutils" = dontDistribute super."fsutils"; + "fswatcher" = dontDistribute super."fswatcher"; + "ftdi" = dontDistribute super."ftdi"; + "ftp-conduit" = dontDistribute super."ftp-conduit"; + "ftphs" = dontDistribute super."ftphs"; + "ftree" = dontDistribute super."ftree"; + "ftshell" = dontDistribute super."ftshell"; + "fugue" = dontDistribute super."fugue"; + "full-sessions" = dontDistribute super."full-sessions"; + "full-text-search" = dontDistribute super."full-text-search"; + "fullstop" = dontDistribute super."fullstop"; + "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; + "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "function-combine" = dontDistribute super."function-combine"; + "function-instances-algebra" = dontDistribute super."function-instances-algebra"; + "functional-arrow" = dontDistribute super."functional-arrow"; + "functional-kmp" = dontDistribute super."functional-kmp"; + "functor-apply" = dontDistribute super."functor-apply"; + "functor-combo" = dontDistribute super."functor-combo"; + "functor-infix" = dontDistribute super."functor-infix"; + "functor-monadic" = dontDistribute super."functor-monadic"; + "functor-utils" = dontDistribute super."functor-utils"; + "functorm" = dontDistribute super."functorm"; + "functors" = dontDistribute super."functors"; + "funion" = dontDistribute super."funion"; + "funpat" = dontDistribute super."funpat"; + "funsat" = dontDistribute super."funsat"; + "fusion" = dontDistribute super."fusion"; + "futun" = dontDistribute super."futun"; + "future" = dontDistribute super."future"; + "future-resource" = dontDistribute super."future-resource"; + "fuzzy" = dontDistribute super."fuzzy"; + "fuzzy-timings" = dontDistribute super."fuzzy-timings"; + "fuzzytime" = dontDistribute super."fuzzytime"; + "fwgl" = dontDistribute super."fwgl"; + "fwgl-glfw" = dontDistribute super."fwgl-glfw"; + "fwgl-javascript" = dontDistribute super."fwgl-javascript"; + "g-npm" = dontDistribute super."g-npm"; + "gact" = dontDistribute super."gact"; + "game-of-life" = dontDistribute super."game-of-life"; + "game-probability" = dontDistribute super."game-probability"; + "game-tree" = dontDistribute super."game-tree"; + "gameclock" = dontDistribute super."gameclock"; + "gamma" = dontDistribute super."gamma"; + "gang-of-threads" = dontDistribute super."gang-of-threads"; + "garepinoh" = dontDistribute super."garepinoh"; + "garsia-wachs" = dontDistribute super."garsia-wachs"; + "gbu" = dontDistribute super."gbu"; + "gc" = dontDistribute super."gc"; + "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; + "gconf" = dontDistribute super."gconf"; + "gdiff" = dontDistribute super."gdiff"; + "gdiff-ig" = dontDistribute super."gdiff-ig"; + "gdiff-th" = dontDistribute super."gdiff-th"; + "gdo" = dontDistribute super."gdo"; + "gearbox" = dontDistribute super."gearbox"; + "geek" = dontDistribute super."geek"; + "geek-server" = dontDistribute super."geek-server"; + "gelatin" = dontDistribute super."gelatin"; + "gemstone" = dontDistribute super."gemstone"; + "gencheck" = dontDistribute super."gencheck"; + "gender" = dontDistribute super."gender"; + "genders" = dontDistribute super."genders"; + "general-prelude" = dontDistribute super."general-prelude"; + "generator" = dontDistribute super."generator"; + "generators" = dontDistribute super."generators"; + "generic-accessors" = dontDistribute super."generic-accessors"; + "generic-binary" = dontDistribute super."generic-binary"; + "generic-church" = dontDistribute super."generic-church"; + "generic-deepseq" = dontDistribute super."generic-deepseq"; + "generic-deriving" = doDistribute super."generic-deriving_1_9_0"; + "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; + "generic-maybe" = dontDistribute super."generic-maybe"; + "generic-pretty" = dontDistribute super."generic-pretty"; + "generic-server" = dontDistribute super."generic-server"; + "generic-storable" = dontDistribute super."generic-storable"; + "generic-tree" = dontDistribute super."generic-tree"; + "generic-xml" = dontDistribute super."generic-xml"; + "genericserialize" = dontDistribute super."genericserialize"; + "genetics" = dontDistribute super."genetics"; + "geni-gui" = dontDistribute super."geni-gui"; + "geni-util" = dontDistribute super."geni-util"; + "geniconvert" = dontDistribute super."geniconvert"; + "genifunctors" = dontDistribute super."genifunctors"; + "geniplate" = dontDistribute super."geniplate"; + "geniserver" = dontDistribute super."geniserver"; + "genprog" = dontDistribute super."genprog"; + "gentlemark" = dontDistribute super."gentlemark"; + "geo-resolver" = dontDistribute super."geo-resolver"; + "geo-uk" = dontDistribute super."geo-uk"; + "geocalc" = dontDistribute super."geocalc"; + "geocode-google" = dontDistribute super."geocode-google"; + "geodetic" = dontDistribute super."geodetic"; + "geodetics" = dontDistribute super."geodetics"; + "geohash" = dontDistribute super."geohash"; + "geoip2" = dontDistribute super."geoip2"; + "geojson" = dontDistribute super."geojson"; + "geom2d" = dontDistribute super."geom2d"; + "getemx" = dontDistribute super."getemx"; + "getflag" = dontDistribute super."getflag"; + "getopt-simple" = dontDistribute super."getopt-simple"; + "gf" = dontDistribute super."gf"; + "ggtsTC" = dontDistribute super."ggtsTC"; + "ghc-core" = dontDistribute super."ghc-core"; + "ghc-core-html" = dontDistribute super."ghc-core-html"; + "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; + "ghc-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-options" = dontDistribute super."ghc-options"; + "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; + "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; + "ghc-server" = dontDistribute super."ghc-server"; + "ghc-simple" = dontDistribute super."ghc-simple"; + "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; + "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-vis" = dontDistribute super."ghc-vis"; + "ghci-diagrams" = dontDistribute super."ghci-diagrams"; + "ghci-haskeline" = dontDistribute super."ghci-haskeline"; + "ghci-lib" = dontDistribute super."ghci-lib"; + "ghci-ng" = dontDistribute super."ghci-ng"; + "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; + "ghcjs-dom" = dontDistribute super."ghcjs-dom"; + "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; + "ghclive" = dontDistribute super."ghclive"; + "ghczdecode" = dontDistribute super."ghczdecode"; + "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-girepository" = dontDistribute super."gi-girepository"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-poppler" = dontDistribute super."gi-poppler"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; + "gi-webkit2" = dontDistribute super."gi-webkit2"; + "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_6_20160114"; + "git-checklist" = dontDistribute super."git-checklist"; + "git-date" = dontDistribute super."git-date"; + "git-embed" = dontDistribute super."git-embed"; + "git-freq" = dontDistribute super."git-freq"; + "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; + "git-monitor" = dontDistribute super."git-monitor"; + "git-object" = dontDistribute super."git-object"; + "git-repair" = dontDistribute super."git-repair"; + "git-sanity" = dontDistribute super."git-sanity"; + "git-vogue" = dontDistribute super."git-vogue"; + "gitHUD" = dontDistribute super."gitHUD"; + "gitcache" = dontDistribute super."gitcache"; + "gitdo" = dontDistribute super."gitdo"; + "github-backup" = dontDistribute super."github-backup"; + "github-post-receive" = dontDistribute super."github-post-receive"; + "github-utils" = dontDistribute super."github-utils"; + "gitignore" = dontDistribute super."gitignore"; + "gitit" = dontDistribute super."gitit"; + "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; + "gitlib-cross" = dontDistribute super."gitlib-cross"; + "gitlib-s3" = dontDistribute super."gitlib-s3"; + "gitlib-sample" = dontDistribute super."gitlib-sample"; + "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitter" = dontDistribute super."gitter"; + "gl-capture" = dontDistribute super."gl-capture"; + "glade" = dontDistribute super."glade"; + "gladexml-accessor" = dontDistribute super."gladexml-accessor"; + "glambda" = dontDistribute super."glambda"; + "glapp" = dontDistribute super."glapp"; + "glasso" = dontDistribute super."glasso"; + "glicko" = dontDistribute super."glicko"; + "glider-nlp" = dontDistribute super."glider-nlp"; + "glintcollider" = dontDistribute super."glintcollider"; + "gll" = dontDistribute super."gll"; + "global" = dontDistribute super."global"; + "global-config" = dontDistribute super."global-config"; + "global-lock" = dontDistribute super."global-lock"; + "global-variables" = dontDistribute super."global-variables"; + "glome-hs" = dontDistribute super."glome-hs"; + "gloss" = dontDistribute super."gloss"; + "gloss-accelerate" = dontDistribute super."gloss-accelerate"; + "gloss-algorithms" = dontDistribute super."gloss-algorithms"; + "gloss-banana" = dontDistribute super."gloss-banana"; + "gloss-devil" = dontDistribute super."gloss-devil"; + "gloss-examples" = dontDistribute super."gloss-examples"; + "gloss-game" = dontDistribute super."gloss-game"; + "gloss-juicy" = dontDistribute super."gloss-juicy"; + "gloss-raster" = dontDistribute super."gloss-raster"; + "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; + "gloss-rendering" = dontDistribute super."gloss-rendering"; + "gloss-sodium" = dontDistribute super."gloss-sodium"; + "glpk-hs" = dontDistribute super."glpk-hs"; + "glue" = dontDistribute super."glue"; + "glue-common" = dontDistribute super."glue-common"; + "glue-core" = dontDistribute super."glue-core"; + "glue-ekg" = dontDistribute super."glue-ekg"; + "glue-example" = dontDistribute super."glue-example"; + "gluturtle" = dontDistribute super."gluturtle"; + "gmap" = dontDistribute super."gmap"; + "gmndl" = dontDistribute super."gmndl"; + "gnome-desktop" = dontDistribute super."gnome-desktop"; + "gnome-keyring" = dontDistribute super."gnome-keyring"; + "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goal-core" = dontDistribute super."goal-core"; + "goal-geometry" = dontDistribute super."goal-geometry"; + "goal-probability" = dontDistribute super."goal-probability"; + "goal-simulation" = dontDistribute super."goal-simulation"; + "goatee" = dontDistribute super."goatee"; + "goatee-gtk" = dontDistribute super."goatee-gtk"; + "gofer-prelude" = dontDistribute super."gofer-prelude"; + "gogol" = dontDistribute super."gogol"; + "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer"; + "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller"; + "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer"; + "gogol-admin-directory" = dontDistribute super."gogol-admin-directory"; + "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration"; + "gogol-admin-reports" = dontDistribute super."gogol-admin-reports"; + "gogol-adsense" = dontDistribute super."gogol-adsense"; + "gogol-adsense-host" = dontDistribute super."gogol-adsense-host"; + "gogol-affiliates" = dontDistribute super."gogol-affiliates"; + "gogol-analytics" = dontDistribute super."gogol-analytics"; + "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise"; + "gogol-android-publisher" = dontDistribute super."gogol-android-publisher"; + "gogol-appengine" = dontDistribute super."gogol-appengine"; + "gogol-apps-activity" = dontDistribute super."gogol-apps-activity"; + "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar"; + "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing"; + "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller"; + "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks"; + "gogol-appstate" = dontDistribute super."gogol-appstate"; + "gogol-autoscaler" = dontDistribute super."gogol-autoscaler"; + "gogol-bigquery" = dontDistribute super."gogol-bigquery"; + "gogol-billing" = dontDistribute super."gogol-billing"; + "gogol-blogger" = dontDistribute super."gogol-blogger"; + "gogol-books" = dontDistribute super."gogol-books"; + "gogol-civicinfo" = dontDistribute super."gogol-civicinfo"; + "gogol-classroom" = dontDistribute super."gogol-classroom"; + "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace"; + "gogol-compute" = dontDistribute super."gogol-compute"; + "gogol-container" = dontDistribute super."gogol-container"; + "gogol-core" = dontDistribute super."gogol-core"; + "gogol-customsearch" = dontDistribute super."gogol-customsearch"; + "gogol-dataflow" = dontDistribute super."gogol-dataflow"; + "gogol-datastore" = dontDistribute super."gogol-datastore"; + "gogol-debugger" = dontDistribute super."gogol-debugger"; + "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager"; + "gogol-dfareporting" = dontDistribute super."gogol-dfareporting"; + "gogol-discovery" = dontDistribute super."gogol-discovery"; + "gogol-dns" = dontDistribute super."gogol-dns"; + "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids"; + "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search"; + "gogol-drive" = dontDistribute super."gogol-drive"; + "gogol-fitness" = dontDistribute super."gogol-fitness"; + "gogol-fonts" = dontDistribute super."gogol-fonts"; + "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch"; + "gogol-fusiontables" = dontDistribute super."gogol-fusiontables"; + "gogol-games" = dontDistribute super."gogol-games"; + "gogol-games-configuration" = dontDistribute super."gogol-games-configuration"; + "gogol-games-management" = dontDistribute super."gogol-games-management"; + "gogol-genomics" = dontDistribute super."gogol-genomics"; + "gogol-gmail" = dontDistribute super."gogol-gmail"; + "gogol-groups-migration" = dontDistribute super."gogol-groups-migration"; + "gogol-groups-settings" = dontDistribute super."gogol-groups-settings"; + "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit"; + "gogol-latencytest" = dontDistribute super."gogol-latencytest"; + "gogol-logging" = dontDistribute super."gogol-logging"; + "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate"; + "gogol-maps-engine" = dontDistribute super."gogol-maps-engine"; + "gogol-mirror" = dontDistribute super."gogol-mirror"; + "gogol-monitoring" = dontDistribute super."gogol-monitoring"; + "gogol-oauth2" = dontDistribute super."gogol-oauth2"; + "gogol-pagespeed" = dontDistribute super."gogol-pagespeed"; + "gogol-partners" = dontDistribute super."gogol-partners"; + "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner"; + "gogol-plus" = dontDistribute super."gogol-plus"; + "gogol-plus-domains" = dontDistribute super."gogol-plus-domains"; + "gogol-prediction" = dontDistribute super."gogol-prediction"; + "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon"; + "gogol-pubsub" = dontDistribute super."gogol-pubsub"; + "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress"; + "gogol-replicapool" = dontDistribute super."gogol-replicapool"; + "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater"; + "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager"; + "gogol-resourceviews" = dontDistribute super."gogol-resourceviews"; + "gogol-shopping-content" = dontDistribute super."gogol-shopping-content"; + "gogol-siteverification" = dontDistribute super."gogol-siteverification"; + "gogol-spectrum" = dontDistribute super."gogol-spectrum"; + "gogol-sqladmin" = dontDistribute super."gogol-sqladmin"; + "gogol-storage" = dontDistribute super."gogol-storage"; + "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer"; + "gogol-tagmanager" = dontDistribute super."gogol-tagmanager"; + "gogol-taskqueue" = dontDistribute super."gogol-taskqueue"; + "gogol-translate" = dontDistribute super."gogol-translate"; + "gogol-urlshortener" = dontDistribute super."gogol-urlshortener"; + "gogol-useraccounts" = dontDistribute super."gogol-useraccounts"; + "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools"; + "gogol-youtube" = dontDistribute super."gogol-youtube"; + "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics"; + "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting"; + "gooey" = dontDistribute super."gooey"; + "google-dictionary" = dontDistribute super."google-dictionary"; + "google-drive" = dontDistribute super."google-drive"; + "google-html5-slide" = dontDistribute super."google-html5-slide"; + "google-mail-filters" = dontDistribute super."google-mail-filters"; + "google-oauth2" = dontDistribute super."google-oauth2"; + "google-search" = dontDistribute super."google-search"; + "googleplus" = dontDistribute super."googleplus"; + "googlepolyline" = dontDistribute super."googlepolyline"; + "gopherbot" = dontDistribute super."gopherbot"; + "gore-and-ash" = dontDistribute super."gore-and-ash"; + "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor"; + "gore-and-ash-async" = dontDistribute super."gore-and-ash-async"; + "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo"; + "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging"; + "gore-and-ash-network" = dontDistribute super."gore-and-ash-network"; + "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl"; + "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; + "gpah" = dontDistribute super."gpah"; + "gpcsets" = dontDistribute super."gpcsets"; + "gpolyline" = dontDistribute super."gpolyline"; + "gps" = dontDistribute super."gps"; + "gps2htmlReport" = dontDistribute super."gps2htmlReport"; + "gpx-conduit" = dontDistribute super."gpx-conduit"; + "graceful" = dontDistribute super."graceful"; + "grammar-combinators" = dontDistribute super."grammar-combinators"; + "grapefruit-examples" = dontDistribute super."grapefruit-examples"; + "grapefruit-frp" = dontDistribute super."grapefruit-frp"; + "grapefruit-records" = dontDistribute super."grapefruit-records"; + "grapefruit-ui" = dontDistribute super."grapefruit-ui"; + "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-core" = doDistribute super."graph-core_0_2_2_0"; + "graph-generators" = dontDistribute super."graph-generators"; + "graph-matchings" = dontDistribute super."graph-matchings"; + "graph-rewriting" = dontDistribute super."graph-rewriting"; + "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; + "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; + "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; + "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; + "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; + "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; + "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; + "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; + "graph-serialize" = dontDistribute super."graph-serialize"; + "graph-utils" = dontDistribute super."graph-utils"; + "graph-visit" = dontDistribute super."graph-visit"; + "graphbuilder" = dontDistribute super."graphbuilder"; + "graphene" = dontDistribute super."graphene"; + "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; + "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; + "graphicsFormats" = dontDistribute super."graphicsFormats"; + "graphicstools" = dontDistribute super."graphicstools"; + "graphmod" = dontDistribute super."graphmod"; + "graphql" = dontDistribute super."graphql"; + "graphtype" = dontDistribute super."graphtype"; + "grasp" = dontDistribute super."grasp"; + "gray-code" = dontDistribute super."gray-code"; + "gray-extended" = dontDistribute super."gray-extended"; + "greencard" = dontDistribute super."greencard"; + "greencard-lib" = dontDistribute super."greencard-lib"; + "greg-client" = dontDistribute super."greg-client"; + "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "greplicate" = dontDistribute super."greplicate"; + "grid" = dontDistribute super."grid"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "groupoid" = dontDistribute super."groupoid"; + "gruff" = dontDistribute super."gruff"; + "gruff-examples" = dontDistribute super."gruff-examples"; + "gsc-weighting" = dontDistribute super."gsc-weighting"; + "gsl-random" = dontDistribute super."gsl-random"; + "gsl-random-fu" = dontDistribute super."gsl-random-fu"; + "gsmenu" = dontDistribute super."gsmenu"; + "gstreamer" = dontDistribute super."gstreamer"; + "gt-tools" = dontDistribute super."gt-tools"; + "gtfs" = dontDistribute super."gtfs"; + "gtk-helpers" = dontDistribute super."gtk-helpers"; + "gtk-jsinput" = dontDistribute super."gtk-jsinput"; + "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; + "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; + "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; + "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; + "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; + "gtk-toy" = dontDistribute super."gtk-toy"; + "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; + "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; + "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; + "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; + "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; + "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; + "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; + "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; + "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; + "gtkglext" = dontDistribute super."gtkglext"; + "gtkimageview" = dontDistribute super."gtkimageview"; + "gtkrsync" = dontDistribute super."gtkrsync"; + "gtksourceview2" = dontDistribute super."gtksourceview2"; + "gtksourceview3" = dontDistribute super."gtksourceview3"; + "guarded-rewriting" = dontDistribute super."guarded-rewriting"; + "guess-combinator" = dontDistribute super."guess-combinator"; + "gulcii" = dontDistribute super."gulcii"; + "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; + "gyah-bin" = dontDistribute super."gyah-bin"; + "h-booru" = dontDistribute super."h-booru"; + "h-gpgme" = dontDistribute super."h-gpgme"; + "h2048" = dontDistribute super."h2048"; + "hArduino" = dontDistribute super."hArduino"; + "hBDD" = dontDistribute super."hBDD"; + "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; + "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; + "hCsound" = dontDistribute super."hCsound"; + "hDFA" = dontDistribute super."hDFA"; + "hF2" = dontDistribute super."hF2"; + "hGelf" = dontDistribute super."hGelf"; + "hLLVM" = dontDistribute super."hLLVM"; + "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; + "hPDB-examples" = dontDistribute super."hPDB-examples"; + "hPushover" = dontDistribute super."hPushover"; + "hR" = dontDistribute super."hR"; + "hRESP" = dontDistribute super."hRESP"; + "hS3" = dontDistribute super."hS3"; + "hScraper" = dontDistribute super."hScraper"; + "hSimpleDB" = dontDistribute super."hSimpleDB"; + "hTalos" = dontDistribute super."hTalos"; + "hTensor" = dontDistribute super."hTensor"; + "hVOIDP" = dontDistribute super."hVOIDP"; + "hXmixer" = dontDistribute super."hXmixer"; + "haar" = dontDistribute super."haar"; + "hacanon-light" = dontDistribute super."hacanon-light"; + "hack" = dontDistribute super."hack"; + "hack-contrib" = dontDistribute super."hack-contrib"; + "hack-contrib-press" = dontDistribute super."hack-contrib-press"; + "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; + "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; + "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; + "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; + "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; + "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; + "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; + "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; + "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; + "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; + "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; + "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; + "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; + "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; + "hack2" = dontDistribute super."hack2"; + "hack2-contrib" = dontDistribute super."hack2-contrib"; + "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; + "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; + "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; + "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; + "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; + "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; + "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-plot" = dontDistribute super."hackage-plot"; + "hackage-proxy" = dontDistribute super."hackage-proxy"; + "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; + "hackage-security" = dontDistribute super."hackage-security"; + "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; + "hackage-server" = dontDistribute super."hackage-server"; + "hackage-sparks" = dontDistribute super."hackage-sparks"; + "hackage2hwn" = dontDistribute super."hackage2hwn"; + "hackage2twitter" = dontDistribute super."hackage2twitter"; + "hackager" = dontDistribute super."hackager"; + "hackernews" = dontDistribute super."hackernews"; + "hackertyper" = dontDistribute super."hackertyper"; + "hackport" = dontDistribute super."hackport"; + "hactor" = dontDistribute super."hactor"; + "hactors" = dontDistribute super."hactors"; + "haddock" = dontDistribute super."haddock"; + "haddock-leksah" = dontDistribute super."haddock-leksah"; + "hadoop-formats" = dontDistribute super."hadoop-formats"; + "hadoop-rpc" = dontDistribute super."hadoop-rpc"; + "hadoop-tools" = dontDistribute super."hadoop-tools"; + "haeredes" = dontDistribute super."haeredes"; + "haggis" = dontDistribute super."haggis"; + "haha" = dontDistribute super."haha"; + "hahp" = dontDistribute super."hahp"; + "haiji" = dontDistribute super."haiji"; + "hailgun" = dontDistribute super."hailgun"; + "hailgun-send" = dontDistribute super."hailgun-send"; + "hails" = dontDistribute super."hails"; + "hails-bin" = dontDistribute super."hails-bin"; + "hairy" = dontDistribute super."hairy"; + "hakaru" = dontDistribute super."hakaru"; + "hake" = dontDistribute super."hake"; + "hakismet" = dontDistribute super."hakismet"; + "hako" = dontDistribute super."hako"; + "hakyll-R" = dontDistribute super."hakyll-R"; + "hakyll-agda" = dontDistribute super."hakyll-agda"; + "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; + "hakyll-contrib" = dontDistribute super."hakyll-contrib"; + "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; + "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; + "hakyll-convert" = dontDistribute super."hakyll-convert"; + "hakyll-elm" = dontDistribute super."hakyll-elm"; + "hakyll-sass" = dontDistribute super."hakyll-sass"; + "halberd" = dontDistribute super."halberd"; + "halfs" = dontDistribute super."halfs"; + "halipeto" = dontDistribute super."halipeto"; + "halive" = dontDistribute super."halive"; + "halma" = dontDistribute super."halma"; + "haltavista" = dontDistribute super."haltavista"; + "hamid" = dontDistribute super."hamid"; + "hampp" = dontDistribute super."hampp"; + "hamtmap" = dontDistribute super."hamtmap"; + "hamusic" = dontDistribute super."hamusic"; + "handa-gdata" = dontDistribute super."handa-gdata"; + "handa-geodata" = dontDistribute super."handa-geodata"; + "handa-opengl" = dontDistribute super."handa-opengl"; + "handle-like" = dontDistribute super."handle-like"; + "handsy" = dontDistribute super."handsy"; + "hangman" = dontDistribute super."hangman"; + "hannahci" = dontDistribute super."hannahci"; + "hans" = dontDistribute super."hans"; + "hans-pcap" = dontDistribute super."hans-pcap"; + "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; + "happindicator" = dontDistribute super."happindicator"; + "happindicator3" = dontDistribute super."happindicator3"; + "happraise" = dontDistribute super."happraise"; + "happs-hsp" = dontDistribute super."happs-hsp"; + "happs-hsp-template" = dontDistribute super."happs-hsp-template"; + "happs-tutorial" = dontDistribute super."happs-tutorial"; + "happstack" = dontDistribute super."happstack"; + "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-contrib" = dontDistribute super."happstack-contrib"; + "happstack-data" = dontDistribute super."happstack-data"; + "happstack-dlg" = dontDistribute super."happstack-dlg"; + "happstack-facebook" = dontDistribute super."happstack-facebook"; + "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; + "happstack-fay" = dontDistribute super."happstack-fay"; + "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; + "happstack-foundation" = dontDistribute super."happstack-foundation"; + "happstack-hamlet" = dontDistribute super."happstack-hamlet"; + "happstack-heist" = dontDistribute super."happstack-heist"; + "happstack-helpers" = dontDistribute super."happstack-helpers"; + "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; + "happstack-state" = dontDistribute super."happstack-state"; + "happstack-static-routing" = dontDistribute super."happstack-static-routing"; + "happstack-util" = dontDistribute super."happstack-util"; + "happstack-yui" = dontDistribute super."happstack-yui"; + "happy-meta" = dontDistribute super."happy-meta"; + "happybara" = dontDistribute super."happybara"; + "happybara-webkit" = dontDistribute super."happybara-webkit"; + "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; + "har" = dontDistribute super."har"; + "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "harpy" = dontDistribute super."harpy"; + "has" = dontDistribute super."has"; + "has-th" = dontDistribute super."has-th"; + "hascal" = dontDistribute super."hascal"; + "hascat" = dontDistribute super."hascat"; + "hascat-lib" = dontDistribute super."hascat-lib"; + "hascat-setup" = dontDistribute super."hascat-setup"; + "hascat-system" = dontDistribute super."hascat-system"; + "hash" = dontDistribute super."hash"; + "hashable-generics" = dontDistribute super."hashable-generics"; + "hashabler" = dontDistribute super."hashabler"; + "hashed-storage" = dontDistribute super."hashed-storage"; + "hashids" = dontDistribute super."hashids"; + "hashring" = dontDistribute super."hashring"; + "hashtables-plus" = dontDistribute super."hashtables-plus"; + "hasim" = dontDistribute super."hasim"; + "hask" = dontDistribute super."hask"; + "hask-home" = dontDistribute super."hask-home"; + "haskades" = dontDistribute super."haskades"; + "haskakafka" = dontDistribute super."haskakafka"; + "haskanoid" = dontDistribute super."haskanoid"; + "haskarrow" = dontDistribute super."haskarrow"; + "haskbot-core" = dontDistribute super."haskbot-core"; + "haskdeep" = dontDistribute super."haskdeep"; + "haskdogs" = dontDistribute super."haskdogs"; + "haskeem" = dontDistribute super."haskeem"; + "haskeline" = doDistribute super."haskeline_0_7_2_2"; + "haskeline-class" = dontDistribute super."haskeline-class"; + "haskell-aliyun" = dontDistribute super."haskell-aliyun"; + "haskell-awk" = dontDistribute super."haskell-awk"; + "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; + "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; + "haskell-cnc" = dontDistribute super."haskell-cnc"; + "haskell-coffee" = dontDistribute super."haskell-coffee"; + "haskell-compression" = dontDistribute super."haskell-compression"; + "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; + "haskell-docs" = dontDistribute super."haskell-docs"; + "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; + "haskell-formatter" = dontDistribute super."haskell-formatter"; + "haskell-ftp" = dontDistribute super."haskell-ftp"; + "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; + "haskell-import-graph" = dontDistribute super."haskell-import-graph"; + "haskell-in-space" = dontDistribute super."haskell-in-space"; + "haskell-modbus" = dontDistribute super."haskell-modbus"; + "haskell-mpfr" = dontDistribute super."haskell-mpfr"; + "haskell-mpi" = dontDistribute super."haskell-mpi"; + "haskell-names" = dontDistribute super."haskell-names"; + "haskell-openflow" = dontDistribute super."haskell-openflow"; + "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; + "haskell-platform-test" = dontDistribute super."haskell-platform-test"; + "haskell-plot" = dontDistribute super."haskell-plot"; + "haskell-qrencode" = dontDistribute super."haskell-qrencode"; + "haskell-read-editor" = dontDistribute super."haskell-read-editor"; + "haskell-reflect" = dontDistribute super."haskell-reflect"; + "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; + "haskell-token-utils" = dontDistribute super."haskell-token-utils"; + "haskell-tor" = dontDistribute super."haskell-tor"; + "haskell-type-exts" = dontDistribute super."haskell-type-exts"; + "haskell-typescript" = dontDistribute super."haskell-typescript"; + "haskell-tyrant" = dontDistribute super."haskell-tyrant"; + "haskell-updater" = dontDistribute super."haskell-updater"; + "haskell-xmpp" = dontDistribute super."haskell-xmpp"; + "haskell2010" = dontDistribute super."haskell2010"; + "haskell98" = dontDistribute super."haskell98"; + "haskell98libraries" = dontDistribute super."haskell98libraries"; + "haskelldb" = dontDistribute super."haskelldb"; + "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; + "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; + "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; + "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; + "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; + "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; + "haskelldb-flat" = dontDistribute super."haskelldb-flat"; + "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; + "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; + "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; + "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; + "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; + "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; + "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; + "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; + "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; + "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; + "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; + "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; + "haskelldb-th" = dontDistribute super."haskelldb-th"; + "haskelldb-wx" = dontDistribute super."haskelldb-wx"; + "haskellscrabble" = dontDistribute super."haskellscrabble"; + "haskellscript" = dontDistribute super."haskellscript"; + "haskelm" = dontDistribute super."haskelm"; + "haskgame" = dontDistribute super."haskgame"; + "haskheap" = dontDistribute super."haskheap"; + "haskhol-core" = dontDistribute super."haskhol-core"; + "haskmon" = dontDistribute super."haskmon"; + "haskoin" = dontDistribute super."haskoin"; + "haskoin-core" = dontDistribute super."haskoin-core"; + "haskoin-crypto" = dontDistribute super."haskoin-crypto"; + "haskoin-node" = dontDistribute super."haskoin-node"; + "haskoin-protocol" = dontDistribute super."haskoin-protocol"; + "haskoin-script" = dontDistribute super."haskoin-script"; + "haskoin-util" = dontDistribute super."haskoin-util"; + "haskoin-wallet" = dontDistribute super."haskoin-wallet"; + "haskoon" = dontDistribute super."haskoon"; + "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; + "haskoon-salvia" = dontDistribute super."haskoon-salvia"; + "haskore" = dontDistribute super."haskore"; + "haskore-realtime" = dontDistribute super."haskore-realtime"; + "haskore-supercollider" = dontDistribute super."haskore-supercollider"; + "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; + "haskore-vintage" = dontDistribute super."haskore-vintage"; + "hasktags" = dontDistribute super."hasktags"; + "haslo" = dontDistribute super."haslo"; + "hasloGUI" = dontDistribute super."hasloGUI"; + "hasparql-client" = dontDistribute super."hasparql-client"; + "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; + "hasql-postgres" = dontDistribute super."hasql-postgres"; + "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; + "hastache-aeson" = dontDistribute super."hastache-aeson"; + "haste" = dontDistribute super."haste"; + "haste-compiler" = dontDistribute super."haste-compiler"; + "haste-markup" = dontDistribute super."haste-markup"; + "haste-perch" = dontDistribute super."haste-perch"; + "hastily" = dontDistribute super."hastily"; + "hat" = dontDistribute super."hat"; + "hatex-guide" = dontDistribute super."hatex-guide"; + "hath" = dontDistribute super."hath"; + "hatt" = dontDistribute super."hatt"; + "haverer" = dontDistribute super."haverer"; + "hawitter" = dontDistribute super."hawitter"; + "haxl-amazonka" = dontDistribute super."haxl-amazonka"; + "haxl-facebook" = dontDistribute super."haxl-facebook"; + "haxparse" = dontDistribute super."haxparse"; + "haxr-th" = dontDistribute super."haxr-th"; + "haxy" = dontDistribute super."haxy"; + "hayland" = dontDistribute super."hayland"; + "hayoo-cli" = dontDistribute super."hayoo-cli"; + "hback" = dontDistribute super."hback"; + "hbayes" = dontDistribute super."hbayes"; + "hbb" = dontDistribute super."hbb"; + "hbcd" = dontDistribute super."hbcd"; + "hbeat" = dontDistribute super."hbeat"; + "hblas" = dontDistribute super."hblas"; + "hblock" = dontDistribute super."hblock"; + "hbro" = dontDistribute super."hbro"; + "hbro-contrib" = dontDistribute super."hbro-contrib"; + "hburg" = dontDistribute super."hburg"; + "hcc" = dontDistribute super."hcc"; + "hcg-minus" = dontDistribute super."hcg-minus"; + "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; + "hcheat" = dontDistribute super."hcheat"; + "hchesslib" = dontDistribute super."hchesslib"; + "hcltest" = dontDistribute super."hcltest"; + "hcoap" = dontDistribute super."hcoap"; + "hcron" = dontDistribute super."hcron"; + "hcube" = dontDistribute super."hcube"; + "hcwiid" = dontDistribute super."hcwiid"; + "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; + "hdbc-aeson" = dontDistribute super."hdbc-aeson"; + "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; + "hdbc-tuple" = dontDistribute super."hdbc-tuple"; + "hdbi" = dontDistribute super."hdbi"; + "hdbi-conduit" = dontDistribute super."hdbi-conduit"; + "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; + "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; + "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdf" = dontDistribute super."hdf"; + "hdigest" = dontDistribute super."hdigest"; + "hdirect" = dontDistribute super."hdirect"; + "hdis86" = dontDistribute super."hdis86"; + "hdiscount" = dontDistribute super."hdiscount"; + "hdm" = dontDistribute super."hdm"; + "hdph" = dontDistribute super."hdph"; + "hdph-closure" = dontDistribute super."hdph-closure"; + "hdr-histogram" = dontDistribute super."hdr-histogram"; + "headergen" = dontDistribute super."headergen"; + "heapsort" = dontDistribute super."heapsort"; + "hecc" = dontDistribute super."hecc"; + "hedis-config" = dontDistribute super."hedis-config"; + "hedis-monadic" = dontDistribute super."hedis-monadic"; + "hedis-pile" = dontDistribute super."hedis-pile"; + "hedis-simple" = dontDistribute super."hedis-simple"; + "hedis-tags" = dontDistribute super."hedis-tags"; + "hedn" = dontDistribute super."hedn"; + "hein" = dontDistribute super."hein"; + "heist-aeson" = dontDistribute super."heist-aeson"; + "heist-async" = dontDistribute super."heist-async"; + "helics" = dontDistribute super."helics"; + "helics-wai" = dontDistribute super."helics-wai"; + "helisp" = dontDistribute super."helisp"; + "helium" = dontDistribute super."helium"; + "helix" = dontDistribute super."helix"; + "hell" = dontDistribute super."hell"; + "hellage" = dontDistribute super."hellage"; + "hellnet" = dontDistribute super."hellnet"; + "hello" = dontDistribute super."hello"; + "helm" = dontDistribute super."helm"; + "help-esb" = dontDistribute super."help-esb"; + "hemkay" = dontDistribute super."hemkay"; + "hemkay-core" = dontDistribute super."hemkay-core"; + "hemokit" = dontDistribute super."hemokit"; + "hen" = dontDistribute super."hen"; + "henet" = dontDistribute super."henet"; + "hepevt" = dontDistribute super."hepevt"; + "her-lexer" = dontDistribute super."her-lexer"; + "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; + "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; + "heroku" = dontDistribute super."heroku"; + "heroku-persistent" = dontDistribute super."heroku-persistent"; + "herringbone" = dontDistribute super."herringbone"; + "herringbone-embed" = dontDistribute super."herringbone-embed"; + "herringbone-wai" = dontDistribute super."herringbone-wai"; + "hesql" = dontDistribute super."hesql"; + "hetero-map" = dontDistribute super."hetero-map"; + "hetris" = dontDistribute super."hetris"; + "heukarya" = dontDistribute super."heukarya"; + "hevolisa" = dontDistribute super."hevolisa"; + "hevolisa-dph" = dontDistribute super."hevolisa-dph"; + "hexdump" = dontDistribute super."hexdump"; + "hexif" = dontDistribute super."hexif"; + "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; + "hexpat-lens" = dontDistribute super."hexpat-lens"; + "hexpat-pickle" = dontDistribute super."hexpat-pickle"; + "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; + "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; + "hexpr" = dontDistribute super."hexpr"; + "hexquote" = dontDistribute super."hexquote"; + "heyefi" = dontDistribute super."heyefi"; + "hfann" = dontDistribute super."hfann"; + "hfd" = dontDistribute super."hfd"; + "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; + "hfoil" = dontDistribute super."hfoil"; + "hformat" = dontDistribute super."hformat"; + "hfov" = dontDistribute super."hfov"; + "hfractal" = dontDistribute super."hfractal"; + "hfusion" = dontDistribute super."hfusion"; + "hg-buildpackage" = dontDistribute super."hg-buildpackage"; + "hgal" = dontDistribute super."hgal"; + "hgalib" = dontDistribute super."hgalib"; + "hgdbmi" = dontDistribute super."hgdbmi"; + "hgearman" = dontDistribute super."hgearman"; + "hgen" = dontDistribute super."hgen"; + "hgeometric" = dontDistribute super."hgeometric"; + "hgeometry" = dontDistribute super."hgeometry"; + "hgithub" = dontDistribute super."hgithub"; + "hgl-example" = dontDistribute super."hgl-example"; + "hgom" = dontDistribute super."hgom"; + "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; + "hgrib" = dontDistribute super."hgrib"; + "hharp" = dontDistribute super."hharp"; + "hi" = dontDistribute super."hi"; + "hi3status" = dontDistribute super."hi3status"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hieraclus" = dontDistribute super."hieraclus"; + "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; + "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; + "hierarchy" = dontDistribute super."hierarchy"; + "hiernotify" = dontDistribute super."hiernotify"; + "highWaterMark" = dontDistribute super."highWaterMark"; + "higher-leveldb" = dontDistribute super."higher-leveldb"; + "higherorder" = dontDistribute super."higherorder"; + "highlight-versions" = dontDistribute super."highlight-versions"; + "highlighter" = dontDistribute super."highlighter"; + "highlighter2" = dontDistribute super."highlighter2"; + "hills" = dontDistribute super."hills"; + "himerge" = dontDistribute super."himerge"; + "himg" = dontDistribute super."himg"; + "himpy" = dontDistribute super."himpy"; + "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; + "hinduce-classifier" = dontDistribute super."hinduce-classifier"; + "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; + "hinduce-examples" = dontDistribute super."hinduce-examples"; + "hinduce-missingh" = dontDistribute super."hinduce-missingh"; + "hinquire" = dontDistribute super."hinquire"; + "hinstaller" = dontDistribute super."hinstaller"; + "hint-server" = dontDistribute super."hint-server"; + "hinvaders" = dontDistribute super."hinvaders"; + "hinze-streams" = dontDistribute super."hinze-streams"; + "hipbot" = dontDistribute super."hipbot"; + "hipe" = dontDistribute super."hipe"; + "hips" = dontDistribute super."hips"; + "hircules" = dontDistribute super."hircules"; + "hirt" = dontDistribute super."hirt"; + "hissmetrics" = dontDistribute super."hissmetrics"; + "hist-pl" = dontDistribute super."hist-pl"; + "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; + "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; + "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; + "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; + "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; + "hist-pl-types" = dontDistribute super."hist-pl-types"; + "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; + "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; + "historian" = dontDistribute super."historian"; + "hjcase" = dontDistribute super."hjcase"; + "hjpath" = dontDistribute super."hjpath"; + "hjs" = dontDistribute super."hjs"; + "hjson" = dontDistribute super."hjson"; + "hjson-query" = dontDistribute super."hjson-query"; + "hjsonpointer" = dontDistribute super."hjsonpointer"; + "hjsonschema" = dontDistribute super."hjsonschema"; + "hkdf" = dontDistribute super."hkdf"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hleap" = dontDistribute super."hleap"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-irr" = dontDistribute super."hledger-irr"; + "hledger-vty" = dontDistribute super."hledger-vty"; + "hlibBladeRF" = dontDistribute super."hlibBladeRF"; + "hlibev" = dontDistribute super."hlibev"; + "hlibfam" = dontDistribute super."hlibfam"; + "hlogger" = dontDistribute super."hlogger"; + "hlongurl" = dontDistribute super."hlongurl"; + "hls" = dontDistribute super."hls"; + "hlwm" = dontDistribute super."hlwm"; + "hly" = dontDistribute super."hly"; + "hmark" = dontDistribute super."hmark"; + "hmarkup" = dontDistribute super."hmarkup"; + "hmatrix-banded" = dontDistribute super."hmatrix-banded"; + "hmatrix-csv" = dontDistribute super."hmatrix-csv"; + "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; + "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; + "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; + "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; + "hmatrix-repa" = dontDistribute super."hmatrix-repa"; + "hmatrix-special" = dontDistribute super."hmatrix-special"; + "hmatrix-static" = dontDistribute super."hmatrix-static"; + "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; + "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; + "hmatrix-tests" = dontDistribute super."hmatrix-tests"; + "hmeap" = dontDistribute super."hmeap"; + "hmeap-utils" = dontDistribute super."hmeap-utils"; + "hmemdb" = dontDistribute super."hmemdb"; + "hmenu" = dontDistribute super."hmenu"; + "hmidi" = dontDistribute super."hmidi"; + "hmk" = dontDistribute super."hmk"; + "hmm" = dontDistribute super."hmm"; + "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; + "hmp3" = dontDistribute super."hmp3"; + "hmpfr" = dontDistribute super."hmpfr"; + "hmt" = dontDistribute super."hmt"; + "hmt-diagrams" = dontDistribute super."hmt-diagrams"; + "hmumps" = dontDistribute super."hmumps"; + "hnetcdf" = dontDistribute super."hnetcdf"; + "hnix" = dontDistribute super."hnix"; + "hnn" = dontDistribute super."hnn"; + "hnop" = dontDistribute super."hnop"; + "ho-rewriting" = dontDistribute super."ho-rewriting"; + "hoauth" = dontDistribute super."hoauth"; + "hob" = dontDistribute super."hob"; + "hobbes" = dontDistribute super."hobbes"; + "hobbits" = dontDistribute super."hobbits"; + "hoe" = dontDistribute super."hoe"; + "hofix-mtl" = dontDistribute super."hofix-mtl"; + "hog" = dontDistribute super."hog"; + "hogg" = dontDistribute super."hogg"; + "hogre" = dontDistribute super."hogre"; + "hogre-examples" = dontDistribute super."hogre-examples"; + "hois" = dontDistribute super."hois"; + "hoist-error" = dontDistribute super."hoist-error"; + "hold-em" = dontDistribute super."hold-em"; + "hole" = dontDistribute super."hole"; + "holey-format" = dontDistribute super."holey-format"; + "homeomorphic" = dontDistribute super."homeomorphic"; + "hommage" = dontDistribute super."hommage"; + "hommage-ds" = dontDistribute super."hommage-ds"; + "homplexity" = dontDistribute super."homplexity"; + "honi" = dontDistribute super."honi"; + "honk" = dontDistribute super."honk"; + "hoobuddy" = dontDistribute super."hoobuddy"; + "hood" = dontDistribute super."hood"; + "hood-off" = dontDistribute super."hood-off"; + "hood2" = dontDistribute super."hood2"; + "hoodie" = dontDistribute super."hoodie"; + "hoodle" = dontDistribute super."hoodle"; + "hoodle-builder" = dontDistribute super."hoodle-builder"; + "hoodle-core" = dontDistribute super."hoodle-core"; + "hoodle-extra" = dontDistribute super."hoodle-extra"; + "hoodle-parser" = dontDistribute super."hoodle-parser"; + "hoodle-publish" = dontDistribute super."hoodle-publish"; + "hoodle-render" = dontDistribute super."hoodle-render"; + "hoodle-types" = dontDistribute super."hoodle-types"; + "hoogle-index" = dontDistribute super."hoogle-index"; + "hooks-dir" = dontDistribute super."hooks-dir"; + "hoovie" = dontDistribute super."hoovie"; + "hopencc" = dontDistribute super."hopencc"; + "hopencl" = dontDistribute super."hopencl"; + "hopfield" = dontDistribute super."hopfield"; + "hopfield-networks" = dontDistribute super."hopfield-networks"; + "hopfli" = dontDistribute super."hopfli"; + "hops" = dontDistribute super."hops"; + "hoq" = dontDistribute super."hoq"; + "horizon" = dontDistribute super."horizon"; + "hosc" = dontDistribute super."hosc"; + "hosc-json" = dontDistribute super."hosc-json"; + "hosc-utils" = dontDistribute super."hosc-utils"; + "hosts-server" = dontDistribute super."hosts-server"; + "hothasktags" = dontDistribute super."hothasktags"; + "hotswap" = dontDistribute super."hotswap"; + "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; + "hp2any-core" = dontDistribute super."hp2any-core"; + "hp2any-graph" = dontDistribute super."hp2any-graph"; + "hp2any-manager" = dontDistribute super."hp2any-manager"; + "hp2html" = dontDistribute super."hp2html"; + "hp2pretty" = dontDistribute super."hp2pretty"; + "hpack" = dontDistribute super."hpack"; + "hpaco" = dontDistribute super."hpaco"; + "hpaco-lib" = dontDistribute super."hpaco-lib"; + "hpage" = dontDistribute super."hpage"; + "hpapi" = dontDistribute super."hpapi"; + "hpaste" = dontDistribute super."hpaste"; + "hpasteit" = dontDistribute super."hpasteit"; + "hpc-strobe" = dontDistribute super."hpc-strobe"; + "hpc-tracer" = dontDistribute super."hpc-tracer"; + "hplayground" = dontDistribute super."hplayground"; + "hplaylist" = dontDistribute super."hplaylist"; + "hpodder" = dontDistribute super."hpodder"; + "hpp" = dontDistribute super."hpp"; + "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc-fork" = dontDistribute super."hprotoc-fork"; + "hps" = dontDistribute super."hps"; + "hps-cairo" = dontDistribute super."hps-cairo"; + "hps-kmeans" = dontDistribute super."hps-kmeans"; + "hpuz" = dontDistribute super."hpuz"; + "hpygments" = dontDistribute super."hpygments"; + "hpylos" = dontDistribute super."hpylos"; + "hpyrg" = dontDistribute super."hpyrg"; + "hquantlib" = dontDistribute super."hquantlib"; + "hquery" = dontDistribute super."hquery"; + "hranker" = dontDistribute super."hranker"; + "hreader" = dontDistribute super."hreader"; + "hricket" = dontDistribute super."hricket"; + "hruby" = dontDistribute super."hruby"; + "hs-GeoIP" = dontDistribute super."hs-GeoIP"; + "hs-blake2" = dontDistribute super."hs-blake2"; + "hs-captcha" = dontDistribute super."hs-captcha"; + "hs-carbon" = dontDistribute super."hs-carbon"; + "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; + "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-dotnet" = dontDistribute super."hs-dotnet"; + "hs-duktape" = dontDistribute super."hs-duktape"; + "hs-excelx" = dontDistribute super."hs-excelx"; + "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; + "hs-fltk" = dontDistribute super."hs-fltk"; + "hs-gchart" = dontDistribute super."hs-gchart"; + "hs-gen-iface" = dontDistribute super."hs-gen-iface"; + "hs-gizapp" = dontDistribute super."hs-gizapp"; + "hs-inspector" = dontDistribute super."hs-inspector"; + "hs-java" = dontDistribute super."hs-java"; + "hs-json-rpc" = dontDistribute super."hs-json-rpc"; + "hs-logo" = dontDistribute super."hs-logo"; + "hs-mesos" = dontDistribute super."hs-mesos"; + "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; + "hs-pgms" = dontDistribute super."hs-pgms"; + "hs-php-session" = dontDistribute super."hs-php-session"; + "hs-pkg-config" = dontDistribute super."hs-pkg-config"; + "hs-pkpass" = dontDistribute super."hs-pkpass"; + "hs-re" = dontDistribute super."hs-re"; + "hs-scrape" = dontDistribute super."hs-scrape"; + "hs-twitter" = dontDistribute super."hs-twitter"; + "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; + "hs-vcard" = dontDistribute super."hs-vcard"; + "hs2048" = dontDistribute super."hs2048"; + "hs2bf" = dontDistribute super."hs2bf"; + "hs2dot" = dontDistribute super."hs2dot"; + "hsConfigure" = dontDistribute super."hsConfigure"; + "hsSqlite3" = dontDistribute super."hsSqlite3"; + "hsXenCtrl" = dontDistribute super."hsXenCtrl"; + "hsay" = dontDistribute super."hsay"; + "hsb2hs" = dontDistribute super."hsb2hs"; + "hsbackup" = dontDistribute super."hsbackup"; + "hsbencher" = dontDistribute super."hsbencher"; + "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; + "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; + "hsc2hs" = dontDistribute super."hsc2hs"; + "hsc3" = dontDistribute super."hsc3"; + "hsc3-auditor" = dontDistribute super."hsc3-auditor"; + "hsc3-cairo" = dontDistribute super."hsc3-cairo"; + "hsc3-data" = dontDistribute super."hsc3-data"; + "hsc3-db" = dontDistribute super."hsc3-db"; + "hsc3-dot" = dontDistribute super."hsc3-dot"; + "hsc3-forth" = dontDistribute super."hsc3-forth"; + "hsc3-graphs" = dontDistribute super."hsc3-graphs"; + "hsc3-lang" = dontDistribute super."hsc3-lang"; + "hsc3-lisp" = dontDistribute super."hsc3-lisp"; + "hsc3-plot" = dontDistribute super."hsc3-plot"; + "hsc3-process" = dontDistribute super."hsc3-process"; + "hsc3-rec" = dontDistribute super."hsc3-rec"; + "hsc3-rw" = dontDistribute super."hsc3-rw"; + "hsc3-server" = dontDistribute super."hsc3-server"; + "hsc3-sf" = dontDistribute super."hsc3-sf"; + "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; + "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; + "hsc3-utils" = dontDistribute super."hsc3-utils"; + "hscamwire" = dontDistribute super."hscamwire"; + "hscassandra" = dontDistribute super."hscassandra"; + "hscd" = dontDistribute super."hscd"; + "hsclock" = dontDistribute super."hsclock"; + "hscolour" = doDistribute super."hscolour_1_23"; + "hscope" = dontDistribute super."hscope"; + "hscrtmpl" = dontDistribute super."hscrtmpl"; + "hscuid" = dontDistribute super."hscuid"; + "hscurses" = dontDistribute super."hscurses"; + "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; + "hsdev" = dontDistribute super."hsdev"; + "hsdif" = dontDistribute super."hsdif"; + "hsdip" = dontDistribute super."hsdip"; + "hsdns" = dontDistribute super."hsdns"; + "hsdns-cache" = dontDistribute super."hsdns-cache"; + "hsemail-ns" = dontDistribute super."hsemail-ns"; + "hsenv" = dontDistribute super."hsenv"; + "hserv" = dontDistribute super."hserv"; + "hset" = dontDistribute super."hset"; + "hsfacter" = dontDistribute super."hsfacter"; + "hsfcsh" = dontDistribute super."hsfcsh"; + "hsfilt" = dontDistribute super."hsfilt"; + "hsgnutls" = dontDistribute super."hsgnutls"; + "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; + "hsgsom" = dontDistribute super."hsgsom"; + "hsgtd" = dontDistribute super."hsgtd"; + "hsharc" = dontDistribute super."hsharc"; + "hsilop" = dontDistribute super."hsilop"; + "hsimport" = dontDistribute super."hsimport"; + "hsini" = dontDistribute super."hsini"; + "hskeleton" = dontDistribute super."hskeleton"; + "hslackbuilder" = dontDistribute super."hslackbuilder"; + "hslibsvm" = dontDistribute super."hslibsvm"; + "hslinks" = dontDistribute super."hslinks"; + "hslogger-reader" = dontDistribute super."hslogger-reader"; + "hslogger-template" = dontDistribute super."hslogger-template"; + "hslogger4j" = dontDistribute super."hslogger4j"; + "hslogstash" = dontDistribute super."hslogstash"; + "hsmagick" = dontDistribute super."hsmagick"; + "hsmisc" = dontDistribute super."hsmisc"; + "hsmtpclient" = dontDistribute super."hsmtpclient"; + "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; + "hsnock" = dontDistribute super."hsnock"; + "hsnoise" = dontDistribute super."hsnoise"; + "hsns" = dontDistribute super."hsns"; + "hsnsq" = dontDistribute super."hsnsq"; + "hsntp" = dontDistribute super."hsntp"; + "hsoptions" = dontDistribute super."hsoptions"; + "hsp-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; + "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; + "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; + "hspec-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; + "hspec-test-framework" = dontDistribute super."hspec-test-framework"; + "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; + "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec2" = dontDistribute super."hspec2"; + "hspr-sh" = dontDistribute super."hspr-sh"; + "hspread" = dontDistribute super."hspread"; + "hspresent" = dontDistribute super."hspresent"; + "hsprocess" = dontDistribute super."hsprocess"; + "hsql" = dontDistribute super."hsql"; + "hsql-mysql" = dontDistribute super."hsql-mysql"; + "hsql-odbc" = dontDistribute super."hsql-odbc"; + "hsql-postgresql" = dontDistribute super."hsql-postgresql"; + "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; + "hsqml" = dontDistribute super."hsqml"; + "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; + "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; + "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; + "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; + "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; + "hsqml-morris" = dontDistribute super."hsqml-morris"; + "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "hstats" = dontDistribute super."hstats"; + "hstest" = dontDistribute super."hstest"; + "hstidy" = dontDistribute super."hstidy"; + "hstorchat" = dontDistribute super."hstorchat"; + "hstradeking" = dontDistribute super."hstradeking"; + "hstyle" = dontDistribute super."hstyle"; + "hstzaar" = dontDistribute super."hstzaar"; + "hsubconvert" = dontDistribute super."hsubconvert"; + "hsverilog" = dontDistribute super."hsverilog"; + "hswip" = dontDistribute super."hswip"; + "hsx" = dontDistribute super."hsx"; + "hsx-xhtml" = dontDistribute super."hsx-xhtml"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "htags" = dontDistribute super."htags"; + "htar" = dontDistribute super."htar"; + "htiled" = dontDistribute super."htiled"; + "htime" = dontDistribute super."htime"; + "html-email-validate" = dontDistribute super."html-email-validate"; + "html-entities" = dontDistribute super."html-entities"; + "html-kure" = dontDistribute super."html-kure"; + "html-minimalist" = dontDistribute super."html-minimalist"; + "html-rules" = dontDistribute super."html-rules"; + "html-tokenizer" = dontDistribute super."html-tokenizer"; + "html-truncate" = dontDistribute super."html-truncate"; + "html2hamlet" = dontDistribute super."html2hamlet"; + "html5-entity" = dontDistribute super."html5-entity"; + "htodo" = dontDistribute super."htodo"; + "htoml" = dontDistribute super."htoml"; + "htrace" = dontDistribute super."htrace"; + "hts" = dontDistribute super."hts"; + "htsn" = dontDistribute super."htsn"; + "htsn-common" = dontDistribute super."htsn-common"; + "htsn-import" = dontDistribute super."htsn-import"; + "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client-auth" = dontDistribute super."http-client-auth"; + "http-client-conduit" = dontDistribute super."http-client-conduit"; + "http-client-lens" = dontDistribute super."http-client-lens"; + "http-client-multipart" = dontDistribute super."http-client-multipart"; + "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; + "http-client-streams" = dontDistribute super."http-client-streams"; + "http-conduit-browser" = dontDistribute super."http-conduit-browser"; + "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; + "http-encodings" = dontDistribute super."http-encodings"; + "http-enumerator" = dontDistribute super."http-enumerator"; + "http-kit" = dontDistribute super."http-kit"; + "http-listen" = dontDistribute super."http-listen"; + "http-monad" = dontDistribute super."http-monad"; + "http-proxy" = dontDistribute super."http-proxy"; + "http-querystring" = dontDistribute super."http-querystring"; + "http-server" = dontDistribute super."http-server"; + "http-shed" = dontDistribute super."http-shed"; + "http-test" = dontDistribute super."http-test"; + "http-wget" = dontDistribute super."http-wget"; + "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; + "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; + "httpspec" = dontDistribute super."httpspec"; + "htune" = dontDistribute super."htune"; + "htzaar" = dontDistribute super."htzaar"; + "hub" = dontDistribute super."hub"; + "hubigraph" = dontDistribute super."hubigraph"; + "hubris" = dontDistribute super."hubris"; + "huckleberry" = dontDistribute super."huckleberry"; + "huffman" = dontDistribute super."huffman"; + "hugs2yc" = dontDistribute super."hugs2yc"; + "hulk" = dontDistribute super."hulk"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "hunit-gui" = dontDistribute super."hunit-gui"; + "hunit-parsec" = dontDistribute super."hunit-parsec"; + "hunit-rematch" = dontDistribute super."hunit-rematch"; + "hunp" = dontDistribute super."hunp"; + "hunt-searchengine" = dontDistribute super."hunt-searchengine"; + "hunt-server" = dontDistribute super."hunt-server"; + "hunt-server-cli" = dontDistribute super."hunt-server-cli"; + "hurdle" = dontDistribute super."hurdle"; + "husk-scheme" = dontDistribute super."husk-scheme"; + "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; + "husky" = dontDistribute super."husky"; + "hutton" = dontDistribute super."hutton"; + "huttons-razor" = dontDistribute super."huttons-razor"; + "huzzy" = dontDistribute super."huzzy"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "hws" = dontDistribute super."hws"; + "hwsl2" = dontDistribute super."hwsl2"; + "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; + "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; + "hx" = dontDistribute super."hx"; + "hxmppc" = dontDistribute super."hxmppc"; + "hxournal" = dontDistribute super."hxournal"; + "hxt-binary" = dontDistribute super."hxt-binary"; + "hxt-cache" = dontDistribute super."hxt-cache"; + "hxt-extras" = dontDistribute super."hxt-extras"; + "hxt-filter" = dontDistribute super."hxt-filter"; + "hxt-xpath" = dontDistribute super."hxt-xpath"; + "hxt-xslt" = dontDistribute super."hxt-xslt"; + "hxthelper" = dontDistribute super."hxthelper"; + "hxweb" = dontDistribute super."hxweb"; + "hyahtzee" = dontDistribute super."hyahtzee"; + "hyakko" = dontDistribute super."hyakko"; + "hybrid" = dontDistribute super."hybrid"; + "hydra-hs" = dontDistribute super."hydra-hs"; + "hydra-print" = dontDistribute super."hydra-print"; + "hydrogen" = dontDistribute super."hydrogen"; + "hydrogen-cli" = dontDistribute super."hydrogen-cli"; + "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; + "hydrogen-data" = dontDistribute super."hydrogen-data"; + "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; + "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; + "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; + "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; + "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; + "hydrogen-util" = dontDistribute super."hydrogen-util"; + "hydrogen-version" = dontDistribute super."hydrogen-version"; + "hyena" = dontDistribute super."hyena"; + "hylolib" = dontDistribute super."hylolib"; + "hylotab" = dontDistribute super."hylotab"; + "hyloutils" = dontDistribute super."hyloutils"; + "hyperdrive" = dontDistribute super."hyperdrive"; + "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzaif" = dontDistribute super."hzaif"; + "hzk" = dontDistribute super."hzk"; + "i18n" = dontDistribute super."i18n"; + "iCalendar" = dontDistribute super."iCalendar"; + "iException" = dontDistribute super."iException"; + "iap-verifier" = dontDistribute super."iap-verifier"; + "ib-api" = dontDistribute super."ib-api"; + "iban" = dontDistribute super."iban"; + "ibus-hs" = dontDistribute super."ibus-hs"; + "ideas" = dontDistribute super."ideas"; + "ideas-math" = dontDistribute super."ideas-math"; + "idempotent" = dontDistribute super."idempotent"; + "identifiers" = dontDistribute super."identifiers"; + "idiii" = dontDistribute super."idiii"; + "idna" = dontDistribute super."idna"; + "idna2008" = dontDistribute super."idna2008"; + "idris" = dontDistribute super."idris"; + "ieee" = dontDistribute super."ieee"; + "ieee-utils" = dontDistribute super."ieee-utils"; + "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; + "ieee754-parser" = dontDistribute super."ieee754-parser"; + "ifcxt" = dontDistribute super."ifcxt"; + "iff" = dontDistribute super."iff"; + "ifscs" = dontDistribute super."ifscs"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "ihaskell-display" = dontDistribute super."ihaskell-display"; + "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; + "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; + "ihaskell-plot" = dontDistribute super."ihaskell-plot"; + "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; + "ihttp" = dontDistribute super."ihttp"; + "illuminate" = dontDistribute super."illuminate"; + "image-type" = dontDistribute super."image-type"; + "imagefilters" = dontDistribute super."imagefilters"; + "imagemagick" = dontDistribute super."imagemagick"; + "imagepaste" = dontDistribute super."imagepaste"; + "imapget" = dontDistribute super."imapget"; + "imbib" = dontDistribute super."imbib"; + "imgurder" = dontDistribute super."imgurder"; + "imm" = dontDistribute super."imm"; + "imparse" = dontDistribute super."imparse"; + "imperative-edsl" = dontDistribute super."imperative-edsl"; + "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; + "implicit" = dontDistribute super."implicit"; + "implicit-params" = dontDistribute super."implicit-params"; + "imports" = dontDistribute super."imports"; + "impossible" = dontDistribute super."impossible"; + "improve" = dontDistribute super."improve"; + "inc-ref" = dontDistribute super."inc-ref"; + "inch" = dontDistribute super."inch"; + "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; + "increments" = dontDistribute super."increments"; + "indentation" = dontDistribute super."indentation"; + "indentparser" = dontDistribute super."indentparser"; + "index-core" = dontDistribute super."index-core"; + "indexed" = dontDistribute super."indexed"; + "indexed-do-notation" = dontDistribute super."indexed-do-notation"; + "indexed-extras" = dontDistribute super."indexed-extras"; + "indexed-free" = dontDistribute super."indexed-free"; + "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; + "indices" = dontDistribute super."indices"; + "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; + "infer-upstream" = dontDistribute super."infer-upstream"; + "infernu" = dontDistribute super."infernu"; + "infinite-search" = dontDistribute super."infinite-search"; + "infinity" = dontDistribute super."infinity"; + "infix" = dontDistribute super."infix"; + "inflist" = dontDistribute super."inflist"; + "influxdb" = dontDistribute super."influxdb"; + "informative" = dontDistribute super."informative"; + "inilist" = dontDistribute super."inilist"; + "inject" = dontDistribute super."inject"; + "inject-function" = dontDistribute super."inject-function"; + "inline-c-win32" = dontDistribute super."inline-c-win32"; + "inquire" = dontDistribute super."inquire"; + "inserts" = dontDistribute super."inserts"; + "inspection-proxy" = dontDistribute super."inspection-proxy"; + "instant-aeson" = dontDistribute super."instant-aeson"; + "instant-bytes" = dontDistribute super."instant-bytes"; + "instant-deepseq" = dontDistribute super."instant-deepseq"; + "instant-generics" = dontDistribute super."instant-generics"; + "instant-hashable" = dontDistribute super."instant-hashable"; + "instant-zipper" = dontDistribute super."instant-zipper"; + "instinct" = dontDistribute super."instinct"; + "instrument-chord" = dontDistribute super."instrument-chord"; + "int-cast" = dontDistribute super."int-cast"; + "integer-pure" = dontDistribute super."integer-pure"; + "intel-aes" = dontDistribute super."intel-aes"; + "interchangeable" = dontDistribute super."interchangeable"; + "interleavableGen" = dontDistribute super."interleavableGen"; + "interleavableIO" = dontDistribute super."interleavableIO"; + "interleave" = dontDistribute super."interleave"; + "interlude" = dontDistribute super."interlude"; + "intern" = dontDistribute super."intern"; + "internetmarke" = dontDistribute super."internetmarke"; + "interpol" = dontDistribute super."interpol"; + "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; + "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; + "interpolation" = dontDistribute super."interpolation"; + "intricacy" = dontDistribute super."intricacy"; + "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3_1"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-reactive" = dontDistribute super."io-reactive"; + "io-streams-http" = dontDistribute super."io-streams-http"; + "io-throttle" = dontDistribute super."io-throttle"; + "ioctl" = dontDistribute super."ioctl"; + "ioref-stable" = dontDistribute super."ioref-stable"; + "iothread" = dontDistribute super."iothread"; + "iotransaction" = dontDistribute super."iotransaction"; + "ip-quoter" = dontDistribute super."ip-quoter"; + "ipatch" = dontDistribute super."ipatch"; + "ipc" = dontDistribute super."ipc"; + "ipcvar" = dontDistribute super."ipcvar"; + "ipopt-hs" = dontDistribute super."ipopt-hs"; + "ipprint" = dontDistribute super."ipprint"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-core" = dontDistribute super."irc-core"; + "irc-fun-bot" = dontDistribute super."irc-fun-bot"; + "irc-fun-client" = dontDistribute super."irc-fun-client"; + "irc-fun-color" = dontDistribute super."irc-fun-color"; + "irc-fun-messages" = dontDistribute super."irc-fun-messages"; + "irc-fun-types" = dontDistribute super."irc-fun-types"; + "ircbot" = dontDistribute super."ircbot"; + "ircbouncer" = dontDistribute super."ircbouncer"; + "ireal" = dontDistribute super."ireal"; + "iron-mq" = dontDistribute super."iron-mq"; + "ironforge" = dontDistribute super."ironforge"; + "is" = dontDistribute super."is"; + "isdicom" = dontDistribute super."isdicom"; + "isevaluated" = dontDistribute super."isevaluated"; + "isiz" = dontDistribute super."isiz"; + "ismtp" = dontDistribute super."ismtp"; + "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; + "isohunt" = dontDistribute super."isohunt"; + "itanium-abi" = dontDistribute super."itanium-abi"; + "iter-stats" = dontDistribute super."iter-stats"; + "iterIO" = dontDistribute super."iterIO"; + "iteratee" = dontDistribute super."iteratee"; + "iteratee-compress" = dontDistribute super."iteratee-compress"; + "iteratee-mtl" = dontDistribute super."iteratee-mtl"; + "iteratee-parsec" = dontDistribute super."iteratee-parsec"; + "iteratee-stm" = dontDistribute super."iteratee-stm"; + "iterio-server" = dontDistribute super."iterio-server"; + "ivar-simple" = dontDistribute super."ivar-simple"; + "ivor" = dontDistribute super."ivor"; + "ivory" = dontDistribute super."ivory"; + "ivory-backend-c" = dontDistribute super."ivory-backend-c"; + "ivory-bitdata" = dontDistribute super."ivory-bitdata"; + "ivory-examples" = dontDistribute super."ivory-examples"; + "ivory-hw" = dontDistribute super."ivory-hw"; + "ivory-opts" = dontDistribute super."ivory-opts"; + "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; + "ivory-stdlib" = dontDistribute super."ivory-stdlib"; + "ivy-web" = dontDistribute super."ivy-web"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "iyql" = dontDistribute super."iyql"; + "j2hs" = dontDistribute super."j2hs"; + "ja-base-extra" = dontDistribute super."ja-base-extra"; + "jack" = dontDistribute super."jack"; + "jack-bindings" = dontDistribute super."jack-bindings"; + "jackminimix" = dontDistribute super."jackminimix"; + "jacobi-roots" = dontDistribute super."jacobi-roots"; + "jail" = dontDistribute super."jail"; + "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; + "jalaali" = dontDistribute super."jalaali"; + "jalla" = dontDistribute super."jalla"; + "jammittools" = dontDistribute super."jammittools"; + "jarfind" = dontDistribute super."jarfind"; + "java-bridge" = dontDistribute super."java-bridge"; + "java-bridge-extras" = dontDistribute super."java-bridge-extras"; + "java-character" = dontDistribute super."java-character"; + "java-poker" = dontDistribute super."java-poker"; + "java-reflect" = dontDistribute super."java-reflect"; + "javasf" = dontDistribute super."javasf"; + "javav" = dontDistribute super."javav"; + "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; + "jdi" = dontDistribute super."jdi"; + "jespresso" = dontDistribute super."jespresso"; + "jobqueue" = dontDistribute super."jobqueue"; + "join" = dontDistribute super."join"; + "joinlist" = dontDistribute super."joinlist"; + "jonathanscard" = dontDistribute super."jonathanscard"; + "jort" = dontDistribute super."jort"; + "jose" = dontDistribute super."jose"; + "jpeg" = dontDistribute super."jpeg"; + "js-good-parts" = dontDistribute super."js-good-parts"; + "jsaddle" = dontDistribute super."jsaddle"; + "jsaddle-hello" = dontDistribute super."jsaddle-hello"; + "jsc" = dontDistribute super."jsc"; + "jsmw" = dontDistribute super."jsmw"; + "json-assertions" = dontDistribute super."json-assertions"; + "json-ast" = dontDistribute super."json-ast"; + "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-b" = dontDistribute super."json-b"; + "json-encoder" = dontDistribute super."json-encoder"; + "json-enumerator" = dontDistribute super."json-enumerator"; + "json-extra" = dontDistribute super."json-extra"; + "json-fu" = dontDistribute super."json-fu"; + "json-litobj" = dontDistribute super."json-litobj"; + "json-pointer" = dontDistribute super."json-pointer"; + "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; + "json-python" = dontDistribute super."json-python"; + "json-qq" = dontDistribute super."json-qq"; + "json-rpc" = dontDistribute super."json-rpc"; + "json-rpc-client" = dontDistribute super."json-rpc-client"; + "json-rpc-server" = dontDistribute super."json-rpc-server"; + "json-sop" = dontDistribute super."json-sop"; + "json-state" = dontDistribute super."json-state"; + "json-stream" = dontDistribute super."json-stream"; + "json-togo" = dontDistribute super."json-togo"; + "json-tools" = dontDistribute super."json-tools"; + "json-types" = dontDistribute super."json-types"; + "json2" = dontDistribute super."json2"; + "json2-hdbc" = dontDistribute super."json2-hdbc"; + "json2-types" = dontDistribute super."json2-types"; + "json2yaml" = dontDistribute super."json2yaml"; + "jsonresume" = dontDistribute super."jsonresume"; + "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; + "jsonschema-gen" = dontDistribute super."jsonschema-gen"; + "jsonsql" = dontDistribute super."jsonsql"; + "jsontsv" = dontDistribute super."jsontsv"; + "jspath" = dontDistribute super."jspath"; + "judy" = dontDistribute super."judy"; + "jukebox" = dontDistribute super."jukebox"; + "jumpthefive" = dontDistribute super."jumpthefive"; + "jvm-parser" = dontDistribute super."jvm-parser"; + "kademlia" = dontDistribute super."kademlia"; + "kafka-client" = dontDistribute super."kafka-client"; + "kangaroo" = dontDistribute super."kangaroo"; + "kansas-lava" = dontDistribute super."kansas-lava"; + "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; + "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; + "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; + "karakuri" = dontDistribute super."karakuri"; + "karver" = dontDistribute super."karver"; + "katt" = dontDistribute super."katt"; + "kazura-queue" = dontDistribute super."kazura-queue"; + "kbq-gu" = dontDistribute super."kbq-gu"; + "kd-tree" = dontDistribute super."kd-tree"; + "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; + "keera-callbacks" = dontDistribute super."keera-callbacks"; + "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; + "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; + "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; + "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; + "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; + "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; + "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; + "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; + "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; + "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; + "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; + "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; + "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; + "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; + "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; + "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; + "keera-posture" = dontDistribute super."keera-posture"; + "keiretsu" = dontDistribute super."keiretsu"; + "kevin" = dontDistribute super."kevin"; + "keyed" = dontDistribute super."keyed"; + "keyring" = dontDistribute super."keyring"; + "keystore" = dontDistribute super."keystore"; + "keyvaluehash" = dontDistribute super."keyvaluehash"; + "keyword-args" = dontDistribute super."keyword-args"; + "kibro" = dontDistribute super."kibro"; + "kicad-data" = dontDistribute super."kicad-data"; + "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; + "kickchan" = dontDistribute super."kickchan"; + "kif-parser" = dontDistribute super."kif-parser"; + "kinds" = dontDistribute super."kinds"; + "kit" = dontDistribute super."kit"; + "kmeans-par" = dontDistribute super."kmeans-par"; + "kmeans-vector" = dontDistribute super."kmeans-vector"; + "knots" = dontDistribute super."knots"; + "koellner-phonetic" = dontDistribute super."koellner-phonetic"; + "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; + "korfu" = dontDistribute super."korfu"; + "kqueue" = dontDistribute super."kqueue"; + "krpc" = dontDistribute super."krpc"; + "ks-test" = dontDistribute super."ks-test"; + "ktx" = dontDistribute super."ktx"; + "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; + "kyotocabinet" = dontDistribute super."kyotocabinet"; + "l-bfgs-b" = dontDistribute super."l-bfgs-b"; + "labeled-graph" = dontDistribute super."labeled-graph"; + "labeled-tree" = dontDistribute super."labeled-tree"; + "laborantin-hs" = dontDistribute super."laborantin-hs"; + "labyrinth" = dontDistribute super."labyrinth"; + "labyrinth-server" = dontDistribute super."labyrinth-server"; + "lackey" = dontDistribute super."lackey"; + "lagrangian" = dontDistribute super."lagrangian"; + "laika" = dontDistribute super."laika"; + "lambda-ast" = dontDistribute super."lambda-ast"; + "lambda-bridge" = dontDistribute super."lambda-bridge"; + "lambda-canvas" = dontDistribute super."lambda-canvas"; + "lambda-devs" = dontDistribute super."lambda-devs"; + "lambda-options" = dontDistribute super."lambda-options"; + "lambda-placeholders" = dontDistribute super."lambda-placeholders"; + "lambda-toolbox" = dontDistribute super."lambda-toolbox"; + "lambda2js" = dontDistribute super."lambda2js"; + "lambdaBase" = dontDistribute super."lambdaBase"; + "lambdaFeed" = dontDistribute super."lambdaFeed"; + "lambdaLit" = dontDistribute super."lambdaLit"; + "lambdabot" = dontDistribute super."lambdabot"; + "lambdabot-core" = dontDistribute super."lambdabot-core"; + "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins"; + "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins"; + "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins"; + "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins"; + "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins"; + "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins"; + "lambdabot-trusted" = dontDistribute super."lambdabot-trusted"; + "lambdabot-utils" = dontDistribute super."lambdabot-utils"; + "lambdacat" = dontDistribute super."lambdacat"; + "lambdacms-core" = dontDistribute super."lambdacms-core"; + "lambdacms-media" = dontDistribute super."lambdacms-media"; + "lambdacube" = dontDistribute super."lambdacube"; + "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-compiler" = dontDistribute super."lambdacube-compiler"; + "lambdacube-core" = dontDistribute super."lambdacube-core"; + "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; + "lambdacube-engine" = dontDistribute super."lambdacube-engine"; + "lambdacube-examples" = dontDistribute super."lambdacube-examples"; + "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-ir" = dontDistribute super."lambdacube-ir"; + "lambdacube-samples" = dontDistribute super."lambdacube-samples"; + "lambdatex" = dontDistribute super."lambdatex"; + "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdiff" = dontDistribute super."lambdiff"; + "lame-tester" = dontDistribute super."lame-tester"; + "language-asn1" = dontDistribute super."language-asn1"; + "language-bash" = dontDistribute super."language-bash"; + "language-boogie" = dontDistribute super."language-boogie"; + "language-c-comments" = dontDistribute super."language-c-comments"; + "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = dontDistribute super."language-c-quote"; + "language-cil" = dontDistribute super."language-cil"; + "language-css" = dontDistribute super."language-css"; + "language-dot" = dontDistribute super."language-dot"; + "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; + "language-eiffel" = dontDistribute super."language-eiffel"; + "language-fortran" = dontDistribute super."language-fortran"; + "language-gcl" = dontDistribute super."language-gcl"; + "language-go" = dontDistribute super."language-go"; + "language-guess" = dontDistribute super."language-guess"; + "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-kort" = dontDistribute super."language-kort"; + "language-lua" = dontDistribute super."language-lua"; + "language-lua-qq" = dontDistribute super."language-lua-qq"; + "language-mixal" = dontDistribute super."language-mixal"; + "language-objc" = dontDistribute super."language-objc"; + "language-openscad" = dontDistribute super."language-openscad"; + "language-pig" = dontDistribute super."language-pig"; + "language-puppet" = dontDistribute super."language-puppet"; + "language-python" = dontDistribute super."language-python"; + "language-python-colour" = dontDistribute super."language-python-colour"; + "language-python-test" = dontDistribute super."language-python-test"; + "language-qux" = dontDistribute super."language-qux"; + "language-sh" = dontDistribute super."language-sh"; + "language-slice" = dontDistribute super."language-slice"; + "language-spelling" = dontDistribute super."language-spelling"; + "language-sqlite" = dontDistribute super."language-sqlite"; + "language-typescript" = dontDistribute super."language-typescript"; + "language-vhdl" = dontDistribute super."language-vhdl"; + "lat" = dontDistribute super."lat"; + "latest-npm-version" = dontDistribute super."latest-npm-version"; + "latex" = dontDistribute super."latex"; + "launchpad-control" = dontDistribute super."launchpad-control"; + "lax" = dontDistribute super."lax"; + "layers" = dontDistribute super."layers"; + "layers-game" = dontDistribute super."layers-game"; + "layout" = dontDistribute super."layout"; + "layout-bootstrap" = dontDistribute super."layout-bootstrap"; + "lazy-io" = dontDistribute super."lazy-io"; + "lazyarray" = dontDistribute super."lazyarray"; + "lazyio" = dontDistribute super."lazyio"; + "lazysmallcheck" = dontDistribute super."lazysmallcheck"; + "lazysplines" = dontDistribute super."lazysplines"; + "lbfgs" = dontDistribute super."lbfgs"; + "lcs" = dontDistribute super."lcs"; + "lda" = dontDistribute super."lda"; + "ldap-client" = dontDistribute super."ldap-client"; + "ldif" = dontDistribute super."ldif"; + "leaf" = dontDistribute super."leaf"; + "leaky" = dontDistribute super."leaky"; + "leankit-api" = dontDistribute super."leankit-api"; + "leapseconds-announced" = dontDistribute super."leapseconds-announced"; + "learn" = dontDistribute super."learn"; + "learn-physics" = dontDistribute super."learn-physics"; + "learn-physics-examples" = dontDistribute super."learn-physics-examples"; + "learning-hmm" = dontDistribute super."learning-hmm"; + "leetify" = dontDistribute super."leetify"; + "leksah" = dontDistribute super."leksah"; + "leksah-server" = dontDistribute super."leksah-server"; + "lendingclub" = dontDistribute super."lendingclub"; + "lens-datetime" = dontDistribute super."lens-datetime"; + "lens-prelude" = dontDistribute super."lens-prelude"; + "lens-properties" = dontDistribute super."lens-properties"; + "lens-sop" = dontDistribute super."lens-sop"; + "lens-text-encoding" = dontDistribute super."lens-text-encoding"; + "lens-time" = dontDistribute super."lens-time"; + "lens-tutorial" = dontDistribute super."lens-tutorial"; + "lens-utils" = dontDistribute super."lens-utils"; + "lenses" = dontDistribute super."lenses"; + "lensref" = dontDistribute super."lensref"; + "lenz" = dontDistribute super."lenz"; + "lenz-template" = dontDistribute super."lenz-template"; + "level-monad" = dontDistribute super."level-monad"; + "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; + "levmar" = dontDistribute super."levmar"; + "levmar-chart" = dontDistribute super."levmar-chart"; + "lgtk" = dontDistribute super."lgtk"; + "lha" = dontDistribute super."lha"; + "lhae" = dontDistribute super."lhae"; + "lhc" = dontDistribute super."lhc"; + "lhe" = dontDistribute super."lhe"; + "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; + "lhs2html" = dontDistribute super."lhs2html"; + "lhslatex" = dontDistribute super."lhslatex"; + "libGenI" = dontDistribute super."libGenI"; + "libarchive-conduit" = dontDistribute super."libarchive-conduit"; + "libconfig" = dontDistribute super."libconfig"; + "libcspm" = dontDistribute super."libcspm"; + "libexpect" = dontDistribute super."libexpect"; + "libffi" = dontDistribute super."libffi"; + "libgraph" = dontDistribute super."libgraph"; + "libhbb" = dontDistribute super."libhbb"; + "libjenkins" = dontDistribute super."libjenkins"; + "liblastfm" = dontDistribute super."liblastfm"; + "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; + "libltdl" = dontDistribute super."libltdl"; + "libmpd" = dontDistribute super."libmpd"; + "libnvvm" = dontDistribute super."libnvvm"; + "liboleg" = dontDistribute super."liboleg"; + "libpafe" = dontDistribute super."libpafe"; + "libpq" = dontDistribute super."libpq"; + "librandomorg" = dontDistribute super."librandomorg"; + "libravatar" = dontDistribute super."libravatar"; + "libssh2" = dontDistribute super."libssh2"; + "libssh2-conduit" = dontDistribute super."libssh2-conduit"; + "libstackexchange" = dontDistribute super."libstackexchange"; + "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; + "libtagc" = dontDistribute super."libtagc"; + "libvirt-hs" = dontDistribute super."libvirt-hs"; + "libvorbis" = dontDistribute super."libvorbis"; + "libxml" = dontDistribute super."libxml"; + "libxml-enumerator" = dontDistribute super."libxml-enumerator"; + "libxslt" = dontDistribute super."libxslt"; + "life" = dontDistribute super."life"; + "lift-generics" = dontDistribute super."lift-generics"; + "lifted-threads" = dontDistribute super."lifted-threads"; + "lifter" = dontDistribute super."lifter"; + "ligature" = dontDistribute super."ligature"; + "ligd" = dontDistribute super."ligd"; + "lighttpd-conf" = dontDistribute super."lighttpd-conf"; + "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; + "lilypond" = dontDistribute super."lilypond"; + "limp" = dontDistribute super."limp"; + "limp-cbc" = dontDistribute super."limp-cbc"; + "lin-alg" = dontDistribute super."lin-alg"; + "linda" = dontDistribute super."linda"; + "lindenmayer" = dontDistribute super."lindenmayer"; + "line-break" = dontDistribute super."line-break"; + "line2pdf" = dontDistribute super."line2pdf"; + "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; + "linear-circuit" = dontDistribute super."linear-circuit"; + "linear-grammar" = dontDistribute super."linear-grammar"; + "linear-maps" = dontDistribute super."linear-maps"; + "linear-opengl" = dontDistribute super."linear-opengl"; + "linear-vect" = dontDistribute super."linear-vect"; + "linearEqSolver" = dontDistribute super."linearEqSolver"; + "linearscan" = dontDistribute super."linearscan"; + "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; + "linebreak" = dontDistribute super."linebreak"; + "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; + "linkchk" = dontDistribute super."linkchk"; + "linkcore" = dontDistribute super."linkcore"; + "linkedhashmap" = dontDistribute super."linkedhashmap"; + "linklater" = dontDistribute super."linklater"; + "linode" = dontDistribute super."linode"; + "linux-blkid" = dontDistribute super."linux-blkid"; + "linux-cgroup" = dontDistribute super."linux-cgroup"; + "linux-evdev" = dontDistribute super."linux-evdev"; + "linux-inotify" = dontDistribute super."linux-inotify"; + "linux-kmod" = dontDistribute super."linux-kmod"; + "linux-mount" = dontDistribute super."linux-mount"; + "linux-perf" = dontDistribute super."linux-perf"; + "linux-ptrace" = dontDistribute super."linux-ptrace"; + "linux-xattr" = dontDistribute super."linux-xattr"; + "linx-gateway" = dontDistribute super."linx-gateway"; + "lio" = dontDistribute super."lio"; + "lio-eci11" = dontDistribute super."lio-eci11"; + "lio-fs" = dontDistribute super."lio-fs"; + "lio-simple" = dontDistribute super."lio-simple"; + "lipsum-gen" = dontDistribute super."lipsum-gen"; + "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; + "liquidhaskell" = dontDistribute super."liquidhaskell"; + "lispparser" = dontDistribute super."lispparser"; + "list-extras" = dontDistribute super."list-extras"; + "list-grouping" = dontDistribute super."list-grouping"; + "list-mux" = dontDistribute super."list-mux"; + "list-remote-forwards" = dontDistribute super."list-remote-forwards"; + "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; + "list-t-html-parser" = dontDistribute super."list-t-html-parser"; + "list-t-http-client" = dontDistribute super."list-t-http-client"; + "list-t-libcurl" = dontDistribute super."list-t-libcurl"; + "list-t-text" = dontDistribute super."list-t-text"; + "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; + "listlike-instances" = dontDistribute super."listlike-instances"; + "lists" = dontDistribute super."lists"; + "listsafe" = dontDistribute super."listsafe"; + "lit" = dontDistribute super."lit"; + "literals" = dontDistribute super."literals"; + "live-sequencer" = dontDistribute super."live-sequencer"; + "ll-picosat" = dontDistribute super."ll-picosat"; + "llrbtree" = dontDistribute super."llrbtree"; + "llsd" = dontDistribute super."llsd"; + "llvm" = dontDistribute super."llvm"; + "llvm-analysis" = dontDistribute super."llvm-analysis"; + "llvm-base" = dontDistribute super."llvm-base"; + "llvm-base-types" = dontDistribute super."llvm-base-types"; + "llvm-base-util" = dontDistribute super."llvm-base-util"; + "llvm-data-interop" = dontDistribute super."llvm-data-interop"; + "llvm-extra" = dontDistribute super."llvm-extra"; + "llvm-ffi" = dontDistribute super."llvm-ffi"; + "llvm-general" = dontDistribute super."llvm-general"; + "llvm-general-pure" = dontDistribute super."llvm-general-pure"; + "llvm-general-quote" = dontDistribute super."llvm-general-quote"; + "llvm-ht" = dontDistribute super."llvm-ht"; + "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; + "llvm-pretty" = dontDistribute super."llvm-pretty"; + "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; + "llvm-tf" = dontDistribute super."llvm-tf"; + "llvm-tools" = dontDistribute super."llvm-tools"; + "lmdb" = dontDistribute super."lmdb"; + "lmonad" = dontDistribute super."lmonad"; + "lmonad-yesod" = dontDistribute super."lmonad-yesod"; + "load-env" = dontDistribute super."load-env"; + "loadavg" = dontDistribute super."loadavg"; + "local-address" = dontDistribute super."local-address"; + "local-search" = dontDistribute super."local-search"; + "located-base" = dontDistribute super."located-base"; + "locators" = dontDistribute super."locators"; + "loch" = dontDistribute super."loch"; + "lock-file" = dontDistribute super."lock-file"; + "locked-poll" = dontDistribute super."locked-poll"; + "lockfree-queue" = dontDistribute super."lockfree-queue"; + "log" = dontDistribute super."log"; + "log-effect" = dontDistribute super."log-effect"; + "log2json" = dontDistribute super."log2json"; + "logfloat" = dontDistribute super."logfloat"; + "logger" = dontDistribute super."logger"; + "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; + "logsink" = dontDistribute super."logsink"; + "lojban" = dontDistribute super."lojban"; + "lojbanParser" = dontDistribute super."lojbanParser"; + "lojbanXiragan" = dontDistribute super."lojbanXiragan"; + "lojysamban" = dontDistribute super."lojysamban"; + "lol" = dontDistribute super."lol"; + "loli" = dontDistribute super."loli"; + "lookup-tables" = dontDistribute super."lookup-tables"; + "loop-effin" = dontDistribute super."loop-effin"; + "loop-while" = dontDistribute super."loop-while"; + "loops" = dontDistribute super."loops"; + "loopy" = dontDistribute super."loopy"; + "lord" = dontDistribute super."lord"; + "lorem" = dontDistribute super."lorem"; + "loris" = dontDistribute super."loris"; + "loshadka" = dontDistribute super."loshadka"; + "lostcities" = dontDistribute super."lostcities"; + "lowgl" = dontDistribute super."lowgl"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; + "ls-usb" = dontDistribute super."ls-usb"; + "lscabal" = dontDistribute super."lscabal"; + "lss" = dontDistribute super."lss"; + "lsystem" = dontDistribute super."lsystem"; + "ltk" = dontDistribute super."ltk"; + "ltl" = dontDistribute super."ltl"; + "lua-bytecode" = dontDistribute super."lua-bytecode"; + "luachunk" = dontDistribute super."luachunk"; + "luautils" = dontDistribute super."luautils"; + "lub" = dontDistribute super."lub"; + "lucid-foundation" = dontDistribute super."lucid-foundation"; + "lucienne" = dontDistribute super."lucienne"; + "luhn" = dontDistribute super."luhn"; + "lui" = dontDistribute super."lui"; + "luka" = dontDistribute super."luka"; + "lushtags" = dontDistribute super."lushtags"; + "luthor" = dontDistribute super."luthor"; + "lvish" = dontDistribute super."lvish"; + "lvmlib" = dontDistribute super."lvmlib"; + "lvmrun" = dontDistribute super."lvmrun"; + "lxc" = dontDistribute super."lxc"; + "lye" = dontDistribute super."lye"; + "lz4" = dontDistribute super."lz4"; + "lzma" = dontDistribute super."lzma"; + "lzma-clib" = dontDistribute super."lzma-clib"; + "lzma-enumerator" = dontDistribute super."lzma-enumerator"; + "lzma-streams" = dontDistribute super."lzma-streams"; + "maam" = dontDistribute super."maam"; + "mac" = dontDistribute super."mac"; + "maccatcher" = dontDistribute super."maccatcher"; + "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; + "machines-zlib" = dontDistribute super."machines-zlib"; + "macho" = dontDistribute super."macho"; + "maclight" = dontDistribute super."maclight"; + "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; + "mage" = dontDistribute super."mage"; + "magico" = dontDistribute super."magico"; + "magma" = dontDistribute super."magma"; + "mahoro" = dontDistribute super."mahoro"; + "maid" = dontDistribute super."maid"; + "mailbox-count" = dontDistribute super."mailbox-count"; + "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; + "mailgun" = dontDistribute super."mailgun"; + "mainland-pretty" = dontDistribute super."mainland-pretty"; + "majordomo" = dontDistribute super."majordomo"; + "majority" = dontDistribute super."majority"; + "make-hard-links" = dontDistribute super."make-hard-links"; + "make-package" = dontDistribute super."make-package"; + "makedo" = dontDistribute super."makedo"; + "manatee" = dontDistribute super."manatee"; + "manatee-all" = dontDistribute super."manatee-all"; + "manatee-anything" = dontDistribute super."manatee-anything"; + "manatee-browser" = dontDistribute super."manatee-browser"; + "manatee-core" = dontDistribute super."manatee-core"; + "manatee-curl" = dontDistribute super."manatee-curl"; + "manatee-editor" = dontDistribute super."manatee-editor"; + "manatee-filemanager" = dontDistribute super."manatee-filemanager"; + "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; + "manatee-ircclient" = dontDistribute super."manatee-ircclient"; + "manatee-mplayer" = dontDistribute super."manatee-mplayer"; + "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; + "manatee-processmanager" = dontDistribute super."manatee-processmanager"; + "manatee-reader" = dontDistribute super."manatee-reader"; + "manatee-template" = dontDistribute super."manatee-template"; + "manatee-terminal" = dontDistribute super."manatee-terminal"; + "manatee-welcome" = dontDistribute super."manatee-welcome"; + "mancala" = dontDistribute super."mancala"; + "mandulia" = dontDistribute super."mandulia"; + "manifold-random" = dontDistribute super."manifold-random"; + "manifolds" = dontDistribute super."manifolds"; + "mappy" = dontDistribute super."mappy"; + "marionetta" = dontDistribute super."marionetta"; + "markdown-kate" = dontDistribute super."markdown-kate"; + "markdown-pap" = dontDistribute super."markdown-pap"; + "markdown2svg" = dontDistribute super."markdown2svg"; + "marked-pretty" = dontDistribute super."marked-pretty"; + "markov" = dontDistribute super."markov"; + "markov-chain" = dontDistribute super."markov-chain"; + "markov-processes" = dontDistribute super."markov-processes"; + "markup-preview" = dontDistribute super."markup-preview"; + "marmalade-upload" = dontDistribute super."marmalade-upload"; + "marquise" = dontDistribute super."marquise"; + "marxup" = dontDistribute super."marxup"; + "masakazu-bot" = dontDistribute super."masakazu-bot"; + "mastermind" = dontDistribute super."mastermind"; + "matchers" = dontDistribute super."matchers"; + "mathblog" = dontDistribute super."mathblog"; + "mathgenealogy" = dontDistribute super."mathgenealogy"; + "mathista" = dontDistribute super."mathista"; + "mathlink" = dontDistribute super."mathlink"; + "matlab" = dontDistribute super."matlab"; + "matrix-market" = dontDistribute super."matrix-market"; + "matrix-market-pure" = dontDistribute super."matrix-market-pure"; + "matsuri" = dontDistribute super."matsuri"; + "maude" = dontDistribute super."maude"; + "maxent" = dontDistribute super."maxent"; + "maxsharing" = dontDistribute super."maxsharing"; + "maybe-justify" = dontDistribute super."maybe-justify"; + "maybench" = dontDistribute super."maybench"; + "mbox-tools" = dontDistribute super."mbox-tools"; + "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; + "mcmc-samplers" = dontDistribute super."mcmc-samplers"; + "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; + "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; + "mdcat" = dontDistribute super."mdcat"; + "mdo" = dontDistribute super."mdo"; + "mdp" = dontDistribute super."mdp"; + "mecab" = dontDistribute super."mecab"; + "mecha" = dontDistribute super."mecha"; + "mediawiki" = dontDistribute super."mediawiki"; + "mediawiki2latex" = dontDistribute super."mediawiki2latex"; + "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; + "meep" = dontDistribute super."meep"; + "mega-sdist" = dontDistribute super."mega-sdist"; + "meldable-heap" = dontDistribute super."meldable-heap"; + "melody" = dontDistribute super."melody"; + "memcache" = dontDistribute super."memcache"; + "memcache-conduit" = dontDistribute super."memcache-conduit"; + "memcache-haskell" = dontDistribute super."memcache-haskell"; + "memcached" = dontDistribute super."memcached"; + "memexml" = dontDistribute super."memexml"; + "memo-ptr" = dontDistribute super."memo-ptr"; + "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memscript" = dontDistribute super."memscript"; + "mersenne-random" = dontDistribute super."mersenne-random"; + "messente" = dontDistribute super."messente"; + "meta-misc" = dontDistribute super."meta-misc"; + "meta-par" = dontDistribute super."meta-par"; + "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; + "metadata" = dontDistribute super."metadata"; + "metamorphic" = dontDistribute super."metamorphic"; + "metaplug" = dontDistribute super."metaplug"; + "metric" = dontDistribute super."metric"; + "metricsd-client" = dontDistribute super."metricsd-client"; + "metronome" = dontDistribute super."metronome"; + "mezzolens" = dontDistribute super."mezzolens"; + "mfsolve" = dontDistribute super."mfsolve"; + "mgeneric" = dontDistribute super."mgeneric"; + "mi" = dontDistribute super."mi"; + "microbench" = dontDistribute super."microbench"; + "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens-each" = dontDistribute super."microlens-each"; + "microtimer" = dontDistribute super."microtimer"; + "mida" = dontDistribute super."mida"; + "midi" = dontDistribute super."midi"; + "midi-alsa" = dontDistribute super."midi-alsa"; + "midi-music-box" = dontDistribute super."midi-music-box"; + "midi-util" = dontDistribute super."midi-util"; + "midimory" = dontDistribute super."midimory"; + "midisurface" = dontDistribute super."midisurface"; + "mighttpd" = dontDistribute super."mighttpd"; + "mighttpd2" = dontDistribute super."mighttpd2"; + "mikmod" = dontDistribute super."mikmod"; + "miku" = dontDistribute super."miku"; + "milena" = dontDistribute super."milena"; + "mime" = dontDistribute super."mime"; + "mime-directory" = dontDistribute super."mime-directory"; + "mime-string" = dontDistribute super."mime-string"; + "mines" = dontDistribute super."mines"; + "minesweeper" = dontDistribute super."minesweeper"; + "miniball" = dontDistribute super."miniball"; + "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; + "minimal-configuration" = dontDistribute super."minimal-configuration"; + "minimorph" = dontDistribute super."minimorph"; + "minimung" = dontDistribute super."minimung"; + "minions" = dontDistribute super."minions"; + "minioperational" = dontDistribute super."minioperational"; + "miniplex" = dontDistribute super."miniplex"; + "minirotate" = dontDistribute super."minirotate"; + "minisat" = dontDistribute super."minisat"; + "ministg" = dontDistribute super."ministg"; + "miniutter" = dontDistribute super."miniutter"; + "minst-idx" = dontDistribute super."minst-idx"; + "mirror-tweet" = dontDistribute super."mirror-tweet"; + "missing-py2" = dontDistribute super."missing-py2"; + "mix-arrows" = dontDistribute super."mix-arrows"; + "mixed-strategies" = dontDistribute super."mixed-strategies"; + "mkbndl" = dontDistribute super."mkbndl"; + "mkcabal" = dontDistribute super."mkcabal"; + "ml-w" = dontDistribute super."ml-w"; + "mlist" = dontDistribute super."mlist"; + "mmtl" = dontDistribute super."mmtl"; + "mmtl-base" = dontDistribute super."mmtl-base"; + "moan" = dontDistribute super."moan"; + "modbus-tcp" = dontDistribute super."modbus-tcp"; + "modelicaparser" = dontDistribute super."modelicaparser"; + "modsplit" = dontDistribute super."modsplit"; + "modular-arithmetic" = dontDistribute super."modular-arithmetic"; + "modular-prelude" = dontDistribute super."modular-prelude"; + "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; + "module-management" = dontDistribute super."module-management"; + "modulespection" = dontDistribute super."modulespection"; + "modulo" = dontDistribute super."modulo"; + "moe" = dontDistribute super."moe"; + "mohws" = dontDistribute super."mohws"; + "monad-abort-fd" = dontDistribute super."monad-abort-fd"; + "monad-atom" = dontDistribute super."monad-atom"; + "monad-atom-simple" = dontDistribute super."monad-atom-simple"; + "monad-bool" = dontDistribute super."monad-bool"; + "monad-classes" = dontDistribute super."monad-classes"; + "monad-codec" = dontDistribute super."monad-codec"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_2"; + "monad-exception" = dontDistribute super."monad-exception"; + "monad-fork" = dontDistribute super."monad-fork"; + "monad-gen" = dontDistribute super."monad-gen"; + "monad-interleave" = dontDistribute super."monad-interleave"; + "monad-levels" = dontDistribute super."monad-levels"; + "monad-loops-stm" = dontDistribute super."monad-loops-stm"; + "monad-lrs" = dontDistribute super."monad-lrs"; + "monad-memo" = dontDistribute super."monad-memo"; + "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; + "monad-open" = dontDistribute super."monad-open"; + "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_1"; + "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; + "monad-param" = dontDistribute super."monad-param"; + "monad-ran" = dontDistribute super."monad-ran"; + "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-state" = dontDistribute super."monad-state"; + "monad-statevar" = dontDistribute super."monad-statevar"; + "monad-stlike-io" = dontDistribute super."monad-stlike-io"; + "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; + "monad-supply" = dontDistribute super."monad-supply"; + "monad-task" = dontDistribute super."monad-task"; + "monad-tx" = dontDistribute super."monad-tx"; + "monad-unify" = dontDistribute super."monad-unify"; + "monad-wrap" = dontDistribute super."monad-wrap"; + "monadIO" = dontDistribute super."monadIO"; + "monadLib-compose" = dontDistribute super."monadLib-compose"; + "monadacme" = dontDistribute super."monadacme"; + "monadbi" = dontDistribute super."monadbi"; + "monadfibre" = dontDistribute super."monadfibre"; + "monadiccp" = dontDistribute super."monadiccp"; + "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; + "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; + "monadlist" = dontDistribute super."monadlist"; + "monadloc-pp" = dontDistribute super."monadloc-pp"; + "monadplus" = dontDistribute super."monadplus"; + "monads-fd" = dontDistribute super."monads-fd"; + "monadtransform" = dontDistribute super."monadtransform"; + "monarch" = dontDistribute super."monarch"; + "mongodb-queue" = dontDistribute super."mongodb-queue"; + "mongrel2-handler" = dontDistribute super."mongrel2-handler"; + "monitor" = dontDistribute super."monitor"; + "mono-foldable" = dontDistribute super."mono-foldable"; + "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-owns" = dontDistribute super."monoid-owns"; + "monoid-record" = dontDistribute super."monoid-record"; + "monoid-statistics" = dontDistribute super."monoid-statistics"; + "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidplus" = dontDistribute super."monoidplus"; + "monoids" = dontDistribute super."monoids"; + "monomorphic" = dontDistribute super."monomorphic"; + "montage" = dontDistribute super."montage"; + "montage-client" = dontDistribute super."montage-client"; + "monte-carlo" = dontDistribute super."monte-carlo"; + "moo" = dontDistribute super."moo"; + "moonshine" = dontDistribute super."moonshine"; + "morfette" = dontDistribute super."morfette"; + "morfeusz" = dontDistribute super."morfeusz"; + "mosaico-lib" = dontDistribute super."mosaico-lib"; + "mount" = dontDistribute super."mount"; + "mp" = dontDistribute super."mp"; + "mp3decoder" = dontDistribute super."mp3decoder"; + "mpdmate" = dontDistribute super."mpdmate"; + "mpppc" = dontDistribute super."mpppc"; + "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; + "mprover" = dontDistribute super."mprover"; + "mps" = dontDistribute super."mps"; + "mpvguihs" = dontDistribute super."mpvguihs"; + "mqtt-hs" = dontDistribute super."mqtt-hs"; + "ms" = dontDistribute super."ms"; + "msgpack" = dontDistribute super."msgpack"; + "msgpack-aeson" = dontDistribute super."msgpack-aeson"; + "msgpack-idl" = dontDistribute super."msgpack-idl"; + "msgpack-rpc" = dontDistribute super."msgpack-rpc"; + "msh" = dontDistribute super."msh"; + "msu" = dontDistribute super."msu"; + "mtgoxapi" = dontDistribute super."mtgoxapi"; + "mtl-c" = dontDistribute super."mtl-c"; + "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; + "mtl-tf" = dontDistribute super."mtl-tf"; + "mtl-unleashed" = dontDistribute super."mtl-unleashed"; + "mtlparse" = dontDistribute super."mtlparse"; + "mtlx" = dontDistribute super."mtlx"; + "mtp" = dontDistribute super."mtp"; + "mtree" = dontDistribute super."mtree"; + "mucipher" = dontDistribute super."mucipher"; + "mudbath" = dontDistribute super."mudbath"; + "muesli" = dontDistribute super."muesli"; + "mueval" = dontDistribute super."mueval"; + "mulang" = dontDistribute super."mulang"; + "multext-east-msd" = dontDistribute super."multext-east-msd"; + "multi-cabal" = dontDistribute super."multi-cabal"; + "multifocal" = dontDistribute super."multifocal"; + "multihash" = dontDistribute super."multihash"; + "multipart-names" = dontDistribute super."multipart-names"; + "multipass" = dontDistribute super."multipass"; + "multiplate-simplified" = dontDistribute super."multiplate-simplified"; + "multiplicity" = dontDistribute super."multiplicity"; + "multirec" = dontDistribute super."multirec"; + "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; + "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset-comb" = dontDistribute super."multiset-comb"; + "multisetrewrite" = dontDistribute super."multisetrewrite"; + "multistate" = dontDistribute super."multistate"; + "muon" = dontDistribute super."muon"; + "murder" = dontDistribute super."murder"; + "murmur3" = dontDistribute super."murmur3"; + "murmurhash3" = dontDistribute super."murmurhash3"; + "music-articulation" = dontDistribute super."music-articulation"; + "music-diatonic" = dontDistribute super."music-diatonic"; + "music-dynamics" = dontDistribute super."music-dynamics"; + "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; + "music-graphics" = dontDistribute super."music-graphics"; + "music-parts" = dontDistribute super."music-parts"; + "music-pitch" = dontDistribute super."music-pitch"; + "music-pitch-literal" = dontDistribute super."music-pitch-literal"; + "music-preludes" = dontDistribute super."music-preludes"; + "music-score" = dontDistribute super."music-score"; + "music-sibelius" = dontDistribute super."music-sibelius"; + "music-suite" = dontDistribute super."music-suite"; + "music-util" = dontDistribute super."music-util"; + "musicbrainz-email" = dontDistribute super."musicbrainz-email"; + "musicxml" = dontDistribute super."musicxml"; + "musicxml2" = dontDistribute super."musicxml2"; + "mustache-haskell" = dontDistribute super."mustache-haskell"; + "mustache2hs" = dontDistribute super."mustache2hs"; + "mutable-iter" = dontDistribute super."mutable-iter"; + "mute-unmute" = dontDistribute super."mute-unmute"; + "mvc" = dontDistribute super."mvc"; + "mvc-updates" = dontDistribute super."mvc-updates"; + "mvclient" = dontDistribute super."mvclient"; + "mwc-random-monad" = dontDistribute super."mwc-random-monad"; + "myTestlll" = dontDistribute super."myTestlll"; + "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; + "myo" = dontDistribute super."myo"; + "mysnapsession" = dontDistribute super."mysnapsession"; + "mysnapsession-example" = dontDistribute super."mysnapsession-example"; + "mysql-effect" = dontDistribute super."mysql-effect"; + "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; + "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mzv" = dontDistribute super."mzv"; + "n-m" = dontDistribute super."n-m"; + "nagios-perfdata" = dontDistribute super."nagios-perfdata"; + "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; + "named-formlet" = dontDistribute super."named-formlet"; + "named-lock" = dontDistribute super."named-lock"; + "named-records" = dontDistribute super."named-records"; + "namelist" = dontDistribute super."namelist"; + "names" = dontDistribute super."names"; + "names-th" = dontDistribute super."names-th"; + "nano-cryptr" = dontDistribute super."nano-cryptr"; + "nano-erl" = dontDistribute super."nano-erl"; + "nano-hmac" = dontDistribute super."nano-hmac"; + "nano-md5" = dontDistribute super."nano-md5"; + "nanoAgda" = dontDistribute super."nanoAgda"; + "nanocurses" = dontDistribute super."nanocurses"; + "nanomsg" = dontDistribute super."nanomsg"; + "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; + "nanoparsec" = dontDistribute super."nanoparsec"; + "nanq" = dontDistribute super."nanq"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "natural-transformation" = dontDistribute super."natural-transformation"; + "naturalcomp" = dontDistribute super."naturalcomp"; + "naturals" = dontDistribute super."naturals"; + "naver-translate" = dontDistribute super."naver-translate"; + "nbt" = dontDistribute super."nbt"; + "nc-indicators" = dontDistribute super."nc-indicators"; + "ncurses" = dontDistribute super."ncurses"; + "neat" = dontDistribute super."neat"; + "needle" = dontDistribute super."needle"; + "neet" = dontDistribute super."neet"; + "nehe-tuts" = dontDistribute super."nehe-tuts"; + "neil" = dontDistribute super."neil"; + "neither" = dontDistribute super."neither"; + "nemesis" = dontDistribute super."nemesis"; + "nemesis-titan" = dontDistribute super."nemesis-titan"; + "nerf" = dontDistribute super."nerf"; + "nero" = dontDistribute super."nero"; + "nero-wai" = dontDistribute super."nero-wai"; + "nero-warp" = dontDistribute super."nero-warp"; + "nested-routes" = dontDistribute super."nested-routes"; + "nested-sets" = dontDistribute super."nested-sets"; + "nestedmap" = dontDistribute super."nestedmap"; + "net-concurrent" = dontDistribute super."net-concurrent"; + "netclock" = dontDistribute super."netclock"; + "netcore" = dontDistribute super."netcore"; + "netlines" = dontDistribute super."netlines"; + "netlink" = dontDistribute super."netlink"; + "netlist" = dontDistribute super."netlist"; + "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; + "netpbm" = dontDistribute super."netpbm"; + "netrc" = dontDistribute super."netrc"; + "netspec" = dontDistribute super."netspec"; + "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle-frp" = dontDistribute super."nettle-frp"; + "nettle-netkit" = dontDistribute super."nettle-netkit"; + "nettle-openflow" = dontDistribute super."nettle-openflow"; + "netwire" = dontDistribute super."netwire"; + "netwire-input" = dontDistribute super."netwire-input"; + "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; + "network-address" = dontDistribute super."network-address"; + "network-api-support" = dontDistribute super."network-api-support"; + "network-bitcoin" = dontDistribute super."network-bitcoin"; + "network-builder" = dontDistribute super."network-builder"; + "network-bytestring" = dontDistribute super."network-bytestring"; + "network-conduit" = dontDistribute super."network-conduit"; + "network-connection" = dontDistribute super."network-connection"; + "network-data" = dontDistribute super."network-data"; + "network-dbus" = dontDistribute super."network-dbus"; + "network-dns" = dontDistribute super."network-dns"; + "network-enumerator" = dontDistribute super."network-enumerator"; + "network-fancy" = dontDistribute super."network-fancy"; + "network-interfacerequest" = dontDistribute super."network-interfacerequest"; + "network-ip" = dontDistribute super."network-ip"; + "network-metrics" = dontDistribute super."network-metrics"; + "network-minihttp" = dontDistribute super."network-minihttp"; + "network-msg" = dontDistribute super."network-msg"; + "network-netpacket" = dontDistribute super."network-netpacket"; + "network-pgi" = dontDistribute super."network-pgi"; + "network-rpca" = dontDistribute super."network-rpca"; + "network-server" = dontDistribute super."network-server"; + "network-service" = dontDistribute super."network-service"; + "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; + "network-simple-tls" = dontDistribute super."network-simple-tls"; + "network-socket-options" = dontDistribute super."network-socket-options"; + "network-stream" = dontDistribute super."network-stream"; + "network-topic-models" = dontDistribute super."network-topic-models"; + "network-transport-amqp" = dontDistribute super."network-transport-amqp"; + "network-transport-inmemory" = dontDistribute super."network-transport-inmemory"; + "network-uri-static" = dontDistribute super."network-uri-static"; + "network-wai-router" = dontDistribute super."network-wai-router"; + "network-websocket" = dontDistribute super."network-websocket"; + "networked-game" = dontDistribute super."networked-game"; + "newports" = dontDistribute super."newports"; + "newsynth" = dontDistribute super."newsynth"; + "newt" = dontDistribute super."newt"; + "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-th" = dontDistribute super."newtype-th"; + "newtyper" = dontDistribute super."newtyper"; + "nextstep-plist" = dontDistribute super."nextstep-plist"; + "nf" = dontDistribute super."nf"; + "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; + "nibblestring" = dontDistribute super."nibblestring"; + "nicify" = dontDistribute super."nicify"; + "nicify-lib" = dontDistribute super."nicify-lib"; + "nicovideo-translator" = dontDistribute super."nicovideo-translator"; + "nikepub" = dontDistribute super."nikepub"; + "nimber" = dontDistribute super."nimber"; + "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; + "nixfromnpm" = dontDistribute super."nixfromnpm"; + "nixos-types" = dontDistribute super."nixos-types"; + "nkjp" = dontDistribute super."nkjp"; + "nlp-scores" = dontDistribute super."nlp-scores"; + "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; + "nm" = dontDistribute super."nm"; + "nme" = dontDistribute super."nme"; + "nntp" = dontDistribute super."nntp"; + "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; + "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; + "nofib-analyze" = dontDistribute super."nofib-analyze"; + "noise" = dontDistribute super."noise"; + "non-empty" = dontDistribute super."non-empty"; + "non-negative" = dontDistribute super."non-negative"; + "nondeterminism" = dontDistribute super."nondeterminism"; + "nonfree" = dontDistribute super."nonfree"; + "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; + "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; + "noodle" = dontDistribute super."noodle"; + "normaldistribution" = dontDistribute super."normaldistribution"; + "not-gloss" = dontDistribute super."not-gloss"; + "not-gloss-examples" = dontDistribute super."not-gloss-examples"; + "not-in-base" = dontDistribute super."not-in-base"; + "notcpp" = dontDistribute super."notcpp"; + "notmuch-haskell" = dontDistribute super."notmuch-haskell"; + "notmuch-web" = dontDistribute super."notmuch-web"; + "notzero" = dontDistribute super."notzero"; + "np-extras" = dontDistribute super."np-extras"; + "np-linear" = dontDistribute super."np-linear"; + "nptools" = dontDistribute super."nptools"; + "nth-prime" = dontDistribute super."nth-prime"; + "nthable" = dontDistribute super."nthable"; + "ntp-control" = dontDistribute super."ntp-control"; + "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; + "number" = dontDistribute super."number"; + "number-length" = dontDistribute super."number-length"; + "numbering" = dontDistribute super."numbering"; + "numerals" = dontDistribute super."numerals"; + "numerals-base" = dontDistribute super."numerals-base"; + "numeric-limits" = dontDistribute super."numeric-limits"; + "numeric-prelude" = dontDistribute super."numeric-prelude"; + "numeric-qq" = dontDistribute super."numeric-qq"; + "numeric-quest" = dontDistribute super."numeric-quest"; + "numeric-ranges" = dontDistribute super."numeric-ranges"; + "numeric-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype" = dontDistribute super."numtype"; + "numtype-tf" = dontDistribute super."numtype-tf"; + "nurbs" = dontDistribute super."nurbs"; + "nvim-hs" = dontDistribute super."nvim-hs"; + "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; + "nyan" = dontDistribute super."nyan"; + "nylas" = dontDistribute super."nylas"; + "nymphaea" = dontDistribute super."nymphaea"; + "oauthenticated" = dontDistribute super."oauthenticated"; + "obdd" = dontDistribute super."obdd"; + "oberon0" = dontDistribute super."oberon0"; + "obj" = dontDistribute super."obj"; + "objectid" = dontDistribute super."objectid"; + "observable-sharing" = dontDistribute super."observable-sharing"; + "octane" = dontDistribute super."octane"; + "octohat" = dontDistribute super."octohat"; + "octopus" = dontDistribute super."octopus"; + "oculus" = dontDistribute super."oculus"; + "oeis" = dontDistribute super."oeis"; + "off-simple" = dontDistribute super."off-simple"; + "ohloh-hs" = dontDistribute super."ohloh-hs"; + "oi" = dontDistribute super."oi"; + "oidc-client" = dontDistribute super."oidc-client"; + "ois-input-manager" = dontDistribute super."ois-input-manager"; + "old-version" = dontDistribute super."old-version"; + "olwrapper" = dontDistribute super."olwrapper"; + "omaketex" = dontDistribute super."omaketex"; + "omega" = dontDistribute super."omega"; + "omnicodec" = dontDistribute super."omnicodec"; + "on-a-horse" = dontDistribute super."on-a-horse"; + "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; + "one-liner" = dontDistribute super."one-liner"; + "one-time-password" = dontDistribute super."one-time-password"; + "oneOfN" = dontDistribute super."oneOfN"; + "oneormore" = dontDistribute super."oneormore"; + "only" = dontDistribute super."only"; + "onu-course" = dontDistribute super."onu-course"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; + "open-haddock" = dontDistribute super."open-haddock"; + "open-pandoc" = dontDistribute super."open-pandoc"; + "open-symbology" = dontDistribute super."open-symbology"; + "open-typerep" = dontDistribute super."open-typerep"; + "open-union" = dontDistribute super."open-union"; + "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; + "opencv-raw" = dontDistribute super."opencv-raw"; + "opendatatable" = dontDistribute super."opendatatable"; + "openexchangerates" = dontDistribute super."openexchangerates"; + "openflow" = dontDistribute super."openflow"; + "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo"; + "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator"; + "opengles" = dontDistribute super."opengles"; + "openid" = dontDistribute super."openid"; + "openpgp" = dontDistribute super."openpgp"; + "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; + "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; + "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; + "openssh-github-keys" = dontDistribute super."openssh-github-keys"; + "openssl-createkey" = dontDistribute super."openssl-createkey"; + "opentheory" = dontDistribute super."opentheory"; + "opentheory-bits" = dontDistribute super."opentheory-bits"; + "opentheory-byte" = dontDistribute super."opentheory-byte"; + "opentheory-char" = dontDistribute super."opentheory-char"; + "opentheory-divides" = dontDistribute super."opentheory-divides"; + "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; + "opentheory-parser" = dontDistribute super."opentheory-parser"; + "opentheory-prime" = dontDistribute super."opentheory-prime"; + "opentheory-primitive" = dontDistribute super."opentheory-primitive"; + "opentheory-probability" = dontDistribute super."opentheory-probability"; + "opentheory-stream" = dontDistribute super."opentheory-stream"; + "opentheory-unicode" = dontDistribute super."opentheory-unicode"; + "operational-alacarte" = dontDistribute super."operational-alacarte"; + "opml" = dontDistribute super."opml"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "option" = dontDistribute super."option"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-declarative" = dontDistribute super."optparse-declarative"; + "orc" = dontDistribute super."orc"; + "orchestrate" = dontDistribute super."orchestrate"; + "orchid" = dontDistribute super."orchid"; + "orchid-demo" = dontDistribute super."orchid-demo"; + "ord-adhoc" = dontDistribute super."ord-adhoc"; + "order-maintenance" = dontDistribute super."order-maintenance"; + "order-statistics" = dontDistribute super."order-statistics"; + "ordered" = dontDistribute super."ordered"; + "orders" = dontDistribute super."orders"; + "ordrea" = dontDistribute super."ordrea"; + "organize-imports" = dontDistribute super."organize-imports"; + "orgmode" = dontDistribute super."orgmode"; + "orgmode-parse" = dontDistribute super."orgmode-parse"; + "origami" = dontDistribute super."origami"; + "os-release" = dontDistribute super."os-release"; + "osc" = dontDistribute super."osc"; + "osm-download" = dontDistribute super."osm-download"; + "oso2pdf" = dontDistribute super."oso2pdf"; + "osx-ar" = dontDistribute super."osx-ar"; + "ot" = dontDistribute super."ot"; + "ottparse-pretty" = dontDistribute super."ottparse-pretty"; + "overture" = dontDistribute super."overture"; + "pack" = dontDistribute super."pack"; + "package-o-tron" = dontDistribute super."package-o-tron"; + "package-vt" = dontDistribute super."package-vt"; + "packdeps" = dontDistribute super."packdeps"; + "packed-dawg" = dontDistribute super."packed-dawg"; + "packedstring" = dontDistribute super."packedstring"; + "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; + "packunused" = dontDistribute super."packunused"; + "pacman-memcache" = dontDistribute super."pacman-memcache"; + "padKONTROL" = dontDistribute super."padKONTROL"; + "pagarme" = dontDistribute super."pagarme"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; + "pandoc-crossref" = dontDistribute super."pandoc-crossref"; + "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; + "pandoc-lens" = dontDistribute super."pandoc-lens"; + "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; + "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "papillon" = dontDistribute super."papillon"; + "pappy" = dontDistribute super."pappy"; + "para" = dontDistribute super."para"; + "paragon" = dontDistribute super."paragon"; + "parallel-tasks" = dontDistribute super."parallel-tasks"; + "parallel-tree-search" = dontDistribute super."parallel-tree-search"; + "parameterized-data" = dontDistribute super."parameterized-data"; + "parco" = dontDistribute super."parco"; + "parco-attoparsec" = dontDistribute super."parco-attoparsec"; + "parco-parsec" = dontDistribute super."parco-parsec"; + "parcom-lib" = dontDistribute super."parcom-lib"; + "parconc-examples" = dontDistribute super."parconc-examples"; + "parport" = dontDistribute super."parport"; + "parse-dimacs" = dontDistribute super."parse-dimacs"; + "parse-help" = dontDistribute super."parse-help"; + "parsec-extra" = dontDistribute super."parsec-extra"; + "parsec-numbers" = dontDistribute super."parsec-numbers"; + "parsec-parsers" = dontDistribute super."parsec-parsers"; + "parsec-permutation" = dontDistribute super."parsec-permutation"; + "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; + "parsec-trace" = dontDistribute super."parsec-trace"; + "parsec-utils" = dontDistribute super."parsec-utils"; + "parsec1" = dontDistribute super."parsec1"; + "parsec2" = dontDistribute super."parsec2"; + "parsec3" = dontDistribute super."parsec3"; + "parsec3-numbers" = dontDistribute super."parsec3-numbers"; + "parsedate" = dontDistribute super."parsedate"; + "parsek" = dontDistribute super."parsek"; + "parsely" = dontDistribute super."parsely"; + "parser-helper" = dontDistribute super."parser-helper"; + "parser241" = dontDistribute super."parser241"; + "parsergen" = dontDistribute super."parsergen"; + "parsestar" = dontDistribute super."parsestar"; + "parsimony" = dontDistribute super."parsimony"; + "partial" = dontDistribute super."partial"; + "partial-lens" = dontDistribute super."partial-lens"; + "partial-uri" = dontDistribute super."partial-uri"; + "partly" = dontDistribute super."partly"; + "passage" = dontDistribute super."passage"; + "passwords" = dontDistribute super."passwords"; + "pastis" = dontDistribute super."pastis"; + "pasty" = dontDistribute super."pasty"; + "patch-combinators" = dontDistribute super."patch-combinators"; + "patch-image" = dontDistribute super."patch-image"; + "path-io" = doDistribute super."path-io_0_2_0"; + "pathfinding" = dontDistribute super."pathfinding"; + "pathfindingcore" = dontDistribute super."pathfindingcore"; + "pathtype" = dontDistribute super."pathtype"; + "patronscraper" = dontDistribute super."patronscraper"; + "patterns" = dontDistribute super."patterns"; + "paymill" = dontDistribute super."paymill"; + "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; + "paypal-api" = dontDistribute super."paypal-api"; + "pb" = dontDistribute super."pb"; + "pbc4hs" = dontDistribute super."pbc4hs"; + "pbkdf" = dontDistribute super."pbkdf"; + "pcap-conduit" = dontDistribute super."pcap-conduit"; + "pcap-enumerator" = dontDistribute super."pcap-enumerator"; + "pcd-loader" = dontDistribute super."pcd-loader"; + "pcf" = dontDistribute super."pcf"; + "pcg-random" = dontDistribute super."pcg-random"; + "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_1"; + "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_1"; + "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_1"; + "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; + "pdf2line" = dontDistribute super."pdf2line"; + "pdfsplit" = dontDistribute super."pdfsplit"; + "pdynload" = dontDistribute super."pdynload"; + "peakachu" = dontDistribute super."peakachu"; + "peano" = dontDistribute super."peano"; + "peano-inf" = dontDistribute super."peano-inf"; + "pec" = dontDistribute super."pec"; + "pecoff" = dontDistribute super."pecoff"; + "peg" = dontDistribute super."peg"; + "peggy" = dontDistribute super."peggy"; + "pell" = dontDistribute super."pell"; + "penn-treebank" = dontDistribute super."penn-treebank"; + "penny" = dontDistribute super."penny"; + "penny-bin" = dontDistribute super."penny-bin"; + "penny-lib" = dontDistribute super."penny-lib"; + "peparser" = dontDistribute super."peparser"; + "perceptron" = dontDistribute super."perceptron"; + "perdure" = dontDistribute super."perdure"; + "period" = dontDistribute super."period"; + "perm" = dontDistribute super."perm"; + "permutation" = dontDistribute super."permutation"; + "permute" = dontDistribute super."permute"; + "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = dontDistribute super."persistable-record"; + "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg"; + "persistent-cereal" = dontDistribute super."persistent-cereal"; + "persistent-equivalence" = dontDistribute super."persistent-equivalence"; + "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; + "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; + "persistent-map" = dontDistribute super."persistent-map"; + "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-protobuf" = dontDistribute super."persistent-protobuf"; + "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; + "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-vector" = dontDistribute super."persistent-vector"; + "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; + "persona" = dontDistribute super."persona"; + "persona-idp" = dontDistribute super."persona-idp"; + "pesca" = dontDistribute super."pesca"; + "peyotls" = dontDistribute super."peyotls"; + "peyotls-codec" = dontDistribute super."peyotls-codec"; + "pez" = dontDistribute super."pez"; + "pg-harness" = dontDistribute super."pg-harness"; + "pg-harness-client" = dontDistribute super."pg-harness-client"; + "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pgdl" = dontDistribute super."pgdl"; + "pgm" = dontDistribute super."pgm"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "phizzle" = dontDistribute super."phizzle"; + "phoityne" = dontDistribute super."phoityne"; + "phone-numbers" = dontDistribute super."phone-numbers"; + "phone-push" = dontDistribute super."phone-push"; + "phonetic-code" = dontDistribute super."phonetic-code"; + "phooey" = dontDistribute super."phooey"; + "photoname" = dontDistribute super."photoname"; + "phraskell" = dontDistribute super."phraskell"; + "phybin" = dontDistribute super."phybin"; + "pi-calculus" = dontDistribute super."pi-calculus"; + "pia-forward" = dontDistribute super."pia-forward"; + "pianola" = dontDistribute super."pianola"; + "picologic" = dontDistribute super."picologic"; + "picosat" = dontDistribute super."picosat"; + "piet" = dontDistribute super."piet"; + "piki" = dontDistribute super."piki"; + "pinboard" = dontDistribute super."pinboard"; + "pinchot" = doDistribute super."pinchot_0_6_0_0"; + "pipe-enumerator" = dontDistribute super."pipe-enumerator"; + "pipeclip" = dontDistribute super."pipeclip"; + "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-cellular" = dontDistribute super."pipes-cellular"; + "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; + "pipes-cereal" = dontDistribute super."pipes-cereal"; + "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-conduit" = dontDistribute super."pipes-conduit"; + "pipes-core" = dontDistribute super."pipes-core"; + "pipes-courier" = dontDistribute super."pipes-courier"; + "pipes-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-network-tls" = dontDistribute super."pipes-network-tls"; + "pipes-p2p" = dontDistribute super."pipes-p2p"; + "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-rt" = dontDistribute super."pipes-rt"; + "pipes-shell" = dontDistribute super."pipes-shell"; + "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_2_1"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-websockets" = dontDistribute super."pipes-websockets"; + "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; + "pipes-zlib" = dontDistribute super."pipes-zlib"; + "pisigma" = dontDistribute super."pisigma"; + "pit" = dontDistribute super."pit"; + "pitchtrack" = dontDistribute super."pitchtrack"; + "pivotal-tracker" = dontDistribute super."pivotal-tracker"; + "pkcs1" = dontDistribute super."pkcs1"; + "pkcs7" = dontDistribute super."pkcs7"; + "pkggraph" = dontDistribute super."pkggraph"; + "pktree" = dontDistribute super."pktree"; + "plailude" = dontDistribute super."plailude"; + "plan-b" = dontDistribute super."plan-b"; + "planar-graph" = dontDistribute super."planar-graph"; + "plat" = dontDistribute super."plat"; + "playlists" = dontDistribute super."playlists"; + "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; + "plivo" = dontDistribute super."plivo"; + "plot-lab" = dontDistribute super."plot-lab"; + "plotfont" = dontDistribute super."plotfont"; + "plotserver-api" = dontDistribute super."plotserver-api"; + "plugins" = dontDistribute super."plugins"; + "plugins-auto" = dontDistribute super."plugins-auto"; + "plugins-multistage" = dontDistribute super."plugins-multistage"; + "plumbers" = dontDistribute super."plumbers"; + "ply-loader" = dontDistribute super."ply-loader"; + "png-file" = dontDistribute super."png-file"; + "pngload" = dontDistribute super."pngload"; + "pngload-fixed" = dontDistribute super."pngload-fixed"; + "pnm" = dontDistribute super."pnm"; + "pocket-dns" = dontDistribute super."pocket-dns"; + "pointfree" = dontDistribute super."pointfree"; + "pointful" = dontDistribute super."pointful"; + "pointless-fun" = dontDistribute super."pointless-fun"; + "pointless-haskell" = dontDistribute super."pointless-haskell"; + "pointless-lenses" = dontDistribute super."pointless-lenses"; + "pointless-rewrite" = dontDistribute super."pointless-rewrite"; + "poker-eval" = dontDistribute super."poker-eval"; + "pokitdok" = dontDistribute super."pokitdok"; + "polar" = dontDistribute super."polar"; + "polar-configfile" = dontDistribute super."polar-configfile"; + "polar-shader" = dontDistribute super."polar-shader"; + "polh-lexicon" = dontDistribute super."polh-lexicon"; + "polimorf" = dontDistribute super."polimorf"; + "poll" = dontDistribute super."poll"; + "poly-control" = dontDistribute super."poly-control"; + "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; + "polynomial" = dontDistribute super."polynomial"; + "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; + "polyseq" = dontDistribute super."polyseq"; + "polysoup" = dontDistribute super."polysoup"; + "polytypeable" = dontDistribute super."polytypeable"; + "polytypeable-utils" = dontDistribute super."polytypeable-utils"; + "ponder" = dontDistribute super."ponder"; + "pong-server" = dontDistribute super."pong-server"; + "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; + "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; + "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; + "pony" = dontDistribute super."pony"; + "pool" = dontDistribute super."pool"; + "pool-conduit" = dontDistribute super."pool-conduit"; + "pooled-io" = dontDistribute super."pooled-io"; + "pop3-client" = dontDistribute super."pop3-client"; + "popenhs" = dontDistribute super."popenhs"; + "poppler" = dontDistribute super."poppler"; + "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; + "portable-lines" = dontDistribute super."portable-lines"; + "portaudio" = dontDistribute super."portaudio"; + "porte" = dontDistribute super."porte"; + "porter" = dontDistribute super."porter"; + "ports" = dontDistribute super."ports"; + "ports-tools" = dontDistribute super."ports-tools"; + "positive" = dontDistribute super."positive"; + "posix-acl" = dontDistribute super."posix-acl"; + "posix-escape" = dontDistribute super."posix-escape"; + "posix-filelock" = dontDistribute super."posix-filelock"; + "posix-paths" = dontDistribute super."posix-paths"; + "posix-pty" = dontDistribute super."posix-pty"; + "posix-timer" = dontDistribute super."posix-timer"; + "posix-waitpid" = dontDistribute super."posix-waitpid"; + "possible" = dontDistribute super."possible"; + "postcodes" = dontDistribute super."postcodes"; + "postgresql-config" = dontDistribute super."postgresql-config"; + "postgresql-connector" = dontDistribute super."postgresql-connector"; + "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; + "postgresql-cube" = dontDistribute super."postgresql-cube"; + "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; + "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; + "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; + "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; + "postgresql-typed" = dontDistribute super."postgresql-typed"; + "postgrest" = dontDistribute super."postgrest"; + "postie" = dontDistribute super."postie"; + "postmark" = dontDistribute super."postmark"; + "postmaster" = dontDistribute super."postmaster"; + "potato-tool" = dontDistribute super."potato-tool"; + "potrace" = dontDistribute super."potrace"; + "potrace-diagrams" = dontDistribute super."potrace-diagrams"; + "powermate" = dontDistribute super."powermate"; + "powerpc" = dontDistribute super."powerpc"; + "ppm" = dontDistribute super."ppm"; + "pqc" = dontDistribute super."pqc"; + "pqueue-mtl" = dontDistribute super."pqueue-mtl"; + "practice-room" = dontDistribute super."practice-room"; + "precis" = dontDistribute super."precis"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "prefork" = dontDistribute super."prefork"; + "pregame" = dontDistribute super."pregame"; + "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-generalize" = dontDistribute super."prelude-generalize"; + "prelude-plus" = dontDistribute super."prelude-plus"; + "prelude-prime" = dontDistribute super."prelude-prime"; + "prelude-safeenum" = dontDistribute super."prelude-safeenum"; + "preprocess-haskell" = dontDistribute super."preprocess-haskell"; + "preprocessor-tools" = dontDistribute super."preprocessor-tools"; + "present" = dontDistribute super."present"; + "press" = dontDistribute super."press"; + "presto-hdbc" = dontDistribute super."presto-hdbc"; + "prettify" = dontDistribute super."prettify"; + "pretty-compact" = dontDistribute super."pretty-compact"; + "pretty-error" = dontDistribute super."pretty-error"; + "pretty-hex" = dontDistribute super."pretty-hex"; + "pretty-ncols" = dontDistribute super."pretty-ncols"; + "pretty-sop" = dontDistribute super."pretty-sop"; + "pretty-tree" = dontDistribute super."pretty-tree"; + "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; + "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive-simd" = dontDistribute super."primitive-simd"; + "primula-board" = dontDistribute super."primula-board"; + "primula-bot" = dontDistribute super."primula-bot"; + "printf-mauke" = dontDistribute super."printf-mauke"; + "printxosd" = dontDistribute super."printxosd"; + "priority-queue" = dontDistribute super."priority-queue"; + "priority-sync" = dontDistribute super."priority-sync"; + "privileged-concurrency" = dontDistribute super."privileged-concurrency"; + "prizm" = dontDistribute super."prizm"; + "probability" = dontDistribute super."probability"; + "probable" = dontDistribute super."probable"; + "proc" = dontDistribute super."proc"; + "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_7"; + "process-iterio" = dontDistribute super."process-iterio"; + "process-leksah" = dontDistribute super."process-leksah"; + "process-listlike" = dontDistribute super."process-listlike"; + "process-progress" = dontDistribute super."process-progress"; + "process-qq" = dontDistribute super."process-qq"; + "process-streaming" = dontDistribute super."process-streaming"; + "processing" = dontDistribute super."processing"; + "processor-creative-kit" = dontDistribute super."processor-creative-kit"; + "procrastinating-structure" = dontDistribute super."procrastinating-structure"; + "procrastinating-variable" = dontDistribute super."procrastinating-variable"; + "procstat" = dontDistribute super."procstat"; + "proctest" = dontDistribute super."proctest"; + "prof2dot" = dontDistribute super."prof2dot"; + "prof2pretty" = dontDistribute super."prof2pretty"; + "profiteur" = dontDistribute super."profiteur"; + "progress" = dontDistribute super."progress"; + "progressbar" = dontDistribute super."progressbar"; + "progression" = dontDistribute super."progression"; + "progressive" = dontDistribute super."progressive"; + "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; + "projection" = dontDistribute super."projection"; + "prolog" = dontDistribute super."prolog"; + "prolog-graph" = dontDistribute super."prolog-graph"; + "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; + "prologue" = dontDistribute super."prologue"; + "promise" = dontDistribute super."promise"; + "promises" = dontDistribute super."promises"; + "propane" = dontDistribute super."propane"; + "propellor" = dontDistribute super."propellor"; + "properties" = dontDistribute super."properties"; + "property-list" = dontDistribute super."property-list"; + "proplang" = dontDistribute super."proplang"; + "props" = dontDistribute super."props"; + "prosper" = dontDistribute super."prosper"; + "proteaaudio" = dontDistribute super."proteaaudio"; + "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; + "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "proton-haskell" = dontDistribute super."proton-haskell"; + "prototype" = dontDistribute super."prototype"; + "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; + "proxy-kindness" = dontDistribute super."proxy-kindness"; + "psc-ide" = doDistribute super."psc-ide_0_5_0"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_2_0"; + "pub" = dontDistribute super."pub"; + "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; + "publicsuffixlist" = dontDistribute super."publicsuffixlist"; + "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; + "pubnub" = dontDistribute super."pubnub"; + "pubsub" = dontDistribute super."pubsub"; + "puffytools" = dontDistribute super."puffytools"; + "pugixml" = dontDistribute super."pugixml"; + "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; + "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; + "pugs-compat" = dontDistribute super."pugs-compat"; + "pugs-hsregex" = dontDistribute super."pugs-hsregex"; + "pulse-simple" = dontDistribute super."pulse-simple"; + "punkt" = dontDistribute super."punkt"; + "punycode" = dontDistribute super."punycode"; + "puppetresources" = dontDistribute super."puppetresources"; + "pure-fft" = dontDistribute super."pure-fft"; + "pure-priority-queue" = dontDistribute super."pure-priority-queue"; + "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; + "pure-zlib" = dontDistribute super."pure-zlib"; + "purescript" = doDistribute super."purescript_0_7_6_1"; + "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; + "push-notify" = dontDistribute super."push-notify"; + "push-notify-ccs" = dontDistribute super."push-notify-ccs"; + "push-notify-general" = dontDistribute super."push-notify-general"; + "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pushme" = dontDistribute super."pushme"; + "putlenses" = dontDistribute super."putlenses"; + "puzzle-draw" = dontDistribute super."puzzle-draw"; + "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; + "pvd" = dontDistribute super."pvd"; + "pwstore-cli" = dontDistribute super."pwstore-cli"; + "pxsl-tools" = dontDistribute super."pxsl-tools"; + "pyffi" = dontDistribute super."pyffi"; + "pyfi" = dontDistribute super."pyfi"; + "python-pickle" = dontDistribute super."python-pickle"; + "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; + "qd" = dontDistribute super."qd"; + "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; + "qhull-simple" = dontDistribute super."qhull-simple"; + "qrcode" = dontDistribute super."qrcode"; + "qt" = dontDistribute super."qt"; + "quadratic-irrational" = dontDistribute super."quadratic-irrational"; + "quantfin" = dontDistribute super."quantfin"; + "quantities" = dontDistribute super."quantities"; + "quantum-arrow" = dontDistribute super."quantum-arrow"; + "qudb" = dontDistribute super."qudb"; + "quenya-verb" = dontDistribute super."quenya-verb"; + "querystring-pickle" = dontDistribute super."querystring-pickle"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-poly" = dontDistribute super."quickcheck-poly"; + "quickcheck-properties" = dontDistribute super."quickcheck-properties"; + "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; + "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; + "quickcheck-regex" = dontDistribute super."quickcheck-regex"; + "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; + "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; + "quickcheck-script" = dontDistribute super."quickcheck-script"; + "quickcheck-simple" = dontDistribute super."quickcheck-simple"; + "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; + "quicklz" = dontDistribute super."quicklz"; + "quickpull" = dontDistribute super."quickpull"; + "quickset" = dontDistribute super."quickset"; + "quickspec" = dontDistribute super."quickspec"; + "quicktest" = dontDistribute super."quicktest"; + "quickwebapp" = dontDistribute super."quickwebapp"; + "quiver" = dontDistribute super."quiver"; + "quiver-bytestring" = dontDistribute super."quiver-bytestring"; + "quiver-cell" = dontDistribute super."quiver-cell"; + "quiver-csv" = dontDistribute super."quiver-csv"; + "quiver-enumerator" = dontDistribute super."quiver-enumerator"; + "quiver-http" = dontDistribute super."quiver-http"; + "quoridor-hs" = dontDistribute super."quoridor-hs"; + "qux" = dontDistribute super."qux"; + "rabocsv2qif" = dontDistribute super."rabocsv2qif"; + "rad" = dontDistribute super."rad"; + "radian" = dontDistribute super."radian"; + "radium" = dontDistribute super."radium"; + "radium-formula-parser" = dontDistribute super."radium-formula-parser"; + "radix" = dontDistribute super."radix"; + "rados-haskell" = dontDistribute super."rados-haskell"; + "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rake" = dontDistribute super."rake"; + "rakhana" = dontDistribute super."rakhana"; + "ralist" = dontDistribute super."ralist"; + "rallod" = dontDistribute super."rallod"; + "raml" = dontDistribute super."raml"; + "rand-vars" = dontDistribute super."rand-vars"; + "randfile" = dontDistribute super."randfile"; + "random-access-list" = dontDistribute super."random-access-list"; + "random-derive" = dontDistribute super."random-derive"; + "random-eff" = dontDistribute super."random-eff"; + "random-effin" = dontDistribute super."random-effin"; + "random-extras" = dontDistribute super."random-extras"; + "random-hypergeometric" = dontDistribute super."random-hypergeometric"; + "random-stream" = dontDistribute super."random-stream"; + "random-variates" = dontDistribute super."random-variates"; + "randomgen" = dontDistribute super."randomgen"; + "randproc" = dontDistribute super."randproc"; + "randsolid" = dontDistribute super."randsolid"; + "range-space" = dontDistribute super."range-space"; + "rangemin" = dontDistribute super."rangemin"; + "ranges" = dontDistribute super."ranges"; + "rascal" = dontDistribute super."rascal"; + "rate-limit" = dontDistribute super."rate-limit"; + "ratio-int" = dontDistribute super."ratio-int"; + "raven-haskell" = dontDistribute super."raven-haskell"; + "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "rawstring-qm" = dontDistribute super."rawstring-qm"; + "razom-text-util" = dontDistribute super."razom-text-util"; + "rbr" = dontDistribute super."rbr"; + "rclient" = dontDistribute super."rclient"; + "rcu" = dontDistribute super."rcu"; + "rdf4h" = dontDistribute super."rdf4h"; + "rdioh" = dontDistribute super."rdioh"; + "rdtsc" = dontDistribute super."rdtsc"; + "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; + "re2" = dontDistribute super."re2"; + "react-flux" = dontDistribute super."react-flux"; + "react-haskell" = dontDistribute super."react-haskell"; + "reaction-logic" = dontDistribute super."reaction-logic"; + "reactive" = dontDistribute super."reactive"; + "reactive-bacon" = dontDistribute super."reactive-bacon"; + "reactive-balsa" = dontDistribute super."reactive-balsa"; + "reactive-banana" = dontDistribute super."reactive-banana"; + "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; + "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; + "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; + "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; + "reactive-glut" = dontDistribute super."reactive-glut"; + "reactive-haskell" = dontDistribute super."reactive-haskell"; + "reactive-io" = dontDistribute super."reactive-io"; + "reactive-thread" = dontDistribute super."reactive-thread"; + "reactor" = dontDistribute super."reactor"; + "read-bounded" = dontDistribute super."read-bounded"; + "readline-statevar" = dontDistribute super."readline-statevar"; + "readpyc" = dontDistribute super."readpyc"; + "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; + "reasonable-lens" = dontDistribute super."reasonable-lens"; + "reasonable-operational" = dontDistribute super."reasonable-operational"; + "rebase" = dontDistribute super."rebase"; + "recaptcha" = dontDistribute super."recaptcha"; + "record" = dontDistribute super."record"; + "record-aeson" = dontDistribute super."record-aeson"; + "record-gl" = dontDistribute super."record-gl"; + "record-preprocessor" = dontDistribute super."record-preprocessor"; + "record-syntax" = dontDistribute super."record-syntax"; + "records" = dontDistribute super."records"; + "records-th" = dontDistribute super."records-th"; + "recursive-line-count" = dontDistribute super."recursive-line-count"; + "redHandlers" = dontDistribute super."redHandlers"; + "reddit" = dontDistribute super."reddit"; + "redis" = dontDistribute super."redis"; + "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; + "redis-simple" = dontDistribute super."redis-simple"; + "redo" = dontDistribute super."redo"; + "reedsolomon" = dontDistribute super."reedsolomon"; + "reenact" = dontDistribute super."reenact"; + "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; + "ref" = dontDistribute super."ref"; + "ref-mtl" = dontDistribute super."ref-mtl"; + "ref-tf" = dontDistribute super."ref-tf"; + "refcount" = dontDistribute super."refcount"; + "reference" = dontDistribute super."reference"; + "references" = dontDistribute super."references"; + "refh" = dontDistribute super."refh"; + "refined" = dontDistribute super."refined"; + "reflection-extras" = dontDistribute super."reflection-extras"; + "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; + "reflex" = dontDistribute super."reflex"; + "reflex-animation" = dontDistribute super."reflex-animation"; + "reflex-dom" = dontDistribute super."reflex-dom"; + "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; + "reflex-gloss" = dontDistribute super."reflex-gloss"; + "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-transformers" = dontDistribute super."reflex-transformers"; + "regex-deriv" = dontDistribute super."regex-deriv"; + "regex-dfa" = dontDistribute super."regex-dfa"; + "regex-easy" = dontDistribute super."regex-easy"; + "regex-genex" = dontDistribute super."regex-genex"; + "regex-parsec" = dontDistribute super."regex-parsec"; + "regex-pderiv" = dontDistribute super."regex-pderiv"; + "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; + "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; + "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; + "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; + "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; + "regex-tre" = dontDistribute super."regex-tre"; + "regex-xmlschema" = dontDistribute super."regex-xmlschema"; + "regexchar" = dontDistribute super."regexchar"; + "regexdot" = dontDistribute super."regexdot"; + "regexp-tries" = dontDistribute super."regexp-tries"; + "regexpr" = dontDistribute super."regexpr"; + "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; + "regexqq" = dontDistribute super."regexqq"; + "regional-pointers" = dontDistribute super."regional-pointers"; + "regions" = dontDistribute super."regions"; + "regions-monadsfd" = dontDistribute super."regions-monadsfd"; + "regions-monadstf" = dontDistribute super."regions-monadstf"; + "regions-mtl" = dontDistribute super."regions-mtl"; + "regress" = dontDistribute super."regress"; + "regular" = dontDistribute super."regular"; + "regular-extras" = dontDistribute super."regular-extras"; + "regular-web" = dontDistribute super."regular-web"; + "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; + "reheat" = dontDistribute super."reheat"; + "rehoo" = dontDistribute super."rehoo"; + "rei" = dontDistribute super."rei"; + "reified-records" = dontDistribute super."reified-records"; + "reify" = dontDistribute super."reify"; + "relacion" = dontDistribute super."relacion"; + "relation" = dontDistribute super."relation"; + "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = dontDistribute super."relational-query"; + "relational-query-HDBC" = dontDistribute super."relational-query-HDBC"; + "relational-record" = dontDistribute super."relational-record"; + "relational-record-examples" = dontDistribute super."relational-record-examples"; + "relational-schemas" = dontDistribute super."relational-schemas"; + "relative-date" = dontDistribute super."relative-date"; + "relit" = dontDistribute super."relit"; + "rematch" = dontDistribute super."rematch"; + "rematch-text" = dontDistribute super."rematch-text"; + "remote" = dontDistribute super."remote"; + "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-monad" = dontDistribute super."remote-monad"; + "remotion" = dontDistribute super."remotion"; + "renderable" = dontDistribute super."renderable"; + "reord" = dontDistribute super."reord"; + "reorderable" = dontDistribute super."reorderable"; + "repa-array" = dontDistribute super."repa-array"; + "repa-bytestring" = dontDistribute super."repa-bytestring"; + "repa-convert" = dontDistribute super."repa-convert"; + "repa-eval" = dontDistribute super."repa-eval"; + "repa-examples" = dontDistribute super."repa-examples"; + "repa-fftw" = dontDistribute super."repa-fftw"; + "repa-flow" = dontDistribute super."repa-flow"; + "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; + "repa-plugin" = dontDistribute super."repa-plugin"; + "repa-scalar" = dontDistribute super."repa-scalar"; + "repa-series" = dontDistribute super."repa-series"; + "repa-sndfile" = dontDistribute super."repa-sndfile"; + "repa-stream" = dontDistribute super."repa-stream"; + "repa-v4l2" = dontDistribute super."repa-v4l2"; + "repl" = dontDistribute super."repl"; + "repl-toolkit" = dontDistribute super."repl-toolkit"; + "repline" = dontDistribute super."repline"; + "repo-based-blog" = dontDistribute super."repo-based-blog"; + "repr" = dontDistribute super."repr"; + "repr-tree-syb" = dontDistribute super."repr-tree-syb"; + "representable-functors" = dontDistribute super."representable-functors"; + "representable-profunctors" = dontDistribute super."representable-profunctors"; + "representable-tries" = dontDistribute super."representable-tries"; + "request-monad" = dontDistribute super."request-monad"; + "reserve" = dontDistribute super."reserve"; + "resistor-cube" = dontDistribute super."resistor-cube"; + "resource-effect" = dontDistribute super."resource-effect"; + "resource-embed" = dontDistribute super."resource-embed"; + "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; + "resource-pool-monad" = dontDistribute super."resource-pool-monad"; + "resource-simple" = dontDistribute super."resource-simple"; + "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_37"; + "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_19_0_1"; + "restful-snap" = dontDistribute super."restful-snap"; + "restricted-workers" = dontDistribute super."restricted-workers"; + "restyle" = dontDistribute super."restyle"; + "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb-model" = dontDistribute super."rethinkdb-model"; + "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retryer" = dontDistribute super."retryer"; + "revdectime" = dontDistribute super."revdectime"; + "reverse-apply" = dontDistribute super."reverse-apply"; + "reverse-geocoding" = dontDistribute super."reverse-geocoding"; + "reversi" = dontDistribute super."reversi"; + "rewrite" = dontDistribute super."rewrite"; + "rewriting" = dontDistribute super."rewriting"; + "rex" = dontDistribute super."rex"; + "rezoom" = dontDistribute super."rezoom"; + "rfc3339" = dontDistribute super."rfc3339"; + "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; + "richreports" = dontDistribute super."richreports"; + "riemann" = dontDistribute super."riemann"; + "riff" = dontDistribute super."riff"; + "ring-buffer" = dontDistribute super."ring-buffer"; + "riot" = dontDistribute super."riot"; + "ripple" = dontDistribute super."ripple"; + "ripple-federation" = dontDistribute super."ripple-federation"; + "risc386" = dontDistribute super."risc386"; + "rivers" = dontDistribute super."rivers"; + "rivet" = dontDistribute super."rivet"; + "rivet-core" = dontDistribute super."rivet-core"; + "rivet-migration" = dontDistribute super."rivet-migration"; + "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; + "rlglue" = dontDistribute super."rlglue"; + "rmonad" = dontDistribute super."rmonad"; + "rncryptor" = dontDistribute super."rncryptor"; + "rng-utils" = dontDistribute super."rng-utils"; + "robin" = dontDistribute super."robin"; + "robot" = dontDistribute super."robot"; + "robots-txt" = dontDistribute super."robots-txt"; + "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; + "roguestar" = dontDistribute super."roguestar"; + "roguestar-engine" = dontDistribute super."roguestar-engine"; + "roguestar-gl" = dontDistribute super."roguestar-gl"; + "roguestar-glut" = dontDistribute super."roguestar-glut"; + "rollbar" = dontDistribute super."rollbar"; + "roller" = dontDistribute super."roller"; + "rolling-queue" = dontDistribute super."rolling-queue"; + "roman-numerals" = dontDistribute super."roman-numerals"; + "romkan" = dontDistribute super."romkan"; + "roots" = dontDistribute super."roots"; + "rope" = dontDistribute super."rope"; + "rosa" = dontDistribute super."rosa"; + "rose-trie" = dontDistribute super."rose-trie"; + "roshask" = dontDistribute super."roshask"; + "rosso" = dontDistribute super."rosso"; + "rot13" = dontDistribute super."rot13"; + "rotating-log" = dontDistribute super."rotating-log"; + "rounding" = dontDistribute super."rounding"; + "roundtrip" = dontDistribute super."roundtrip"; + "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; + "roundtrip-string" = dontDistribute super."roundtrip-string"; + "roundtrip-xml" = dontDistribute super."roundtrip-xml"; + "route-generator" = dontDistribute super."route-generator"; + "route-planning" = dontDistribute super."route-planning"; + "rowrecord" = dontDistribute super."rowrecord"; + "rpc" = dontDistribute super."rpc"; + "rpc-framework" = dontDistribute super."rpc-framework"; + "rpf" = dontDistribute super."rpf"; + "rpm" = dontDistribute super."rpm"; + "rsagl" = dontDistribute super."rsagl"; + "rsagl-frp" = dontDistribute super."rsagl-frp"; + "rsagl-math" = dontDistribute super."rsagl-math"; + "rspp" = dontDistribute super."rspp"; + "rss" = dontDistribute super."rss"; + "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; + "rtld" = dontDistribute super."rtld"; + "rtlsdr" = dontDistribute super."rtlsdr"; + "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; + "rtorrent-state" = dontDistribute super."rtorrent-state"; + "rubberband" = dontDistribute super."rubberband"; + "ruby-marshal" = dontDistribute super."ruby-marshal"; + "ruby-qq" = dontDistribute super."ruby-qq"; + "ruff" = dontDistribute super."ruff"; + "ruler" = dontDistribute super."ruler"; + "ruler-core" = dontDistribute super."ruler-core"; + "rungekutta" = dontDistribute super."rungekutta"; + "runghc" = dontDistribute super."runghc"; + "rwlock" = dontDistribute super."rwlock"; + "rws" = dontDistribute super."rws"; + "s-cargot" = dontDistribute super."s-cargot"; + "safe-access" = dontDistribute super."safe-access"; + "safe-failure" = dontDistribute super."safe-failure"; + "safe-failure-cme" = dontDistribute super."safe-failure-cme"; + "safe-freeze" = dontDistribute super."safe-freeze"; + "safe-globals" = dontDistribute super."safe-globals"; + "safe-lazy-io" = dontDistribute super."safe-lazy-io"; + "safe-length" = dontDistribute super."safe-length"; + "safe-plugins" = dontDistribute super."safe-plugins"; + "safe-printf" = dontDistribute super."safe-printf"; + "safeint" = dontDistribute super."safeint"; + "safer-file-handles" = dontDistribute super."safer-file-handles"; + "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; + "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; + "saferoute" = dontDistribute super."saferoute"; + "sai-shape-syb" = dontDistribute super."sai-shape-syb"; + "saltine" = dontDistribute super."saltine"; + "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; + "salvia" = dontDistribute super."salvia"; + "salvia-demo" = dontDistribute super."salvia-demo"; + "salvia-extras" = dontDistribute super."salvia-extras"; + "salvia-protocol" = dontDistribute super."salvia-protocol"; + "salvia-sessions" = dontDistribute super."salvia-sessions"; + "salvia-websocket" = dontDistribute super."salvia-websocket"; + "sample-frame" = dontDistribute super."sample-frame"; + "sample-frame-np" = dontDistribute super."sample-frame-np"; + "samtools" = dontDistribute super."samtools"; + "samtools-conduit" = dontDistribute super."samtools-conduit"; + "samtools-enumerator" = dontDistribute super."samtools-enumerator"; + "samtools-iteratee" = dontDistribute super."samtools-iteratee"; + "sandlib" = dontDistribute super."sandlib"; + "sarasvati" = dontDistribute super."sarasvati"; + "sasl" = dontDistribute super."sasl"; + "sat" = dontDistribute super."sat"; + "sat-micro-hs" = dontDistribute super."sat-micro-hs"; + "satchmo" = dontDistribute super."satchmo"; + "satchmo-backends" = dontDistribute super."satchmo-backends"; + "satchmo-examples" = dontDistribute super."satchmo-examples"; + "satchmo-funsat" = dontDistribute super."satchmo-funsat"; + "satchmo-minisat" = dontDistribute super."satchmo-minisat"; + "satchmo-toysat" = dontDistribute super."satchmo-toysat"; + "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; + "sc3-rdu" = dontDistribute super."sc3-rdu"; + "scalable-server" = dontDistribute super."scalable-server"; + "scaleimage" = dontDistribute super."scaleimage"; + "scalp-webhooks" = dontDistribute super."scalp-webhooks"; + "scalpel" = doDistribute super."scalpel_0_2_1_1"; + "scan" = dontDistribute super."scan"; + "scan-vector-machine" = dontDistribute super."scan-vector-machine"; + "scat" = dontDistribute super."scat"; + "scc" = dontDistribute super."scc"; + "scenegraph" = dontDistribute super."scenegraph"; + "scgi" = dontDistribute super."scgi"; + "schedevr" = dontDistribute super."schedevr"; + "schedule-planner" = dontDistribute super."schedule-planner"; + "schedyield" = dontDistribute super."schedyield"; + "scholdoc" = dontDistribute super."scholdoc"; + "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; + "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; + "scholdoc-types" = dontDistribute super."scholdoc-types"; + "schonfinkeling" = dontDistribute super."schonfinkeling"; + "sci-ratio" = dontDistribute super."sci-ratio"; + "science-constants" = dontDistribute super."science-constants"; + "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; + "scion" = dontDistribute super."scion"; + "scion-browser" = dontDistribute super."scion-browser"; + "scons2dot" = dontDistribute super."scons2dot"; + "scope" = dontDistribute super."scope"; + "scope-cairo" = dontDistribute super."scope-cairo"; + "scottish" = dontDistribute super."scottish"; + "scotty" = doDistribute super."scotty_0_10_2"; + "scotty-binding-play" = dontDistribute super."scotty-binding-play"; + "scotty-blaze" = dontDistribute super."scotty-blaze"; + "scotty-cookie" = dontDistribute super."scotty-cookie"; + "scotty-fay" = dontDistribute super."scotty-fay"; + "scotty-hastache" = dontDistribute super."scotty-hastache"; + "scotty-rest" = dontDistribute super."scotty-rest"; + "scotty-session" = dontDistribute super."scotty-session"; + "scotty-tls" = dontDistribute super."scotty-tls"; + "scp-streams" = dontDistribute super."scp-streams"; + "scrabble-bot" = dontDistribute super."scrabble-bot"; + "scrobble" = dontDistribute super."scrobble"; + "scroll" = dontDistribute super."scroll"; + "scrz" = dontDistribute super."scrz"; + "scyther-proof" = dontDistribute super."scyther-proof"; + "sde-solver" = dontDistribute super."sde-solver"; + "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; + "sdl2-cairo" = dontDistribute super."sdl2-cairo"; + "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; + "sdl2-compositor" = dontDistribute super."sdl2-compositor"; + "sdl2-image" = dontDistribute super."sdl2-image"; + "sdl2-ttf" = dontDistribute super."sdl2-ttf"; + "sdnv" = dontDistribute super."sdnv"; + "sdr" = dontDistribute super."sdr"; + "seacat" = dontDistribute super."seacat"; + "seal-module" = dontDistribute super."seal-module"; + "search" = dontDistribute super."search"; + "sec" = dontDistribute super."sec"; + "secdh" = dontDistribute super."secdh"; + "seclib" = dontDistribute super."seclib"; + "secp256k1" = dontDistribute super."secp256k1"; + "secret-santa" = dontDistribute super."secret-santa"; + "secret-sharing" = dontDistribute super."secret-sharing"; + "secrm" = dontDistribute super."secrm"; + "secure-sockets" = dontDistribute super."secure-sockets"; + "sednaDBXML" = dontDistribute super."sednaDBXML"; + "select" = dontDistribute super."select"; + "selectors" = dontDistribute super."selectors"; + "selenium" = dontDistribute super."selenium"; + "selenium-server" = dontDistribute super."selenium-server"; + "selfrestart" = dontDistribute super."selfrestart"; + "selinux" = dontDistribute super."selinux"; + "semaphore-plus" = dontDistribute super."semaphore-plus"; + "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; + "semigroups-actions" = dontDistribute super."semigroups-actions"; + "semiring" = dontDistribute super."semiring"; + "semiring-simple" = dontDistribute super."semiring-simple"; + "semver-range" = dontDistribute super."semver-range"; + "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; + "sensenet" = dontDistribute super."sensenet"; + "sentry" = dontDistribute super."sentry"; + "senza" = dontDistribute super."senza"; + "separated" = dontDistribute super."separated"; + "seqaid" = dontDistribute super."seqaid"; + "seqid" = dontDistribute super."seqid"; + "seqid-streams" = dontDistribute super."seqid-streams"; + "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; + "sequence" = dontDistribute super."sequence"; + "sequent-core" = dontDistribute super."sequent-core"; + "sequential-index" = dontDistribute super."sequential-index"; + "sequor" = dontDistribute super."sequor"; + "serial" = dontDistribute super."serial"; + "serial-test-generators" = dontDistribute super."serial-test-generators"; + "serialport" = dontDistribute super."serialport"; + "serv" = dontDistribute super."serv"; + "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; + "servant-lucid" = dontDistribute super."servant-lucid"; + "servant-mock" = dontDistribute super."servant-mock"; + "servant-pandoc" = dontDistribute super."servant-pandoc"; + "servant-pool" = dontDistribute super."servant-pool"; + "servant-postgresql" = dontDistribute super."servant-postgresql"; + "servant-response" = dontDistribute super."servant-response"; + "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-swagger" = doDistribute super."servant-swagger_0_1_2"; + "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; + "sessions" = dontDistribute super."sessions"; + "set-cover" = dontDistribute super."set-cover"; + "set-with" = dontDistribute super."set-with"; + "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; + "setops" = dontDistribute super."setops"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-grammar" = dontDistribute super."sexp-grammar"; + "sexp-show" = dontDistribute super."sexp-show"; + "sexpr" = dontDistribute super."sexpr"; + "sext" = dontDistribute super."sext"; + "sfml-audio" = dontDistribute super."sfml-audio"; + "sfmt" = dontDistribute super."sfmt"; + "sgd" = dontDistribute super."sgd"; + "sgf" = dontDistribute super."sgf"; + "sgrep" = dontDistribute super."sgrep"; + "sha-streams" = dontDistribute super."sha-streams"; + "shadower" = dontDistribute super."shadower"; + "shadowsocks" = dontDistribute super."shadowsocks"; + "shady-gen" = dontDistribute super."shady-gen"; + "shady-graphics" = dontDistribute super."shady-graphics"; + "shake-cabal-build" = dontDistribute super."shake-cabal-build"; + "shake-extras" = dontDistribute super."shake-extras"; + "shake-minify" = dontDistribute super."shake-minify"; + "shake-pack" = dontDistribute super."shake-pack"; + "shake-persist" = dontDistribute super."shake-persist"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; + "shakespeare-css" = dontDistribute super."shakespeare-css"; + "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; + "shakespeare-js" = dontDistribute super."shakespeare-js"; + "shakespeare-text" = dontDistribute super."shakespeare-text"; + "shana" = dontDistribute super."shana"; + "shapefile" = dontDistribute super."shapefile"; + "shapely-data" = dontDistribute super."shapely-data"; + "sharc-timbre" = dontDistribute super."sharc-timbre"; + "shared-buffer" = dontDistribute super."shared-buffer"; + "shared-fields" = dontDistribute super."shared-fields"; + "shared-memory" = dontDistribute super."shared-memory"; + "sharedio" = dontDistribute super."sharedio"; + "she" = dontDistribute super."she"; + "shelduck" = dontDistribute super."shelduck"; + "shell-escape" = dontDistribute super."shell-escape"; + "shell-monad" = dontDistribute super."shell-monad"; + "shell-pipe" = dontDistribute super."shell-pipe"; + "shellish" = dontDistribute super."shellish"; + "shellmate" = dontDistribute super."shellmate"; + "shelly-extra" = dontDistribute super."shelly-extra"; + "shivers-cfg" = dontDistribute super."shivers-cfg"; + "shoap" = dontDistribute super."shoap"; + "shortcircuit" = dontDistribute super."shortcircuit"; + "shorten-strings" = dontDistribute super."shorten-strings"; + "show" = dontDistribute super."show"; + "show-type" = dontDistribute super."show-type"; + "showdown" = dontDistribute super."showdown"; + "shpider" = dontDistribute super."shpider"; + "shplit" = dontDistribute super."shplit"; + "shqq" = dontDistribute super."shqq"; + "shuffle" = dontDistribute super."shuffle"; + "sieve" = dontDistribute super."sieve"; + "sifflet" = dontDistribute super."sifflet"; + "sifflet-lib" = dontDistribute super."sifflet-lib"; + "sign" = dontDistribute super."sign"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "simple-actors" = dontDistribute super."simple-actors"; + "simple-atom" = dontDistribute super."simple-atom"; + "simple-bluetooth" = dontDistribute super."simple-bluetooth"; + "simple-c-value" = dontDistribute super."simple-c-value"; + "simple-conduit" = dontDistribute super."simple-conduit"; + "simple-config" = dontDistribute super."simple-config"; + "simple-css" = dontDistribute super."simple-css"; + "simple-eval" = dontDistribute super."simple-eval"; + "simple-firewire" = dontDistribute super."simple-firewire"; + "simple-form" = dontDistribute super."simple-form"; + "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; + "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; + "simple-get-opt" = dontDistribute super."simple-get-opt"; + "simple-index" = dontDistribute super."simple-index"; + "simple-log" = dontDistribute super."simple-log"; + "simple-log-syslog" = dontDistribute super."simple-log-syslog"; + "simple-neural-networks" = dontDistribute super."simple-neural-networks"; + "simple-nix" = dontDistribute super."simple-nix"; + "simple-observer" = dontDistribute super."simple-observer"; + "simple-pascal" = dontDistribute super."simple-pascal"; + "simple-pipe" = dontDistribute super."simple-pipe"; + "simple-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "simple-sessions" = dontDistribute super."simple-sessions"; + "simple-sql-parser" = dontDistribute super."simple-sql-parser"; + "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; + "simple-tabular" = dontDistribute super."simple-tabular"; + "simple-vec3" = dontDistribute super."simple-vec3"; + "simpleargs" = dontDistribute super."simpleargs"; + "simpleirc" = dontDistribute super."simpleirc"; + "simpleirc-lens" = dontDistribute super."simpleirc-lens"; + "simplenote" = dontDistribute super."simplenote"; + "simpleprelude" = dontDistribute super."simpleprelude"; + "simplesmtpclient" = dontDistribute super."simplesmtpclient"; + "simplessh" = dontDistribute super."simplessh"; + "simplest-sqlite" = dontDistribute super."simplest-sqlite"; + "simplex" = dontDistribute super."simplex"; + "simplex-basic" = dontDistribute super."simplex-basic"; + "simseq" = dontDistribute super."simseq"; + "simtreelo" = dontDistribute super."simtreelo"; + "sindre" = dontDistribute super."sindre"; + "singleton-nats" = dontDistribute super."singleton-nats"; + "sink" = dontDistribute super."sink"; + "sirkel" = dontDistribute super."sirkel"; + "sitemap" = dontDistribute super."sitemap"; + "sized" = dontDistribute super."sized"; + "sized-types" = dontDistribute super."sized-types"; + "sized-vector" = dontDistribute super."sized-vector"; + "sizes" = dontDistribute super."sizes"; + "sjsp" = dontDistribute super."sjsp"; + "skeleton" = dontDistribute super."skeleton"; + "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; + "skype4hs" = dontDistribute super."skype4hs"; + "skypelogexport" = dontDistribute super."skypelogexport"; + "slack" = dontDistribute super."slack"; + "slack-api" = dontDistribute super."slack-api"; + "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; + "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; + "slidemews" = dontDistribute super."slidemews"; + "sloane" = dontDistribute super."sloane"; + "slot-lambda" = dontDistribute super."slot-lambda"; + "sloth" = dontDistribute super."sloth"; + "smallarray" = dontDistribute super."smallarray"; + "smallcheck-laws" = dontDistribute super."smallcheck-laws"; + "smallcheck-lens" = dontDistribute super."smallcheck-lens"; + "smallcheck-series" = dontDistribute super."smallcheck-series"; + "smallpt-hs" = dontDistribute super."smallpt-hs"; + "smallstring" = dontDistribute super."smallstring"; + "smaoin" = dontDistribute super."smaoin"; + "smartGroup" = dontDistribute super."smartGroup"; + "smartcheck" = dontDistribute super."smartcheck"; + "smartconstructor" = dontDistribute super."smartconstructor"; + "smartword" = dontDistribute super."smartword"; + "sme" = dontDistribute super."sme"; + "smt-lib" = dontDistribute super."smt-lib"; + "smtlib2" = dontDistribute super."smtlib2"; + "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; + "smtp2mta" = dontDistribute super."smtp2mta"; + "smtps-gmail" = dontDistribute super."smtps-gmail"; + "snake-game" = dontDistribute super."snake-game"; + "snap-accept" = dontDistribute super."snap-accept"; + "snap-app" = dontDistribute super."snap-app"; + "snap-auth-cli" = dontDistribute super."snap-auth-cli"; + "snap-blaze" = dontDistribute super."snap-blaze"; + "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; + "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; + "snap-cors" = dontDistribute super."snap-cors"; + "snap-elm" = dontDistribute super."snap-elm"; + "snap-error-collector" = dontDistribute super."snap-error-collector"; + "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; + "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; + "snap-loader-static" = dontDistribute super."snap-loader-static"; + "snap-predicates" = dontDistribute super."snap-predicates"; + "snap-testing" = dontDistribute super."snap-testing"; + "snap-utils" = dontDistribute super."snap-utils"; + "snap-web-routes" = dontDistribute super."snap-web-routes"; + "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; + "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; + "snaplet-amqp" = dontDistribute super."snaplet-amqp"; + "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; + "snaplet-coffee" = dontDistribute super."snaplet-coffee"; + "snaplet-css-min" = dontDistribute super."snaplet-css-min"; + "snaplet-environments" = dontDistribute super."snaplet-environments"; + "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; + "snaplet-hasql" = dontDistribute super."snaplet-hasql"; + "snaplet-haxl" = dontDistribute super."snaplet-haxl"; + "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; + "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; + "snaplet-i18n" = dontDistribute super."snaplet-i18n"; + "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; + "snaplet-lss" = dontDistribute super."snaplet-lss"; + "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; + "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; + "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; + "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; + "snaplet-oauth" = dontDistribute super."snaplet-oauth"; + "snaplet-persistent" = dontDistribute super."snaplet-persistent"; + "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; + "snaplet-postmark" = dontDistribute super."snaplet-postmark"; + "snaplet-purescript" = dontDistribute super."snaplet-purescript"; + "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; + "snaplet-redis" = dontDistribute super."snaplet-redis"; + "snaplet-redson" = dontDistribute super."snaplet-redson"; + "snaplet-rest" = dontDistribute super."snaplet-rest"; + "snaplet-riak" = dontDistribute super."snaplet-riak"; + "snaplet-sass" = dontDistribute super."snaplet-sass"; + "snaplet-sedna" = dontDistribute super."snaplet-sedna"; + "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; + "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; + "snaplet-stripe" = dontDistribute super."snaplet-stripe"; + "snaplet-tasks" = dontDistribute super."snaplet-tasks"; + "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; + "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; + "snappy" = dontDistribute super."snappy"; + "snappy-conduit" = dontDistribute super."snappy-conduit"; + "snappy-framing" = dontDistribute super."snappy-framing"; + "snappy-iteratee" = dontDistribute super."snappy-iteratee"; + "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; + "sneakyterm" = dontDistribute super."sneakyterm"; + "sneathlane-haste" = dontDistribute super."sneathlane-haste"; + "snippet-extractor" = dontDistribute super."snippet-extractor"; + "snm" = dontDistribute super."snm"; + "snow-white" = dontDistribute super."snow-white"; + "snowball" = dontDistribute super."snowball"; + "snowglobe" = dontDistribute super."snowglobe"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "socket-activation" = dontDistribute super."socket-activation"; + "socket-sctp" = dontDistribute super."socket-sctp"; + "socketio" = dontDistribute super."socketio"; + "soegtk" = dontDistribute super."soegtk"; + "sonic-visualiser" = dontDistribute super."sonic-visualiser"; + "sophia" = dontDistribute super."sophia"; + "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; + "sorted" = dontDistribute super."sorted"; + "sorting" = dontDistribute super."sorting"; + "sorty" = dontDistribute super."sorty"; + "sound-collage" = dontDistribute super."sound-collage"; + "sounddelay" = dontDistribute super."sounddelay"; + "source-code-server" = dontDistribute super."source-code-server"; + "sousit" = dontDistribute super."sousit"; + "sox" = dontDistribute super."sox"; + "soxlib" = dontDistribute super."soxlib"; + "soyuz" = dontDistribute super."soyuz"; + "spacefill" = dontDistribute super."spacefill"; + "spacepart" = dontDistribute super."spacepart"; + "spaceprobe" = dontDistribute super."spaceprobe"; + "spanout" = dontDistribute super."spanout"; + "sparse" = dontDistribute super."sparse"; + "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; + "sparsebit" = dontDistribute super."sparsebit"; + "sparsecheck" = dontDistribute super."sparsecheck"; + "sparser" = dontDistribute super."sparser"; + "spata" = dontDistribute super."spata"; + "spatial-math" = dontDistribute super."spatial-math"; + "spawn" = dontDistribute super."spawn"; + "spe" = dontDistribute super."spe"; + "special-functors" = dontDistribute super."special-functors"; + "special-keys" = dontDistribute super."special-keys"; + "specialize-th" = dontDistribute super."specialize-th"; + "species" = dontDistribute super."species"; + "speculation-transformers" = dontDistribute super."speculation-transformers"; + "spelling-suggest" = dontDistribute super."spelling-suggest"; + "sphero" = dontDistribute super."sphero"; + "sphinx-cli" = dontDistribute super."sphinx-cli"; + "spice" = dontDistribute super."spice"; + "spike" = dontDistribute super."spike"; + "spine" = dontDistribute super."spine"; + "spir-v" = dontDistribute super."spir-v"; + "splay" = dontDistribute super."splay"; + "splaytree" = dontDistribute super."splaytree"; + "spline3" = dontDistribute super."spline3"; + "splines" = dontDistribute super."splines"; + "split-channel" = dontDistribute super."split-channel"; + "split-record" = dontDistribute super."split-record"; + "split-tchan" = dontDistribute super."split-tchan"; + "splitter" = dontDistribute super."splitter"; + "splot" = dontDistribute super."splot"; + "spool" = dontDistribute super."spool"; + "spoonutil" = dontDistribute super."spoonutil"; + "spoty" = dontDistribute super."spoty"; + "spreadsheet" = dontDistribute super."spreadsheet"; + "spritz" = dontDistribute super."spritz"; + "spsa" = dontDistribute super."spsa"; + "spy" = dontDistribute super."spy"; + "sql-simple" = dontDistribute super."sql-simple"; + "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; + "sql-simple-pool" = dontDistribute super."sql-simple-pool"; + "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; + "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; + "sql-words" = dontDistribute super."sql-words"; + "sqlite" = dontDistribute super."sqlite"; + "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; + "sqlvalue-list" = dontDistribute super."sqlvalue-list"; + "squeeze" = dontDistribute super."squeeze"; + "sr-extra" = dontDistribute super."sr-extra"; + "srcinst" = dontDistribute super."srcinst"; + "srec" = dontDistribute super."srec"; + "sscgi" = dontDistribute super."sscgi"; + "ssh" = dontDistribute super."ssh"; + "sshd-lint" = dontDistribute super."sshd-lint"; + "sshtun" = dontDistribute super."sshtun"; + "sssp" = dontDistribute super."sssp"; + "sstable" = dontDistribute super."sstable"; + "ssv" = dontDistribute super."ssv"; + "stable-heap" = dontDistribute super."stable-heap"; + "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; + "stable-memo" = dontDistribute super."stable-memo"; + "stable-tree" = dontDistribute super."stable-tree"; + "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; + "stack-prism" = dontDistribute super."stack-prism"; + "stack-run" = dontDistribute super."stack-run"; + "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; + "standalone-haddock" = dontDistribute super."standalone-haddock"; + "star-to-star" = dontDistribute super."star-to-star"; + "star-to-star-contra" = dontDistribute super."star-to-star-contra"; + "starling" = dontDistribute super."starling"; + "starrover2" = dontDistribute super."starrover2"; + "stash" = dontDistribute super."stash"; + "state" = dontDistribute super."state"; + "state-record" = dontDistribute super."state-record"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statethread" = dontDistribute super."statethread"; + "statgrab" = dontDistribute super."statgrab"; + "static-hash" = dontDistribute super."static-hash"; + "static-resources" = dontDistribute super."static-resources"; + "staticanalysis" = dontDistribute super."staticanalysis"; + "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; + "statistics-fusion" = dontDistribute super."statistics-fusion"; + "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "stats" = dontDistribute super."stats"; + "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; + "statsd-datadog" = dontDistribute super."statsd-datadog"; + "statvfs" = dontDistribute super."statvfs"; + "stb-image" = dontDistribute super."stb-image"; + "stb-truetype" = dontDistribute super."stb-truetype"; + "stdata" = dontDistribute super."stdata"; + "stdf" = dontDistribute super."stdf"; + "steambrowser" = dontDistribute super."steambrowser"; + "steeloverseer" = dontDistribute super."steeloverseer"; + "stemmer" = dontDistribute super."stemmer"; + "step-function" = dontDistribute super."step-function"; + "stepwise" = dontDistribute super."stepwise"; + "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; + "stitch" = dontDistribute super."stitch"; + "stm-channelize" = dontDistribute super."stm-channelize"; + "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-firehose" = dontDistribute super."stm-firehose"; + "stm-io-hooks" = dontDistribute super."stm-io-hooks"; + "stm-lifted" = dontDistribute super."stm-lifted"; + "stm-linkedlist" = dontDistribute super."stm-linkedlist"; + "stm-orelse-io" = dontDistribute super."stm-orelse-io"; + "stm-promise" = dontDistribute super."stm-promise"; + "stm-queue-extras" = dontDistribute super."stm-queue-extras"; + "stm-sbchan" = dontDistribute super."stm-sbchan"; + "stm-split" = dontDistribute super."stm-split"; + "stm-tlist" = dontDistribute super."stm-tlist"; + "stmcontrol" = dontDistribute super."stmcontrol"; + "stomp-conduit" = dontDistribute super."stomp-conduit"; + "stomp-patterns" = dontDistribute super."stomp-patterns"; + "stomp-queue" = dontDistribute super."stomp-queue"; + "stompl" = dontDistribute super."stompl"; + "stopwatch" = dontDistribute super."stopwatch"; + "storable" = dontDistribute super."storable"; + "storable-record" = dontDistribute super."storable-record"; + "storable-static-array" = dontDistribute super."storable-static-array"; + "storable-tuple" = dontDistribute super."storable-tuple"; + "storablevector" = dontDistribute super."storablevector"; + "storablevector-carray" = dontDistribute super."storablevector-carray"; + "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; + "str" = dontDistribute super."str"; + "stratum-tool" = dontDistribute super."stratum-tool"; + "stream-fusion" = dontDistribute super."stream-fusion"; + "stream-monad" = dontDistribute super."stream-monad"; + "streamed" = dontDistribute super."streamed"; + "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; + "strict-base-types" = doDistribute super."strict-base-types_0_4_0"; + "strict-concurrency" = dontDistribute super."strict-concurrency"; + "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; + "strict-identity" = dontDistribute super."strict-identity"; + "strict-io" = dontDistribute super."strict-io"; + "strictify" = dontDistribute super."strictify"; + "strictly" = dontDistribute super."strictly"; + "string" = dontDistribute super."string"; + "string-conv" = dontDistribute super."string-conv"; + "string-convert" = dontDistribute super."string-convert"; + "string-quote" = dontDistribute super."string-quote"; + "string-similarity" = dontDistribute super."string-similarity"; + "string-typelits" = dontDistribute super."string-typelits"; + "stringlike" = dontDistribute super."stringlike"; + "stringprep" = dontDistribute super."stringprep"; + "strings" = dontDistribute super."strings"; + "stringtable-atom" = dontDistribute super."stringtable-atom"; + "strio" = dontDistribute super."strio"; + "stripe" = dontDistribute super."stripe"; + "strive" = dontDistribute super."strive"; + "strptime" = dontDistribute super."strptime"; + "structs" = dontDistribute super."structs"; + "structural-induction" = dontDistribute super."structural-induction"; + "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; + "structured-mongoDB" = dontDistribute super."structured-mongoDB"; + "structures" = dontDistribute super."structures"; + "stunclient" = dontDistribute super."stunclient"; + "stunts" = dontDistribute super."stunts"; + "stylized" = dontDistribute super."stylized"; + "sub-state" = dontDistribute super."sub-state"; + "subhask" = dontDistribute super."subhask"; + "subleq-toolchain" = dontDistribute super."subleq-toolchain"; + "subnet" = dontDistribute super."subnet"; + "subtitleParser" = dontDistribute super."subtitleParser"; + "subtitles" = dontDistribute super."subtitles"; + "success" = doDistribute super."success_0_2_6"; + "suffixarray" = dontDistribute super."suffixarray"; + "suffixtree" = dontDistribute super."suffixtree"; + "sugarhaskell" = dontDistribute super."sugarhaskell"; + "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; + "sundown" = dontDistribute super."sundown"; + "sunlight" = dontDistribute super."sunlight"; + "sunroof-compiler" = dontDistribute super."sunroof-compiler"; + "sunroof-examples" = dontDistribute super."sunroof-examples"; + "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; + "supercollider-ht" = dontDistribute super."supercollider-ht"; + "supercollider-midi" = dontDistribute super."supercollider-midi"; + "superdoc" = dontDistribute super."superdoc"; + "supero" = dontDistribute super."supero"; + "supervisor" = dontDistribute super."supervisor"; + "suspend" = dontDistribute super."suspend"; + "svg2q" = dontDistribute super."svg2q"; + "svgcairo" = dontDistribute super."svgcairo"; + "svgutils" = dontDistribute super."svgutils"; + "svm" = dontDistribute super."svm"; + "svm-light-utils" = dontDistribute super."svm-light-utils"; + "svm-simple" = dontDistribute super."svm-simple"; + "svndump" = dontDistribute super."svndump"; + "swagger2" = doDistribute super."swagger2_1_2_1"; + "swapper" = dontDistribute super."swapper"; + "swearjure" = dontDistribute super."swearjure"; + "swf" = dontDistribute super."swf"; + "swift-lda" = dontDistribute super."swift-lda"; + "swish" = dontDistribute super."swish"; + "sws" = dontDistribute super."sws"; + "syb-extras" = dontDistribute super."syb-extras"; + "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "symbol" = dontDistribute super."symbol"; + "sync" = dontDistribute super."sync"; + "synchronous-channels" = dontDistribute super."synchronous-channels"; + "syncthing-hs" = dontDistribute super."syncthing-hs"; + "synt" = dontDistribute super."synt"; + "syntactic" = dontDistribute super."syntactic"; + "syntactical" = dontDistribute super."syntactical"; + "syntax" = dontDistribute super."syntax"; + "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; + "syntax-example" = dontDistribute super."syntax-example"; + "syntax-example-json" = dontDistribute super."syntax-example-json"; + "syntax-pretty" = dontDistribute super."syntax-pretty"; + "syntax-printer" = dontDistribute super."syntax-printer"; + "syntax-trees" = dontDistribute super."syntax-trees"; + "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; + "synthesizer" = dontDistribute super."synthesizer"; + "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; + "synthesizer-core" = dontDistribute super."synthesizer-core"; + "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; + "synthesizer-filter" = dontDistribute super."synthesizer-filter"; + "synthesizer-inference" = dontDistribute super."synthesizer-inference"; + "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; + "synthesizer-midi" = dontDistribute super."synthesizer-midi"; + "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; + "sys-process" = dontDistribute super."sys-process"; + "system-canonicalpath" = dontDistribute super."system-canonicalpath"; + "system-command" = dontDistribute super."system-command"; + "system-gpio" = dontDistribute super."system-gpio"; + "system-inotify" = dontDistribute super."system-inotify"; + "system-lifted" = dontDistribute super."system-lifted"; + "system-random-effect" = dontDistribute super."system-random-effect"; + "system-time-monotonic" = dontDistribute super."system-time-monotonic"; + "system-util" = dontDistribute super."system-util"; + "system-uuid" = dontDistribute super."system-uuid"; + "systemd" = dontDistribute super."systemd"; + "t-regex" = dontDistribute super."t-regex"; + "ta" = dontDistribute super."ta"; + "table" = dontDistribute super."table"; + "table-tennis" = dontDistribute super."table-tennis"; + "tableaux" = dontDistribute super."tableaux"; + "tables" = dontDistribute super."tables"; + "tablestorage" = dontDistribute super."tablestorage"; + "tabloid" = dontDistribute super."tabloid"; + "taffybar" = dontDistribute super."taffybar"; + "tag-bits" = dontDistribute super."tag-bits"; + "tag-stream" = dontDistribute super."tag-stream"; + "tagchup" = dontDistribute super."tagchup"; + "tagged-exception-core" = dontDistribute super."tagged-exception-core"; + "tagged-list" = dontDistribute super."tagged-list"; + "tagged-th" = dontDistribute super."tagged-th"; + "tagged-transformer" = dontDistribute super."tagged-transformer"; + "tagging" = dontDistribute super."tagging"; + "taggy" = dontDistribute super."taggy"; + "taggy-lens" = dontDistribute super."taggy-lens"; + "taglib" = dontDistribute super."taglib"; + "taglib-api" = dontDistribute super."taglib-api"; + "tagset-positional" = dontDistribute super."tagset-positional"; + "tagsoup-ht" = dontDistribute super."tagsoup-ht"; + "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; + "takahashi" = dontDistribute super."takahashi"; + "takusen-oracle" = dontDistribute super."takusen-oracle"; + "tamarin-prover" = dontDistribute super."tamarin-prover"; + "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; + "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; + "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; + "tamper" = dontDistribute super."tamper"; + "target" = dontDistribute super."target"; + "task" = dontDistribute super."task"; + "taskpool" = dontDistribute super."taskpool"; + "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; + "tasty-integrate" = dontDistribute super."tasty-integrate"; + "tasty-laws" = dontDistribute super."tasty-laws"; + "tasty-lens" = dontDistribute super."tasty-lens"; + "tasty-program" = dontDistribute super."tasty-program"; + "tateti-tateti" = dontDistribute super."tateti-tateti"; + "tau" = dontDistribute super."tau"; + "tbox" = dontDistribute super."tbox"; + "tcache-AWS" = dontDistribute super."tcache-AWS"; + "tccli" = dontDistribute super."tccli"; + "tce-conf" = dontDistribute super."tce-conf"; + "tconfig" = dontDistribute super."tconfig"; + "tcp" = dontDistribute super."tcp"; + "tdd-util" = dontDistribute super."tdd-util"; + "tdoc" = dontDistribute super."tdoc"; + "teams" = dontDistribute super."teams"; + "teeth" = dontDistribute super."teeth"; + "telegram" = dontDistribute super."telegram"; + "telegram-api" = dontDistribute super."telegram-api"; + "teleport" = dontDistribute super."teleport"; + "template-default" = dontDistribute super."template-default"; + "template-haskell-util" = dontDistribute super."template-haskell-util"; + "template-hsml" = dontDistribute super."template-hsml"; + "template-yj" = dontDistribute super."template-yj"; + "templatepg" = dontDistribute super."templatepg"; + "templater" = dontDistribute super."templater"; + "tempodb" = dontDistribute super."tempodb"; + "temporal-csound" = dontDistribute super."temporal-csound"; + "temporal-media" = dontDistribute super."temporal-media"; + "temporal-music-notation" = dontDistribute super."temporal-music-notation"; + "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; + "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; + "temporary-resourcet" = dontDistribute super."temporary-resourcet"; + "tempus" = dontDistribute super."tempus"; + "tempus-fugit" = dontDistribute super."tempus-fugit"; + "tensor" = dontDistribute super."tensor"; + "term-rewriting" = dontDistribute super."term-rewriting"; + "termbox-bindings" = dontDistribute super."termbox-bindings"; + "termination-combinators" = dontDistribute super."termination-combinators"; + "terminfo" = doDistribute super."terminfo_0_4_0_2"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; + "terrahs" = dontDistribute super."terrahs"; + "tersmu" = dontDistribute super."tersmu"; + "test-framework-doctest" = dontDistribute super."test-framework-doctest"; + "test-framework-golden" = dontDistribute super."test-framework-golden"; + "test-framework-program" = dontDistribute super."test-framework-program"; + "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; + "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; + "test-framework-skip" = dontDistribute super."test-framework-skip"; + "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "test-invariant" = dontDistribute super."test-invariant"; + "test-pkg" = dontDistribute super."test-pkg"; + "test-sandbox" = dontDistribute super."test-sandbox"; + "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; + "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; + "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; + "test-shouldbe" = dontDistribute super."test-shouldbe"; + "testPkg" = dontDistribute super."testPkg"; + "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; + "testloop" = dontDistribute super."testloop"; + "testpack" = dontDistribute super."testpack"; + "testpattern" = dontDistribute super."testpattern"; + "testrunner" = dontDistribute super."testrunner"; + "tetris" = dontDistribute super."tetris"; + "tex2txt" = dontDistribute super."tex2txt"; + "texrunner" = dontDistribute super."texrunner"; + "text-and-plots" = dontDistribute super."text-and-plots"; + "text-format-simple" = dontDistribute super."text-format-simple"; + "text-icu-translit" = dontDistribute super."text-icu-translit"; + "text-json-qq" = dontDistribute super."text-json-qq"; + "text-latin1" = dontDistribute super."text-latin1"; + "text-ldap" = dontDistribute super."text-ldap"; + "text-locale-encoding" = dontDistribute super."text-locale-encoding"; + "text-normal" = dontDistribute super."text-normal"; + "text-position" = dontDistribute super."text-position"; + "text-postgresql" = dontDistribute super."text-postgresql"; + "text-printer" = dontDistribute super."text-printer"; + "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-region" = dontDistribute super."text-region"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "text-show-instances" = dontDistribute super."text-show-instances"; + "text-stream-decode" = dontDistribute super."text-stream-decode"; + "text-utf7" = dontDistribute super."text-utf7"; + "text-xml-generic" = dontDistribute super."text-xml-generic"; + "text-xml-qq" = dontDistribute super."text-xml-qq"; + "text1" = dontDistribute super."text1"; + "textPlot" = dontDistribute super."textPlot"; + "textmatetags" = dontDistribute super."textmatetags"; + "textocat-api" = dontDistribute super."textocat-api"; + "texts" = dontDistribute super."texts"; + "textual" = dontDistribute super."textual"; + "tfp" = dontDistribute super."tfp"; + "tfp-th" = dontDistribute super."tfp-th"; + "tftp" = dontDistribute super."tftp"; + "tga" = dontDistribute super."tga"; + "th-alpha" = dontDistribute super."th-alpha"; + "th-build" = dontDistribute super."th-build"; + "th-cas" = dontDistribute super."th-cas"; + "th-context" = dontDistribute super."th-context"; + "th-fold" = dontDistribute super."th-fold"; + "th-inline-io-action" = dontDistribute super."th-inline-io-action"; + "th-instance-reification" = dontDistribute super."th-instance-reification"; + "th-instances" = dontDistribute super."th-instances"; + "th-kinds" = dontDistribute super."th-kinds"; + "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift-instances" = dontDistribute super."th-lift-instances"; + "th-printf" = dontDistribute super."th-printf"; + "th-sccs" = dontDistribute super."th-sccs"; + "th-traced" = dontDistribute super."th-traced"; + "th-typegraph" = dontDistribute super."th-typegraph"; + "themoviedb" = dontDistribute super."themoviedb"; + "themplate" = dontDistribute super."themplate"; + "theoremquest" = dontDistribute super."theoremquest"; + "theoremquest-client" = dontDistribute super."theoremquest-client"; + "thespian" = dontDistribute super."thespian"; + "theta-functions" = dontDistribute super."theta-functions"; + "thih" = dontDistribute super."thih"; + "thimk" = dontDistribute super."thimk"; + "thorn" = dontDistribute super."thorn"; + "thread-local-storage" = dontDistribute super."thread-local-storage"; + "threadPool" = dontDistribute super."threadPool"; + "threadmanager" = dontDistribute super."threadmanager"; + "threads-pool" = dontDistribute super."threads-pool"; + "threads-supervisor" = dontDistribute super."threads-supervisor"; + "threadscope" = dontDistribute super."threadscope"; + "threefish" = dontDistribute super."threefish"; + "threepenny-gui" = dontDistribute super."threepenny-gui"; + "thrift" = dontDistribute super."thrift"; + "thrist" = dontDistribute super."thrist"; + "throttle" = dontDistribute super."throttle"; + "thumbnail" = dontDistribute super."thumbnail"; + "tianbar" = dontDistribute super."tianbar"; + "tic-tac-toe" = dontDistribute super."tic-tac-toe"; + "tickle" = dontDistribute super."tickle"; + "tictactoe3d" = dontDistribute super."tictactoe3d"; + "tidal" = dontDistribute super."tidal"; + "tidal-midi" = dontDistribute super."tidal-midi"; + "tidal-vis" = dontDistribute super."tidal-vis"; + "tie-knot" = dontDistribute super."tie-knot"; + "tiempo" = dontDistribute super."tiempo"; + "tiger" = dontDistribute super."tiger"; + "tight-apply" = dontDistribute super."tight-apply"; + "tightrope" = dontDistribute super."tightrope"; + "tighttp" = dontDistribute super."tighttp"; + "tilings" = dontDistribute super."tilings"; + "timberc" = dontDistribute super."timberc"; + "time-extras" = dontDistribute super."time-extras"; + "time-exts" = dontDistribute super."time-exts"; + "time-http" = dontDistribute super."time-http"; + "time-interval" = dontDistribute super."time-interval"; + "time-io-access" = dontDistribute super."time-io-access"; + "time-patterns" = dontDistribute super."time-patterns"; + "time-qq" = dontDistribute super."time-qq"; + "time-recurrence" = dontDistribute super."time-recurrence"; + "time-series" = dontDistribute super."time-series"; + "time-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; + "timemap" = dontDistribute super."timemap"; + "timeout" = dontDistribute super."timeout"; + "timeout-control" = dontDistribute super."timeout-control"; + "timeout-with-results" = dontDistribute super."timeout-with-results"; + "timeparsers" = dontDistribute super."timeparsers"; + "timeplot" = dontDistribute super."timeplot"; + "timers" = dontDistribute super."timers"; + "timers-updatable" = dontDistribute super."timers-updatable"; + "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; + "timestamper" = dontDistribute super."timestamper"; + "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timing-convenience" = dontDistribute super."timing-convenience"; + "tinyMesh" = dontDistribute super."tinyMesh"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "tiphys" = dontDistribute super."tiphys"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "tls-extra" = dontDistribute super."tls-extra"; + "tmpl" = dontDistribute super."tmpl"; + "tn" = dontDistribute super."tn"; + "tnet" = dontDistribute super."tnet"; + "to-haskell" = dontDistribute super."to-haskell"; + "to-string-class" = dontDistribute super."to-string-class"; + "to-string-instances" = dontDistribute super."to-string-instances"; + "todos" = dontDistribute super."todos"; + "tofromxml" = dontDistribute super."tofromxml"; + "toilet" = dontDistribute super."toilet"; + "tokenify" = dontDistribute super."tokenify"; + "tokenize" = dontDistribute super."tokenize"; + "toktok" = dontDistribute super."toktok"; + "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; + "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; + "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; + "toml" = dontDistribute super."toml"; + "toolshed" = dontDistribute super."toolshed"; + "topkata" = dontDistribute super."topkata"; + "torch" = dontDistribute super."torch"; + "total" = dontDistribute super."total"; + "total-map" = dontDistribute super."total-map"; + "total-maps" = dontDistribute super."total-maps"; + "touched" = dontDistribute super."touched"; + "toysolver" = dontDistribute super."toysolver"; + "tpdb" = dontDistribute super."tpdb"; + "trace" = dontDistribute super."trace"; + "trace-call" = dontDistribute super."trace-call"; + "trace-function-call" = dontDistribute super."trace-function-call"; + "traced" = dontDistribute super."traced"; + "tracer" = dontDistribute super."tracer"; + "tracker" = dontDistribute super."tracker"; + "trajectory" = dontDistribute super."trajectory"; + "transactional-events" = dontDistribute super."transactional-events"; + "transf" = dontDistribute super."transf"; + "transformations" = dontDistribute super."transformations"; + "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compose" = dontDistribute super."transformers-compose"; + "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-free" = dontDistribute super."transformers-free"; + "transformers-runnable" = dontDistribute super."transformers-runnable"; + "transformers-supply" = dontDistribute super."transformers-supply"; + "transient" = dontDistribute super."transient"; + "translatable-intset" = dontDistribute super."translatable-intset"; + "translate" = dontDistribute super."translate"; + "travis" = dontDistribute super."travis"; + "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; + "trawl" = dontDistribute super."trawl"; + "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-monad" = dontDistribute super."tree-monad"; + "treemap-html" = dontDistribute super."treemap-html"; + "treemap-html-tools" = dontDistribute super."treemap-html-tools"; + "treersec" = dontDistribute super."treersec"; + "treeviz" = dontDistribute super."treeviz"; + "tremulous-query" = dontDistribute super."tremulous-query"; + "trhsx" = dontDistribute super."trhsx"; + "triangulation" = dontDistribute super."triangulation"; + "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "truelevel" = dontDistribute super."truelevel"; + "trurl" = dontDistribute super."trurl"; + "truthful" = dontDistribute super."truthful"; + "tsession" = dontDistribute super."tsession"; + "tsession-happstack" = dontDistribute super."tsession-happstack"; + "tskiplist" = dontDistribute super."tskiplist"; + "tslogger" = dontDistribute super."tslogger"; + "tsp-viz" = dontDistribute super."tsp-viz"; + "tsparse" = dontDistribute super."tsparse"; + "tst" = dontDistribute super."tst"; + "tsvsql" = dontDistribute super."tsvsql"; + "tttool" = doDistribute super."tttool_1_5_1"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple" = dontDistribute super."tuple"; + "tuple-gen" = dontDistribute super."tuple-gen"; + "tuple-generic" = dontDistribute super."tuple-generic"; + "tuple-hlist" = dontDistribute super."tuple-hlist"; + "tuple-lenses" = dontDistribute super."tuple-lenses"; + "tuple-morph" = dontDistribute super."tuple-morph"; + "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; + "turing-music" = dontDistribute super."turing-music"; + "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; + "turni" = dontDistribute super."turni"; + "tweak" = dontDistribute super."tweak"; + "twentefp" = dontDistribute super."twentefp"; + "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; + "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; + "twentefp-graphs" = dontDistribute super."twentefp-graphs"; + "twentefp-number" = dontDistribute super."twentefp-number"; + "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; + "twentefp-trees" = dontDistribute super."twentefp-trees"; + "twentefp-websockets" = dontDistribute super."twentefp-websockets"; + "twhs" = dontDistribute super."twhs"; + "twidge" = dontDistribute super."twidge"; + "twilight-stm" = dontDistribute super."twilight-stm"; + "twilio" = dontDistribute super."twilio"; + "twill" = dontDistribute super."twill"; + "twiml" = dontDistribute super."twiml"; + "twine" = dontDistribute super."twine"; + "twisty" = dontDistribute super."twisty"; + "twitch" = dontDistribute super."twitch"; + "twitter" = dontDistribute super."twitter"; + "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "tx" = dontDistribute super."tx"; + "txt-sushi" = dontDistribute super."txt-sushi"; + "txt2rtf" = dontDistribute super."txt2rtf"; + "txtblk" = dontDistribute super."txtblk"; + "ty" = dontDistribute super."ty"; + "typalyze" = dontDistribute super."typalyze"; + "type-booleans" = dontDistribute super."type-booleans"; + "type-cache" = dontDistribute super."type-cache"; + "type-cereal" = dontDistribute super."type-cereal"; + "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; + "type-digits" = dontDistribute super."type-digits"; + "type-equality" = dontDistribute super."type-equality"; + "type-equality-check" = dontDistribute super."type-equality-check"; + "type-fun" = dontDistribute super."type-fun"; + "type-functions" = dontDistribute super."type-functions"; + "type-hint" = dontDistribute super."type-hint"; + "type-int" = dontDistribute super."type-int"; + "type-iso" = dontDistribute super."type-iso"; + "type-level" = dontDistribute super."type-level"; + "type-level-bst" = dontDistribute super."type-level-bst"; + "type-level-natural-number" = dontDistribute super."type-level-natural-number"; + "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; + "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; + "type-level-sets" = dontDistribute super."type-level-sets"; + "type-level-tf" = dontDistribute super."type-level-tf"; + "type-natural" = dontDistribute super."type-natural"; + "type-ord" = dontDistribute super."type-ord"; + "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; + "type-prelude" = dontDistribute super."type-prelude"; + "type-settheory" = dontDistribute super."type-settheory"; + "type-spine" = dontDistribute super."type-spine"; + "type-structure" = dontDistribute super."type-structure"; + "type-sub-th" = dontDistribute super."type-sub-th"; + "type-unary" = dontDistribute super."type-unary"; + "typeable-th" = dontDistribute super."typeable-th"; + "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; + "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel" = dontDistribute super."typelevel"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typeof" = dontDistribute super."typeof"; + "typeparams" = dontDistribute super."typeparams"; + "typesafe-endian" = dontDistribute super."typesafe-endian"; + "typescript-docs" = dontDistribute super."typescript-docs"; + "typical" = dontDistribute super."typical"; + "typography-geometry" = dontDistribute super."typography-geometry"; + "uAgda" = dontDistribute super."uAgda"; + "ua-parser" = dontDistribute super."ua-parser"; + "uacpid" = dontDistribute super."uacpid"; + "uberlast" = dontDistribute super."uberlast"; + "uconv" = dontDistribute super."uconv"; + "udbus" = dontDistribute super."udbus"; + "udbus-model" = dontDistribute super."udbus-model"; + "udcode" = dontDistribute super."udcode"; + "udev" = dontDistribute super."udev"; + "uhc-light" = dontDistribute super."uhc-light"; + "uhc-util" = dontDistribute super."uhc-util"; + "uhexdump" = dontDistribute super."uhexdump"; + "uhttpc" = dontDistribute super."uhttpc"; + "ui-command" = dontDistribute super."ui-command"; + "uid" = dontDistribute super."uid"; + "una" = dontDistribute super."una"; + "unagi-chan" = dontDistribute super."unagi-chan"; + "unagi-streams" = dontDistribute super."unagi-streams"; + "unamb" = dontDistribute super."unamb"; + "unamb-custom" = dontDistribute super."unamb-custom"; + "unbound" = dontDistribute super."unbound"; + "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; + "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; + "unfoldable" = dontDistribute super."unfoldable"; + "ungadtagger" = dontDistribute super."ungadtagger"; + "uni-events" = dontDistribute super."uni-events"; + "uni-graphs" = dontDistribute super."uni-graphs"; + "uni-htk" = dontDistribute super."uni-htk"; + "uni-posixutil" = dontDistribute super."uni-posixutil"; + "uni-reactor" = dontDistribute super."uni-reactor"; + "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; + "uni-util" = dontDistribute super."uni-util"; + "unicode" = dontDistribute super."unicode"; + "unicode-names" = dontDistribute super."unicode-names"; + "unicode-normalization" = dontDistribute super."unicode-normalization"; + "unicode-prelude" = dontDistribute super."unicode-prelude"; + "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-show" = dontDistribute super."unicode-show"; + "unicode-symbols" = dontDistribute super."unicode-symbols"; + "unicoder" = dontDistribute super."unicoder"; + "uniform-io" = dontDistribute super."uniform-io"; + "uniform-pair" = dontDistribute super."uniform-pair"; + "union-find-array" = dontDistribute super."union-find-array"; + "union-map" = dontDistribute super."union-map"; + "unique" = dontDistribute super."unique"; + "unique-logic" = dontDistribute super."unique-logic"; + "unique-logic-tf" = dontDistribute super."unique-logic-tf"; + "uniqueid" = dontDistribute super."uniqueid"; + "unit" = dontDistribute super."unit"; + "units" = dontDistribute super."units"; + "units-attoparsec" = dontDistribute super."units-attoparsec"; + "units-defs" = dontDistribute super."units-defs"; + "units-parser" = dontDistribute super."units-parser"; + "unittyped" = dontDistribute super."unittyped"; + "universal-binary" = dontDistribute super."universal-binary"; + "universe-th" = dontDistribute super."universe-th"; + "unix-fcntl" = dontDistribute super."unix-fcntl"; + "unix-handle" = dontDistribute super."unix-handle"; + "unix-io-extra" = dontDistribute super."unix-io-extra"; + "unix-memory" = dontDistribute super."unix-memory"; + "unix-process-conduit" = dontDistribute super."unix-process-conduit"; + "unix-pty-light" = dontDistribute super."unix-pty-light"; + "unlambda" = dontDistribute super."unlambda"; + "unlit" = dontDistribute super."unlit"; + "unm-hip" = dontDistribute super."unm-hip"; + "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; + "unordered-graphs" = dontDistribute super."unordered-graphs"; + "unpack-funcs" = dontDistribute super."unpack-funcs"; + "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; + "unsafe" = dontDistribute super."unsafe"; + "unsafe-promises" = dontDistribute super."unsafe-promises"; + "unsafely" = dontDistribute super."unsafely"; + "unsafeperformst" = dontDistribute super."unsafeperformst"; + "unscramble" = dontDistribute super."unscramble"; + "unusable-pkg" = dontDistribute super."unusable-pkg"; + "uom-plugin" = dontDistribute super."uom-plugin"; + "up" = dontDistribute super."up"; + "up-grade" = dontDistribute super."up-grade"; + "uploadcare" = dontDistribute super."uploadcare"; + "upskirt" = dontDistribute super."upskirt"; + "ureader" = dontDistribute super."ureader"; + "urembed" = dontDistribute super."urembed"; + "uri" = dontDistribute super."uri"; + "uri-conduit" = dontDistribute super."uri-conduit"; + "uri-enumerator" = dontDistribute super."uri-enumerator"; + "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; + "uri-template" = dontDistribute super."uri-template"; + "url-generic" = dontDistribute super."url-generic"; + "urlcheck" = dontDistribute super."urlcheck"; + "urldecode" = dontDistribute super."urldecode"; + "urldisp-happstack" = dontDistribute super."urldisp-happstack"; + "urlencoded" = dontDistribute super."urlencoded"; + "urn" = dontDistribute super."urn"; + "urxml" = dontDistribute super."urxml"; + "usb" = dontDistribute super."usb"; + "usb-enumerator" = dontDistribute super."usb-enumerator"; + "usb-hid" = dontDistribute super."usb-hid"; + "usb-id-database" = dontDistribute super."usb-id-database"; + "usb-iteratee" = dontDistribute super."usb-iteratee"; + "usb-safe" = dontDistribute super."usb-safe"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "uu-cco" = dontDistribute super."uu-cco"; + "uu-cco-examples" = dontDistribute super."uu-cco-examples"; + "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; + "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; + "uu-options" = dontDistribute super."uu-options"; + "uu-tc" = dontDistribute super."uu-tc"; + "uuagc" = dontDistribute super."uuagc"; + "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; + "uuagc-cabal" = dontDistribute super."uuagc-cabal"; + "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; + "uuagd" = dontDistribute super."uuagd"; + "uuid-aeson" = dontDistribute super."uuid-aeson"; + "uuid-le" = dontDistribute super."uuid-le"; + "uuid-quasi" = dontDistribute super."uuid-quasi"; + "uulib" = dontDistribute super."uulib"; + "uvector" = dontDistribute super."uvector"; + "uvector-algorithms" = dontDistribute super."uvector-algorithms"; + "uxadt" = dontDistribute super."uxadt"; + "uzbl-with-source" = dontDistribute super."uzbl-with-source"; + "v4l2" = dontDistribute super."v4l2"; + "v4l2-examples" = dontDistribute super."v4l2-examples"; + "vacuum" = dontDistribute super."vacuum"; + "vacuum-cairo" = dontDistribute super."vacuum-cairo"; + "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; + "vacuum-opengl" = dontDistribute super."vacuum-opengl"; + "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; + "vado" = dontDistribute super."vado"; + "valid-names" = dontDistribute super."valid-names"; + "validate" = dontDistribute super."validate"; + "validated-literals" = dontDistribute super."validated-literals"; + "validations" = dontDistribute super."validations"; + "value-supply" = dontDistribute super."value-supply"; + "vampire" = dontDistribute super."vampire"; + "var" = dontDistribute super."var"; + "varan" = dontDistribute super."varan"; + "variable-precision" = dontDistribute super."variable-precision"; + "variables" = dontDistribute super."variables"; + "varying" = dontDistribute super."varying"; + "vaultaire-common" = dontDistribute super."vaultaire-common"; + "vcache" = dontDistribute super."vcache"; + "vcache-trie" = dontDistribute super."vcache-trie"; + "vcard" = dontDistribute super."vcard"; + "vcd" = dontDistribute super."vcd"; + "vcs-revision" = dontDistribute super."vcs-revision"; + "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; + "vcsgui" = dontDistribute super."vcsgui"; + "vcswrapper" = dontDistribute super."vcswrapper"; + "vect" = dontDistribute super."vect"; + "vect-floating" = dontDistribute super."vect-floating"; + "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; + "vect-opengl" = dontDistribute super."vect-opengl"; + "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_1"; + "vector-bytestring" = dontDistribute super."vector-bytestring"; + "vector-clock" = dontDistribute super."vector-clock"; + "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-functorlazy" = dontDistribute super."vector-functorlazy"; + "vector-heterogenous" = dontDistribute super."vector-heterogenous"; + "vector-instances-collections" = dontDistribute super."vector-instances-collections"; + "vector-mmap" = dontDistribute super."vector-mmap"; + "vector-random" = dontDistribute super."vector-random"; + "vector-read-instances" = dontDistribute super."vector-read-instances"; + "vector-space-map" = dontDistribute super."vector-space-map"; + "vector-space-opengl" = dontDistribute super."vector-space-opengl"; + "vector-space-points" = dontDistribute super."vector-space-points"; + "vector-static" = dontDistribute super."vector-static"; + "vector-strategies" = dontDistribute super."vector-strategies"; + "verbalexpressions" = dontDistribute super."verbalexpressions"; + "verbosity" = dontDistribute super."verbosity"; + "verdict" = dontDistribute super."verdict"; + "verdict-json" = dontDistribute super."verdict-json"; + "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; + "vhdl" = dontDistribute super."vhdl"; + "views" = dontDistribute super."views"; + "vigilance" = dontDistribute super."vigilance"; + "vimeta" = dontDistribute super."vimeta"; + "vimus" = dontDistribute super."vimus"; + "vintage-basic" = dontDistribute super."vintage-basic"; + "vinyl-gl" = dontDistribute super."vinyl-gl"; + "vinyl-json" = dontDistribute super."vinyl-json"; + "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; + "virthualenv" = dontDistribute super."virthualenv"; + "visibility" = dontDistribute super."visibility"; + "vision" = dontDistribute super."vision"; + "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; + "visual-prof" = dontDistribute super."visual-prof"; + "vivid" = dontDistribute super."vivid"; + "vk-aws-route53" = dontDistribute super."vk-aws-route53"; + "vk-posix-pty" = dontDistribute super."vk-posix-pty"; + "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; + "vorbiscomment" = dontDistribute super."vorbiscomment"; + "vowpal-utils" = dontDistribute super."vowpal-utils"; + "voyeur" = dontDistribute super."voyeur"; + "vrpn" = dontDistribute super."vrpn"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "vty-examples" = dontDistribute super."vty-examples"; + "vty-menu" = dontDistribute super."vty-menu"; + "vty-ui" = dontDistribute super."vty-ui"; + "vty-ui-extras" = dontDistribute super."vty-ui-extras"; + "waddle" = dontDistribute super."waddle"; + "wai-accept-language" = dontDistribute super."wai-accept-language"; + "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; + "wai-devel" = dontDistribute super."wai-devel"; + "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; + "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; + "wai-graceful" = dontDistribute super."wai-graceful"; + "wai-handler-devel" = dontDistribute super."wai-handler-devel"; + "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; + "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; + "wai-handler-snap" = dontDistribute super."wai-handler-snap"; + "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; + "wai-hastache" = dontDistribute super."wai-hastache"; + "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; + "wai-lens" = dontDistribute super."wai-lens"; + "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; + "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; + "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; + "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; + "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; + "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; + "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; + "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; + "wai-request-spec" = dontDistribute super."wai-request-spec"; + "wai-responsible" = dontDistribute super."wai-responsible"; + "wai-router" = dontDistribute super."wai-router"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; + "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; + "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; + "wai-static-cache" = dontDistribute super."wai-static-cache"; + "wai-static-pages" = dontDistribute super."wai-static-pages"; + "wai-test" = dontDistribute super."wai-test"; + "wai-thrift" = dontDistribute super."wai-thrift"; + "wai-throttler" = dontDistribute super."wai-throttler"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls-uid" = dontDistribute super."warp-tls-uid"; + "watchdog" = dontDistribute super."watchdog"; + "watcher" = dontDistribute super."watcher"; + "watchit" = dontDistribute super."watchit"; + "wavconvert" = dontDistribute super."wavconvert"; + "wavesurfer" = dontDistribute super."wavesurfer"; + "wavy" = dontDistribute super."wavy"; + "wcwidth" = dontDistribute super."wcwidth"; + "weather-api" = dontDistribute super."weather-api"; + "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; + "web-css" = dontDistribute super."web-css"; + "web-encodings" = dontDistribute super."web-encodings"; + "web-mongrel2" = dontDistribute super."web-mongrel2"; + "web-page" = dontDistribute super."web-page"; + "web-routes-mtl" = dontDistribute super."web-routes-mtl"; + "web-routes-quasi" = dontDistribute super."web-routes-quasi"; + "web-routes-regular" = dontDistribute super."web-routes-regular"; + "web-routes-transformers" = dontDistribute super."web-routes-transformers"; + "webapi" = dontDistribute super."webapi"; + "webapp" = dontDistribute super."webapp"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; + "webidl" = dontDistribute super."webidl"; + "webify" = dontDistribute super."webify"; + "webkit" = dontDistribute super."webkit"; + "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; + "webkitgtk3" = dontDistribute super."webkitgtk3"; + "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore"; + "webrtc-vad" = dontDistribute super."webrtc-vad"; + "webserver" = dontDistribute super."webserver"; + "websnap" = dontDistribute super."websnap"; + "webwire" = dontDistribute super."webwire"; + "wedding-announcement" = dontDistribute super."wedding-announcement"; + "wedged" = dontDistribute super."wedged"; + "weighted-regexp" = dontDistribute super."weighted-regexp"; + "weighted-search" = dontDistribute super."weighted-search"; + "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; + "wheb-mongo" = dontDistribute super."wheb-mongo"; + "wheb-redis" = dontDistribute super."wheb-redis"; + "wheb-strapped" = dontDistribute super."wheb-strapped"; + "while-lang-parser" = dontDistribute super."while-lang-parser"; + "whim" = dontDistribute super."whim"; + "whiskers" = dontDistribute super."whiskers"; + "whitespace" = dontDistribute super."whitespace"; + "whois" = dontDistribute super."whois"; + "why3" = dontDistribute super."why3"; + "wigner-symbols" = dontDistribute super."wigner-symbols"; + "wikipedia4epub" = dontDistribute super."wikipedia4epub"; + "win-hp-path" = dontDistribute super."win-hp-path"; + "windowslive" = dontDistribute super."windowslive"; + "winerror" = dontDistribute super."winerror"; + "winio" = dontDistribute super."winio"; + "wiring" = dontDistribute super."wiring"; + "witness" = dontDistribute super."witness"; + "witty" = dontDistribute super."witty"; + "wkt" = dontDistribute super."wkt"; + "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; + "wlc-hs" = dontDistribute super."wlc-hs"; + "wobsurv" = dontDistribute super."wobsurv"; + "woffex" = dontDistribute super."woffex"; + "wol" = dontDistribute super."wol"; + "wolf" = dontDistribute super."wolf"; + "woot" = dontDistribute super."woot"; + "word24" = dontDistribute super."word24"; + "wordcloud" = dontDistribute super."wordcloud"; + "wordexp" = dontDistribute super."wordexp"; + "words" = dontDistribute super."words"; + "wordsearch" = dontDistribute super."wordsearch"; + "wordsetdiff" = dontDistribute super."wordsetdiff"; + "workflow-osx" = dontDistribute super."workflow-osx"; + "wp-archivebot" = dontDistribute super."wp-archivebot"; + "wraparound" = dontDistribute super."wraparound"; + "wraxml" = dontDistribute super."wraxml"; + "wreq-sb" = dontDistribute super."wreq-sb"; + "wright" = dontDistribute super."wright"; + "wsdl" = dontDistribute super."wsdl"; + "wsedit" = dontDistribute super."wsedit"; + "wtk" = dontDistribute super."wtk"; + "wtk-gtk" = dontDistribute super."wtk-gtk"; + "wumpus-basic" = dontDistribute super."wumpus-basic"; + "wumpus-core" = dontDistribute super."wumpus-core"; + "wumpus-drawing" = dontDistribute super."wumpus-drawing"; + "wumpus-microprint" = dontDistribute super."wumpus-microprint"; + "wumpus-tree" = dontDistribute super."wumpus-tree"; + "wuss" = dontDistribute super."wuss"; + "wx" = dontDistribute super."wx"; + "wxAsteroids" = dontDistribute super."wxAsteroids"; + "wxFruit" = dontDistribute super."wxFruit"; + "wxc" = dontDistribute super."wxc"; + "wxcore" = dontDistribute super."wxcore"; + "wxdirect" = dontDistribute super."wxdirect"; + "wxhnotepad" = dontDistribute super."wxhnotepad"; + "wxturtle" = dontDistribute super."wxturtle"; + "wybor" = dontDistribute super."wybor"; + "wyvern" = dontDistribute super."wyvern"; + "x-dsp" = dontDistribute super."x-dsp"; + "x11-xim" = dontDistribute super."x11-xim"; + "x11-xinput" = dontDistribute super."x11-xinput"; + "x509-util" = dontDistribute super."x509-util"; + "xattr" = dontDistribute super."xattr"; + "xbattbar" = dontDistribute super."xbattbar"; + "xcb-types" = dontDistribute super."xcb-types"; + "xcffib" = dontDistribute super."xcffib"; + "xchat-plugin" = dontDistribute super."xchat-plugin"; + "xcp" = dontDistribute super."xcp"; + "xdg-userdirs" = dontDistribute super."xdg-userdirs"; + "xdot" = dontDistribute super."xdot"; + "xfconf" = dontDistribute super."xfconf"; + "xhaskell-library" = dontDistribute super."xhaskell-library"; + "xhb" = dontDistribute super."xhb"; + "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; + "xhb-ewmh" = dontDistribute super."xhb-ewmh"; + "xhtml" = doDistribute super."xhtml_3000_2_1"; + "xhtml-combinators" = dontDistribute super."xhtml-combinators"; + "xilinx-lava" = dontDistribute super."xilinx-lava"; + "xine" = dontDistribute super."xine"; + "xing-api" = dontDistribute super."xing-api"; + "xinput-conduit" = dontDistribute super."xinput-conduit"; + "xkbcommon" = dontDistribute super."xkbcommon"; + "xkcd" = dontDistribute super."xkcd"; + "xlsx-templater" = dontDistribute super."xlsx-templater"; + "xml-basic" = dontDistribute super."xml-basic"; + "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-enumerator" = dontDistribute super."xml-enumerator"; + "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; + "xml-extractors" = dontDistribute super."xml-extractors"; + "xml-helpers" = dontDistribute super."xml-helpers"; + "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; + "xml-monad" = dontDistribute super."xml-monad"; + "xml-parsec" = dontDistribute super."xml-parsec"; + "xml-picklers" = dontDistribute super."xml-picklers"; + "xml-pipe" = dontDistribute super."xml-pipe"; + "xml-prettify" = dontDistribute super."xml-prettify"; + "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; + "xml2html" = dontDistribute super."xml2html"; + "xml2json" = dontDistribute super."xml2json"; + "xml2x" = dontDistribute super."xml2x"; + "xmltv" = dontDistribute super."xmltv"; + "xmms2-client" = dontDistribute super."xmms2-client"; + "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; + "xmobar" = dontDistribute super."xmobar"; + "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; + "xmonad-contrib" = dontDistribute super."xmonad-contrib"; + "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; + "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; + "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; + "xmonad-eval" = dontDistribute super."xmonad-eval"; + "xmonad-extras" = dontDistribute super."xmonad-extras"; + "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; + "xmonad-utils" = dontDistribute super."xmonad-utils"; + "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; + "xmonad-windownames" = dontDistribute super."xmonad-windownames"; + "xmpipe" = dontDistribute super."xmpipe"; + "xorshift" = dontDistribute super."xorshift"; + "xosd" = dontDistribute super."xosd"; + "xournal-builder" = dontDistribute super."xournal-builder"; + "xournal-convert" = dontDistribute super."xournal-convert"; + "xournal-parser" = dontDistribute super."xournal-parser"; + "xournal-render" = dontDistribute super."xournal-render"; + "xournal-types" = dontDistribute super."xournal-types"; + "xsact" = dontDistribute super."xsact"; + "xsd" = dontDistribute super."xsd"; + "xsha1" = dontDistribute super."xsha1"; + "xslt" = dontDistribute super."xslt"; + "xtc" = dontDistribute super."xtc"; + "xtest" = dontDistribute super."xtest"; + "xturtle" = dontDistribute super."xturtle"; + "xxhash" = dontDistribute super."xxhash"; + "y0l0bot" = dontDistribute super."y0l0bot"; + "yabi" = dontDistribute super."yabi"; + "yabi-muno" = dontDistribute super."yabi-muno"; + "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; + "yahoo-web-search" = dontDistribute super."yahoo-web-search"; + "yajl" = dontDistribute super."yajl"; + "yajl-enumerator" = dontDistribute super."yajl-enumerator"; + "yall" = dontDistribute super."yall"; + "yamemo" = dontDistribute super."yamemo"; + "yaml-config" = dontDistribute super."yaml-config"; + "yaml-light-lens" = dontDistribute super."yaml-light-lens"; + "yaml-rpc" = dontDistribute super."yaml-rpc"; + "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; + "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; + "yaml-union" = dontDistribute super."yaml-union"; + "yaml2owl" = dontDistribute super."yaml2owl"; + "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; + "yampa-canvas" = dontDistribute super."yampa-canvas"; + "yampa-glfw" = dontDistribute super."yampa-glfw"; + "yampa-glut" = dontDistribute super."yampa-glut"; + "yampa2048" = dontDistribute super."yampa2048"; + "yaop" = dontDistribute super."yaop"; + "yap" = dontDistribute super."yap"; + "yarr" = dontDistribute super."yarr"; + "yarr-image-io" = dontDistribute super."yarr-image-io"; + "yate" = dontDistribute super."yate"; + "yavie" = dontDistribute super."yavie"; + "ycextra" = dontDistribute super."ycextra"; + "yeganesh" = dontDistribute super."yeganesh"; + "yeller" = dontDistribute super."yeller"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; + "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; + "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; + "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; + "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth"; + "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; + "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; + "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; + "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; + "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-crud" = dontDistribute super."yesod-crud"; + "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; + "yesod-csp" = dontDistribute super."yesod-csp"; + "yesod-datatables" = dontDistribute super."yesod-datatables"; + "yesod-dsl" = dontDistribute super."yesod-dsl"; + "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-goodies" = dontDistribute super."yesod-goodies"; + "yesod-json" = dontDistribute super."yesod-json"; + "yesod-links" = dontDistribute super."yesod-links"; + "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-markdown" = dontDistribute super."yesod-markdown"; + "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5"; + "yesod-paginate" = dontDistribute super."yesod-paginate"; + "yesod-pagination" = dontDistribute super."yesod-pagination"; + "yesod-paginator" = dontDistribute super."yesod-paginator"; + "yesod-platform" = dontDistribute super."yesod-platform"; + "yesod-pnotify" = dontDistribute super."yesod-pnotify"; + "yesod-pure" = dontDistribute super."yesod-pure"; + "yesod-purescript" = dontDistribute super."yesod-purescript"; + "yesod-raml" = dontDistribute super."yesod-raml"; + "yesod-raml-bin" = dontDistribute super."yesod-raml-bin"; + "yesod-raml-docs" = dontDistribute super."yesod-raml-docs"; + "yesod-raml-mock" = dontDistribute super."yesod-raml-mock"; + "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; + "yesod-routes" = dontDistribute super."yesod-routes"; + "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; + "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; + "yesod-rst" = dontDistribute super."yesod-rst"; + "yesod-s3" = dontDistribute super."yesod-s3"; + "yesod-sass" = dontDistribute super."yesod-sass"; + "yesod-session-redis" = dontDistribute super."yesod-session-redis"; + "yesod-tableview" = dontDistribute super."yesod-tableview"; + "yesod-test-json" = dontDistribute super."yesod-test-json"; + "yesod-tls" = dontDistribute super."yesod-tls"; + "yesod-transloadit" = dontDistribute super."yesod-transloadit"; + "yesod-vend" = dontDistribute super."yesod-vend"; + "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; + "yesod-worker" = dontDistribute super."yesod-worker"; + "yet-another-logger" = dontDistribute super."yet-another-logger"; + "yhccore" = dontDistribute super."yhccore"; + "yi-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "yi-snippet" = dontDistribute super."yi-snippet"; + "yi-solarized" = dontDistribute super."yi-solarized"; + "yi-spolsky" = dontDistribute super."yi-spolsky"; + "yi-vty" = dontDistribute super."yi-vty"; + "yices" = dontDistribute super."yices"; + "yices-easy" = dontDistribute super."yices-easy"; + "yices-painless" = dontDistribute super."yices-painless"; + "yjftp" = dontDistribute super."yjftp"; + "yjftp-libs" = dontDistribute super."yjftp-libs"; + "yjsvg" = dontDistribute super."yjsvg"; + "yjtools" = dontDistribute super."yjtools"; + "yocto" = dontDistribute super."yocto"; + "yoctoparsec" = dontDistribute super."yoctoparsec"; + "yoko" = dontDistribute super."yoko"; + "york-lava" = dontDistribute super."york-lava"; + "youtube" = dontDistribute super."youtube"; + "yql" = dontDistribute super."yql"; + "yst" = dontDistribute super."yst"; + "yuiGrid" = dontDistribute super."yuiGrid"; + "yuuko" = dontDistribute super."yuuko"; + "yxdb-utils" = dontDistribute super."yxdb-utils"; + "z3" = dontDistribute super."z3"; + "zalgo" = dontDistribute super."zalgo"; + "zampolit" = dontDistribute super."zampolit"; + "zasni-gerna" = dontDistribute super."zasni-gerna"; + "zcache" = dontDistribute super."zcache"; + "zenc" = dontDistribute super."zenc"; + "zendesk-api" = dontDistribute super."zendesk-api"; + "zeno" = dontDistribute super."zeno"; + "zerobin" = dontDistribute super."zerobin"; + "zeromq-haskell" = dontDistribute super."zeromq-haskell"; + "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; + "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; + "zeroth" = dontDistribute super."zeroth"; + "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip-conduit" = dontDistribute super."zip-conduit"; + "zipedit" = dontDistribute super."zipedit"; + "zipkin" = dontDistribute super."zipkin"; + "zipper" = dontDistribute super."zipper"; + "zippers" = dontDistribute super."zippers"; + "zippo" = dontDistribute super."zippo"; + "zlib-conduit" = dontDistribute super."zlib-conduit"; + "zmcat" = dontDistribute super."zmcat"; + "zmidi-core" = dontDistribute super."zmidi-core"; + "zmidi-score" = dontDistribute super."zmidi-score"; + "zmqat" = dontDistribute super."zmqat"; + "zoneinfo" = dontDistribute super."zoneinfo"; + "zoom" = dontDistribute super."zoom"; + "zoom-cache" = dontDistribute super."zoom-cache"; + "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; + "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; + "zoom-refs" = dontDistribute super."zoom-refs"; + "zot" = dontDistribute super."zot"; + "zsh-battery" = dontDistribute super."zsh-battery"; + "ztail" = dontDistribute super."ztail"; + +} diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1a9a2ac9729..58ad27a8a92 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -556,10 +556,9 @@ self: { ({ mkDerivation, AbortT-transformers, base, mtl }: mkDerivation { pname = "AbortT-mtl"; - version = "1.0"; - sha256 = "42df8b886598bdfbb10f67d718eae41fb9866618dd8852e97549d915cb26379f"; + version = "1.0.0.1"; + sha256 = "5175fa41e0e71627a4bedd3e61fe9b871a6730b065ffe6ae1952ba6f0de151f4"; libraryHaskellDepends = [ AbortT-transformers base mtl ]; - jailbreak = true; homepage = "http://github.com/gcross/AbortT-mtl"; description = "mtl instances for the AbortT monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -571,14 +570,13 @@ self: { }: mkDerivation { pname = "AbortT-transformers"; - version = "1.0.1.1"; - sha256 = "773dc6aefb5b50937032a5c02d0ccd8320218f6d361361400882e694af600303"; + version = "1.0.1.2"; + sha256 = "62e9da8630493deb3b63aa5ec4c0151fd75e44b0d530eba0cb7f1f58ffb978ea"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; - jailbreak = true; homepage = "http://github.com/gcross/AbortT-transformers"; description = "A monad and monadic transformer providing \"abort\" functionality"; license = stdenv.lib.licenses.bsd3; @@ -1187,8 +1185,8 @@ self: { }: mkDerivation { pname = "BNFC"; - version = "2.8"; - sha256 = "21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34"; + version = "2.8.1"; + sha256 = "2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -5286,25 +5284,25 @@ self: { }) {}; "EtaMOO" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, hashable, haskeline, mtl, network, old-locale, parsec - , pcre, pipes, pipes-bytestring, pipes-concurrency, pipes-network - , pureMD5, random, stm, stm-chans, text, time, transformers, unix - , unordered-containers, vector + ({ mkDerivation, array, async, base, bytestring, case-insensitive + , containers, cryptonite, hashable, haskeline, memory, mtl, network + , parsec, pcre, pipes, pipes-bytestring, pipes-concurrency + , pipes-network, random, stm, stm-chans, text, time, transformers + , unix, unordered-containers, vcache, vector }: mkDerivation { pname = "EtaMOO"; - version = "0.2.0.0"; - sha256 = "365169b4fa2eb1ff2422eedfdb32c0053b8c77cc6c605310c876b46f1ac1f86c"; + version = "0.3.0.0"; + sha256 = "501344b7dfe9ec437fd137a247d785eed7d497f35daacd6aed3d940b8837c57c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base bytestring case-insensitive containers hashable - haskeline mtl network old-locale parsec pipes pipes-bytestring - pipes-concurrency pipes-network pureMD5 random stm stm-chans text - time transformers unix unordered-containers vector + array async base bytestring case-insensitive containers cryptonite + hashable haskeline memory mtl network parsec pipes pipes-bytestring + pipes-concurrency pipes-network random stm stm-chans text time + transformers unix unordered-containers vcache vector ]; - executableSystemDepends = [ pcre ]; + executablePkgconfigDepends = [ pcre ]; homepage = "http://verement.github.io/etamoo"; description = "A new implementation of the LambdaMOO server"; license = stdenv.lib.licenses.bsd3; @@ -12421,6 +12419,21 @@ self: { license = "GPL"; }) {}; + "Lazy-Pbkdf2" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring, SHA + }: + mkDerivation { + pname = "Lazy-Pbkdf2"; + version = "1.0.2"; + sha256 = "6318c60db0b18877c0edf0a01ba21254b44e9624210bc59834e1dc8116ca86fc"; + libraryHaskellDepends = [ base binary bytestring SHA ]; + testHaskellDepends = [ + base base16-bytestring binary bytestring SHA + ]; + description = "Lazy PBKDF2 generator"; + license = stdenv.lib.licenses.mit; + }) {}; + "LazyVault" = callPackage ({ mkDerivation, base, directory, filepath, unix }: mkDerivation { @@ -13368,8 +13381,8 @@ self: { }: mkDerivation { pname = "MoeDict"; - version = "0.0.3"; - sha256 = "2afdb1f3972f93619b236835680616bbfcd435ee52e097afad04a53f38c4c769"; + version = "0.0.4"; + sha256 = "6896d22e1ce081b55fb461fc260ea3613218009ff2c600901a8c4f2f7feef66e"; libraryHaskellDepends = [ aeson base bytestring containers text unordered-containers ]; @@ -15564,8 +15577,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.9.0.0"; - sha256 = "564428ef3f2575cfd89d0a961c4a58997063d5177376212a04e3baf19139a1c3"; + version = "0.9.0.1"; + sha256 = "f7cf62c612c0bdf18b7fa4791260ac7f7b1ee7bb58d8f131c358f002a9262ec9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17739,6 +17752,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "SimpleServer" = callPackage + ({ mkDerivation, base, cmdargs, dyre, transformers, wai-routes + , warp + }: + mkDerivation { + pname = "SimpleServer"; + version = "0.1.1.1"; + sha256 = "e3f3d556ad866c442183788f64d97e4e55e50bedcab4bfef65803352146bdeb4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs dyre transformers wai-routes warp + ]; + executableHaskellDepends = [ + base cmdargs dyre transformers wai-routes warp + ]; + description = "A simple static file server, for when apache is overkill"; + license = stdenv.lib.licenses.mit; + }) {}; + "SizeCompare" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -23705,8 +23738,8 @@ self: { }: mkDerivation { pname = "aivika-branches"; - version = "0.1"; - sha256 = "b792804e0bb8484e2397078751f76b9f2ac042047222446e42d03ab3a1150b11"; + version = "0.1.1"; + sha256 = "56bbc2b3e7c9d1db19828b80fd2fc04dcbd1396a32bfd4d5d8e123418428e94a"; libraryHaskellDepends = [ aivika aivika-transformers base containers mtl random ]; @@ -23789,8 +23822,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "4.3.1"; - sha256 = "4acb26db40ab81c6436d1a3407315eddba1d677967a3210674a1783424ab0055"; + version = "4.3.2"; + sha256 = "34a0f93a75918a9a4c9db2062522bc6e042b33705797ad7a50215f244fa72355"; libraryHaskellDepends = [ aivika array base containers mtl random vector ]; @@ -29236,7 +29269,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "apply-refact" = callPackage + "apply-refact_0_1_0_0" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact , silently, syb, tasty, tasty-expected-failure, tasty-golden @@ -29264,9 +29297,10 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "apply-refact_0_2_0_0" = callPackage + "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact , silently, syb, tasty, tasty-expected-failure, tasty-golden @@ -29295,7 +29329,6 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apportionment" = callPackage @@ -33196,7 +33229,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "b9" = callPackage + "b9_0_5_16" = callPackage ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes , bytestring, conduit, conduit-extra, ConfigFile, directory , filepath, free, hashable, hspec, hspec-expectations, mtl @@ -33227,9 +33260,10 @@ self: { homepage = "https://github.com/sheyll/b9-vm-image-builder"; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "b9_0_5_17" = callPackage + "b9" = callPackage ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes , bytestring, conduit, conduit-extra, ConfigFile, directory , filepath, free, hashable, hspec, hspec-expectations, mtl @@ -33260,7 +33294,6 @@ self: { homepage = "https://github.com/sheyll/b9-vm-image-builder"; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "babylon" = callPackage @@ -37869,8 +37902,8 @@ self: { pname = "blank-canvas"; version = "0.6"; sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3"; - revision = "1"; - editedCabalFile = "898e9d275a0c51fe2e9de5f60d521a622186b87fd801c9336ccbaab2b4adf5fb"; + revision = "2"; + editedCabalFile = "4a18531b67c35f0343333d8281ad3acdbde48f5ff6a4b7e3e687d4eac4c2f570"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour containers data-default-class http-types kansas-comet mime-types @@ -39022,6 +39055,22 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "boombox" = callPackage + ({ mkDerivation, base, bytestring, comonad, semigroupoids + , semigroups, transformers + }: + mkDerivation { + pname = "boombox"; + version = "0.0"; + sha256 = "e48f0f1ee83d128bab671f1ac0077faa13e5f61f89031b77de151d1fcc8704fc"; + libraryHaskellDepends = [ + base bytestring comonad semigroupoids semigroups transformers + ]; + homepage = "https://github.com/fumieval/boombox"; + description = "Chronokinetic stream sources and incremental consumers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "boomerang" = callPackage ({ mkDerivation, base, mtl, template-haskell, text }: mkDerivation { @@ -40840,14 +40889,13 @@ self: { }) {}; "bytestring-short" = callPackage - ({ mkDerivation, base, bytestring, deepseq, QuickCheck }: + ({ mkDerivation, base, bytestring }: mkDerivation { pname = "bytestring-short"; - version = "0.0.1.0"; - sha256 = "9b23a18121366a02fcc49a6c63a453500f475a302eab6e5e255e27c2e1308c0c"; - libraryHaskellDepends = [ base bytestring deepseq ]; - testHaskellDepends = [ base bytestring QuickCheck ]; - jailbreak = true; + version = "0.1.0.0"; + sha256 = "39b303951403758dcf626f48e4501b93865d3b4d52d90ae594bbe91a4fc9fca6"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base ]; description = "Backport copy of ShortByteString"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -40871,14 +40919,16 @@ self: { "bytestring-tree-builder" = callPackage ({ mkDerivation, base, base-prelude, bytestring, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck + , quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text }: mkDerivation { pname = "bytestring-tree-builder"; - version = "0.2.2.1"; - sha256 = "7c63bedde6d0179d0c595fa14d0bfe46625e6fc089eb82675fe463ffa015286d"; - libraryHaskellDepends = [ base base-prelude bytestring ]; + version = "0.2.4"; + sha256 = "5c2c3a45e60d1a58b1036139fdc4976554d6539e6333b5e9183cd580b1e10e4f"; + libraryHaskellDepends = [ + base base-prelude bytestring semigroups text + ]; testHaskellDepends = [ base-prelude bytestring QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-smallcheck @@ -41595,6 +41645,27 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "cabal-info" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath + , optparse-applicative + }: + mkDerivation { + pname = "cabal-info"; + version = "0.1.0.0"; + sha256 = "d7623ce69cdf180f3266cc14fcf4e53f4d5b2c4d9cb359f145a730878096fc6d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal directory filepath optparse-applicative + ]; + executableHaskellDepends = [ + base Cabal filepath optparse-applicative + ]; + homepage = "https://github.com/barrucadu/cabal-info"; + description = "Read information from cabal files"; + license = stdenv.lib.licenses.mit; + }) {}; + "cabal-install_1_18_0_5" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, filepath, HTTP, HUnit, mtl, network, pretty, process @@ -43759,6 +43830,8 @@ self: { pname = "case-insensitive"; version = "1.2.0.5"; sha256 = "c450d04e018a027747592482d7b4d8725e334bde38e903d4f2c03f99583d3700"; + revision = "1"; + editedCabalFile = "4935ae0d0f5866052676c346aa5efc84f0a0a10570eaa44b6221b6db00f90aa6"; libraryHaskellDepends = [ base bytestring deepseq hashable text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text @@ -51847,6 +51920,8 @@ self: { pname = "config-value"; version = "0.4.0.1"; sha256 = "67e92a664a7d5b80c456d3f0cdbbf6f1fc8d00710509f784221fd01c60342f35"; + revision = "1"; + editedCabalFile = "a07f958c50a175dba2f3e4ee6130a1871d14eb6cb28612b4cf040251cd026b28"; libraryHaskellDepends = [ array base pretty text transformers ]; libraryToolDepends = [ alex happy ]; homepage = "https://github.com/glguy/config-value"; @@ -53555,17 +53630,12 @@ self: { }) {}; "coroutine-object" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, either, lens - , mtl, safecopy, transformers, transformers-free, uuid - }: + ({ mkDerivation, base, either, free, mtl, transformers }: mkDerivation { pname = "coroutine-object"; - version = "0.3"; - sha256 = "394cb02b87c8b53b4a89a1652954c0c215d302ae1ec0ae66acbcdf7818db1960"; - libraryHaskellDepends = [ - base bytestring cereal containers either lens mtl safecopy - transformers transformers-free uuid - ]; + version = "0.3.0"; + sha256 = "cf0fb74baee84167898e899f9e5779c0c71c9d2967fc4a52d25941aeddf0f7c1"; + libraryHaskellDepends = [ base either free mtl transformers ]; description = "Object-oriented programming realization using coroutine"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -57357,6 +57427,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-default-instances-bytestring" = callPackage + ({ mkDerivation, base, bytestring, data-default-class }: + mkDerivation { + pname = "data-default-instances-bytestring"; + version = "0.0.1"; + sha256 = "4c431278d0dc1054fd531281db70d8615f88d9b2a29924aba2567fb3cf647220"; + libraryHaskellDepends = [ base bytestring data-default-class ]; + homepage = "https://github.com/trskop/data-default-extra"; + description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "data-default-instances-case-insensitive" = callPackage + ({ mkDerivation, case-insensitive, data-default-class }: + mkDerivation { + pname = "data-default-instances-case-insensitive"; + version = "0.0.1"; + sha256 = "430135708ad9d0730a4c3a3d1eb574bdc6f07547a5a9c5f30202e1e786070ab4"; + libraryHaskellDepends = [ case-insensitive data-default-class ]; + homepage = "https://github.com/trskop/data-default-extra"; + description = "Default instance for CI type from case-insensitive package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-default-instances-containers" = callPackage ({ mkDerivation, base, containers, data-default-class }: mkDerivation { @@ -57379,6 +57473,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-default-instances-new-base" = callPackage + ({ mkDerivation, base, data-default-class + , data-default-instances-base + }: + mkDerivation { + pname = "data-default-instances-new-base"; + version = "0.0.1"; + sha256 = "d923d291a26817f2bc54ba110efc8cb1cefcdb17c7a5af8e2d12506c594b7edc"; + libraryHaskellDepends = [ + base data-default-class data-default-instances-base + ]; + homepage = "https://github.com/trskop/data-default-extra"; + description = "Default instances for types in newer versions of base package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-default-instances-old-locale" = callPackage ({ mkDerivation, base, data-default-class, old-locale }: mkDerivation { @@ -57390,6 +57500,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-default-instances-text" = callPackage + ({ mkDerivation, base, data-default-class, text }: + mkDerivation { + pname = "data-default-instances-text"; + version = "0.0.1"; + sha256 = "db5d4c46cf36ce5956ffd0affe0f2c48e1c000b9bd61821d3e6c1b0171060cdf"; + libraryHaskellDepends = [ base data-default-class text ]; + homepage = "https://github.com/trskop/data-default-extra"; + description = "Default instances for (lazy and strict) Text and Text Builder"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "data-default-instances-unordered-containers" = callPackage + ({ mkDerivation, data-default-class, unordered-containers }: + mkDerivation { + pname = "data-default-instances-unordered-containers"; + version = "0.0.1"; + sha256 = "b382a7ea90fd61127782e95fa5e7ee3a17969b762bf0aac4efd15fa7c2552fc0"; + libraryHaskellDepends = [ + data-default-class unordered-containers + ]; + homepage = "https://github.com/trskop/data-default-extra"; + description = "Default instances for unordered-containers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "data-default-instances-vector" = callPackage + ({ mkDerivation, data-default-class, vector }: + mkDerivation { + pname = "data-default-instances-vector"; + version = "0.0.1"; + sha256 = "9ac84473a3af8b0c5e795ea5f84a34a0c18c3b2d5e17ce428206203f9d794666"; + libraryHaskellDepends = [ data-default-class vector ]; + homepage = "https://github.com/trskop/data-default-extra"; + description = "Default instances for types defined in vector package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-dispersal" = callPackage ({ mkDerivation, AES, array, base, binary, bytestring, entropy , finite-field, matrix, QuickCheck, secret-sharing, spool, syb @@ -63352,6 +63500,7 @@ self: { testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text ]; + doCheck = false; homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; @@ -66561,6 +66710,8 @@ self: { pname = "dynamic-state"; version = "0.2.0.0"; sha256 = "53a09c16380012b35079a7d41fca332fc94b55a0b0c929937af94cc9cad5e0b6"; + revision = "1"; + editedCabalFile = "640601c8531dae847d624eac78db22ce0343c1607040a7158454635f486e477c"; libraryHaskellDepends = [ base binary bytestring hashable unordered-containers ]; @@ -69076,6 +69227,8 @@ self: { pname = "enummapset-th"; version = "0.6.1.0"; sha256 = "bd7ec9fd9063dcf9c8504fe509abdd15466261ef2ba9ec62d6e6abb51e8694f6"; + revision = "1"; + editedCabalFile = "2544cf675da1fd28debde06f5d2c9747da0d8b48aa66f2374886d38333f8dc17"; libraryHaskellDepends = [ base containers deepseq template-haskell ]; @@ -69683,7 +69836,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "errors" = callPackage + "errors_2_1_1" = callPackage ({ mkDerivation, base, safe, transformers, transformers-compat , unexceptionalio }: @@ -69696,6 +69849,22 @@ self: { ]; description = "Simplified error-handling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "errors" = callPackage + ({ mkDerivation, base, safe, transformers, transformers-compat + , unexceptionalio + }: + mkDerivation { + pname = "errors"; + version = "2.1.2"; + sha256 = "5c818778b88b76eca016348a04395c1d4913d7c125c0b9c0a1ccf69accf9d887"; + libraryHaskellDepends = [ + base safe transformers transformers-compat unexceptionalio + ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; }) {}; "ersatz_0_2_6_1" = callPackage @@ -70538,6 +70707,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "exact-pi_0_4_1_1" = callPackage + ({ mkDerivation, base, numtype-dk }: + mkDerivation { + pname = "exact-pi"; + version = "0.4.1.1"; + sha256 = "ea5928688a202ae54fd7216dbaab073ae660ffec4b3165724d98c938cc1acad8"; + libraryHaskellDepends = [ base numtype-dk ]; + homepage = "https://github.com/dmcclean/exact-pi/"; + description = "Exact rational multiples of pi (and integer powers of pi)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exact-real" = callPackage ({ mkDerivation, base, checkers, directory, doctest, filepath , groups, integer-gmp, memoize, QuickCheck, random, tasty @@ -74941,6 +75123,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "fixfile" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, exceptions, filepath, hashable, hashtables, lens, mtl + , QuickCheck, tasty, tasty-quickcheck, temporary + }: + mkDerivation { + pname = "fixfile"; + version = "0.1.0.0"; + sha256 = "f52739e9ecd4b018fa1744890a3fb185da003b08c1244b748719ea657c36321a"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath hashable + hashtables lens mtl temporary + ]; + testHaskellDepends = [ + base binary bytestring directory exceptions lens mtl QuickCheck + tasty tasty-quickcheck temporary + ]; + homepage = "https://github.com/revnull/fixfile"; + description = "File-backed recursive data structures"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "fixhs" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , bytestring, containers, deepseq, dlist, enumerator, HaXml @@ -76874,18 +77078,17 @@ self: { }) {}; "fquery" = callPackage - ({ mkDerivation, base, directory, extensible-exceptions, hashtables - , parsec, process, regex-compat, unix + ({ mkDerivation, base, directory, filepath, hashtables, parsec + , process, regex-compat, unix }: mkDerivation { pname = "fquery"; - version = "0.2.1.5"; - sha256 = "f124de95a18d2e177ed1fae3493ad093c8c365d513c0cc958227fc59f2ca38ec"; + version = "0.2.2"; + sha256 = "5641c8748ff11e5ba37175eac76ee4b14739a3d4d4711ea5ce023bc8d8559cbe"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory extensible-exceptions hashtables parsec process - regex-compat unix + base directory filepath hashtables parsec process regex-compat unix ]; description = "Installed package query tool for Gentoo Linux"; license = "unknown"; @@ -77567,8 +77770,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "frown"; - version = "0.6.2"; - sha256 = "549b372590e98b4d182310948db8053b32465ce96d78ea8d8953494252c242d7"; + version = "0.6.2.2"; + sha256 = "d061880b6b3fca4f2a5c054f5669d9c0747139386c47ccf57db4d5521c02c447"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory ]; @@ -80715,7 +80918,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-typelits-natnormalise" = callPackage + "ghc-typelits-natnormalise_0_4" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit }: mkDerivation { @@ -80727,6 +80930,21 @@ self: { homepage = "http://www.clash-lang.org/"; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-typelits-natnormalise" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.4.1"; + sha256 = "d7b1d7059eb0a9254ff6983897141f8fd0ac485dcb2c09eafd19f36dce0e5af7"; + libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; }) {}; "ghc-vis" = callPackage @@ -82251,7 +82469,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "github" = callPackage + "github_0_14_0" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat , base16-bytestring, binary, binary-orphans, byteable, bytestring , containers, cryptohash, deepseq, deepseq-generics, exceptions @@ -82279,9 +82497,10 @@ self: { homepage = "https://github.com/phadej/github"; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "github_0_14_1" = callPackage + "github" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat , base16-bytestring, binary, binary-orphans, byteable, bytestring , containers, cryptohash, deepseq, deepseq-generics, exceptions @@ -82309,7 +82528,6 @@ self: { homepage = "https://github.com/phadej/github"; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-backup" = callPackage @@ -82320,8 +82538,8 @@ self: { }: mkDerivation { pname = "github-backup"; - version = "1.20150807"; - sha256 = "52236cba75a6e9c2a71c77e62839d22d5a672bb3e4bf4bb61d32c3c64d38a8a7"; + version = "1.20160207"; + sha256 = "7502179fe38bc00b21f9352a013334bfb9ca51488854bd9c01092cedf2330c64"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82331,6 +82549,7 @@ self: { unix-compat ]; executableToolDepends = [ git ]; + jailbreak = true; homepage = "https://github.com/joeyh/github-backup"; description = "backs up everything github knows about a repository, to the repository"; license = stdenv.lib.licenses.gpl3; @@ -85789,7 +86008,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "graph-core" = callPackage + "graph-core_0_2_2_0" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, HTF, mtl , QuickCheck, safe, unordered-containers, vector }: @@ -85810,24 +86029,50 @@ self: { homepage = "https://github.com/factisresearch/graph-core"; description = "Fast, memory efficient and persistent graph implementation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "graph-core" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, HTF, mtl + , QuickCheck, safe, unordered-containers, vector + }: + mkDerivation { + pname = "graph-core"; + version = "0.3.0.0"; + sha256 = "378f0baa40ebbb78e8c389f79e363eb573cdf182f799684d2f3d6ac51b10e854"; + libraryHaskellDepends = [ + base containers deepseq hashable mtl safe unordered-containers + vector + ]; + testHaskellDepends = [ + base containers deepseq hashable HTF mtl QuickCheck safe + unordered-containers vector + ]; + homepage = "https://github.com/factisresearch/graph-core"; + description = "Fast, memory efficient and persistent graph implementation"; + license = stdenv.lib.licenses.mit; }) {}; "graph-generators" = callPackage - ({ mkDerivation, base, Cabal, containers, fgl, hspec + ({ mkDerivation, base, Cabal, containers, directory, fgl, hspec , hspec-expectations, multiset, mwc-random, QuickCheck }: mkDerivation { pname = "graph-generators"; - version = "0.1.2.0"; - sha256 = "3ae508177ce01f86cfcc091421294a1a0736a56f9f8a34cd07cc67486b168247"; + version = "0.1.3.0"; + sha256 = "1fe09712b7c52b18da467facf0ffb78e7de515113401b5c2d8adf7fb13603d50"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers fgl multiset mwc-random ]; + executableHaskellDepends = [ + base containers directory fgl multiset mwc-random + ]; testHaskellDepends = [ base Cabal containers fgl hspec hspec-expectations multiset mwc-random QuickCheck ]; - jailbreak = true; homepage = "https://github.com/ulikoehler/graph-random"; description = "Functions for generating structured or random FGL graphs"; license = stdenv.lib.licenses.asl20; @@ -85886,13 +86131,12 @@ self: { }: mkDerivation { pname = "graph-rewriting-gl"; - version = "0.7.5"; - sha256 = "1ece884c105a81479a57d215b50ff22e7d60a86d6b04ab072724192132fcd633"; + version = "0.7.6"; + sha256 = "a6157c17e07fbf167b64ebfa51e256794fd99ce1fff4ede88035d8c9e4299239"; libraryHaskellDepends = [ AC-Vector base base-unicode-symbols containers GLUT graph-rewriting graph-rewriting-layout OpenGL ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "OpenGL interface for interactive port graph rewriting"; license = stdenv.lib.licenses.bsd3; @@ -85906,8 +86150,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-lambdascope"; - version = "0.5.6"; - sha256 = "77efc3d0516306119c1e959a7bfb37428e9cfb67e6e34cc7bfb728216c159ee3"; + version = "0.5.8"; + sha256 = "e56293febd459060627af0912e7c1d0a0d6840fa31c2d5e9fcc1ca9bf9914db1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85915,7 +86159,6 @@ self: { graph-rewriting-layout graph-rewriting-strategies IndentParser OpenGL parsec ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system"; license = stdenv.lib.licenses.bsd3; @@ -85928,12 +86171,11 @@ self: { }: mkDerivation { pname = "graph-rewriting-layout"; - version = "0.5.3"; - sha256 = "c5950e8c5714968e59203518335dad4f796191248a8f762c8676343b9567da25"; + version = "0.5.4"; + sha256 = "052f1d481edf398cfd486849d981de20a298842a75a20864190b921af8fd7d92"; libraryHaskellDepends = [ AC-Vector base base-unicode-symbols graph-rewriting ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Force-directed node placement intended for incremental graph drawing"; license = stdenv.lib.licenses.bsd3; @@ -85946,15 +86188,14 @@ self: { }: mkDerivation { pname = "graph-rewriting-ski"; - version = "0.6.4"; - sha256 = "4409c3422694fa332cafb8cde7711d4442c3e0cd412daa401e9d1e413ee3ae49"; + version = "0.6.5"; + sha256 = "019378940fb886e668a57a580b2df65309ab80def00555c77cf75b224923ac1a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL parsec ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems"; license = stdenv.lib.licenses.bsd3; @@ -85967,12 +86208,11 @@ self: { }: mkDerivation { pname = "graph-rewriting-strategies"; - version = "0.2.3"; - sha256 = "59a6a16d6c4d51608a0e07dc611e89ee4dc376c4096488a460e9dabafab93556"; + version = "0.2.4"; + sha256 = "6230a111c89e765aba002eaf62db138e7ec848474f78b300c21b7d7e087caa57"; libraryHaskellDepends = [ base base-unicode-symbols containers graph-rewriting ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluation strategies for port-graph rewriting systems"; license = stdenv.lib.licenses.bsd3; @@ -85986,8 +86226,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-trs"; - version = "0.1.6"; - sha256 = "cf237b8faf13a36d5bb594a64b2768db0203a819b083c02ff45282ea07ab11ed"; + version = "0.1.7"; + sha256 = "e5e3a8e1bf70e39a933cd0b4d395eaf4c912cdbb547926b6a26472163fdbe92e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85995,7 +86235,6 @@ self: { graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL uu-parsinglib ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction"; license = stdenv.lib.licenses.bsd3; @@ -86009,15 +86248,14 @@ self: { }: mkDerivation { pname = "graph-rewriting-ww"; - version = "0.3.4"; - sha256 = "5c6c65e3904c00c3ac62ebba5ef1ce64604101cb3f76e944a034e1127c2c3a99"; + version = "0.3.5"; + sha256 = "649160c0315861f275012e891a074a96aa6f59a3890f2e69f9612a1d91dece5a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout IndentParser OpenGL parsec ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing"; license = stdenv.lib.licenses.bsd3; @@ -86537,6 +86775,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "greplicate" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "greplicate"; + version = "0.0.2"; + sha256 = "c73d6b8f586e6004d3d66bb7b5d1402941021ce8d29a309fbb61c45f28753ce5"; + libraryHaskellDepends = [ base lens ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/NICTA/greplicate"; + description = "Generalised replicate functions"; + license = "unknown"; + }) {}; + "grid" = callPackage ({ mkDerivation, base, cereal, containers, QuickCheck , test-framework, test-framework-quickcheck2 @@ -88450,6 +88705,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hOpenPGP_2_4_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib + , conduit, conduit-extra, containers, crypto-cipher-types + , cryptonite, data-default-class, errors, hashable + , incremental-parser, ixset-typed, lens, memory, monad-loops + , nettle, network, network-uri, newtype, openpgp-asciiarmor + , QuickCheck, quickcheck-instances, resourcet, securemem + , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text + , time, time-locale-compat, transformers, unordered-containers + , wl-pprint-extras, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.4.3"; + sha256 = "3e7ff2430415856b2d99d3cba144f9c41fcfe0cceea5d0967909b4033f0a86c9"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bifunctors binary + binary-conduit byteable bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype openpgp-asciiarmor resourcet + securemem semigroups split text time time-locale-compat + transformers unordered-containers wl-pprint-extras zlib + ]; + testHaskellDepends = [ + aeson attoparsec base bifunctors binary binary-conduit byteable + bytestring bzlib conduit conduit-extra containers + crypto-cipher-types cryptonite data-default-class errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri newtype QuickCheck quickcheck-instances + resourcet securemem semigroups split tasty tasty-hunit + tasty-quickcheck text time time-locale-compat transformers + unordered-containers wl-pprint-extras zlib + ]; + homepage = "http://floss.scru.org/hOpenPGP/"; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPDB_1_2_0" = callPackage ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel @@ -89622,26 +89918,27 @@ self: { }) {}; "hackport" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , directory, extensible-exceptions, filepath, HTTP, HUnit, MissingH - , network, network-uri, old-locale, old-time, parsec, pretty - , process, regex-compat, tar, time, unix, xml, zlib + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, extensible-exceptions, filepath, HTTP, HUnit + , MissingH, network, network-uri, old-locale, old-time, parsec + , pretty, process, random, regex-compat, stm, tar, time, unix, xml + , zlib }: mkDerivation { pname = "hackport"; - version = "0.4.6"; - sha256 = "5b5cd178fbefe5363bd4f68ca98386fd2762df88ff24435e1999f28e80b1e14e"; + version = "0.4.7"; + sha256 = "17dc05163b456dceeb00180a03bb56f4218e5c5e1145c7ad12af13a261b0cf36"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base bytestring containers deepseq directory + array base binary bytestring containers deepseq directory extensible-exceptions filepath HTTP MissingH network network-uri - old-locale old-time parsec pretty process regex-compat tar time - unix xml zlib + old-locale old-time parsec pretty process random regex-compat stm + tar time unix xml zlib ]; testHaskellDepends = [ - base bytestring containers deepseq directory extensible-exceptions - filepath HUnit pretty process time unix xml + base binary bytestring containers deepseq directory + extensible-exceptions filepath HUnit pretty process time unix xml ]; description = "Hackage and Portage integration tool"; license = "GPL"; @@ -89984,6 +90281,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hahp" = callPackage + ({ mkDerivation, base, containers, hmatrix, parallel, time }: + mkDerivation { + pname = "hahp"; + version = "0.1.2"; + sha256 = "8c13015c685d5abf70ec6fbb7e6b50304f8689bab332d078d53d815e66f9b7fa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers hmatrix parallel time ]; + executableHaskellDepends = [ base time ]; + description = "Analytic Hierarchy Process"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "haiji" = callPackage ({ mkDerivation, aeson, attoparsec, base, data-default, doctest , filepath, mtl, process-extras, scientific, tagged, tasty @@ -93242,12 +93553,13 @@ self: { }) {}; "haskell-bcrypt" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, QuickCheck, random }: mkDerivation { pname = "haskell-bcrypt"; - version = "0.3.1"; - sha256 = "ed281ee8520e24b7d0a818494d48ab1c57e8b06d47a76207e058805aefcd0cf1"; + version = "0.3.2"; + sha256 = "427c3f95a0b9e3bd53a8d4b17b5f44bf3656ae1d5cfa93e48f2be85e6ea48a5a"; libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring QuickCheck random ]; homepage = "http://www.github.com/zbskii/haskell-bcrypt"; description = "A bcrypt implementation for haskell"; license = stdenv.lib.licenses.mit; @@ -95308,8 +95620,8 @@ self: { }: mkDerivation { pname = "haskore"; - version = "0.2.0.7"; - sha256 = "5ebbd8bf1d5164a67c12d7f42e6c2cc4f3a0ea996fd5644651c0ea5f6e579a92"; + version = "0.2.0.8"; + sha256 = "b4ac45e260e8ae417347985cc84062b684e59cc3519d18e765fa2d35f7c3d429"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95950,8 +96262,8 @@ self: { ({ mkDerivation, base-prelude, hasql, resource-pool, time }: mkDerivation { pname = "hasql-pool"; - version = "0.3"; - sha256 = "7afb74396758b9df4e5a5c0b2d63de1253e7717011eaea6269f9740423f18428"; + version = "0.4"; + sha256 = "6bb18b7f41a471e0260a60ecd0a4495ccef111e3151d0b3e55ae5e3865c3850e"; libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; homepage = "https://github.com/nikita-volkov/hasql-pool"; description = "A pool of connections for Hasql"; @@ -97249,6 +97561,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hcoap" = callPackage + ({ mkDerivation, async, base, binary, bytestring, HUnit, mtl + , network, QuickCheck, random, stm, time + }: + mkDerivation { + pname = "hcoap"; + version = "0.1.0.2"; + sha256 = "71a2ecfde4fc2a17d116d5cfacd6868b6abe7ae851b834710173dc6e449952a2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring mtl network random stm time + ]; + executableHaskellDepends = [ base bytestring network ]; + testHaskellDepends = [ + base bytestring HUnit network QuickCheck random + ]; + homepage = "https://github.com/lulf/hcoap"; + description = "CoAP implementation for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hcron" = callPackage ({ mkDerivation, base, bytestring, containers, directory, mtl , old-locale, pretty, process, random, stm, time @@ -101049,6 +101383,8 @@ self: { pname = "hjsmin"; version = "0.1.4.7"; sha256 = "0e157fa21ad14996e9b416f78c4af595459064dc63a3cbb3ed38e3788d8e89bf"; + revision = "1"; + editedCabalFile = "8b24f51f4fa13d3837421f03ef731625bde85e0e2913bc43377098d44d9c2521"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101078,6 +101414,8 @@ self: { pname = "hjsmin"; version = "0.1.4.8"; sha256 = "439f3524795e34b9999818155d2d3de0fe00ec856b3f57cb20d2e22d3e220188"; + revision = "1"; + editedCabalFile = "626a6e3677688c88a40f61f25025b67382c28826b908e55e4f98b9be1681c061"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101107,6 +101445,39 @@ self: { pname = "hjsmin"; version = "0.1.5.0"; sha256 = "f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7"; + revision = "1"; + editedCabalFile = "3f4d4ae3a1f8b219a975059ebe9957e45f260ed1e6802d886ad3f5ddc931c684"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers language-javascript text + ]; + executableHaskellDepends = [ + base blaze-builder bytestring containers language-javascript + optparse-applicative text + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers HUnit + language-javascript QuickCheck test-framework test-framework-hunit + text + ]; + homepage = "http://github.com/erikd/hjsmin"; + description = "Haskell implementation of a javascript minifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hjsmin_0_1_5_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , HUnit, language-javascript, optparse-applicative, QuickCheck + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "hjsmin"; + version = "0.1.5.1"; + sha256 = "d1e36c8fe5dfd46819425877ca7fc6a5b422fce138de9787b7409850252decff"; + revision = "1"; + editedCabalFile = "84b6550796b29b1ee7bec20c47223fe3e2e0c57abc52bc2565b2ac6e7e929351"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101134,8 +101505,8 @@ self: { }: mkDerivation { pname = "hjsmin"; - version = "0.1.5.1"; - sha256 = "d1e36c8fe5dfd46819425877ca7fc6a5b422fce138de9787b7409850252decff"; + version = "0.1.5.2"; + sha256 = "c2d04fe6b1f45d88d6b2e382b0fdf648a18b0cd913c2688af7ab77d7c27dd330"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102210,8 +102581,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.27"; - sha256 = "3e467fdd5ce0283f4513055230ef2ea3672a2b33469d8c73780ed240f23cdf6d"; + version = "1.9.28"; + sha256 = "eb06658a19c362a1f522dc495a6d5e5a90af68cefbcc178713aa8ee0a4c7f710"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107163,8 +107534,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.1.5.5"; - sha256 = "48422c732a18cd212d12c269dce834d4c781886573c190100fe9682394305db2"; + version = "0.1.6.0"; + sha256 = "93a1bd6462f45d9abf39cba0479f519f562c62d4bc30a3df3153314b7d300345"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107187,7 +107558,6 @@ self: { aeson aeson-lens async base containers data-default deepseq hformat hspec lens mtl text ]; - jailbreak = true; homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc"; license = stdenv.lib.licenses.bsd3; @@ -116584,6 +116954,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "include-file_0_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, random, template-haskell }: + mkDerivation { + pname = "include-file"; + version = "0.1.0.3"; + sha256 = "208f1f3bdc717f5f953cb7c9935c84d6a6291b7cd5ed8a22fa8567184be33d29"; + libraryHaskellDepends = [ + base bytestring random template-haskell + ]; + testHaskellDepends = [ base bytestring ]; + description = "Inclusion of files in executables at compile-time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-computing" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers , dlist, fingertree, order-maintenance, QuickCheck, transformers @@ -117789,8 +118174,11 @@ self: { pname = "intervals"; version = "0.7.0.1"; sha256 = "e92a527f8f23b7262f58102b9d3975220f926e73c3f7e866f5da79a11e210b0b"; + revision = "1"; + editedCabalFile = "ff335c7921df2f341b02893cf5aa3118ca96d3b3650d39f20467838a5931d44b"; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/intervals"; description = "Interval Arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -117928,6 +118316,8 @@ self: { pname = "invariant"; version = "0.3"; sha256 = "c45b9a150b3b48b22ec41964481bbe85567b3eab0ae15b784dd75b9a666a7a00"; + revision = "1"; + editedCabalFile = "560be9fd410c36d98bd6d1203a9916bf321d26d1b7c2b5ba259b30215245cd6f"; libraryHaskellDepends = [ array base bifunctors containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell transformers @@ -117939,6 +118329,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "invariant_0_3_1" = callPackage + ({ mkDerivation, array, base, bifunctors, containers, contravariant + , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar + , stm, tagged, template-haskell, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.3.1"; + sha256 = "db88ce3955ba99cec99dd1da2d917ce26c204837a6779712dd55f79cc873fdff"; + libraryHaskellDepends = [ + array base bifunctors containers contravariant ghc-prim profunctors + semigroups StateVar stm tagged template-haskell transformers + transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/nfrisby/invariant-functors"; + description = "Haskell 98 invariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible-syntax" = callPackage ({ mkDerivation, base, partial-isomorphisms }: mkDerivation { @@ -120468,12 +120880,11 @@ self: { }: mkDerivation { pname = "json-ast-quickcheck"; - version = "0.1"; - sha256 = "68c77372e7d7f1c7340d6932d91bc72fa0f24501930e01fa77387ed0e8931f1b"; + version = "0.2"; + sha256 = "41a6cab47756614727427311c08326ae960d7b88c21a5c9c5910f29a66e6cd04"; libraryHaskellDepends = [ base json-ast QuickCheck quickcheck-instances ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/json-ast-quickcheck"; description = "Compatibility layer for \"json-ast\" and \"QuickCheck\""; license = stdenv.lib.licenses.mit; @@ -120729,20 +121140,19 @@ self: { }) {}; "json-encoder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring - , bytestring-tree-builder, contravariant, contravariant-extras - , scientific, text + ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, scientific, semigroups, text }: mkDerivation { pname = "json-encoder"; - version = "0.1.3.1"; - sha256 = "0127462ef932a643adc948bbb1de89de78d705a464c2591aedafddcd8382fadc"; + version = "0.1.5"; + sha256 = "bd71014bca5df3be295bfd851eb39d4c30bc38acaa7fd277f6cb6d8ac60c9bd4"; libraryHaskellDepends = [ - base base-prelude bytestring bytestring-tree-builder contravariant - contravariant-extras scientific text + base-prelude bytestring bytestring-tree-builder contravariant + contravariant-extras scientific semigroups text ]; homepage = "https://github.com/sannsyn/json-encoder"; - description = "A very fast single-pass JSON encoder with a declarative DSL"; + description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL"; license = stdenv.lib.licenses.mit; }) {}; @@ -120832,6 +121242,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "json-pointer-hasql" = callPackage + ({ mkDerivation, aeson, base-prelude, either, hasql, json-pointer + , rebase, text, transformers + }: + mkDerivation { + pname = "json-pointer-hasql"; + version = "0.1"; + sha256 = "5ed9ae42aadc1fde554480f055df77f751e5eb1c5386d0ed71883dfe9d534a8a"; + libraryHaskellDepends = [ base-prelude hasql json-pointer text ]; + testHaskellDepends = [ + aeson either hasql json-pointer rebase transformers + ]; + jailbreak = true; + homepage = "https://github.com/sannsyn/json-pointer-hasql"; + description = "JSON Pointer extensions for Hasql"; + license = stdenv.lib.licenses.mit; + }) {}; + "json-python" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, pureMD5 , python, template-haskell @@ -124014,6 +124442,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lambdacube-compiler" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , deepseq, directory, exceptions, filepath, indentation + , lambdacube-ir, monad-control, mtl, optparse-applicative, parsec + , pretty-compact, QuickCheck, tasty, tasty-quickcheck, text, time + , vector + }: + mkDerivation { + pname = "lambdacube-compiler"; + version = "0.4.0.0"; + sha256 = "745a5593e7a8bf9af194c747a62ad32e16076156841863093b6aefb032b5ac74"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers deepseq directory exceptions filepath + indentation lambdacube-ir mtl parsec pretty-compact text vector + ]; + executableHaskellDepends = [ + aeson async base bytestring containers deepseq directory exceptions + filepath indentation lambdacube-ir monad-control mtl + optparse-applicative parsec pretty-compact QuickCheck tasty + tasty-quickcheck text time vector + ]; + jailbreak = true; + homepage = "http://lambdacube3d.com"; + description = "LambdaCube 3D is a DSL to program GPUs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lambdacube-core" = callPackage ({ mkDerivation, base, bytestring, bytestring-trie, containers, mtl , vector @@ -124088,26 +124545,34 @@ self: { }) {}; "lambdacube-gl" = callPackage - ({ mkDerivation, base, binary, bitmap, bytestring, bytestring-trie - , containers, lambdacube-core, lambdacube-edsl, language-glsl, mtl - , OpenGLRaw, prettyclass, vector + ({ mkDerivation, base, bytestring, containers, JuicyPixels + , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms }: mkDerivation { pname = "lambdacube-gl"; - version = "0.2.2"; - sha256 = "bee622839c09a05fdab01fb88c15680eb0cc0feda1a580ddb81fa2cbbefa1d28"; + version = "0.4.0.2"; + sha256 = "f9ebec4a981381ffa9f998a636c0aba3f4425b4fb2ae06650ff24e9109328174"; libraryHaskellDepends = [ - base binary bitmap bytestring bytestring-trie containers - lambdacube-core lambdacube-edsl language-glsl mtl OpenGLRaw - prettyclass vector + base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw + vector vector-algorithms ]; - jailbreak = true; - homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine"; - description = "OpenGL backend for LambdaCube graphics language (main package)"; + homepage = "http://lambdacube3d.com"; + description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lambdacube-ir" = callPackage + ({ mkDerivation, aeson, base, containers, mtl, text, vector }: + mkDerivation { + pname = "lambdacube-ir"; + version = "0.2.0.0"; + sha256 = "488cbb21a8dca80c16552d3aca868d5aa7085b7bfa2e9ea7c92965bd1e288c48"; + libraryHaskellDepends = [ aeson base containers mtl text vector ]; + description = "LambdaCube 3D intermediate representation of 3D graphics pipelines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lambdacube-samples" = callPackage ({ mkDerivation, base, bytestring, bytestring-trie, elerea, GLFW-b , lambdacube-core, lambdacube-edsl, lambdacube-gl, mtl, OpenGLRaw @@ -126483,6 +126948,8 @@ self: { pname = "lens"; version = "4.13.1"; sha256 = "987137d11f189e08ceeb0e2e5c047c1456ad666642974067d2d8e11309ef6b7b"; + revision = "1"; + editedCabalFile = "35b2594d3e37b4294c2a9dd3e7620af7a27ce10044631a2f91611cdaf66a55f9"; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -126686,6 +127153,8 @@ self: { pname = "lens-family-th"; version = "0.4.0.0"; sha256 = "a52e7e99bb0e324ca9dc09f441db98443ad7d9af227221a461c29f75ef1ccc09"; + revision = "1"; + editedCabalFile = "b2236e693bf705ef944458bc08e449b6e62da03c9370cee79858a3df01ef78dd"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/DanBurton/lens-family-th#readme"; description = "Generate lens-family style lenses"; @@ -126699,8 +127168,8 @@ self: { pname = "lens-family-th"; version = "0.4.1.0"; sha256 = "754fdc4c7c292b160a87974ec3690b755fb93f3877c8080d331cfa6ec4b39e20"; - revision = "1"; - editedCabalFile = "13c96ddf2d410ec4e6671c8412710b7cdbbfc837ff5be1d09a6dbb9ecdb9285d"; + revision = "2"; + editedCabalFile = "978c149edc250ed1c91c03be304b752415e93ab5eb76aacb194bbe94135c356a"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/DanBurton/lens-family-th#readme"; description = "Generate lens-family style lenses"; @@ -127887,6 +128356,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lift-generics_0_1_1" = callPackage + ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim + , hspec, template-haskell + }: + mkDerivation { + pname = "lift-generics"; + version = "0.1.1"; + sha256 = "07cf2cc4416fb7b0e45595da8a964459498da976e18cdcc169ac2416143930cb"; + libraryHaskellDepends = [ + base generic-deriving ghc-prim template-haskell + ]; + testHaskellDepends = [ + base base-compat generic-deriving hspec template-haskell + ]; + jailbreak = true; + homepage = "https://github.com/RyanGlScott/lift-generics"; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-async_0_2_0_2" = callPackage ({ mkDerivation, async, base, HUnit, lifted-base, monad-control , mtl, tasty, tasty-hunit, tasty-th, transformers-base @@ -129871,8 +130361,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.5.1.0"; - sha256 = "7c6a6634abeb541c1fea59b34743dfb37b71f92359b0d481e50f962486f99da4"; + version = "3.5.1.1"; + sha256 = "e1f636b445b5a161750273d11a4a70ac1263c237dd47b1b347c6150fdfd29733"; libraryHaskellDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -129884,6 +130374,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 transformers transformers-compat ]; + homepage = "http://github.com/bscarlet/llvm-general/"; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; }) {llvm-config = null;}; @@ -130616,13 +131107,12 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.0.0"; - sha256 = "9c7deabf027c2e7bfc800b26f103b259e25ee9ef814ce53260df3950aa682e8f"; + version = "1.0.1"; + sha256 = "8a27b42451dbcda3faba5db20c275061f8133441b09b0138ac36037ff0108af1"; libraryHaskellDepends = [ async base exceptions free monad-control mtl stm stm-delay text time transformers transformers-base wl-pprint-text ]; - jailbreak = true; homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; @@ -133415,8 +133905,8 @@ self: { }: mkDerivation { pname = "mappy"; - version = "0.1.2.0"; - sha256 = "22f99e145fd8e3208078ad67761bcdc718abd916d7c4a279aa0c09dfcb9de208"; + version = "0.1.2.1"; + sha256 = "54f6af643b2aeb6245ec92717a27dfca4e8b0b65442fef39cf09cd09b83268d8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134444,6 +134934,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mdp" = callPackage + ({ mkDerivation, base, containers, HTF, HUnit, QuickCheck, vector + }: + mkDerivation { + pname = "mdp"; + version = "0.1.0.0"; + sha256 = "816474886b59ab0f0cd5c4779f2702e9b7484fe94179a426894f561828f86711"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers vector ]; + executableHaskellDepends = [ base containers vector ]; + testHaskellDepends = [ + base containers HTF HUnit QuickCheck vector + ]; + description = "Tools for solving Markov Decision Processes"; + license = stdenv.lib.licenses.mit; + }) {}; + "mecab" = callPackage ({ mkDerivation, base, bytestring, mecab, text }: mkDerivation { @@ -136676,7 +137184,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mmorph" = callPackage + "mmorph_1_0_5" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "mmorph"; @@ -136685,9 +137193,10 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Monad morphisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mmorph_1_0_6" = callPackage + "mmorph" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; @@ -136698,7 +137207,6 @@ self: { ]; description = "Monad morphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmtl" = callPackage @@ -136816,7 +137324,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "modify-fasta" = callPackage + "modify-fasta_0_8_0_4" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text , text-show @@ -136838,6 +137346,31 @@ self: { homepage = "https://github.com/GregorySchwartz/modify-fasta"; description = "Modify fasta (and CLIP) files in several optional ways"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "modify-fasta" = callPackage + ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative + , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text + , text-show + }: + mkDerivation { + pname = "modify-fasta"; + version = "0.8.1.3"; + sha256 = "362c99eb19428ed9d8f950ef5a8a377d4d9a4a8feaca229bf3aabb9ee0908585"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers fasta regex-tdfa regex-tdfa-text split text + text-show + ]; + executableHaskellDepends = [ + base containers fasta mtl optparse-applicative pipes pipes-text + split text + ]; + homepage = "https://github.com/GregorySchwartz/modify-fasta"; + description = "Modify fasta (and CLIP) files in several optional ways"; + license = stdenv.lib.licenses.gpl2; }) {}; "modsplit" = callPackage @@ -137299,6 +137832,23 @@ self: { license = "GPL"; }) {}; + "monad-coroutine_0_9_0_2" = callPackage + ({ mkDerivation, base, monad-parallel, transformers + , transformers-compat + }: + mkDerivation { + pname = "monad-coroutine"; + version = "0.9.0.2"; + sha256 = "c648272e0578f8d590bdf834aaf2866ebe94474517c34d8e34b4c821469b4da4"; + libraryHaskellDepends = [ + base monad-parallel transformers transformers-compat + ]; + homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine"; + description = "Coroutine monad transformer for suspending and resuming monadic computations"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-exception" = callPackage ({ mkDerivation, base, monad-control, mtl-evil-instances , transformers, transformers-base @@ -137682,7 +138232,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-logger" = callPackage + "monad-logger_0_3_17" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans @@ -137702,9 +138252,10 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-logger_0_3_18" = callPackage + "monad-logger" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans @@ -137724,7 +138275,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -137967,6 +138517,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-parallel_0_7_2_1" = callPackage + ({ mkDerivation, base, parallel, transformers, transformers-compat + }: + mkDerivation { + pname = "monad-parallel"; + version = "0.7.2.1"; + sha256 = "8bd8e90bcf9b71375bea031703551c09a51137c05377876dde2616e375782065"; + libraryHaskellDepends = [ + base parallel transformers transformers-compat + ]; + homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; + description = "Parallel execution of monadic computations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-parallel-progressbar" = callPackage ({ mkDerivation, base, monad-parallel, monadIO , terminal-progress-bar @@ -149137,8 +149703,8 @@ self: { ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { pname = "pandoc-csv2table"; - version = "1.0.2"; - sha256 = "0818e8b8e88e98b162a4fb7a9369cf3e54a2108f428d3a88b0217c7b58a6d961"; + version = "1.0.4"; + sha256 = "c1f14975239d5b26faba78f3db6c84573d4db99ab021560c184755259ca61b82"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; @@ -151064,6 +151630,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pdf-toolbox-content_0_0_5_1" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , containers, io-streams, pdf-toolbox-core, text + }: + mkDerivation { + pname = "pdf-toolbox-content"; + version = "0.0.5.1"; + sha256 = "1c104e232e178603ff9dd8c6eaaf0ccbda918c70b40ed63f08fa1922a3c88488"; + libraryHaskellDepends = [ + attoparsec base base16-bytestring bytestring containers io-streams + pdf-toolbox-core text + ]; + homepage = "https://github.com/Yuras/pdf-toolbox"; + description = "A collection of tools for processing PDF files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pdf-toolbox-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , io-streams, scientific, transformers, zlib-bindings @@ -151081,6 +151665,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pdf-toolbox-core_0_0_4_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, errors + , io-streams, scientific, transformers, zlib-bindings + }: + mkDerivation { + pname = "pdf-toolbox-core"; + version = "0.0.4.1"; + sha256 = "cce3949ef5596b5d61032ce1547160dc5f52e3d5c556dcdb9aabf1582173a981"; + libraryHaskellDepends = [ + attoparsec base bytestring containers errors io-streams scientific + transformers zlib-bindings + ]; + homepage = "https://github.com/Yuras/pdf-toolbox"; + description = "A collection of tools for processing PDF files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pdf-toolbox-document" = callPackage ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4 , containers, crypto-api, cryptohash, io-streams @@ -151100,6 +151702,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pdf-toolbox-document_0_0_7_1" = callPackage + ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4 + , containers, crypto-api, cryptohash, io-streams + , pdf-toolbox-content, pdf-toolbox-core, text, transformers + }: + mkDerivation { + pname = "pdf-toolbox-document"; + version = "0.0.7.1"; + sha256 = "3f7d379baa85c1cf9998e3f84177ad24b5cc8632fb211af7a09603e59596f0e1"; + libraryHaskellDepends = [ + base bytestring cipher-aes cipher-rc4 containers crypto-api + cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text + transformers + ]; + homepage = "https://github.com/Yuras/pdf-toolbox"; + description = "A collection of tools for processing PDF files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pdf-toolbox-viewer" = callPackage ({ mkDerivation, base, bytestring, cairo, containers, directory , filepath, gtk, io-streams, pdf-toolbox-content @@ -155157,6 +155779,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-text_0_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, pipes, pipes-bytestring + , pipes-group, pipes-parse, pipes-safe, streaming-commons, text + , transformers + }: + mkDerivation { + pname = "pipes-text"; + version = "0.0.2.1"; + sha256 = "4bb6f008ad1a56e8a685ca960ddd777647183c15989883d14f84e5a5aa21b3e3"; + libraryHaskellDepends = [ + base bytestring pipes pipes-bytestring pipes-group pipes-parse + pipes-safe streaming-commons text transformers + ]; + homepage = "https://github.com/michaelt/text-pipes"; + description = "properly streaming text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-transduce" = callPackage ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest , foldl, free, lens-family-core, pipes, pipes-bytestring @@ -156545,6 +157186,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pong-server" = callPackage + ({ mkDerivation, base, hspec, network, QuickCheck }: + mkDerivation { + pname = "pong-server"; + version = "0.0.1.0"; + sha256 = "649ea24e1412408d55e4e82f4c0d0e87bdbeb100bb70ea2167627f304ee2730e"; + libraryHaskellDepends = [ base network ]; + testHaskellDepends = [ base hspec network QuickCheck ]; + homepage = "http://github.com/RobertFischer/pong-server#readme"; + description = "A simple embedded pingable server that runs in the background"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "pontarius-mediaserver" = callPackage ({ mkDerivation, base, HDBC, HDBC-sqlite3, hlogger, pontarius-xmpp , pontarius-xpmn, xml-types @@ -157224,6 +157878,7 @@ self: { tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time transformers uuid vector ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; @@ -160284,37 +160939,6 @@ self: { }) {}; "psc-ide" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , edit-distance, either, filepath, fsnotify, hspec, http-client - , lens, lens-aeson, monad-logger, mtl, network - , optparse-applicative, parsec, purescript, regex-tdfa, stm, text - , wreq - }: - mkDerivation { - pname = "psc-ide"; - version = "0.6.0"; - sha256 = "9ec4f96eabd70cd4ba84731a527bf86cd2bd0dc8891e8cde7b99705973e72deb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory edit-distance either - filepath fsnotify http-client lens lens-aeson monad-logger mtl - parsec purescript regex-tdfa stm text wreq - ]; - executableHaskellDepends = [ - base directory filepath monad-logger mtl network - optparse-applicative stm text - ]; - testHaskellDepends = [ - base containers hspec monad-logger mtl stm - ]; - doHaddock = false; - homepage = "http://github.com/kRITZCREEK/psc-ide"; - description = "Language support for the PureScript programming language"; - license = stdenv.lib.licenses.mit; - }) {}; - - "psc-ide_0_6_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , edit-distance, either, filepath, fsnotify, hspec, http-client , lens, lens-aeson, monad-logger, mtl, network @@ -160342,7 +160966,6 @@ self: { homepage = "http://github.com/kRITZCREEK/psc-ide"; description = "Language support for the PureScript programming language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pseudo-boolean" = callPackage @@ -160411,7 +161034,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "psqueues" = callPackage + "psqueues_0_2_0_3" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -160427,9 +161050,10 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "psqueues_0_2_1_0" = callPackage + "psqueues" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -160445,6 +161069,24 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "psqueues_0_2_2_0" = callPackage + ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit + , QuickCheck, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.2.0"; + sha256 = "14b12f505eea093f25190a9d74109f0178e611701849b83a3878811affe0b52a"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -163718,6 +164360,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reactive-banana-sdl2" = callPackage + ({ mkDerivation, base, reactive-banana, sdl2 }: + mkDerivation { + pname = "reactive-banana-sdl2"; + version = "0.1.0.0"; + sha256 = "605dd7df6814f82b69d2ba0aa51029417659c6ab560c869c7598a06615905942"; + revision = "1"; + editedCabalFile = "3c82ab987be2ab12330aa5863b3c80f5022525a5fb7d65cff6b5de47288b9ae7"; + libraryHaskellDepends = [ base reactive-banana sdl2 ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/cies/reactive-banana-sdl2#readme"; + description = "Reactive Banana integration with SDL2"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reactive-banana-threepenny" = callPackage ({ mkDerivation, base, reactive-banana, threepenny-gui }: mkDerivation { @@ -163983,17 +164640,18 @@ self: { "rebase" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist - , hashable, profunctors, scientific, semigroups, text, time - , unordered-containers, uuid, vector, void + , either, hashable, mtl, profunctors, scientific, semigroups, text + , time, transformers, unordered-containers, uuid, vector, void }: mkDerivation { pname = "rebase"; - version = "0.2.1"; - sha256 = "1a6813a90e6ff5904bf3bbf1f96a25a636da1fd76b937ee34d5f7efeb34c8665"; + version = "0.4.1"; + sha256 = "7c5bbc55a5653b9f456f1369616e22d135f667441d8ea160a8b11e02549e5abe"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist hashable profunctors scientific - semigroups text time unordered-containers uuid vector void + contravariant-extras deepseq dlist either hashable mtl profunctors + scientific semigroups text time transformers unordered-containers + uuid vector void ]; homepage = "https://github.com/nikita-volkov/rebase"; description = "A more progressive alternative to the \"base\" package"; @@ -164800,8 +165458,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.3.2"; - sha256 = "55fae21380809137c5bdbde646479b01e36793f10523e44842eb35bc9c42f419"; + version = "0.4.0"; + sha256 = "d60c2d425c57cf2239e1088628099f44b834e3f2c661ddb6133cc397b5476b9c"; libraryHaskellDepends = [ base containers dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups @@ -164840,24 +165498,21 @@ self: { ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default, dependent-map, dependent-sum , dependent-sum-template, directory, exception-transformers - , ghcjs-dom, glib, gtk3, lens, mtl, ref-tf, reflex, safe - , semigroups, text, these, time, transformers, webkitgtk3 - , webkitgtk3-javascriptcore + , ghcjs-dom, glib, gtk3, lens, mtl, raw-strings-qq, ref-tf, reflex + , safe, semigroups, text, these, time, transformers, unix + , webkitgtk3, webkitgtk3-javascriptcore }: mkDerivation { pname = "reflex-dom"; - version = "0.2"; - sha256 = "fd350b5e6d4613802bf37ebf15362b083af7bfec9ec22a56d1245bc3d2af86dd"; - revision = "2"; - editedCabalFile = "2aa20b3cf39f41e8850a54ab28b95b000065ccc5b65e44f0710171821e72cbe6"; + version = "0.3"; + sha256 = "a52bacd0ebdbb559a64fc3c7abfb34d8264c3c84243b8bc126c256e505b58d3a"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default dependent-map dependent-sum dependent-sum-template directory - exception-transformers ghcjs-dom glib gtk3 lens mtl ref-tf reflex - safe semigroups text these time transformers webkitgtk3 - webkitgtk3-javascriptcore + exception-transformers ghcjs-dom glib gtk3 lens mtl raw-strings-qq + ref-tf reflex safe semigroups text these time transformers unix + webkitgtk3 webkitgtk3-javascriptcore ]; - jailbreak = true; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -165866,8 +166521,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.8.0.2"; - sha256 = "784433068c59871ccfcc50aaba93298a85e96a4ad0917f2fbc9b23290d34f63a"; + version = "0.8.0.4"; + sha256 = "0a2b8f3739cfeaf19c2b0dca4f321c2d1fbbedc007f241cfbf85142e25f03eb5"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text time time-locale-compat @@ -166042,8 +166697,8 @@ self: { }: mkDerivation { pname = "remote-monad"; - version = "0.1.0.0"; - sha256 = "c4a9aec18e78195f187b92480e2654c996cbb3e5686c5071314504f9a020035c"; + version = "0.1.0.1"; + sha256 = "e52a1a304d507169be144abbff8c7e28b08a36e7c05f296dbcd4be8a5fcd53e1"; libraryHaskellDepends = [ base natural-transformation transformers ]; @@ -166924,10 +167579,13 @@ self: { pname = "resource-pool"; version = "0.2.3.1"; sha256 = "2265fc16f409eeb8d8e85644029c19b46bc48834ebba8aba8cb0b1ef64e1d709"; + revision = "1"; + editedCabalFile = "68c8ac9105a980178fc6e2a07446b3ba87283fc662df1dec181c50953b74b96d"; libraryHaskellDepends = [ base hashable monad-control stm time transformers transformers-base vector ]; + jailbreak = true; homepage = "http://github.com/bos/pool"; description = "A high-performance striped resource pooling implementation"; license = stdenv.lib.licenses.bsd3; @@ -167476,7 +168134,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rest-core" = callPackage + "rest-core_0_37" = callPackage ({ mkDerivation, aeson, aeson-utils, base, bytestring , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap @@ -167503,6 +168161,34 @@ self: { ]; description = "Rest API library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rest-core" = callPackage + ({ mkDerivation, aeson, aeson-utils, base, base-compat, bytestring + , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils + , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap + , rest-types, safe, split, test-framework, test-framework-hunit + , text, transformers, transformers-compat, unordered-containers + , uri-encode, utf8-string, uuid + }: + mkDerivation { + pname = "rest-core"; + version = "0.38"; + sha256 = "b491b734c2d74729f427ca02370f12b839dd92347fea44b5fb66c66a39b11cec"; + libraryHaskellDepends = [ + aeson aeson-utils base base-compat bytestring case-insensitive + errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat + multipart random rest-stringmap rest-types safe split text + transformers transformers-compat unordered-containers uri-encode + utf8-string uuid + ]; + testHaskellDepends = [ + base bytestring HUnit mtl test-framework test-framework-hunit + transformers transformers-compat unordered-containers + ]; + description = "Rest API library"; + license = stdenv.lib.licenses.bsd3; }) {}; "rest-example" = callPackage @@ -167523,6 +168209,7 @@ self: { transformers-compat unordered-containers ]; executableHaskellDepends = [ base rest-gen ]; + jailbreak = true; homepage = "http://www.github.com/silkapp/rest"; description = "Example project for rest"; license = stdenv.lib.licenses.bsd3; @@ -167870,7 +168557,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rest-gen" = callPackage + "rest-gen_0_19_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder , directory, fclabels, filepath, hashable, haskell-src-exts , HStringTemplate, HUnit, hxt, json-schema, pretty, process @@ -167892,6 +168579,34 @@ self: { base fclabels haskell-src-exts HUnit rest-core test-framework test-framework-hunit ]; + jailbreak = true; + description = "Documentation and client generation from rest definition"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rest-gen" = callPackage + ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal + , code-builder, directory, fclabels, filepath, hashable + , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema + , pretty, process, rest-core, safe, scientific, semigroups, split + , test-framework, test-framework-hunit, text, uniplate + , unordered-containers, vector + }: + mkDerivation { + pname = "rest-gen"; + version = "0.19.0.2"; + sha256 = "12caa70e7b29b073cb0e066cf7d5c590b13e0fb5b2f924944cd1ae5217c79330"; + libraryHaskellDepends = [ + aeson base base-compat blaze-html Cabal code-builder directory + fclabels filepath hashable haskell-src-exts HStringTemplate hxt + json-schema pretty process rest-core safe scientific semigroups + split text uniplate unordered-containers vector + ]; + testHaskellDepends = [ + base fclabels haskell-src-exts HUnit rest-core test-framework + test-framework-hunit + ]; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -167978,6 +168693,8 @@ self: { pname = "rest-happstack"; version = "0.3.1"; sha256 = "a2c2e1b1e1bfdc7870100eee642e488268e21117b08aad254342d14a53ce13d9"; + revision = "1"; + editedCabalFile = "bcee53122444a7394e71c1f20b614f1b3504c90f96a519ff8981f7eb05805ca1"; libraryHaskellDepends = [ base containers happstack-server mtl rest-core rest-gen utf8-string ]; @@ -168047,6 +168764,8 @@ self: { pname = "rest-snap"; version = "0.2"; sha256 = "38947f552b90b08cf21567dd8931891f1c328546e5e5dda7e083fb2f3711eefc"; + revision = "1"; + editedCabalFile = "86fefb10994951f66e3e125ad5bf4060fa21cc636b41d1c605ddad81744ee2af"; libraryHaskellDepends = [ base bytestring case-insensitive rest-core safe snap-core unordered-containers uri-encode utf8-string @@ -168253,8 +168972,8 @@ self: { pname = "rest-wai"; version = "0.2"; sha256 = "92d7455c537d24c6d2ccadd9272cac385659ed2a828fbe20bca9249016897413"; - revision = "1"; - editedCabalFile = "66767f5908d25ffaeaf9f15ad093f57f88ed212638bbfb7ec23190ed77c133b4"; + revision = "2"; + editedCabalFile = "ac37af20f1f44b9ada05e25dea369b8149359ba6a020a92d5b3e841846f731c7"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-types mime-types mtl rest-core text unordered-containers wai @@ -175122,7 +175841,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-swagger" = callPackage + "servant-swagger_0_1_2" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec , http-media, lens, servant, swagger2, text, time , unordered-containers @@ -175138,9 +175857,57 @@ self: { testHaskellDepends = [ aeson aeson-qq base hspec lens servant swagger2 text time ]; + jailbreak = true; homepage = "https://github.com/dmjio/servant-swagger"; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-swagger" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob + , hspec, http-media, lens, QuickCheck, servant, swagger2, text + , time, unordered-containers + }: + mkDerivation { + pname = "servant-swagger"; + version = "1.0"; + sha256 = "cc9bc89bd83c373d1a31ce7ba603104f302db90b96cd93f45029b125f59e668e"; + libraryHaskellDepends = [ + aeson base bytestring hspec http-media lens QuickCheck servant + swagger2 text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base doctest Glob hspec lens QuickCheck servant + swagger2 text time + ]; + homepage = "https://github.com/haskell-servant/servant-swagger"; + description = "Generate Swagger specification for your servant API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-swagger_1_0_3" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob + , hspec, http-media, lens, QuickCheck, servant, swagger2, text + , time, unordered-containers + }: + mkDerivation { + pname = "servant-swagger"; + version = "1.0.3"; + sha256 = "ea1b3c7f33ae1c788ef33858c9c74849f450155c1bd81dcd472a36389aa17597"; + libraryHaskellDepends = [ + aeson base bytestring hspec http-media lens QuickCheck servant + swagger2 text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base doctest Glob hspec lens QuickCheck servant + swagger2 text time + ]; + jailbreak = true; + homepage = "https://github.com/haskell-servant/servant-swagger"; + description = "Generate Swagger specification for your servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-yaml" = callPackage @@ -175715,8 +176482,8 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "1.1.0"; - sha256 = "e784db96a9fdcf1fe5f48adfc62e8b4ef9795bf4558769c149f244ed5ef9415c"; + version = "1.1.1"; + sha256 = "4737183b0201c27d4c0824418644abff466bdfe653c411cb8da8c53899d6dbd6"; libraryHaskellDepends = [ array base containers mtl scientific semigroups split stack-prism template-haskell text wl-pprint-text @@ -177925,8 +178692,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.3.3"; - sha256 = "2b4ccfc67b6b4b7dc2a27ebfd9166b911910750e28c86e2e5ca8a8c7cad51783"; + version = "0.3.4"; + sha256 = "7d81fdfb91a2ee88d73dc4a5680be4f0e8b44faa460ce15d41a33d3a975c84f9"; libraryHaskellDepends = [ async base containers deepseq directory filepath MonadCatchIO-transformers mtl SafeSemaphore text time transformers @@ -184704,6 +185471,53 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stackage-curator_0_13_1" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async + , base, base16-bytestring, binary, binary-tagged, blaze-html + , byteable, bytestring, Cabal, classy-prelude-conduit, conduit + , conduit-extra, containers, cryptohash, cryptohash-conduit + , data-default-class, directory, filepath, hspec, html-conduit + , http-client, http-client-tls, http-conduit, lucid, mime-types + , monad-unlift, mono-traversable, mtl, old-locale + , optparse-applicative, optparse-simple, process, QuickCheck + , resourcet, semigroups, stackage-cli, stackage-install + , stackage-metadata, stackage-types, stm, streaming-commons + , system-fileio, system-filepath, tar, temporary, text, time + , transformers, unix-compat, utf8-string, xml-conduit, xml-types + , yaml, zlib + }: + mkDerivation { + pname = "stackage-curator"; + version = "0.13.1"; + sha256 = "3234df1ffa4c7131a5dec91596dd53daef0ca7558245312e4b4ae591a10a1a16"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 async base + base16-bytestring binary binary-tagged blaze-html byteable + bytestring Cabal classy-prelude-conduit conduit conduit-extra + containers cryptohash cryptohash-conduit data-default-class + directory filepath html-conduit http-client http-client-tls + http-conduit lucid mime-types monad-unlift mono-traversable mtl + old-locale process resourcet semigroups stackage-install + stackage-metadata stackage-types stm streaming-commons + system-fileio system-filepath tar temporary text time transformers + unix-compat utf8-string xml-conduit xml-types yaml zlib + ]; + executableHaskellDepends = [ + base http-client http-client-tls optparse-applicative + optparse-simple stackage-cli system-filepath text + ]; + testHaskellDepends = [ + base Cabal classy-prelude-conduit containers directory hspec + http-client http-client-tls QuickCheck text yaml + ]; + homepage = "https://github.com/fpco/stackage"; + description = "Tools for curating Stackage bundles"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stackage-install_0_1_0_3" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , cryptohash, directory, filepath, http-client, http-client-tls @@ -187836,36 +188650,6 @@ self: { }) {}; "stylish-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, cmdargs, containers - , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb - , test-framework, test-framework-hunit, yaml - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.5.15.0"; - sha256 = "58567478ec005164a3cb617b66676a1351c599e5bbf7bf81ef9c2fe4a199d9e5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl syb yaml - ]; - executableHaskellDepends = [ - aeson base bytestring cmdargs containers directory filepath - haskell-src-exts mtl strict syb yaml - ]; - testHaskellDepends = [ - aeson base bytestring cmdargs containers directory filepath - haskell-src-exts HUnit mtl syb test-framework test-framework-hunit - yaml - ]; - doHaddock = false; - homepage = "https://github.com/jaspervdj/stylish-haskell"; - description = "Haskell code prettifier"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stylish-haskell_0_5_15_1" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb , test-framework, test-framework-hunit, yaml @@ -187892,7 +188676,6 @@ self: { homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stylized" = callPackage @@ -188030,7 +188813,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "success" = callPackage + "success_0_2_5" = callPackage ({ mkDerivation, base, monad-control, mtl, transformers , transformers-base }: @@ -188038,12 +188821,48 @@ self: { pname = "success"; version = "0.2.5"; sha256 = "d1548e0a685956ae0b568f89e9935af58ed6042fd5b850314b81e0a1efadabca"; + revision = "1"; + editedCabalFile = "0e3e195460c31e3cb90b992a36cfb7c39d5a7a5ac225cec3a45fb43aeb6a5580"; libraryHaskellDepends = [ base monad-control mtl transformers transformers-base ]; homepage = "https://github.com/nikita-volkov/success"; description = "A version of Either specialised for encoding of success or failure"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "success" = callPackage + ({ mkDerivation, base, monad-control, mtl, transformers + , transformers-base + }: + mkDerivation { + pname = "success"; + version = "0.2.5.1"; + sha256 = "7efbd9b238a6741ab70f5b021c5ebc95369bf4de00ab88220eecb30b3df86bec"; + libraryHaskellDepends = [ + base monad-control mtl transformers transformers-base + ]; + homepage = "https://github.com/nikita-volkov/success"; + description = "A version of Either specialised for encoding of success or failure"; + license = stdenv.lib.licenses.mit; + }) {}; + + "success_0_2_6" = callPackage + ({ mkDerivation, base, monad-control, mtl, transformers + , transformers-base + }: + mkDerivation { + pname = "success"; + version = "0.2.6"; + sha256 = "e995e77e8ae13bc4d543ea771f6a4d17853dea1ae46ef294131fc8c582f2dab6"; + libraryHaskellDepends = [ + base monad-control mtl transformers transformers-base + ]; + homepage = "https://github.com/nikita-volkov/success"; + description = "A version of Either specialised for encoding of success or failure"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "suffixarray" = callPackage @@ -188580,7 +189399,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "swagger2" = callPackage + "swagger2_1_2_1" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, doctest, Glob , hashable, hspec, http-media, HUnit, lens, mtl, network , QuickCheck, scientific, text, time, unordered-containers, vector @@ -188602,6 +189421,58 @@ self: { homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "swagger2" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers + , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl + , network, QuickCheck, scientific, template-haskell, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.0"; + sha256 = "bbd6d2f3287e619ec9caa6e1c1628a5fd0f71ac311e451d87456d00c41a8f2d0"; + libraryHaskellDepends = [ + aeson base base-compat containers hashable http-media lens mtl + network scientific template-haskell text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat containers doctest Glob hashable + hspec HUnit lens mtl QuickCheck text time unordered-containers + vector + ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "swagger2_2_0_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers + , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl + , network, QuickCheck, scientific, template-haskell, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.0.1"; + sha256 = "ff8c3a195ff7689ba027d7caecd9b20505529ecc4962ddb7503b5130aa815898"; + libraryHaskellDepends = [ + aeson base base-compat containers hashable http-media lens mtl + network scientific template-haskell text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat containers doctest Glob hashable + hspec HUnit lens mtl QuickCheck text time unordered-containers + vector + ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -193184,6 +194055,31 @@ self: { license = "GPL"; }) {}; + "texmath_0_8_4_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, network-uri, pandoc-types, parsec, process, split, syb + , temporary, text, utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.8.4.2"; + sha256 = "ee18da2835eba8ec388d15b4fa08cb72d789bb345be3abc4eac1713f0052b17d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + executableHaskellDepends = [ network-uri ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -193738,8 +194634,8 @@ self: { pname = "text-show"; version = "2"; sha256 = "5f64a35d1121c31a9166fd3910c865ad8f23e50edfc4b3733e63d4f415635694"; - revision = "1"; - editedCabalFile = "7009bf56e8594ddf59fcc5ac896d56f3928ba06eebfaf9e456c5298471138e5a"; + revision = "2"; + editedCabalFile = "26d3d47cd81cdf00d2d529569aec498a095fe424a4469405527b40ef489c3cc4"; libraryHaskellDepends = [ array base base-compat bytestring bytestring-builder containers generic-deriving ghc-prim integer-gmp nats semigroups tagged @@ -193769,8 +194665,8 @@ self: { pname = "text-show"; version = "2.1.2"; sha256 = "76c1ce631c6932816dc241b290400e7200d7c79fd50ec03f51964e244fae320d"; - revision = "1"; - editedCabalFile = "3fc10600ed0d309c095024b4d320ace8d39dd883e4e8d109d182930c2b35fc9c"; + revision = "2"; + editedCabalFile = "b3b37a10589923b91729f07291795acf58f98efd5df1f32de99ab27fa1d3eda3"; libraryHaskellDepends = [ array base base-compat bytestring bytestring-builder containers generic-deriving ghc-prim integer-gmp nats semigroups tagged @@ -193787,20 +194683,49 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show_3" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors + , bytestring, bytestring-builder, containers, generic-deriving + , ghc-prim, hspec, integer-gmp, nats, QuickCheck + , quickcheck-instances, semigroups, tagged, template-haskell, text + , th-lift, transformers, transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "3"; + sha256 = "49e8110e4bd5f67fa6dbe4ce07614633fc2e65bd3dae14b0759df10e3f1b98b2"; + libraryHaskellDepends = [ + array base base-compat bifunctors bytestring bytestring-builder + containers generic-deriving ghc-prim integer-gmp nats semigroups + tagged template-haskell text th-lift transformers + transformers-compat void + ]; + testHaskellDepends = [ + array base base-compat base-orphans bifunctors bytestring + bytestring-builder containers generic-deriving ghc-prim hspec + integer-gmp nats QuickCheck quickcheck-instances semigroups tagged + template-haskell text transformers transformers-compat void + ]; + jailbreak = true; + homepage = "https://github.com/RyanGlScott/text-show"; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring - , containers, directory, ghc-prim, haskeline, hoopl, hpc, hspec - , old-locale, old-time, pretty, QuickCheck, quickcheck-instances - , random, semigroups, tagged, template-haskell, terminfo, text - , text-show, th-orphans, time, transformers, transformers-compat - , unix, unordered-containers, vector, xhtml + , containers, directory, generic-deriving, ghc-prim, haskeline + , hoopl, hpc, hspec, old-locale, old-time, pretty, QuickCheck + , quickcheck-instances, random, semigroups, tagged + , template-haskell, terminfo, text, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "2.1"; - sha256 = "d8941910e88ad921a6337dd635356203137b85e5153a460b0b6bb3ebb0fd51b0"; - revision = "2"; - editedCabalFile = "f7407e5c0227a4fae2090ae9a10d4f4b62b869c56432a9ecb8bc8daf453a6cf8"; + version = "3.0.1"; + sha256 = "9164fd2e5ad017923d9e5cdafae6d895a4014009e982346e1a13b3ef8ecb1045"; libraryHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory haskeline hoopl hpc old-locale old-time pretty random semigroups @@ -193809,11 +194734,13 @@ self: { ]; testHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory - ghc-prim haskeline hoopl hpc hspec old-locale old-time pretty - QuickCheck quickcheck-instances random semigroups tagged - template-haskell terminfo text-show th-orphans time transformers - transformers-compat unix unordered-containers vector xhtml + generic-deriving ghc-prim haskeline hoopl hpc hspec old-locale + old-time pretty QuickCheck quickcheck-instances random semigroups + tagged template-haskell terminfo text text-show th-orphans time + transformers transformers-compat unix unordered-containers vector + xhtml ]; + jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; @@ -194285,8 +195212,11 @@ self: { pname = "th-expand-syns"; version = "0.3.0.5"; sha256 = "30933dcd5b92c3daa6317adb0688cb7cb0eed193a6a2af9bda142d6dd95f39f6"; + revision = "1"; + editedCabalFile = "f0c7ebf50e7282f73c160d7b6821e3b9da2f42c4f076655416925788eb968eb3"; libraryHaskellDepends = [ base containers syb template-haskell ]; testHaskellDepends = [ base template-haskell ]; + jailbreak = true; description = "Expands type synonyms in Template Haskell ASTs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -200741,6 +201671,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode-show" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "unicode-show"; + version = "0.1.0.2"; + sha256 = "7ee394879b345ee397aef87ca058628cd79d59cbfc1cec81aeda7fea65f53943"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "http://github.com/nushio3/unicode-show#readme"; + description = "print and show in unicode"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unicode-symbols" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -202590,8 +203538,8 @@ self: { ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "uu-cco"; - version = "0.1.0.3"; - sha256 = "12451700f85e3f7c21265698b5a799802e3a24ced34dadeecd949e2f507b4259"; + version = "0.1.0.4"; + sha256 = "a2913c4802337ae57d5a4ede73e2664795fe823035da00b65f52d015c42632a0"; libraryHaskellDepends = [ ansi-terminal base ]; homepage = "https://github.com/UU-ComputerScience/uu-cco"; description = "Utilities for compiler construction: core functionality"; @@ -203935,6 +204883,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-binary-instances_0_2_1_1" = callPackage + ({ mkDerivation, base, binary, vector }: + mkDerivation { + pname = "vector-binary-instances"; + version = "0.2.1.1"; + sha256 = "9647a467cc248ea967b16982be0a395688882d711b5b6613405064bcae6a4eb7"; + libraryHaskellDepends = [ base binary vector ]; + homepage = "https://github.com/bos/vector-binary-instances"; + description = "Instances of Data.Binary and Data.Serialize for vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-buffer" = callPackage ({ mkDerivation, base, deepseq, vector }: mkDerivation { @@ -210760,8 +211721,8 @@ self: { }: mkDerivation { pname = "werewolf"; - version = "0.4.2.0"; - sha256 = "b3872595401edf28f7a1854756f661253d8e1353ded7b92e60cabf3f5e35c68c"; + version = "0.4.3.1"; + sha256 = "daf3e180e534b2dd36667f8855c5d1699afab5512b3d38009f64bc9d8a24a19c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218075,8 +219036,8 @@ self: { }: mkDerivation { pname = "yesod-content-pdf"; - version = "0.2.0.2"; - sha256 = "867cb1a9bbbeff69bb8ae35659f780bcf057cb44a2b1f6c8e424d280a55a0fbb"; + version = "0.2.0.3"; + sha256 = "8c5874e54246a70f6fed205cf29b7a6068176f3af80a991a05b0adc532803230"; libraryHaskellDepends = [ base blaze-builder blaze-html bytestring conduit data-default directory network-uri process temporary transformers yesod-core @@ -219673,7 +220634,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-newsfeed" = callPackage + "yesod-newsfeed_1_5" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , containers, shakespeare, text, time, xml-conduit, yesod-core }: @@ -219688,9 +220649,10 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Helper functions and data types for producing News feeds"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-newsfeed_1_6" = callPackage + "yesod-newsfeed" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , containers, shakespeare, text, time, xml-conduit, yesod-core }: @@ -219705,7 +220667,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Helper functions and data types for producing News feeds"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-paginate" = callPackage @@ -221345,6 +222306,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yoctoparsec" = callPackage + ({ mkDerivation, base, free, mtl }: + mkDerivation { + pname = "yoctoparsec"; + version = "0.1.0.0"; + sha256 = "d70739d3429dede8800290939dbd08d0e23cacb5717402ba93f931fa80e1335d"; + libraryHaskellDepends = [ base free mtl ]; + homepage = "https://github.com/mniip/yoctoparsec"; + description = "A truly tiny monadic parsing library"; + license = stdenv.lib.licenses.mit; + }) {}; + "yoko" = callPackage ({ mkDerivation, base, bifunctors, containers, invariant, kinds , mtl, records, semigroups, template-haskell, th-sccs, type-cereal From 31f160e6dd6b971f5fac4ddac2dc8be73b7cef59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Feb 2016 11:55:23 +0100 Subject: [PATCH 068/308] Add LTS Haskell 5.2. --- pkgs/top-level/haskell-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9014280a914..2d0151dc542 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -343,6 +343,9 @@ rec { lts-5_1 = packages.ghc7103.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.1.nix { }; }; + lts-5_2 = packages.ghc7103.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.2.nix { }; + }; }; } From d4dcfa9a767dd4c82e152b2e6bc2caf1d53c4c3b Mon Sep 17 00:00:00 2001 From: Ivan Solyankin Date: Tue, 9 Feb 2016 16:43:37 +0300 Subject: [PATCH 069/308] maintainers: add vanzef --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f73312db99e..b7fbb90db0c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -316,6 +316,7 @@ twey = "James ‘Twey’ Kay "; urkud = "Yury G. Kudryashov "; vandenoever = "Jos van den Oever "; + vanzef = "Ivan Solyankin "; vbgl = "Vincent Laporte "; vbmithr = "Vincent Bernardoff "; vcunat = "Vladimír Čunát "; From 3482020486352802cfe2db5b219bc67914e68975 Mon Sep 17 00:00:00 2001 From: Ivan Solyankin Date: Tue, 9 Feb 2016 16:45:04 +0300 Subject: [PATCH 070/308] qtscrobbler: init at 0.11 --- .../audio/qtscrobbler/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/audio/qtscrobbler/default.nix diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix new file mode 100644 index 00000000000..e7108ebe487 --- /dev/null +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4 }: + +stdenv.mkDerivation rec { + name = "qtscrobbler-${version}"; + version = "0.11"; + + src = fetchurl { + url = "mirror://sourceforge/qtscrob/qtscrob/${version}/qtscrob-${version}.tar.bz2"; + sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba"; + }; + + nativeBuildInputs = lib.optionals withMtp [ pkgconfig which ]; + buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp; + + enableParallelBuilding = true; + + postPatch = '' + cd src + sed -i "s,/usr/local,$out," common.pri + ''; + + configurePhase = "qmake"; + + meta = with lib; { + description = "Qt based last.fm scrobbler"; + longDescription = '' + QTScrobbler is a tool to upload information about the tracks you have played from your Digital Audio Player (DAP) to your last.fm account. + It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware. + ''; + + homepage = http://qtscrob.sourceforge.net; + license = licenses.gpl2; + maintainers = [ maintainers.vanzef ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92fd1d49a66..b38d374718a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12991,6 +12991,8 @@ let qtractor = callPackage ../applications/audio/qtractor { }; + qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; + quirc = callPackage ../tools/graphics/quirc {}; quodlibet = callPackage ../applications/audio/quodlibet { From 8477e5788c32734af2fc210b2a7521d669f41e42 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 9 Feb 2016 14:26:11 +0000 Subject: [PATCH 071/308] atom: 1.4.0 -> 1.4.3 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 7120b8f43ee..87a36a36f90 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.4.0"; + version = "1.4.3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0dipww58p0sm99jn1ariisha9wsnhl7rnd8achpxqkf4b3vwi5iz"; + sha256 = "15ix5ww3ny5ylgmmxpkc32li6af2vc4a2p6aymx9c472fra0c41x"; name = "${name}.deb"; }; From 2fabb4b34d666ec99573218957d463d8239c2f9a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 9 Feb 2016 14:38:06 +0000 Subject: [PATCH 072/308] linux-testing: 4.5-rc2 -> 4.5-rc3 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4128edea7c2..8dc55f6e6a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.5-rc2"; - modDirVersion = "4.5.0-rc2"; + version = "4.5-rc3"; + modDirVersion = "4.5.0-rc3"; extraMeta.branch = "4.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1nq61nimgvl7m7rrimr95ixwkc5sd473m5kvaf5qdyhfnh7m4br3"; + sha256 = "fae5b3b318d6ca7d142b2947e8df3e4091e2330dc509ba19503abf4b9c314986"; }; features.iwlwifi = true; From 5594bd8e2d02b7893814d54be2c2915c52d0b524 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 9 Feb 2016 14:09:54 +0000 Subject: [PATCH 073/308] Add etsy/hound (cherry picked from commit ea43515da1dbcf2b2876bf44c970b33448eb0e31) --- pkgs/top-level/go-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 4c10eec65af..97fafe7c752 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1849,6 +1849,27 @@ let }; }; + hound = buildGoPackage rec { + rev = "0a364935ba9db53e6f3f5563b02fcce242e0930f"; + name = "hound-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/etsy/hound"; + + src = fetchFromGitHub { + inherit rev; + owner = "etsy"; + repo = "hound"; + sha256 = "0jhnjskpm15nfa1cvx0h214lx72zjvnkjwrbgwgqqyn9afrihc7q"; + }; + buildInputs = [ go-bindata.bin pkgs.nodejs pkgs.nodePackages.react-tools pkgs.python pkgs.rsync ]; + postInstall = '' + pushd go + python src/github.com/etsy/hound/tools/setup + sed -i 's|bin/go-bindata||' Makefile + sed -i 's|$<|#go-bindata|' Makefile + make + ''; + }; + hologram = buildGoPackage rec { rev = "63014b81675e1228818bf36ef6ef0028bacad24b"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; From fdbbcef8a2b6453d2113ebc1795789fa1a7127c5 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 9 Feb 2016 14:52:54 +0000 Subject: [PATCH 074/308] Fix waagent revision, previous did not exist anymore. --- nixos/modules/virtualisation/azure-agent.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index ef4e3e1e48d..96418d61ff8 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -8,10 +8,11 @@ let waagent = with pkgs; stdenv.mkDerivation rec { name = "waagent-2.0"; - src = pkgs.fetchgit { - url = https://github.com/Phreedom/WALinuxAgent.git; - rev = "9dba81c7b1239c7971ec96e405e403c7cd224e6b"; - sha256 = "0khxk3ns3z37v26f2qj6m3m698a0vqpc9bxg5p7fyr3xza5gzwhs"; + src = pkgs.fetchFromGitHub { + owner = "phreedom"; + repo = "WALinuxAgent"; + rev = "1d31fe8cbc7f842993eed9b33a3d3f5410c364e3"; + sha256 = "1s53pfmy3azp0rmympmnphyq96sr9jy07pbsfza6mdzpalx1ripl"; }; buildInputs = [ makeWrapper python pythonPackages.wrapPython ]; runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh From 74270469dbdf12895827929753c92ce13737d709 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 10 Feb 2016 00:03:00 +0900 Subject: [PATCH 075/308] firefox-bin: 44.0 -> 44.0.1 --- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index bde8830145b..ba9bae4ff92 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_sources.rb > sources.nix { - version = "44.0"; + version = "44.0.1"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha256 = "c0c65ced611dcc7b788aff7f0e32cd1823467c06dc99ced2e0aca0539ce545a2"; } - { locale = "ach"; arch = "linux-x86_64"; sha256 = "87068d8072d0312af90524c7470c874d33e23c2b3e94be3fe9d934998330e898"; } - { locale = "af"; arch = "linux-i686"; sha256 = "7c8f08471fe561a345175c350c6414e72721baeb41a3ff47a429f5b79c33c82c"; } - { locale = "af"; arch = "linux-x86_64"; sha256 = "4768a53842d40e81a2e357ba58da56b0a81d2224878b6ab2ffad0bfc50c20ec1"; } - { locale = "an"; arch = "linux-i686"; sha256 = "cdb921661a6b20738f38ab2d0fb285aa81a323401f360f77b9ae6d9e8642210d"; } - { locale = "an"; arch = "linux-x86_64"; sha256 = "cff97655831940b84bfa5f73dfa3dc48de084ae6503e7a5824c3e57e373f0ff0"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "9f6322577809b557f325168953170706af6d29a29b5347886f928b5f495799b8"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "d5a1a956d7f9afe5867e2dbeaea4ba2a94e743d291062d18232d20ace29d2c94"; } - { locale = "as"; arch = "linux-i686"; sha256 = "750c5cddd2d436993a4630f0ebf31e9d0ac679cc23a84298071a682e7a8a8de1"; } - { locale = "as"; arch = "linux-x86_64"; sha256 = "5b5a2376daef30eae3ff1a94213937381148ade79783546b1f38687c9fc4489e"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "99b5bc2c709a923a43debfe746c70c3613c206424c88d553f7593c200053a8b6"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "2fd75ff22d3b75f03c6a9ab005e369373f999ef4c38ea49438ab2adaa8e9a2c2"; } - { locale = "az"; arch = "linux-i686"; sha256 = "0781239c9c8f237d66ce0c8d9f39136e0eb71365f6ca8b695014648060c18c38"; } - { locale = "az"; arch = "linux-x86_64"; sha256 = "9fd6f6047ec3c4103c4aa761882053d4e00e018a1509fa1fbede1757394aa3fe"; } - { locale = "be"; arch = "linux-i686"; sha256 = "098e932b708ebc71a2aa7fe86ced4835dbc6725f8714904b25e7ebd1ca7b7d69"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "d9284a84e7e55ad6d73e7d599c5b6824774d7a9e6f7484064fd2985e5634d102"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "02879ea328d1536781f2f9765db51bcb9fa05d0a0b7ad426fd659156c293f347"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "70f55197d8ff67d52f090bd58dcc106fcc08492fe6989494eee3aa3cd1c3552a"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "227873ac53fdac5f27b569a5b6a1f3d45caa4e3c822610a5f294a3abdbc2c0fd"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "0a46de9bfc19fba878104ae2865a092fba7a9eea62a64a31c0decc9fc021b3af"; } - { locale = "bn-IN"; arch = "linux-i686"; sha256 = "2cc4d364852fc987e97f169de9039992d4ecb848125eae38c09bced34aae8653"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "6a722ed42f251e3433d46d9b56ca06f7bc1cf0854de782da10285db6ee4a1bfd"; } - { locale = "br"; arch = "linux-i686"; sha256 = "14b75dc8278a946d705210306b50a85795f70d83d0527d2c77a60b13662e89e3"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "73e62d2869fb450b4597ec3d65ae3c36ef78984462a158dbf565bbac539b1fa5"; } - { locale = "bs"; arch = "linux-i686"; sha256 = "01e02d4a0e140d962e27e4f1a4ec24837c0646e9373f3ce2eb8337437c274ecf"; } - { locale = "bs"; arch = "linux-x86_64"; sha256 = "59fef5429b639a52ee113e855a18080870a2f905212dd0e4aefdd838d040133d"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "62f96267e91fb9a8df1c436adb78945f32eb14bccc57e706104ae0547b723682"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "0be231034e076e162b5568a5247da47ca2038011928f89c729fe9a7e139dd922"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "15c8a066fe101a5b9151c96611e2390008ac54a9a1909b9430ed6f440c856920"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "40400da9851782418a12b224b74c3b5c8c112912bb98dc8f368972cc898ea155"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "b9b8d3d4c5160eb1676f6c4531123ec28dc0ca6b51e7dcf20716611f93f1c975"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "6e00d5e5c7e50aa24468b802bd53377d8962b146fed8a8588dd5c8db4162da93"; } - { locale = "da"; arch = "linux-i686"; sha256 = "760c9d95fe6941847dfd53b254cd662a83f4c9f2d66f84a96b4dd1d3127adbb8"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "e168e7e7e11aabe54f773c960d4c9b9920e15e4ccadef9f728e2016f0240555f"; } - { locale = "de"; arch = "linux-i686"; sha256 = "e5c6372f3fd732fddfaa31ed3ddc81cf803386d7842e103fddd0685739ea63c7"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "73da0a0c66c18dddf5de7b7dda677cb9cef1e0b3c8cff5e22f48bf743ece8116"; } - { locale = "dsb"; arch = "linux-i686"; sha256 = "509b8233c403b629803fb0d67a29f2d6f649627d4b91c592121acd3e2ff62282"; } - { locale = "dsb"; arch = "linux-x86_64"; sha256 = "6089971aa6e19e2cbcb49724e2eea7922d9408936aa8e2d396b8f1966ea81eec"; } - { locale = "el"; arch = "linux-i686"; sha256 = "451f1a7caea7553fc18e440c2716e1954e7d7ba66f5fbe15cc6954224a36444e"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "d02f4b813cc16b4293f9441bdbdef56acd0a7a510d9edcce223d04270e65f2e4"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "663b7a6300fa46c4e62e7542135ab2632117496a5b0365276ec5ac94183a1d55"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "d50895a71408e74d8b5b1965be279011214c50eba56e0046f360f216326f1135"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "84a5fa00271f90356bbfedb1fdbcc033489d1759fef53c4dda92bd285633ae3d"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "49e55275df9e902bc234fa59b4b614a084d76dc2c256ce6218fa96663cabe2dd"; } - { locale = "en-ZA"; arch = "linux-i686"; sha256 = "dfe926680b0bc5852db920ba8b3e4febecf1ead33d9865568ac69e9494337072"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "83c8480482dd154519d26e43a3f79d32c82f149d81a1c6e8ef98e9511ecbf35a"; } - { locale = "eo"; arch = "linux-i686"; sha256 = "a27703068ff3be53e8944c750bde0316414f51ee4c10569018d121db7ec1b705"; } - { locale = "eo"; arch = "linux-x86_64"; sha256 = "981462cf59716c17fc0630d0cf12b03e7cc96d72c2d8d33109c1db633895f18a"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "16b2efda57842f29c6f4432cd51296d5e9a709d30f2310e885c786fc68a96e65"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "7b6c8a2bbae8e72ec820df741b8f4a2e162c4b628db8e669a5e85dc190db6c51"; } - { locale = "es-CL"; arch = "linux-i686"; sha256 = "ad18bc224500c834a159d91fa568461cbf131edd1b044ae8c97e887b2151e112"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "84c414c64bff02d8e82a4ca4c01e1b4dfae21991ee9a6850203ccbe15469cfe8"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "142db7f0bb92976345aace30d9ba53ab4ba98a47332c3f7ae7372d9d80300781"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "337de34606e018ec5b600d559d928e35c79fb28800c9b5ad28e2defe259f9b58"; } - { locale = "es-MX"; arch = "linux-i686"; sha256 = "51cecc939011135842bb51c41cfda0fb4ae53c5180e49bd66a810c243b1d68be"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "cfe309df7412f68abf487c1f9065e6b9d4b4f384254576c8d1098878012e5b53"; } - { locale = "et"; arch = "linux-i686"; sha256 = "1540b0f0c1d867c87d1e109b4e9ad417be51306c324a03e07706d7e215f7ae4f"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "e7c0e4e61d17164a648ae51bcff92d99f76055a1a6a29dfec6ea12a0359f1285"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "c2c88bf65329b168fde8fe02613eb89069d85da8b2a3114ac647158b8a345055"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "9d10a2f8a0e889a6ebe99bc486cf56cc44535b6f67ce3667ac61e87430a24eea"; } - { locale = "fa"; arch = "linux-i686"; sha256 = "21ba5e79f5fbe3c3a8a8a71f8fe9a4280f8e47d4c58070443bbf53305c906175"; } - { locale = "fa"; arch = "linux-x86_64"; sha256 = "99d8d2e81e2a8f495d5568d7a9cbbfbcdc8a0e1d67fa297adf8a021988948a80"; } - { locale = "ff"; arch = "linux-i686"; sha256 = "3e1812cd98e04fcf575783eafdef2c89739c51e6648f4cd7ba7bed44fbe5f960"; } - { locale = "ff"; arch = "linux-x86_64"; sha256 = "cbe37600da8bfdabe683473dbb4f2ccc96beda89a9ca15810432a8fce65a591f"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "ecf982266072b4a15a06b939d4f0cc22c3653982404974baa51871af0e411ab5"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "345b7f038e454e6efd513e923ad2aa0a45d76d846539563bbfc79293ec84a6ec"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "e71b05083a122ef20b5d75481129fa2e3d1e2ac608cea2c5baf7b300a5fbe5df"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "1897112ce462b341abba4c2b1664fbf39b5072a11ea6fb61c66cbfb3336358f0"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "5557347f19ab6d7c90a34bf8a9729d39eb65a02a021040091cc1863e08fb72c9"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "c77b86d5512f8343674248b9b4d31165975f0eeea002313311339ae45d9effe3"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "7a68d7de10abf095fd9240807a6a553b60ba75f3d8edc56afcf5ad1832a05eaf"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f935b317c5aadd60553f497ceae2cc663dec3729b2fc8e48e6a98d1eb91fe263"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "21bbca4e12b3fa230b879f190d279ba9314090454e0263b65e77dbf8f99dcbf3"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "027630690ecff7ad56f6e992ef243d2a734dac1a3e6365bb22c56a571f938fcb"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "6973787b5136491ef28bb2e10976d49c3717a866ec6fe357a995dbf3179a751c"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "0ca57d72bf11ddf74eb79904be607c479c01f31f11fc0ff567a9ad7beef8067d"; } - { locale = "gu-IN"; arch = "linux-i686"; sha256 = "6f422fdcf2fd514e132b33fa079631a6bd4b12deab17a3463b1f3f1ce3f2f535"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "19cc20d1bd838ebfb8518b8076800cc3255376e4928cf2f37be86258307f1104"; } - { locale = "he"; arch = "linux-i686"; sha256 = "f8eb56fea0e73c247fc767541bc97cc3556e4db75ad446e01b0978a5c0b11d3f"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "8ee0ae75d179bfec9e081777e9a34fdae72d8d55ade73983fdac433649b596ac"; } - { locale = "hi-IN"; arch = "linux-i686"; sha256 = "bb64fc5285bca12542669ef83bfc465bf593154f9bca2548510f525bde5a55f3"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "52bb0b68a5f282e65d077166a3a0716fe6c9368ab88f6d5e2a8669515bcc000a"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "f36e7b656e5898191801d6e04f3ebef9f9f7080c011dd695ddccfe12c3cb2f6b"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "9c553d5312363980364c6a9a6591fe5e0229668ff1de3a78943af18235098eee"; } - { locale = "hsb"; arch = "linux-i686"; sha256 = "e58662111147e836ac404cf7fc9d9e52ac141b204004c813c6b8d180a378af57"; } - { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5aa7dcce6e48dfcb7b8b4f9f48b4bdd496bd606d901896fd37f2a2cd6b4a06bf"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "d352b7d67ebbd5e45f972a804cccbb769f6a79700506297c0808d2f9b0f5ca8d"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "0f7e5cf8306e1fa9b8ab56cdb39b5ca1fe2ff1a3f4ded38e5982bbd842438dde"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "bf057113e03190fbfc6947f24a0fb432f53991f02e56d2b5e8270002cd742d4d"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "aa0fdba0a703f06ab5a6b667448316f9de9729c20602fecaf872d14e43a0b822"; } - { locale = "id"; arch = "linux-i686"; sha256 = "eb8fc36302a63113e9891f8153aeffc1da4f990f1473d9d779f28df6658bada0"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "6f2262e13a649499a0783922a3f2d85a71727ef37629a529f084590828746bca"; } - { locale = "is"; arch = "linux-i686"; sha256 = "312f1af8601c24417672383063085f1c588d9301a09ddeef15b8c54e130547ff"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "ed3165767c2a14329869930d2b618a5a795d3c3d34e06cbae0d1694ccdfb0c97"; } - { locale = "it"; arch = "linux-i686"; sha256 = "7555b6f4aac9bcc270fcd5204d15a3cb7b84cdd845f66cea2fbb843315100107"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "b6c2799434bceda271a004769372dfe416584953be5950fe7125920e4e428737"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "e8606fc60aaf6ba91a2616dc991d268e8099eb8d5d3eb3c19fdeace93c6453a7"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "5da4d4c307d661868ff7076e2fc1d929e9d3b9816be25adeba02bd4f9a56f15b"; } - { locale = "kk"; arch = "linux-i686"; sha256 = "f77db4c679c687bd33ed125419666226989ef5da88c2a4c8a81aea0ece602e25"; } - { locale = "kk"; arch = "linux-x86_64"; sha256 = "3af207c5e2b6bf089739056f2be6e585529c87d5f142e7100fee55728faaf785"; } - { locale = "km"; arch = "linux-i686"; sha256 = "d48c3f0952d354b9c6539d9e333a8e9c359006a25f1ca6a0895f7e3344504f70"; } - { locale = "km"; arch = "linux-x86_64"; sha256 = "5bc3f65a205a78b110293df5a94a9bde27a491d61b1f9e340a7fe983c1ee1b3f"; } - { locale = "kn"; arch = "linux-i686"; sha256 = "50efbbad9ea231a9281a00dc702d9c6103bfd09b712b45b6809d78a176714897"; } - { locale = "kn"; arch = "linux-x86_64"; sha256 = "001f41e86fcf93fd6a714e5ee0450fe8424bbb3ff40cebad29cb233cb0667bca"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "11539b78bc650b19be2d25af10242a61ee043b47a15000f2e07e50df00875e2e"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "a4f0b466c5d544f0abecec8861e1d24132755fff54091a49370414ba27c9cc7f"; } - { locale = "lij"; arch = "linux-i686"; sha256 = "eede4d95ac6c7f55b312aaadce690016732bb143f3926c1d1533f64efd7306e8"; } - { locale = "lij"; arch = "linux-x86_64"; sha256 = "6900bfd4af3146881cc045eed187b88a58ea0fe3e0ed6acbff034f68f43b5935"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "4cdf1ced9a687daa34235ae82aa439d69e517d5c31b8f61e12615f361440a54a"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "873f75d77adc9c142f64523c199799f7e9b0460ae0252c514fc1caa5ac5dcdb0"; } - { locale = "lv"; arch = "linux-i686"; sha256 = "65af6b876aeda23827c57d5886cc67665fe2c3fe93cfc2cc5b614400828b6eb7"; } - { locale = "lv"; arch = "linux-x86_64"; sha256 = "1b2f6ef94bb5a1ea999af797e2aa8ff267b4a9945fd0e8afc6c9df12273ce60d"; } - { locale = "mai"; arch = "linux-i686"; sha256 = "65fec172ddfce096f367338c8b95b32fb2415655e900f8dc628b8ac660270e48"; } - { locale = "mai"; arch = "linux-x86_64"; sha256 = "238a78c2bb240609fd0c777399d3307ef659b95cf4e88ae85700321030000eb7"; } - { locale = "mk"; arch = "linux-i686"; sha256 = "e591486c66c9b7175b1ab180e9646976a413338dca225eb50d7db457f95afe98"; } - { locale = "mk"; arch = "linux-x86_64"; sha256 = "f8d04696d02b0af221b8642d4780d79a76be68c07096c7f9c5915a9db6d5f768"; } - { locale = "ml"; arch = "linux-i686"; sha256 = "19dd334052bd9c98ec9afe7b8e5141728b25d2278b7b946921b031aaedd01b2d"; } - { locale = "ml"; arch = "linux-x86_64"; sha256 = "a307739cb6de6f80258c28797125f78fe7746d0edd3182e3716f312f1b0915f8"; } - { locale = "mr"; arch = "linux-i686"; sha256 = "c86343db611dbca1b8fac25ea1e9364b30fcd6c31d5c856f699bacf6e4128c3c"; } - { locale = "mr"; arch = "linux-x86_64"; sha256 = "b25fd422e6b3b1535fbb8839d04a77dec22dfcc0abf14062f5465c0a5aa5c99c"; } - { locale = "ms"; arch = "linux-i686"; sha256 = "e437939df4de54d415224db8fbf6ce9e8ae21fc0402052a72612085c73faa493"; } - { locale = "ms"; arch = "linux-x86_64"; sha256 = "5d9051de7a1bdc68018511d38e29658f00c0db113438a3ec84e68fa99b89f760"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "04d0bdd6235a9321d1a5467c48240cbdb790485b580c1b818b048817fae22f49"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "30afe02bd7090929841edc88eadcd745435f64189782d95477568b3b41cb107c"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "83b01feb621cb9c7c64edb125c19aa0765bc2d16b2c20551be12690f835539da"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "c5af070524b828313a5e819f4c446cdc7a72f6bffd62e734bb8752438e5d28ef"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "527c9c2dd61a318c5b6ca5e9b26ee9b81b71ae8d7c23cdab6efee1bb5caaa685"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6f3d800c347a70c5ed7a8838365599c7401e4805037f5e980865794d395b416a"; } - { locale = "or"; arch = "linux-i686"; sha256 = "e5f9ba3ebe3d641b3dd948ec51dd25671327a35e5ee87b274079a8a3ce7a26b1"; } - { locale = "or"; arch = "linux-x86_64"; sha256 = "53fea5b84051fea6c247fe2baf9f9d3c87b3f78d4655fc8509068fd60ff3c942"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "dc8d60a3f94da475fea5c1c748c52072f69d4642ea2c3b305e92c56fb3b09324"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "c06eb60b39cef2564e248e3d9dd711b863e46cc6d45803002c641a1335927bdc"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "95cbcf68c03ed83590b6e257003282d710c8dd366fd75bd218880735731ed7d2"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "9f59a86501cbb9d8813fbf5812646e87d400f136f2cca5d791dd5ac0bc4964c9"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "690772121588229f34e9a9d5e6042c56a3fdb9fdcafea53f45a12997cd1d1e53"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "fce60e0a3787a2362bdab4d566766c22a4b4f777d1dde7552e195eefc8fe98b1"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "35a4981bc819fa7cba9e2f73ebb28eafd68b464eacc9da4e3e651882ae8b84bd"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "eb4f25e99cc681a6113f9de016a6993e46575caba84f5cba6195c88379e4e661"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "cef140f0b0c4da31235147871679d009f05aeec3e1b138e56bd6acabf79cb666"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "e6aba016e9909cc43a9ab285ed8cbfc15dadf2cf7bba9c78ba340512dd9bbcc5"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "d159bd682f8db01fea12e25bc0d4c24ef2ffffca07b3c5d64223ae75d6f77d23"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "e82f1ad5461e25c25a8c6db480a733e95b81578ec280e93a52b00b650211a0ac"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "fc2e1166c4d9614bcf9c8ccd01aa157bc229cccbdcd2854bbc52302465d24d75"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "c08fcc4457bad70ff5861168364306753df7f03d7817a52dda8c6aad74bde389"; } - { locale = "si"; arch = "linux-i686"; sha256 = "78f60d4ba047d323ec2a36e2f8a775d86bb2c00bb671009105f5fe368419366f"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "d9c84c673378721c0bc45e767176b879858ba0feacdeeca503e600567569ad33"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "1bbddd4c07cffc083997d3b43034438eccf8647bd9b078cbca86f63c50c588ae"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "f8278a40b25bd24a951855b633218c8d0884fec7468291d947890f2e98310acb"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "18e9f99de5847e996ab66202e8718d9844f26ffef771a236ae16ee68098853fa"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "bbc818432701696fd140e914943d076e4d11741180a04ea27f4be75ec3558d1c"; } - { locale = "son"; arch = "linux-i686"; sha256 = "e1d8c54d8b1149f98adb1b46c4973e01fa76bb132f0df9b0f090c4ead0ec4676"; } - { locale = "son"; arch = "linux-x86_64"; sha256 = "a57f3971825a40c8dfce2d987384292f1ad3ebe6a96ff762bc38e69c6ce2889f"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "b452ab04c4bae6079bbdc293bc6c41882dac30ec1b1483340e49d072ecf2ced4"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "b8aaff5e70e7690481a5c22fb2da97ce63de67246217fb106441173573aeb4d9"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "135f60c2012e63622d1a75cab6fd5f686fee71138b1f1f01e367fac0b3b583c8"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "ce464a8ec58fe19e037a26a1b94e346ad314eacbe94232f4b136e0fc7b3919ac"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "937bb415ca95996207c371d111a888f68a24d690db8c31b8c1df530b2b7b30a7"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0ee83de9b3bb77a6e3d1120194700b720d441ee116f9728823c5a78f59d28a10"; } - { locale = "ta"; arch = "linux-i686"; sha256 = "fb908dcbc4fa42c6472e4cb5bd9d8ae7c845bbf9965498091b32f7d1669ede24"; } - { locale = "ta"; arch = "linux-x86_64"; sha256 = "5c8f1c1c09ff2eccf6becf9136f9da3517fabbb0192f157676962fd3bfd31bb8"; } - { locale = "te"; arch = "linux-i686"; sha256 = "5478af8e757d8282993afacd10fc78bc7a207fbdc50705d2d8a665aa98e5f910"; } - { locale = "te"; arch = "linux-x86_64"; sha256 = "719945b8d7a945e556137cc3bdc4a8d7ddf5693e4ac49a3884f912ec471da1f5"; } - { locale = "th"; arch = "linux-i686"; sha256 = "4f0dfccef932beec90f7de951bb2d454bedc192b376caf25c3ba89ecdb5de9df"; } - { locale = "th"; arch = "linux-x86_64"; sha256 = "e14a4cdff4cc89f85043efbf56a82211f1040bc5b369c2113866efb639969017"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "aa5bc43997a6669b1c8da7b04a12c7a16ce8b1fedae8b0bb1a317c83176e88c5"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "3a0a5883b4e4442985fa8e24a80d0849ac450a20d278858e1b3847974cc212f2"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "3ea926ea98fd3506cdcccc32266fd8910f7c6b563818d58fa9708872712daad9"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "c1d596a00831ed30446f8a6f9e7b455329a402939d5c7318616ad182e9564aa5"; } - { locale = "uz"; arch = "linux-i686"; sha256 = "d17a26657562ee017388c878867ff43a1d1d86f80c86a18fcf63268b477bd889"; } - { locale = "uz"; arch = "linux-x86_64"; sha256 = "7115c30ae7c0528f54aa8629402ddcfc54687e3a439d7a96c18f15e903e283c8"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "37fe2af25d7068569770573e605f3d325e41169b3b0a82ca4ff007a0636b155b"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "5bb2b8a27065b9a71a06dbec136a1774e43fbe27a30a03092f718042d58ec26c"; } - { locale = "xh"; arch = "linux-i686"; sha256 = "fa44efebbc0f1174ad10f540668447ddf6bd26a2c918694dd11e63e4d6f36b9c"; } - { locale = "xh"; arch = "linux-x86_64"; sha256 = "2c179d4613b0b7456d900f9b6c02a1041c39d4cf98a0ca0ea2ea97d1d7546199"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "e3c06fbffb4b2c135d31499d1a3490d23baedbed5125b46a4153ad9d60ea2fa8"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3402f491b016e791c9f40f8ac5df5f7017dd6dd71d872020a27eae3634e4fb52"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c77d79a6b1602c9f8c6538be18c974b8557af3ad3898910e1bccfe0a54993207"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "651e4a28750ea9376636293b934cf646b0e6981825a9801fe8bf47785114e34d"; } + { locale = "ach"; arch = "linux-i686"; sha256 = "eefd2889153dc96737781580089fb0db11e02118d9b6e57da3f25ae586e56597"; } + { locale = "ach"; arch = "linux-x86_64"; sha256 = "80c7e6efe4334fbdc7060f779a4cb559ebc4516adcd6bdf9f22a986e75e809cd"; } + { locale = "af"; arch = "linux-i686"; sha256 = "452595636217272dde5adc98202fd39204fe6e9d5fb82c942499b5b27db38bd2"; } + { locale = "af"; arch = "linux-x86_64"; sha256 = "1e746adb9cadaa0ae7014b9b88076ae622f846f117465609367808ee351b33c2"; } + { locale = "an"; arch = "linux-i686"; sha256 = "4bbcc5ba7d917ff4a824c917a204710305bc500b990c0449a905adb967a2e851"; } + { locale = "an"; arch = "linux-x86_64"; sha256 = "2f724f9ccf43b419df2b70d9dfc4ebe779c332a398d17a38e761367de56ed658"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "a9827a7430453c0485708d4473e5267f00127940c9878b9ba67a4698d3efbe1a"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "3422c0378d7fd37efdcdf56fecfc0295414ed3911ceac1f96fc21e6d7775363d"; } + { locale = "as"; arch = "linux-i686"; sha256 = "5c6d72b827db06cf813d80ebfb78a79b24e1037ba53e61b1fb51ed43bb841671"; } + { locale = "as"; arch = "linux-x86_64"; sha256 = "09132af34d7ada1657a466243a17517de4aa7f6f62bf10af777da3a619b465a1"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "b544ded04a9fc7c7cc2d67cc70a3290c483cec18fe443f51d0f897aa3f60c416"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "6dda16d4f4eb05674cf6b29940241d99322793b5d306fe7c61ad17573ffdc3f0"; } + { locale = "az"; arch = "linux-i686"; sha256 = "c115cbdbf94d7fa0c008e676c9c39429d13f702fca70f656cd571ac008a74772"; } + { locale = "az"; arch = "linux-x86_64"; sha256 = "639547d368a06150405ae8bb12354db3c03fbe602410a89e21709b7f6617f24a"; } + { locale = "be"; arch = "linux-i686"; sha256 = "7144c4b0dffec65578b4211a04962bcd93b312977dc61356f0d4f6f6a75c872d"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "57504daaa8d8d02877949dbc14a6791ef6205712e3dfe70e6a46cc76f9b6725a"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "e198c83f7986bee52b772bd44d8642d0b4385262c93cd73423fbb8d9b97c96e6"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "cb66cc10fba3ea5cfab4461f0bd2d26cc1f0816770baf16fd74bda27f6566c8e"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "c31e2c1aa1ce0965f800b13e88127b02d47657519edead877a5c32c5420acabb"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "00bfd63c8950879217ed045caa5d19839e1c9fb38eeeaad933c23eaadeba7296"; } + { locale = "bn-IN"; arch = "linux-i686"; sha256 = "580d9f884aba059968d25e25c2c112318d8015eb5fa29013cf96f49fd620b039"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "30029721b59b1e7fbce580e58019922e61ae751712ca27300c9a125a453e7853"; } + { locale = "br"; arch = "linux-i686"; sha256 = "67e682bfca447d11d2433fa1977e482a9693842e3f98c199afb1b8e41774e9e7"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "8442b995879ab6120bdd259606231b0daf8619abe099a1525f826611a5c34347"; } + { locale = "bs"; arch = "linux-i686"; sha256 = "72f78a32441a03232ae22d86ac0023674b7d6ed57ea9990244252bea35a8b681"; } + { locale = "bs"; arch = "linux-x86_64"; sha256 = "cfdf126ffbfb3b8359c8d01e72fb1e462df102eb458021e66295b5754065b72a"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "53bccb498b5510de99f4d54a5c279f499a92a8fbbec79be68737ef06e5c18325"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "6905d7d8f8cae2192af022cbfe158b77ee02afa26f25e5ade6cfd747a8836119"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "7d8e61f1021064c41f8f6b82ae50dff272f64242d6ab289722a0ee246b141b1f"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "409d1b2c1ce1ae294c530acde139bca076fa20d71825007f08698b51ef0a30b2"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "fc982e9355ea15ff40c998def2f3983933077fc726eab348fbd6ec72d3369cec"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "6a61f1ec194b6235561f2420fba7477a549eeadc3b54dd013c7754dc3c75180b"; } + { locale = "da"; arch = "linux-i686"; sha256 = "7ffbbc279ee6bf587847b4f66c8a5ab968163410a6c9c84227f0df25366f892b"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "7601928a20df30262df46ed1a1127fcfa4710ee7bdc951cb3ef295e20a2e2fea"; } + { locale = "de"; arch = "linux-i686"; sha256 = "b3a079e15c3551b9b62c4cf11decacfaafac6f8e1765c6d19c53aaadbeaa9e8d"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "0b13215b6f1768735cf58b87dc76b3248d196acfd21377da2095177ea8e6072d"; } + { locale = "dsb"; arch = "linux-i686"; sha256 = "568c330a6c397b45cc416d7b4f0086ec75077690ca6902bc7931e795b6eb9848"; } + { locale = "dsb"; arch = "linux-x86_64"; sha256 = "17a0be9e81a35aee281c32a78cfd3c7d34455560d29c423cdf91e8142cc1389d"; } + { locale = "el"; arch = "linux-i686"; sha256 = "77e4a8fe8da982bda24767d7ff499ffb835ac28599933bba7465e7fa90232461"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "8b48f3a412c60c4619c210724372611b7b701c5db21b805ca854aef3c823d83d"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "def26268d266206a8c2b8f5f0b91a74224a1b2d54c70790e00389593e703d09c"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9c1f7d3ab81a025434023551b77021750634f9a468bc8d892be7e13ccaa7914c"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "fda066d70c87669f69c035af9bef327948f71b07c347633967bdd5c78c02beff"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "bf9d192670b516f393c20292580661b323e2ac88c90771b6834d0f46e86823c1"; } + { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9e643d372d31cd1cbc376f7cd3a8e8da95adfdec62057e789bb4be7cda5afe66"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "b109109d6c2efa55c68778eaa21d7ada28074ad3008fe4a123107f962240a2ad"; } + { locale = "eo"; arch = "linux-i686"; sha256 = "8ae463d0f9608689bc4f9d60ceaa30260cf40b6408a2477a542e8fccb2c94b6b"; } + { locale = "eo"; arch = "linux-x86_64"; sha256 = "6853d5d4834839070325a2a5cfbb0610891cf774d015f2d43d9cf42435e0f2df"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "fa0a952c771cd5e124c66066854767141667678cc281f783ab179f71c0a935b0"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "434fd1e7a9ce25a649c7078396319a8234e96bb535b45b2edc02fc9c9e38c04b"; } + { locale = "es-CL"; arch = "linux-i686"; sha256 = "d95d1cbfd606be0b41d6281c6e2c60d53fb96bb1afcbaf3bc8331cc2dca4041a"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "118dca4966717667718b08b238466cab116683e91bcc9c3260990b89192e3e3e"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "efbe0a6c224d2593df791fbcd3b149dc157d9ae114aa8e2ad170e987da6d74e7"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "80d5a5dcfa14b1bf77b665e668fd7734d51251a5f908fcacbe73690116dac466"; } + { locale = "es-MX"; arch = "linux-i686"; sha256 = "7786740923cb23542f0c9fc94169f4850e4f47c9ef4ee190e6995e6593374858"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "e8e281e6594bd3d6f8b6ac0fd13ce8794df59a72f33396247183aa10c5a33f75"; } + { locale = "et"; arch = "linux-i686"; sha256 = "71d575d33f9f4cea252e87d000c9d0660174c247b2ccb41421891eede42bcb1f"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "5408fb992704293a2da2ebf1c671adb919c5b81e3031be81b51d18a470276d94"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "d11baf3547455e0d9c6ee5bef5a8cd421cead916e70eb83f451fcfadeea87a46"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "04c0c262f965d995f5ec0954d160c86ab5c9404f6b443b7309f6588174a348c5"; } + { locale = "fa"; arch = "linux-i686"; sha256 = "97f8929a4d73e726d11c79b539ba8bf7d9ee7662416e1ab3ab7ed9215bd4c028"; } + { locale = "fa"; arch = "linux-x86_64"; sha256 = "77074015a70137a14a86079cae6d548d8b1d5aaef7c1d729a6681289bbc74905"; } + { locale = "ff"; arch = "linux-i686"; sha256 = "e9f29243dc0b1d82a749383e6608a7e166dda840695321ee79d4bdca001f2683"; } + { locale = "ff"; arch = "linux-x86_64"; sha256 = "8debed13660e6565b4f80d0c7383642db5e38cc0a69baeb26a3fa54d3e5299a4"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "f9832f9093953cada6091157c55f3d4ceff8c8fefa4c8c2f8db51d25b7d6d4d1"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "e01613a01cfc5ae121f16b58321d94a202d3e07e8a09793c307d48eccc176c93"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "11c923e8565c7275656486e44e0109b15037ea9fb3476e53a353b9a8c6896c62"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "483944f87a6b6d9f9e5ad1720b497ea47e4260b0e87e91f9d7ef1f274f38506e"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "60e177657a81b5b1378563519b9dd0d23f2268b5b77d4880ea289522ef2fae14"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "6e4eaa7dbeae9090e0bce8dbabcb3b83c97822a387cfa940029f9bc3610532e9"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9638bd74f130f13e16da5e743f484b4f5e8672bd4b196c646932dfd0e13e71b8"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f8166135dea1d167c2eb686786d39ac32c2a9765b3fdf23a26b17550a2e93adb"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "1111deb031ed3b4a8954184ac34a03e765ee044712f921f63d15a5e6def971c0"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "7c9866a8220186ae5c573871829521815241ecba134ebeabd5c18d58f494b414"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "5c7739d6299b19b4cda00daea19e81efc7b9ae6d3a4716de8ade143e8e053c3d"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "02f4090f0c010121b3731ca8a92e0f29c10f97db7fe96309bae4b88e16e853e4"; } + { locale = "gu-IN"; arch = "linux-i686"; sha256 = "fc771898a75e7f8ace3d9093db82bd2648e91480d686bcebe4d6496555af2ff6"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "5492053dea2f4d809b5025d77cd38a710414b06e7e37bf2840b2ec4f6039e591"; } + { locale = "he"; arch = "linux-i686"; sha256 = "92a45496fdf3da5dd1ccb640d5223c1275e0e23f56246b1d82f0dd1856fe3954"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "b79a5112eaaed46b32cc9c54a3c0419cccf342ea8cfb421466e0837d6096a269"; } + { locale = "hi-IN"; arch = "linux-i686"; sha256 = "c7b2e3acb3b6707060ee0b62477a41ba0714a2b3d22e095abefab6938da4bd39"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "1f4492a3c7d0a2b4f88cd256a68c2038d6d145b461b40ffe79e3e7452af06b55"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "d7e2291798e6a54c87fa53409f530cbb36ddea001534eaa0c038305e8aa46d38"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "9295c24919f3094cdbe89e840e5fdfe73ce9588d0b1108d328c6613ae3b1e829"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "cc38ff9f7e0746b2412cbfebec60c44cb0f0c4a92a8b80cd61d5f9eb3e22cb4a"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "8d9afe825ef721726edab87e6f648ed136eb7e13c5acaa59499a55898e2b74cd"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "0e6829af6f5e955cbcd7192e94a613909369ef302349e7d8a45f8cd11df51613"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "16779aa3f754ca4a211d5489d54c15c49673d96fdfa4b64f0e6050b8f1517973"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "3e4cefe678a7f30153690f9d8b1545fc5805c62ccd0af7f1c3172a0dc4dc6772"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "363cac6106e008fe83b80f1c1c2981b46b890c1c2447b7ad4bde9cf7eea19e45"; } + { locale = "id"; arch = "linux-i686"; sha256 = "e3710c2b10ce747e15fa07a426fb2f97983637e9f73eeb0c3d064f2b8bacda6e"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "dfc2a2c1306b624e2cf9b6b4fc3c33ba9b622612f455760674103a78beebfc14"; } + { locale = "is"; arch = "linux-i686"; sha256 = "302d96499bf095bfe7c6c765edb197c5d5bf1c90e1dc86ad966f6185aee6873b"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "409fcec5ed65941cd60e78c4321f7c4d80bf8fd225065cf651d4e7db92649506"; } + { locale = "it"; arch = "linux-i686"; sha256 = "52e17f9210042f1eb116ec4328b136ece380ebb93fbd05190d475b7cf5617e14"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "cbf8b9c62616b19c448995c22563bcc4c68b6c5cbb6e59ab232115ec8bd0bc6b"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "8da7f153541aa283454e4143ca09e3307660b429a48bca3122b7df87b4122812"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "0eaf62dc5d97ddb35ae1c7589e3cef92a345d89f6cb8f0ac177f3991123eee2c"; } + { locale = "kk"; arch = "linux-i686"; sha256 = "22ea4fba5f7b2a64c7f71b68488a00fb1d18a2cc05bdfdede7481ba8fc2b5b53"; } + { locale = "kk"; arch = "linux-x86_64"; sha256 = "0bd0fed9e8ed8531e8b7759021afdd08ff45a3d235193c6434c630efa72f2073"; } + { locale = "km"; arch = "linux-i686"; sha256 = "957958b0b411c7a92bb00cadec9cd766884f9900907420d976eb84c435de22c2"; } + { locale = "km"; arch = "linux-x86_64"; sha256 = "c8cbef947210e4a4c397ebd366128166ba16c59f960eed9ebe1c044918169c9d"; } + { locale = "kn"; arch = "linux-i686"; sha256 = "0616551d7e9622227dac6d95f188fd3d11ff3b93b042c3b793447622b6affebc"; } + { locale = "kn"; arch = "linux-x86_64"; sha256 = "a4914b4b950884b8bdf2b4ba65a017f813d136d0c30ed1199a51ab7394504cb1"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "c47331bb4a65f2a024b9c2d283f9a289e623e0713e4e7a715124ca3e042f1c57"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "bc11ea2d206ab1588c01e862770b321f99a6947a5c13baab266c1ac5104ae4be"; } + { locale = "lij"; arch = "linux-i686"; sha256 = "ea8ad910b666fca73c7312fb338108b2c8d9413595094ae3fe3aa359d2032147"; } + { locale = "lij"; arch = "linux-x86_64"; sha256 = "dedde2eae271be10923ab62e56575c5f9216d9c2b9126e745248f9744177ad94"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "b106645051269bd594418f71b237b569d51cf85de2cf656d787ace395823fd72"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "914b64772231951b41dc3a2cd4e625098809046f7f156f958e170d2f72d50511"; } + { locale = "lv"; arch = "linux-i686"; sha256 = "03dffd9f7f24533034828f4c7cbf5c14337927b930b814e010c187797ce995c5"; } + { locale = "lv"; arch = "linux-x86_64"; sha256 = "c29d6ffd56da153e87da73ddf5ea3db7de143949809081db9f2efdc7bd79d828"; } + { locale = "mai"; arch = "linux-i686"; sha256 = "db4a4f3414491641de0e91b0f66eee7f6262640fc258d3ba15cabdf9b3deb5eb"; } + { locale = "mai"; arch = "linux-x86_64"; sha256 = "a39711b8769a8e9b2e78dc587e364d7c731538202cd72c0257fbda9cc691196d"; } + { locale = "mk"; arch = "linux-i686"; sha256 = "01eb8c625a3ffb68f7dd5fbaac8333bdfbfb6f4284510fc163d3d3db39e1465c"; } + { locale = "mk"; arch = "linux-x86_64"; sha256 = "3cb0b8c6655714ca24e345093ba1b5a5380856ec1f9df04ed2b6f0399c61e2b5"; } + { locale = "ml"; arch = "linux-i686"; sha256 = "b00a9d53bc27950ec451a7861ac0e34d9d1d04c7e6417c767f47f799380cefaf"; } + { locale = "ml"; arch = "linux-x86_64"; sha256 = "e2b53074478efc093e21e5f74ceeaac796a32bb0be347d4023b6d9a8fda99b98"; } + { locale = "mr"; arch = "linux-i686"; sha256 = "2d3b2ee4a0a6527ee284a29b38040208639e31fcae75acac94789f0eae0b7ca2"; } + { locale = "mr"; arch = "linux-x86_64"; sha256 = "4262cccf8feb6cabe08b2e4d0932666d962ad42214b69a6cf0d55e9c9fc04219"; } + { locale = "ms"; arch = "linux-i686"; sha256 = "f957096ac48ffec8430a5351c0697155847ca59ea391d64c6d8111713ff20453"; } + { locale = "ms"; arch = "linux-x86_64"; sha256 = "0e69c0a2f3de0207a0cf0ca3e27fcf6141920bdaa9759bf5567b40ed0e33032c"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "8c77863e64a57c4435e50e349eccc8934e128b9ae78904e93e7beb03d8632847"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "7a64b47f81a484970ea7ff5aa49936deb5ea4db6cefcbaf30c6bbe4c5caf2fc6"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "a6c3e8aa9c9f59d41c098b7db0ee4b5a1deee33fac7934bf99880d35f97b855b"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "261c4401ede66816fb58aadab5c335841bd7c416a6fc1f2bed6c7dae4e987c54"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "d8c567a1d99c9d353d046219a9377236a046f4184e2af1c976a7cd000bc2adda"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "9a1356a688e7b9a6c0cbdc26585098310c9c2ca28f8ad1cad89f8dc4fcd157ca"; } + { locale = "or"; arch = "linux-i686"; sha256 = "cf46bd9016a66144c16f455feaa7c019f06c3514319b3f524c6abf05862e4245"; } + { locale = "or"; arch = "linux-x86_64"; sha256 = "18eed44e7431dd291b77f269e1b5c97142bc8928a8db09bb160999dafa3fdeca"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "4786b4b875da508bafe22c946e0c970f6f1024154c17b80411333ee2ab9b0ee1"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "075fe980df865eb6832956938c76fad0890edbaf22a6514997004fbb591fac66"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "2b36f39eb98c2fde698df2bdb7e93efb8f54df2758a8fa0b8cec9ff4c084def9"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "de3e50631b67a5f3a52c92a9e5aae88397f957367808ebc753eef1f759a135a2"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "db9b2610264f93b2202de4794c1b109ef52d45bd453ed9907058e334c54e2616"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "b3424f2d933a9435ba8db2910c8f13c722beacaeb34f3c47b7369d41e1ef8a67"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "99368ef9c5f580973bd8eb21b24acf1794e9337a6faea98690378888b9185fa8"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "1e2b0c75b2451fdfb355f2ce7d1a7068106c1228aa1eb8f8c56d789e02bec5d5"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "0da9cf51a6be5e25c9e711618f15743bee1a735eaa6fb4804589fa9d4b0513fe"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "fb6b8af9cb51a5bbde5345ed2814fd22b73c25905a8fb9ec304fcaf4b6589584"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "8e6d9f35fbc8da78e0074cb830245804450fc6beebd049f9a4db18c627ee543b"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "b93817243d9709106148143f052c103758bc6290aecc6282a73b8e81632dc1de"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "db0048c6ce2ab732513e09bb216b4d8732c9647f29729ebac1f95a7bda3f41b8"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "79d37bb0d64ff0c723063b4130a9a7b81e59518ed3416bd9fcf623e045c45013"; } + { locale = "si"; arch = "linux-i686"; sha256 = "a69dcffbc4e48881eac39f6708dfa419748852c315b232ee5f20df8daf3bb772"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "22b0dfecf78b254960f12d52d8e41ae4e54a73efc50bda2bec73306b6eabb967"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "9e8d8766f8814bdeaed905cb8b58ece1b346ce8a57f3d7f21a3371cabbd8a994"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "b40d8fc6d23ec5d1b11c46354d5b3cb0e8d661880fce50dbf030bda50794f8b1"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "e58fec03764019c33718bb520c76e8032548543f1bd25b6d8d6f6861a3a902a3"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "505a59db3c1db1e96a3f99d828c0c43dc812f58e83b1cd6cb067d3628df49f2b"; } + { locale = "son"; arch = "linux-i686"; sha256 = "feeea081020fccecbaeb90b79aff7ce2d132f3f9a7d0e848dab3060a06c7e876"; } + { locale = "son"; arch = "linux-x86_64"; sha256 = "bf98080f7ca39d9bfc1a5bafe38a66efbbf4a657019306321e13427d813ad3ab"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "858790b16a8c642cd5f76e4d57de5f215514e470bdfa0449e44a4c97d1245b7e"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "c7f6c20a9436f3a0210010c6f90a1330ca4f3afa4091c6a2256c23021651d898"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "77352b54412e869c66bbb73bc66dd333a1f5675d8f13d114486186a9478f92c5"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "158171775a7b9f8dc0ae87226faac2626a25f8debb5b4d3b0beac3fab2f502d0"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "70ea2d79b1c27615c7d021bdbf0e2a355f46c6e80a91485b6488b03b61266322"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "1aecd8b1a86bccba2a5cff18346bae5c2bc0e2ea8565f30fcc85bdcca2ec4eb2"; } + { locale = "ta"; arch = "linux-i686"; sha256 = "cd97638e80460532e1ca0b14608f0bca63e019fd2c9fa39330410a7763894cf8"; } + { locale = "ta"; arch = "linux-x86_64"; sha256 = "06a46a9292681557c308aa44e09bfb6cd1a2c3af742a635aa6cc101aa8d6964f"; } + { locale = "te"; arch = "linux-i686"; sha256 = "fe15c02885127189ccf444e7ddd4aaab0d70b67c5e90c17ac46ba1e78956ffed"; } + { locale = "te"; arch = "linux-x86_64"; sha256 = "2858c26770951a4d449bfa3d5be2421e34bf26132d34efd933f15397b572b7ae"; } + { locale = "th"; arch = "linux-i686"; sha256 = "eaf57742712cc584f0a436aa545db0753bc23c6f023a1199886efc11946e7566"; } + { locale = "th"; arch = "linux-x86_64"; sha256 = "0a24697e91b6e69fcfb0dba89eac2001766d28b7a02ab3d889ed18e3af05e3ed"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "395e18eb8c77cf20cc99de961b6c09b1d2a4a987384225f0d13c8cefbb5edd65"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "cdf8a47e0b38af8e6749ce8efff8811e6f0fc8fd497bb046cda9523757976edb"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "2b34e068f9a4b48ea20d8173b5fc68de631454646482834393266fef258358bb"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "38afe18c3a167477a060a089d5eaf910295d293619c1627eae161e14741dfcda"; } + { locale = "uz"; arch = "linux-i686"; sha256 = "6d71613a41e37e077974b0806f48f483a62cb79ab7deffb3d0ce7f1874557fbd"; } + { locale = "uz"; arch = "linux-x86_64"; sha256 = "28d09105d86af87750539899cd010d7edc410d7a06671dbf9d7a9633efbf0d1e"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "3ef1bc04ad1d08551f741e676c9fd9d4a42d4b5c78f0dde4297be4321ef64a27"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "38a77586718cdc82b7b71d945cd565a075c3b3c5bb983bee0bc8c1ae25086eb2"; } + { locale = "xh"; arch = "linux-i686"; sha256 = "c6385ae5bb00ed59bc89fab1026b3f9fcee93fffe045564bef116d7700d78092"; } + { locale = "xh"; arch = "linux-x86_64"; sha256 = "480dc73f7cc41db7c0171eeb3139d50830b8dec916111ee4f8af3ad67cf95bf8"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "f06897413ac62dda69242b09be1f44b8bb722a53c1aa1bd6350964ce9a7ae682"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3f551ae58bdeaa0212cfc6d4e033e67a4aa379576f983e6e195c0e962e3fd466"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "ba422c4c436a06b3e4da1d48767c4ea5aed80d7e65e593b3302d76450f0f19f6"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "c6fbbbb71110415f606ffbf44cc3709975e8504e86f3baeac4b086fd1438fff6"; } ]; } From 4d760edb94e94c316fa38399277c0e71f1c6e890 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Feb 2016 16:15:57 +0100 Subject: [PATCH 076/308] Add FIXME --- nixos/modules/virtualisation/qemu-vm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 6e0dc065387..7dfbc38efee 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -110,6 +110,7 @@ let # Generate a hard disk image containing a /boot partition and GRUB # in the MBR. Used when the `useBootLoader' option is set. + # FIXME: use nixos/lib/make-disk-image.nix. bootDisk = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand "nixos-boot-disk" From 9e986c161b8127d16063ff5c0da7aad4639422c8 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Tue, 9 Feb 2016 16:53:11 +0100 Subject: [PATCH 077/308] wpa_supplicant module: add an option for accepting raw PSKs fix #12892 --- .../services/networking/wpa_supplicant.nix | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 1b655af6c82..1558c583289 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -8,11 +8,15 @@ let ${optionalString cfg.userControlled.enable '' ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group} update_config=1''} - ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: '' + ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: let + psk = if networkConfig.psk != null + then ''"${networkConfig.psk}"'' + else networkConfig.pskRaw; + in '' network={ ssid="${ssid}" - ${optionalString (networkConfig.psk != null) ''psk="${networkConfig.psk}"''} - ${optionalString (networkConfig.psk == null) ''key_mgmt=NONE''} + ${optionalString (psk != null) ''psk=${psk}''} + ${optionalString (psk == null) ''key_mgmt=NONE''} } '') cfg.networks)} '' else "/etc/wpa_supplicant.conf"; @@ -49,6 +53,19 @@ in { Be aware that these will be written to the nix store in plaintext! + + Mutually exclusive with pskRaw. + ''; + }; + + pskRaw = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The network's pre-shared key in hex defaulting + to being a network without any authentication. + + Mutually exclusive with psk. ''; }; }; @@ -95,6 +112,11 @@ in { config = mkMerge [ (mkIf cfg.enable { + assertions = flip mapAttrsToList cfg.networks (name: cfg: { + assertion = cfg.psk == null || cfg.pskRaw == null; + message = ''networking.wireless."${name}".psk and networking.wireless."${name}".pskRaw are mutually exclusive''; + }); + environment.systemPackages = [ pkgs.wpa_supplicant ]; services.dbus.packages = [ pkgs.wpa_supplicant ]; From 177464ade947caf561627b4f91c369a2c05dc750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 9 Feb 2016 18:19:56 +0100 Subject: [PATCH 078/308] wrapFirefox: add enableAdobeReader So far we only have 32-bit package. It will be silently missed on 64-bit ATM. --- pkgs/applications/misc/adobe-reader/default.nix | 2 ++ pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 6bb16a02402..d31e9234e09 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; + passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; + meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = http://www.adobe.com/products/reader; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8c805b0bf5f..91486b608b2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ , gnash, flashplayer, hal-flash , MPlayerPlugin, gecko_mediaplayer, gst_all, xorg, libpulseaudio, libcanberra , supportsJDK, jrePlugin, icedtea_web -, trezor-bridge, bluejeans, djview4 +, trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ }: @@ -41,6 +41,7 @@ let ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans + ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ); libs = [ gst_all.gstreamer gst_all.gst-plugins-base ] ++ lib.optionals (cfg.enableQuakeLive or false) From 22818c6ec4a77b640b15050dd48a1aef244075f7 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 9 Feb 2016 21:43:50 +0100 Subject: [PATCH 079/308] beets: 1.3.16 -> 1.3.17 one test fails, see the source comment --- pkgs/tools/audio/beets/default.nix | 34 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c1945ca5de0..6a3345e1d3c 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales , buildPythonPackage, pythonPackages, python, imagemagick -, enableAcoustid ? true -, enableBadfiles ? true, flac ? null, mp3val ? null -, enableDiscogs ? true -, enableEchonest ? true -, enableEmbyupdate ? true -, enableFetchart ? true -, enableLastfm ? true -, enableMpd ? true -, enableReplaygain ? true, bs1770gain ? null -, enableThumbnails ? true -, enableWeb ? true +, enableAcousticbrainz ? true +, enableAcoustid ? true +, enableBadfiles ? true, flac ? null, mp3val ? null +, enableDiscogs ? true +, enableEchonest ? true +, enableEmbyupdate ? true +, enableFetchart ? true +, enableLastfm ? true +, enableMpd ? true +, enableReplaygain ? true, bs1770gain ? null +, enableThumbnails ? true +, enableWeb ? true # External plugins , enableAlternatives ? false @@ -34,6 +35,7 @@ with stdenv.lib; let optionalPlugins = { + acousticbrainz = enableAcousticbrainz; badfiles = enableBadfiles; chroma = enableAcoustid; discogs = enableDiscogs; @@ -68,14 +70,14 @@ let in buildPythonPackage rec { name = "beets-${version}"; - version = "1.3.16"; + version = "1.3.17"; namePrefix = ""; src = fetchFromGitHub { owner = "sampsyo"; repo = "beets"; rev = "v${version}"; - sha256 = "1grjcgr419yq756wwxjpzyfjdf8n51bg6i0agm465lb7l3jgqy6k"; + sha256 = "1fskxx5xxjqf4xmfjrinh7idjiq6qncb24hiyccv09l47fr1yipc"; }; propagatedBuildInputs = [ @@ -91,7 +93,9 @@ in buildPythonPackage rec { python.modules.readline ] ++ optional enableAcoustid pythonPackages.pyacoustid ++ optional (enableFetchart - || enableEmbyupdate) pythonPackages.requests2 + || enableEmbyupdate + || enableAcousticbrainz) + pythonPackages.requests2 ++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableEchonest pythonPackages.pyechonest ++ optional enableLastfm pythonPackages.pylast @@ -135,7 +139,7 @@ in buildPythonPackage rec { test/test_replaygain.py ''; - doCheck = true; + doCheck = false; # TODO, see https://github.com/beetbox/beets/issues/1876#issuecomment-182010438 preCheck = '' (${concatMapStrings (s: "echo \"${s}\";") allPlugins}) \ From ee90c703befceee382be5fe4ba07bdbe2335c841 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 9 Feb 2016 21:49:45 +0100 Subject: [PATCH 080/308] progress: 0.12.1 -> 0.13 --- pkgs/tools/misc/progress/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index 3d0d03f6c4a..ab72dc69fa4 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses }: stdenv.mkDerivation rec { name = "progress-${version}"; - version = "0.12.1"; + version = "0.13"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "0lwj0zdcdsl1wczk3yq7wfpyw3zi87h8x2z8yjp0wgnr45bbqibl"; + sha256 = "0xzpcvz4n0h8m0mhxgpvn1qg8993naip3asjbk3nmk3d4lbyh0b3"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; From e1bcc74135cacb0180255399e76d12ddad2acabe Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Sat, 24 Oct 2015 01:32:20 +0200 Subject: [PATCH 081/308] wayland window managers: orbment, sway, velox --- pkgs/applications/misc/dmenu/wayland.nix | 34 +++++++++++ pkgs/applications/misc/st/wayland.nix | 34 +++++++++++ .../window-managers/orbment/default.nix | 57 ++++++++++++++++++ .../window-managers/sway/default.nix | 38 ++++++++++++ .../window-managers/velox/default.nix | 29 ++++++++++ pkgs/development/libraries/swc/default.nix | 30 ++++++++++ pkgs/development/libraries/wlc/default.nix | 58 +++++++++++++++++++ pkgs/development/libraries/wld/default.nix | 30 ++++++++++ pkgs/top-level/all-packages.nix | 14 +++++ 9 files changed, 324 insertions(+) create mode 100644 pkgs/applications/misc/dmenu/wayland.nix create mode 100644 pkgs/applications/misc/st/wayland.nix create mode 100644 pkgs/applications/window-managers/orbment/default.nix create mode 100644 pkgs/applications/window-managers/sway/default.nix create mode 100644 pkgs/applications/window-managers/velox/default.nix create mode 100644 pkgs/development/libraries/swc/default.nix create mode 100644 pkgs/development/libraries/wlc/default.nix create mode 100644 pkgs/development/libraries/wld/default.nix diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix new file mode 100644 index 00000000000..d55e22c5a3b --- /dev/null +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl #, libX11, libXinerama, enableXft, libXft, zlib +, swc, wld, wayland, libxkbcommon, pixman, fontconfig +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "dmenu-wayland-${version}"; + version = "git-2014-11-02"; + rev = "6e08b77428cc3c406ed2e90d4cae6c41df76341e"; + + src = fetchurl { + url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz"; + sha256 = "d0f73e442baf44a93a3b9d41a72e9cfa14f54af6049c90549f516722e3f88019"; + }; + + buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ]; + + postPatch = '' + sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run + ''; + + preConfigure = [ + ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@$(echo "$nativeBuildInputs" | grep -o '[^ ]*-swc-[^ ]*')/share/swc@g" config.mk'' + ]; + + meta = { + description = "a generic, highly customizable, and efficient menu for the X Window System"; + homepage = http://tools.suckless.org/dmenu; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ ]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix new file mode 100644 index 00000000000..ed7e0cf7ca1 --- /dev/null +++ b/pkgs/applications/misc/st/wayland.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, writeText +, ncurses, wayland, wld, libxkbcommon, fontconfig, pixman +, conf? null}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "st-wayland-${version}"; + version = "git-2015-08-29"; + rev = "61b47b76a09599c8093214e28c48938f5b424daa"; + + src = fetchurl { + url = "https://github.com/michaelforney/st/archive/${rev}.tar.gz"; + sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97"; + }; + + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + + buildInputs = [ pkgconfig ncurses wayland wld libxkbcommon fontconfig pixman ]; + + NIX_LDFLAGS = "-lfontconfig"; + + installPhase = '' + TERMINFO=$out/share/terminfo make install PREFIX=$out + ''; + + meta = { + homepage = http://st.suckless.org/; + license = stdenv.lib.licenses.mit; + maintainers = with maintainers; [ ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix new file mode 100644 index 00000000000..567903f589c --- /dev/null +++ b/pkgs/applications/window-managers/orbment/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchurl, makeWrapper, cmake, pkgconfig +, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng, libdrm, libX11 +}: + +stdenv.mkDerivation rec { + name = "orbment-${version}"; + version = "git-2015-09-30"; + repo = "https://github.com/Cloudef/orbment"; + rev = "229a870dbbb9dbc66c137cf2747eab11acdf1a95"; + + chck_repo = "https://github.com/Cloudef/chck"; + chck_rev = "6191a69572952291c137294317874c06c9c0d6a9"; + inihck_repo = "https://github.com/Cloudef/inihck"; + inihck_rev = "462cbd5fd67226714ac2bdfe4ceaec8e251b2d9c"; + + srcs = [ + (fetchurl { + url = "${repo}/archive/${rev}.tar.gz"; + sha256 = "7aaa0262d078adaf47abdf500b9ea581f6bec164c195a44a3c165a865414ca2c"; + }) + (fetchurl { + url = "${chck_repo}/archive/${chck_rev}.tar.gz"; + sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160"; + }) + (fetchurl { + url = "${inihck_repo}/archive/${inihck_rev}.tar.gz"; + sha256 = "d21f2ac25eafed285614f5f0ef7a1014d629ba382f4e64bc89fe2c3e98c2777f"; + }) + ]; + + sourceRoot = "orbment-${rev}"; + postUnpack = '' + rm -rf orbment-${rev}/lib/chck orbment-${rev}/lib/inihck + ln -s ../../chck-${chck_rev} orbment-${rev}/lib/chck + ln -s ../../inihck-${inihck_rev} orbment-${rev}/lib/inihck + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ makeWrapper wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 libdrm ]; + makeFlags = "PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libdrm dbus_libs ]; + preFixup = '' + wrapProgram $out/bin/orbment \ + --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; + ''; + + meta = { + description = "Modular Wayland compositor"; + homepage = repo; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix new file mode 100644 index 00000000000..cec48fad4e5 --- /dev/null +++ b/pkgs/applications/window-managers/sway/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchurl, makeWrapper, cmake, pkgconfig +, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, asciidoc, libxslt, dbus_libs +}: + +stdenv.mkDerivation rec { + name = "sway-${version}"; + version = "git-2015-10-16"; + + src = fetchurl { + url = "https://github.com/SirCmpwn/sway/archive/16e904634c65128610537bed7fcb16ac3bb45165.tar.gz"; + sha256 = "52d6c4b49fea69e2a2c1b44b858908b7736301bdb9ed483c294bc54bb40e872e"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ makeWrapper wayland wlc libxkbcommon pixman fontconfig pcre json_c asciidoc libxslt dbus_libs ]; + + patchPhase = '' + sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; + ''; + + makeFlags = "PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + LD_LIBRARY_PATH = lib.makeLibraryPath [ wlc dbus_libs ]; + preFixup = '' + wrapProgram $out/bin/sway \ + --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; + ''; + + meta = { + description = "i3-compatible window manager for Wayland"; + homepage = "http://swaywm.org"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix new file mode 100644 index 00000000000..8823b32ee3c --- /dev/null +++ b/pkgs/applications/window-managers/velox/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig +, swc, libxkbcommon +, wld, wayland, pixman, fontconfig +}: + +stdenv.mkDerivation rec { + name = "velox-${version}"; + version = "git-2015-09-23"; + + src = fetchurl { + url = "https://github.com/michaelforney/velox/archive/499768b5834967727e3d91139b4013b6aca95762.tar.gz"; + sha256 = "252959f0f0ff593c187449b61c234c214fdf321e3f4e8b5d9e3c2949d932a0a2"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ swc libxkbcommon wld wayland pixman fontconfig ]; + + makeFlags = "PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + meta = { + description = "velox window manager"; + homepage = "https://github.com/michaelforney/velox"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/swc/default.nix b/pkgs/development/libraries/swc/default.nix new file mode 100644 index 00000000000..448459d0275 --- /dev/null +++ b/pkgs/development/libraries/swc/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, pkgconfig +, wld, wayland, xwayland, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm +}: + +stdenv.mkDerivation rec { + name = "swc-${version}"; + version = "git-2015-09-05"; + repo = "https://github.com/michaelforney/swc"; + rev = "0dff35ad9b80fc62e6b48417f78c24df6648c9d2"; + + src = fetchurl { + url = "${repo}/archive/${rev}.tar.gz"; + sha256 = "7af5655b5bb5fe59bb8e6643e35f794419850463b1d7f44f29b45ab6aee01ae9"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ wld wayland xwayland fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ]; + + makeFlags = "PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + meta = { + description = "A library for making a simple Wayland compositor"; + homepage = repo; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix new file mode 100644 index 00000000000..a0b592df4a3 --- /dev/null +++ b/pkgs/development/libraries/wlc/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchurl, cmake, pkgconfig +, glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs +, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm, linuxPackages_4_2 +}: + +stdenv.mkDerivation rec { + name = "wlc-${version}"; + version = "git-2015-10-04"; + repo = "https://github.com/Cloudef/wlc"; + rev = "74d978cc54fd8256777c8d39327cb677523cddff"; + + chck_repo = "https://github.com/Cloudef/chck"; + chck_rev = "6191a69572952291c137294317874c06c9c0d6a9"; + + srcs = [ + (fetchurl { + url = "${repo}/archive/${rev}.tar.gz"; + sha256 = "a3641e79252a140be089dd2e829b4d21a3b5ff10866951568d54bd4600597254"; + }) + (fetchurl { + url = "${chck_repo}/archive/${chck_rev}.tar.gz"; + sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160"; + }) + ]; + + sourceRoot = "wlc-${rev}"; + postUnpack = '' + rm -rf wlc-${rev}/lib/chck + ln -s ../../chck-${chck_rev} wlc-${rev}/lib/chck + ''; + + patchPhase = '' + ( echo '#include '; + echo '#include '; + cat src/platform/backend/drm.c + ) >src/platform/backend/drm.c-fix; + mv src/platform/backend/drm.c-fix src/platform/backend/drm.c; + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev + libpthreadstubs libX11 libXau libXdmcp libXext libXdamage libxshmfence libXxf86vm + systemd dbus_libs + ]; + + makeFlags = "PREFIX=$(out) -lchck"; + installPhase = "PREFIX=$out make install"; + + meta = { + description = "A library for making a simple Wayland compositor"; + homepage = repo; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/wld/default.nix b/pkgs/development/libraries/wld/default.nix new file mode 100644 index 00000000000..1dd5858ec72 --- /dev/null +++ b/pkgs/development/libraries/wld/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, pkgconfig +, wayland, fontconfig, pixman, freetype, libdrm +}: + +stdenv.mkDerivation rec { + name = "wld-${version}"; + version = "git-2015-09-01"; + repo = "https://github.com/michaelforney/wld"; + rev = "efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f0"; + + src = fetchurl { + url = "${repo}/archive/${rev}.tar.gz"; + sha256 = "09388f7828e18c75e7b8d41454903886a725d7a868f60e66c128bd7d2e953ee1"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ wayland fontconfig pixman freetype libdrm ]; + + makeFlags = "PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + meta = { + description = "A primitive drawing library targeted at Wayland"; + homepage = repo; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d3b6f15740..ad141e1a966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11146,6 +11146,8 @@ let enableXft = true; }; + dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { }; + dmenu2 = callPackage ../applications/misc/dmenu2 { }; dmtx = dmtx-utils; @@ -11825,6 +11827,14 @@ let spectrwm = callPackage ../applications/window-managers/spectrwm { }; + wlc = callPackage ../development/libraries/wlc { }; + orbment = callPackage ../applications/window-managers/orbment { }; + sway = callPackage ../applications/window-managers/sway { }; + + swc = callPackage ../development/libraries/swc { }; + wld = callPackage ../development/libraries/wld { }; + velox = callPackage ../applications/window-managers/velox { }; + i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; @@ -12790,6 +12800,10 @@ let conf = config.st.conf or null; }; + st-wayland = callPackage ../applications/misc/st/wayland.nix { + conf = config.st.conf or null; + }; + stag = callPackage ../applications/misc/stag { curses = ncurses; }; From 9535d51289e6601c9c231755e5f2f6c629715792 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 9 Feb 2016 20:35:17 +0100 Subject: [PATCH 082/308] pythonPackages.pandas: fix tests --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9343e54a2e..8c28c97fd33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14229,7 +14229,8 @@ in modules // { checkPhase = let testsToSkip = ["test_data" "test_excel" "test_html" "test_json" "test_frequencies" "test_frame" - "test_read_clipboard_infer_excel"] ++ + "test_read_clipboard_infer_excel" + "test_interp_alt_scipy" "test_nanops" "test_stats"] ++ optional isPy35 "test_sql"; in '' runHook preCheck From 0ce6603bd86a83bc7800f40e2a887728aea33de5 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Tue, 9 Feb 2016 22:13:33 +0100 Subject: [PATCH 083/308] pflask --- pkgs/os-specific/linux/pflask/default.nix | 37 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/os-specific/linux/pflask/default.nix diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix new file mode 100644 index 00000000000..e3ba10cbacd --- /dev/null +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchurl, python +}: + +stdenv.mkDerivation rec { + name = "pflask-${version}"; + version = "git-2015-10-06"; + rev = "1f575a73d796fbb92e8f2012ded7e97247f1c6c3"; + + src = fetchurl { + url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz"; + sha256 = "3518aa1e8fa35e059bd63956daed9d8c4115475b66b674d02ebc80484248ddbc"; + }; + + buildInputs = [ python ]; + + configurePhase = '' + ln -s ${fetchurl { + url = "http://ftp.waf.io/pub/release/waf-1.8.6"; + sha256 = "81c4e6a3144c7b2021a839e7277bdaf1cedbbc87302186897b4ae03f4effcbf5"; + }} waf + python waf configure --prefix=$out + ''; + buildPhase = '' + python waf build + ''; + installPhase = '' + python waf install + ''; + + meta = { + description = "Lightweight process containers for Linux"; + homepage = "https://ghedo.github.io/pflask/"; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40e92629064..33caf0a6b56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12980,6 +12980,8 @@ let inherit (gst_all_1) gstreamer gst-plugins-base; }; + pflask = callPackage ../os-specific/linux/pflask {}; + photoqt = qt5.callPackage ../applications/graphics/photoqt { }; phototonic = qt5.callPackage ../applications/graphics/phototonic { }; From 8993b652255c07e04f72296e5ac49b6b15844cf8 Mon Sep 17 00:00:00 2001 From: Sheena Artrip Date: Tue, 9 Feb 2016 16:46:05 -0500 Subject: [PATCH 084/308] sipsak - init at 4.1.2.1 --- pkgs/tools/networking/sipsak/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/sipsak/default.nix diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix new file mode 100644 index 00000000000..941e1d809ba --- /dev/null +++ b/pkgs/tools/networking/sipsak/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }: + +stdenv.mkDerivation rec { + name = "sipsak-${version}"; + version = "4.1.2.1"; + + buildInputs = [ + autoreconfHook + openssl + c-ares + ]; + + src = fetchurl { + url = "https://github.com/sipwise/sipsak/archive/mr${version}.tar.gz"; + sha256 = "769fe59966b1962b67aa35aad7beb9a2110ebdface36558072a05c6405fb5374"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/sipwise/sipsak; + description = "SIP Swiss army knife"; + license = stdenv.lib.licenses.gpl2; + }; + +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40e92629064..c573afbc157 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3131,6 +3131,8 @@ let simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; + sipsak = callPackage ../tools/networking/sipsak { }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; skydns = goPackages.skydns.bin // { outputs = [ "bin" ]; }; From c7ef45e15355a49bc8a4cb6052beb9fcae23eeaa Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Tue, 9 Feb 2016 22:54:03 +0100 Subject: [PATCH 085/308] pflask: git-2015-10-06 -> git-2015-12-17 --- pkgs/os-specific/linux/pflask/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index e3ba10cbacd..931b074534e 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "pflask-${version}"; - version = "git-2015-10-06"; - rev = "1f575a73d796fbb92e8f2012ded7e97247f1c6c3"; + version = "git-2015-12-17"; + rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; src = fetchurl { url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz"; - sha256 = "3518aa1e8fa35e059bd63956daed9d8c4115475b66b674d02ebc80484248ddbc"; + sha256 = "2545fca37f9da484b46b6fb5e3a9bbba6526a9725189fe4af5227ef6e6fca440"; }; buildInputs = [ python ]; From 877dc973ab76ad73c371a87285fc294a7edb3f41 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Tue, 9 Feb 2016 23:41:01 +0100 Subject: [PATCH 086/308] wayland window managers: orbment, sway, velox -> latest git --- .../window-managers/orbment/default.nix | 10 ++++---- .../window-managers/sway/default.nix | 6 +++-- .../window-managers/velox/default.nix | 8 ++++--- pkgs/development/libraries/swc/default.nix | 6 ++--- pkgs/development/libraries/wlc/default.nix | 24 +++++++++++++------ 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix index 567903f589c..e7cbd004087 100644 --- a/pkgs/applications/window-managers/orbment/default.nix +++ b/pkgs/applications/window-managers/orbment/default.nix @@ -4,23 +4,23 @@ stdenv.mkDerivation rec { name = "orbment-${version}"; - version = "git-2015-09-30"; + version = "git-2016-01-31"; repo = "https://github.com/Cloudef/orbment"; - rev = "229a870dbbb9dbc66c137cf2747eab11acdf1a95"; + rev = "7f649fb76649f826dd29578a5ec41bb561b116eb"; chck_repo = "https://github.com/Cloudef/chck"; - chck_rev = "6191a69572952291c137294317874c06c9c0d6a9"; + chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc"; inihck_repo = "https://github.com/Cloudef/inihck"; inihck_rev = "462cbd5fd67226714ac2bdfe4ceaec8e251b2d9c"; srcs = [ (fetchurl { url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "7aaa0262d078adaf47abdf500b9ea581f6bec164c195a44a3c165a865414ca2c"; + sha256 = "5a426da0d5f4487911cfe9226865ed0cd1a7cdf253eec19d5eadc4b0d14a2ea0"; }) (fetchurl { url = "${chck_repo}/archive/${chck_rev}.tar.gz"; - sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160"; + sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e"; }) (fetchurl { url = "${inihck_repo}/archive/${inihck_rev}.tar.gz"; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index cec48fad4e5..fa81971885a 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -4,10 +4,12 @@ stdenv.mkDerivation rec { name = "sway-${version}"; - version = "git-2015-10-16"; + version = "git-2016-02-08"; + repo = "https://github.com/SirCmpwn/sway"; + rev = "16e904634c65128610537bed7fcb16ac3bb45165"; src = fetchurl { - url = "https://github.com/SirCmpwn/sway/archive/16e904634c65128610537bed7fcb16ac3bb45165.tar.gz"; + url = "${repo}/archive/${rev}.tar.gz"; sha256 = "52d6c4b49fea69e2a2c1b44b858908b7736301bdb9ed483c294bc54bb40e872e"; }; diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix index 8823b32ee3c..789f074aecd 100644 --- a/pkgs/applications/window-managers/velox/default.nix +++ b/pkgs/applications/window-managers/velox/default.nix @@ -5,11 +5,13 @@ stdenv.mkDerivation rec { name = "velox-${version}"; - version = "git-2015-09-23"; + version = "git-2015-11-03"; + repo = "https://github.com/michaelforney/velox"; + rev = "53b41348df7e37886cab012609923255e4397419"; src = fetchurl { - url = "https://github.com/michaelforney/velox/archive/499768b5834967727e3d91139b4013b6aca95762.tar.gz"; - sha256 = "252959f0f0ff593c187449b61c234c214fdf321e3f4e8b5d9e3c2949d932a0a2"; + url = "${repo}/archive/${rev}.tar.gz"; + sha256 = "e49583efbbe62ea30f0084491ff757dff683f35eef6e9b68aa413e0b50c4bf20"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/swc/default.nix b/pkgs/development/libraries/swc/default.nix index 448459d0275..48e1524e36f 100644 --- a/pkgs/development/libraries/swc/default.nix +++ b/pkgs/development/libraries/swc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "swc-${version}"; - version = "git-2015-09-05"; + version = "git-2016-02-09"; repo = "https://github.com/michaelforney/swc"; - rev = "0dff35ad9b80fc62e6b48417f78c24df6648c9d2"; + rev = "1da0ef13fddc572accea12439a4471b4d2f64ddd"; src = fetchurl { url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "7af5655b5bb5fe59bb8e6643e35f794419850463b1d7f44f29b45ab6aee01ae9"; + sha256 = "d1894612d8aa1ce828efb78f1570290f84bba6563e21eb777e08c3c3859b7bbe"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index a0b592df4a3..9b5fa32bf00 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,32 +1,42 @@ -{ lib, stdenv, fetchurl, cmake, pkgconfig +{ lib, stdenv, fetchurl, fetchgit, cmake, pkgconfig , glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs , libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm, linuxPackages_4_2 }: stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "git-2015-10-04"; + version = "git-2016-01-31"; repo = "https://github.com/Cloudef/wlc"; - rev = "74d978cc54fd8256777c8d39327cb677523cddff"; + rev = "faa4d3cba670576c202b0844e087b13538f772c5"; chck_repo = "https://github.com/Cloudef/chck"; - chck_rev = "6191a69572952291c137294317874c06c9c0d6a9"; + chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc"; + + wl_protos_repo = "git://anongit.freedesktop.org/wayland/wayland-protocols"; + wl_protos_rev = "0b05b70f9da245582f01581be4ca36db683682b8"; + wl_protos_rev_short = "0b05b70"; srcs = [ (fetchurl { url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "a3641e79252a140be089dd2e829b4d21a3b5ff10866951568d54bd4600597254"; + sha256 = "cdf6a772dc90060d57aa1a915a4daff0f79802c141fec92ef2710245d727af67"; }) (fetchurl { url = "${chck_repo}/archive/${chck_rev}.tar.gz"; - sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160"; + sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e"; + }) + (fetchgit { + url = "${wl_protos_repo}"; + rev = "${wl_protos_rev}"; + sha256 = "9c1cfbb570142b2109ecef4d11b17f25e94ed2e0569f522ea56f244c60465224"; }) ]; sourceRoot = "wlc-${rev}"; postUnpack = '' - rm -rf wlc-${rev}/lib/chck + rm -rf wlc-${rev}/lib/chck wlc-${rev}/protos/wayland-protocols ln -s ../../chck-${chck_rev} wlc-${rev}/lib/chck + ln -s ../../wayland-protocols-${wl_protos_rev_short} wlc-${rev}/protos/wayland-protocols ''; patchPhase = '' From 91ac4fc0a488ec79794f943b452d8cff0cff0919 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Sat, 21 Nov 2015 21:54:52 +0100 Subject: [PATCH 087/308] irssi-otr: 640e98c74b -> 1.0.0 --- .../networking/irc/irssi/otr/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 4841aa8070e..33fe5b799db 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,16 +1,14 @@ { stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: -let - rev = "640e98c74b"; -in with stdenv.lib; stdenv.mkDerivation rec { - name = "irssi-otr-20131007-${rev}"; - + name = "irssi-otr-${version}"; + version = "1.0.0"; + src = fetchurl { - url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}"; + url = "https://github.com/cryptodotis/irssi-otr/archive/v${version}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "0d08ianzhy20w0ld8xx7hgrp9psg54l37619pcdpqyrnlzkkdalz"; + sha256 = "bad09a2853ea6fb1a7af42c8f15868fd3ce45f973be90c78944ddf04f8ab517e"; }; patchPhase = '' @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "sh ./bootstrap"; buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; - + meta = { homepage = https://github.com/cryptodotis/irssi-otr; license = stdenv.lib.licenses.gpl2Plus; From 5396a01b6c638cada3d5c81e03e14ffcbf982a1f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 8 Feb 2016 20:47:55 +0300 Subject: [PATCH 088/308] init-script-builder: handle containers without a kernel --- .../boot/loader/init-script/init-script-builder.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh index 502b3b63af2..08d4ab14c9c 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh +++ b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh @@ -80,8 +80,13 @@ for generation in $( | sort -n -r); do link=/nix/var/nix/profiles/system-$generation-link date=$(stat --printf="%y\n" $link | sed 's/\..*//') - kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *) - addEntry "NixOS - Configuration $generation ($date - $kernelVersion)" $link "$generation ($date)" + if [ -d $link/kernel ]; then + kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *) + suffix="($date - $kernelVersion)" + else + suffix="($date)" + fi + addEntry "NixOS - Configuration $generation $suffix" $link "$generation ($date)" done mv $tmpOther $targetOther From 2202bb9cf541543917e6fa6201994fc6d3aee413 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 9 Feb 2016 12:57:42 +0300 Subject: [PATCH 089/308] postsrsd: fix secret generation --- nixos/modules/services/mail/postsrsd.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index 36a0f8218d8..68a4c101206 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -95,7 +95,11 @@ in { preStart = '' if [ ! -e "${cfg.secretsFile}" ]; then echo "WARNING: secrets file not found, autogenerating!" - mkdir -p -m750 "$(dirname "${cfg.secretsFile}")" + DIR="$(dirname "${cfg.secretsFile}")" + if [ ! -d "$DIR" ]; then + mkdir -p -m750 "$DIR" + chown "${cfg.user}:${cfg.group}" "$DIR" + fi dd if=/dev/random bs=18 count=1 | base64 > "${cfg.secretsFile}" chmod 600 "${cfg.secretsFile}" fi From c420a6f1ef34437cfbc9ee5465fb444d1d031b29 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 9 Feb 2016 23:37:02 +0300 Subject: [PATCH 090/308] acme service: update plugins enum --- nixos/modules/security/acme.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 15e5b49878f..3d25e811e67 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -56,8 +56,8 @@ let plugins = mkOption { type = types.listOf (types.enum [ - "cert.der" "cert.pem" "chain.der" "chain.pem" "external_pem.sh" - "fullchain.der" "fullchain.pem" "key.der" "key.pem" "account_key.json" + "cert.der" "cert.pem" "chain.pem" "external_pem.sh" + "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json" ]); default = [ "fullchain.pem" "key.pem" "account_key.json" ]; description = '' From 0024c10a5c974ee41c7bc69cd61faaa920f3a9d4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 10 Feb 2016 00:56:24 +0300 Subject: [PATCH 091/308] dovecot service: add sendmail_path --- nixos/modules/services/mail/dovecot.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 11e8b26c75e..333a03315bc 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -13,6 +13,7 @@ let '' base_dir = ${baseDir} protocols = ${concatStringsSep " " cfg.protocols} + sendmail_path = /var/setuid-wrappers/sendmail '' (if isNull cfg.sslServerCert then '' From 4dacb1116a34962e3a767059551ba1af77723d75 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Feb 2016 00:05:46 +0100 Subject: [PATCH 092/308] mcelog: 129 -> 130 Fixes https://github.com/andikleen/mcelog/issues/31. --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 113d59d641d..9abd6397e85 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "129"; + version = "130"; src = fetchFromGitHub { - sha256 = "143xh5zvgax88yhg6mg6img64nrda85yybf76fgsk7a8gc57ghyk"; + sha256 = "05yszlhd6kljx371nlgrzjs0fi44wwgxcv2j5rwwgklm6ifp2zza"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From 46f3975d9996d73f2257ce92f50a75c362c5d05b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 8 Feb 2016 20:47:36 +0300 Subject: [PATCH 093/308] nixos-install: don't check that /mnt is a mount point --- nixos/modules/installer/tools/nixos-install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 4e10615f902..c23d7e5b509 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -73,11 +73,6 @@ if ! test -e "$mountPoint"; then exit 1 fi -if ! grep -F -q " $mountPoint " /proc/mounts; then - echo "$mountPoint doesn't appear to be a mount point" - exit 1 -fi - # Mount some stuff in the target root directory. mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home From 90ef11ddcdb8ba0c1bddcd50f1a88df3c42f5cf4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 9 Feb 2016 03:07:23 +0300 Subject: [PATCH 094/308] postgresql service: don't use su --- .../modules/services/databases/postgresql.nix | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index c2045a5859c..957fb4723a5 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -177,7 +177,7 @@ in users.extraGroups.postgres.gid = config.ids.gids.postgres; - environment.systemPackages = [postgresql]; + environment.systemPackages = [ postgresql ]; systemd.services.postgresql = { description = "PostgreSQL Server"; @@ -187,35 +187,37 @@ in environment.PGDATA = cfg.dataDir; - path = [ pkgs.su postgresql ]; + path = [ postgresql ]; preStart = + '' + # Create data directory. + if ! test -e ${cfg.dataDir}/PG_VERSION; then + mkdir -m 0700 -p ${cfg.dataDir} + rm -f ${cfg.dataDir}/*.conf + chown -R postgres:postgres ${cfg.dataDir} + fi + ''; # */ + + script = '' # Initialise the database. if ! test -e ${cfg.dataDir}/PG_VERSION; then - mkdir -m 0700 -p ${cfg.dataDir} - rm -f ${cfg.dataDir}/*.conf - if [ "$(id -u)" = 0 ]; then - chown -R postgres ${cfg.dataDir} - su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root' - else - # For non-root operation. - initdb - fi - # See postStart! - touch "${cfg.dataDir}/.first_startup" + initdb -U root + # See postStart! + touch "${cfg.dataDir}/.first_startup" fi - ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf" ${optionalString (cfg.recoveryConfig != null) '' ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \ "${cfg.dataDir}/recovery.conf" ''} - ''; # */ + + exec postgres ${toString flags} + ''; serviceConfig = - { ExecStart = "@${postgresql}/bin/postgres postgres ${toString flags}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "postgres"; Group = "postgres"; PermissionsStartOnly = true; From 42deddb17ae28ed4c0b63c12ef0f416389e6e517 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Mon, 26 Oct 2015 19:47:23 +0100 Subject: [PATCH 095/308] grsecurity: use source URL from a scraped repository as grsecurity.net only has the latest version --- pkgs/os-specific/linux/kernel/patches.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 7e95f1dedb1..3f7afd90322 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -22,7 +22,7 @@ let { name = "grsecurity-${grversion}-${kversion}"; inherit grversion kversion revision; patch = fetchurl { - url = "http://grsecurity.net/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch"; + url = "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true"; inherit sha256; }; features.grsecurity = true; From 37bb4855c8da5d2010f35ebc44aef4e83eae150b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 10 Feb 2016 02:58:55 +0300 Subject: [PATCH 096/308] postfix module: fix link to postfix-files --- nixos/modules/services/mail/postfix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index f2d8189de6e..56c89aca8b2 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -461,7 +461,7 @@ in rm -rf /var/lib/postfix/conf mkdir -p /var/lib/postfix/conf chmod 0755 /var/lib/postfix/conf - ln -sf ${pkgs.postfix}/etc/postfix/postfix-files + ln -sf ${pkgs.postfix}/etc/postfix/postfix-files /var/lib/postfix/conf/postfix-files ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf From b63c566d144d0833c2273ae0d39b47d7a6060dfd Mon Sep 17 00:00:00 2001 From: Adam Russell Date: Sat, 6 Feb 2016 09:50:02 -0600 Subject: [PATCH 097/308] wine unstable: 1.9.2 -> 1.9.3 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 49c7e71af8a..b44693502d7 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,15 +30,15 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.2"; + version = "1.9.3"; url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "0yjf0i2yc0yj366kg6b2ci9bwz3jq5k5vl01bqw4lbpgf5m4sk9k"; + sha256 = "0389xbs943iwdgv3a6pvcy2gxrwqzf20vrsbpd2yrj1lan2m8ps7"; inherit (stable) gecko32 gecko64 mono; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "05lxhl9rv936xh8v640l36xswszwc41iwpbjq7n5cwk361mdh1lp"; + sha256 = "0r932caxlkdw36f36f8y4h2r3anpl61fmqr9payb83fj55gsiq4d"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From c76817291912904f3ed553366804488cf31169e4 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Wed, 10 Feb 2016 01:48:17 +0100 Subject: [PATCH 098/308] tinc: enable chroot --- nixos/modules/services/networking/tinc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 34f4f6b37b6..a26b998b915 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -166,7 +166,7 @@ in fi ''; script = '' - tincd -D -U tinc.${network} -n ${network} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel} + tincd -R -D -U tinc.${network} -n ${network} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel} ''; }) ); From b6595185f6505e198ae4270e92e1ff86c34a2a53 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 10 Feb 2016 02:41:15 +0100 Subject: [PATCH 099/308] beets: Re-enable tests The reason why the completion tests didn't pass was because we had it already disabled in 2acc258dff1a37974edd6475851e218bb09e281a. Meanwhile, beetbox/beets@a07cb83 has moved the file from test/test_completion.sh to test/rsrc/test_completion.sh. So this has silently re-enabled the completion tests, which we need to investigate on our side why they failed in the first place. Signed-off-by: aszlig --- pkgs/tools/audio/beets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 6a3345e1d3c..91407331d7c 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -121,7 +121,7 @@ in buildPythonPackage rec { postPatch = '' sed -i -e '/assertIn.*item.*path/d' test/test_info.py - echo echo completion tests passed > test/test_completion.sh + echo echo completion tests passed > test/rsrc/test_completion.sh sed -i -e '/^BASH_COMPLETION_PATHS *=/,/^])$/ { /^])$/i u"${completion}" @@ -139,7 +139,7 @@ in buildPythonPackage rec { test/test_replaygain.py ''; - doCheck = false; # TODO, see https://github.com/beetbox/beets/issues/1876#issuecomment-182010438 + doCheck = true; preCheck = '' (${concatMapStrings (s: "echo \"${s}\";") allPlugins}) \ From 086cebe2bb5d79c2abf6b64dcc8c54a20e78447b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 10 Feb 2016 08:31:51 +0100 Subject: [PATCH 100/308] pythonPackages.blaze: add missing dependency --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c28c97fd33..76d7004a7da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2051,6 +2051,7 @@ in modules // { cytoolz datashape flask + flask-cors h5py multipledispatch numba From 00c6db841c6f92c25f54a53de3013fe261d58d96 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 10 Feb 2016 08:32:04 +0100 Subject: [PATCH 101/308] pythonPackages.flask-cors: init at 2.1.2 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76d7004a7da..e3096cff69e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8606,6 +8606,25 @@ in modules // { }; }; + flask-cors = buildPythonPackage rec { + name = "Flask-Cors-${version}"; + version = "2.1.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/F/Flask-Cors/${name}.tar.gz"; + sha256 = "0fd618a4f88ykqx4x55viz47cm9rl214q1b45a0b4mz5vhxffqpj"; + }; + + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ flask six ]; + + meta = { + description = "A Flask extension adding a decorator for CORS support"; + homepage = https://github.com/corydolphin/flask-cors; + license = with licenses; [ mit ]; + }; + }; + flask-pymongo = buildPythonPackage rec { name = "Flask-PyMongo-${version}"; version = "0.3.1"; From 46a76d1a7d9d9b413fe8150e1bc40ff5281f9ec8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 10 Feb 2016 08:32:18 +0100 Subject: [PATCH 102/308] pythonPackages.scikitlearn: fix tests --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3096cff69e..1edeb9d84d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18549,6 +18549,13 @@ in modules // { LC_ALL="en_US.UTF-8"; + # Exclude "test_image.py" because the Lena function/image was removed from SciPy since 0.17 + # Should be fixed in next release. + # Using the -I switch broke nosetests...? + patchPhase = '' + rm sklearn/feature_extraction/tests/test_image.py + ''; + checkPhase = '' HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/ ''; From aeee493704dccb1e0ec79f0c763bdb0347d6de75 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 10 Feb 2016 10:48:51 +0100 Subject: [PATCH 103/308] Bugfix: ssvnc had a hard dependency on /usr/bin/perl which is now replaced --- pkgs/applications/networking/remote/ssvnc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index fad7ef90ceb..956391b71f8 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu -, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk }: +, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk, perl }: stdenv.mkDerivation rec { name = "ssvnc-${version}"; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { postInstall = '' sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/lib/ssvnc/util/ssvnc.tcl + sed -i -e 's|/usr/bin/perl|${perl}/bin/perl|' $out/lib/ssvnc/util/ss_vncviewer ''; meta = { From 7ab80e8f79beacfcc5361ef037bc63e6a30a39be Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 9 Feb 2016 03:00:53 +0300 Subject: [PATCH 104/308] kbd module: don't setup vconsoles if we are in a container --- nixos/modules/tasks/kbd.nix | 45 ++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index e1574fa68ad..02721bb3bea 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -12,6 +12,8 @@ let FONT=${config.i18n.consoleFont} ${colors} ''; + + setVconsole = !config.boot.isContainer; in { @@ -41,26 +43,33 @@ in ###### implementation - config = { + config = mkMerge [ + (mkIf (!setVconsole) { + systemd.services."systemd-vconsole-setup".enable = false; + }) - environment.systemPackages = [ pkgs.kbd ]; + (mkIf setVconsole { + environment.systemPackages = [ pkgs.kbd ]; - # Let systemd-vconsole-setup.service do the work of setting up the - # virtual consoles. FIXME: trigger a restart of - # systemd-vconsole-setup.service if /etc/vconsole.conf changes. - environment.etc."vconsole.conf".source = vconsoleConf; + # Let systemd-vconsole-setup.service do the work of setting up the + # virtual consoles. FIXME: trigger a restart of + # systemd-vconsole-setup.service if /etc/vconsole.conf changes. + environment.etc = [ { + target = "vconsole.conf"; + source = vconsoleConf; + } ]; - # This is identical to the systemd-vconsole-setup.service unit - # shipped with systemd, except that it uses /dev/tty1 instead of - # /dev/tty0 to prevent putting the X server in non-raw mode, and - # it has a restart trigger. - systemd.services."systemd-vconsole-setup" = - { wantedBy = [ "multi-user.target" ]; - before = [ "display-manager.service" ]; - after = [ "systemd-udev-settle.service" ]; - restartTriggers = [ vconsoleConf ]; - }; - - }; + # This is identical to the systemd-vconsole-setup.service unit + # shipped with systemd, except that it uses /dev/tty1 instead of + # /dev/tty0 to prevent putting the X server in non-raw mode, and + # it has a restart trigger. + systemd.services."systemd-vconsole-setup" = + { wantedBy = [ "multi-user.target" ]; + before = [ "display-manager.service" ]; + after = [ "systemd-udev-settle.service" ]; + restartTriggers = [ vconsoleConf ]; + }; + }) + ]; } From 112476ec9649d51dd2fd014d759c9bce7626cd49 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 9 Feb 2016 23:47:41 +0100 Subject: [PATCH 105/308] bundix: 1.0.4 -> 2.0.4 --- .../interpreters/ruby/bundix/default.nix | 54 +++++++++++++------ 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix index b5a49043c60..88679f74753 100644 --- a/pkgs/development/interpreters/ruby/bundix/default.nix +++ b/pkgs/development/interpreters/ruby/bundix/default.nix @@ -1,20 +1,44 @@ -{ ruby, fetchgit, buildRubyGem, bundler }: +{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-scripts }: -let - thor = buildRubyGem { - gemName = "thor"; - version = "0.19.1"; - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; +buildRubyGem rec { + inherit ruby; -in buildRubyGem { + name = "${gemName}-${version}"; gemName = "bundix"; - version = "1.0.4"; - gemPath = [ thor bundler ]; - src = fetchgit { - url = "https://github.com/cstrahan/bundix.git"; - rev = "6dcf1f71c61584f5c9b919ee9df7b0c554862076"; - sha256 = "1w17bvc9srcgr4ry81ispcj35g9kxihbyknmqp8rnd4h5090b7b2"; + version = "2.0.4"; + + sha256 = "0i7fdxi6w29yxnblpckczazb79m5x03hja8sfnabndg4yjc868qs"; + + buildInputs = [bundler]; + + postInstall = '' + gem_root=$GEM_HOME/gems/${gemName}-${version} + sed \ + -e 's|NIX_INSTANTIATE =.*|NIX_INSTANTIATE = "${nix}/bin/nix-instantiate"|' \ + -i $gem_root/lib/bundix.rb + sed \ + -e 's|NIX_HASH =.*|NIX_HASH = "${nix}/bin/nix-hash"|' \ + -i $gem_root/lib/bundix.rb + sed \ + -e 's|NIX_PREFETCH_URL =.*|NIX_PREFETCH_URL = "${nix}/bin/nix-prefetch-url"|' \ + -i $gem_root/lib/bundix.rb + sed \ + -e 's|NIX_PREFETCH_GIT =.*|NIX_PREFETCH_GIT = "${nix-prefetch-scripts}/bin/nix-prefetch-git"|' \ + -i $gem_root/lib/bundix.rb + ''; + + meta = { + inherit version; + description = "Creates Nix packages from Gemfiles"; + longDescription = '' + This is a tool that converts Gemfile.lock files to nix expressions. + + The output is then usable by the bundlerEnv derivation to list all the + dependencies of a ruby package. + ''; + homepage = "https://github.com/manveru/bundix"; + license = "MIT"; + maintainers = with lib.maintainers; [ manveru zimbatm ]; + platforms = lib.platforms.all; }; } From 9fecc506034e1f0b23dd0db6fb7df7578d687032 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 10 Feb 2016 02:00:18 +0100 Subject: [PATCH 106/308] alot: 0.3.6 -> 0.3.7, fixes #12914 Version bump. The checks are back again, so far alot has no tests at all. Add urwidtrees dependency. The themes are copied to the derivation and set as default directory. --- pkgs/top-level/python-packages.nix | 47 +++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1edeb9d84d3..fa2abffd552 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -554,28 +554,35 @@ in modules // { alot = buildPythonPackage rec { - rev = "0.3.6"; - name = "alot-0.3.6"; + rev = "0.3.7"; + name = "alot-${rev}"; - src = pkgs.fetchurl { - url = "https://github.com/pazz/alot/tarball/${rev}"; - name = "${name}.tar.bz"; - sha256 = "1rzy70w4isvypa94310xw403vq5him21q8rlx4laa0z530phkrmq"; + src = pkgs.fetchFromGitHub { + owner = "pazz"; + repo = "alot"; + inherit rev; + sha256 = "0sscmmf42gsrjbisi6wm01alzlnq6wqhpwkm8pc557075jfg19il"; }; - # error: invalid command 'test' - doCheck = false; + postPatch = '' + substituteInPlace alot/defaults/alot.rc.spec \ + --replace "themes_dir = string(default=None)" \ + "themes_dir = string(default='$out/share/themes')" + ''; propagatedBuildInputs = [ self.notmuch self.urwid + self.urwidtrees self.twisted - self.magic + self.python_magic self.configobj self.pygpgme ]; postInstall = '' + mkdir -p $out/share + cp -r extra/themes $out/share wrapProgram $out/bin/alot \ --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file}/lib:${pkgs.gpgme}/lib ''; @@ -583,7 +590,7 @@ in modules // { meta = { homepage = https://github.com/pazz/alot; description = "Terminal MUA using notmuch mail"; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ garbas profpatsch ]; }; }; @@ -21060,6 +21067,26 @@ in modules // { }; }); + urwidtrees = buildPythonPackage rec { + name = "urwidtrees-${rev}"; + rev = "1.0"; + + src = pkgs.fetchFromGitHub { + owner = "pazz"; + repo = "urwidtrees"; + inherit rev; + sha256 = "03gpcdi45z2idy1fd9zv8v9naivmpfx65hshm8r984k9wklv1dsa"; + }; + + propagatedBuildInputs = with self; [ urwid ]; + + meta = { + description = "Tree widgets for urwid"; + license = licenses.gpl3; + maintainer = with maintainters; [ profpatsch ]; + }; + }; + pyuv = buildPythonPackage rec { name = "pyuv-0.11.5"; disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49 From 6352bb51f909bd014e5ede6f1e27a66f5ec011df Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 10 Feb 2016 16:53:59 +0300 Subject: [PATCH 107/308] dwarf-fortress-packages.phoebus-theme: 20160118 -> 20160128 --- pkgs/games/dwarf-fortress/themes/phoebus.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 2183a6245c0..ca459c6ef76 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub }: -# On upgrade check https://github.com/fricy/Phoebus/blob/master/manifest.json +# On upgrade check https://github.com/DFgraphics/Phoebus/blob/master/manifest.json # for compatibility information. stdenv.mkDerivation { - name = "phoebus-theme-20160118"; + name = "phoebus-theme-20160128"; src = fetchFromGitHub { - owner = "fricy"; + owner = "DFgraphics"; repo = "Phoebus"; - rev = "2c5777b0f307b1d752a8a484c6a05b67531c84a9"; - sha256 = "0a5ixm181wz7crr3rpa2mh0drb371j5hvizqninvdnhah2mypz8v"; + rev = "52b19b69c7323f9002ad195ecd68ac02ff0099a2"; + sha256 = "1pw5l5v7l1bvxzjf4fivmagpmghffvz0wlws2ksc7d5vy48ybcmg"; }; installPhase = '' From 99f4f1d7ef0b6a2f1bab7daa51985da565c54f6a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 10 Feb 2016 16:54:55 +0300 Subject: [PATCH 108/308] dwarf-fortress-packages.cla-theme: init at 20160128 --- pkgs/games/dwarf-fortress/default.nix | 3 +++ pkgs/games/dwarf-fortress/themes/cla.nix | 32 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/games/dwarf-fortress/themes/cla.nix diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index d91c110c34c..bc0b97b139b 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -16,6 +16,7 @@ let dwarf-fortress = callPackage ./wrapper { themes = { "phoebus" = phoebus-theme; + "cla" = cla-theme; }; }; @@ -28,6 +29,8 @@ let dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { }; phoebus-theme = callPackage ./themes/phoebus.nix { }; + + cla-theme = callPackage ./themes/cla.nix { }; }; in self diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix new file mode 100644 index 00000000000..f3c6b7dd279 --- /dev/null +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +# On upgrade check https://github.com/fricy/Phoebus/blob/master/manifest.json +# for compatibility information. + +stdenv.mkDerivation { + name = "cla-theme-20160128"; + + src = fetchFromGitHub { + owner = "DFgraphics"; + repo = "CLA"; + rev = "94088b778ed6f91cbddcd3e33aa1e5efa67f3101"; + sha256 = "0rx1375x9s791k9wzvj7sxcrv4xaggibxymzirayznvavr7zcsv1"; + }; + + installPhase = '' + mkdir $out + cp -r data raw $out + ''; + + passthru.dfVersion = "0.42.05"; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "CLA graphics set for Dwarf Fortress"; + homepage = "http://www.bay12forums.com/smf/index.php?topic=105376.0"; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + license = licenses.free; + }; +} From aea262f654ee22bba84b9b3b867c62ebb17adc6c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Feb 2016 14:59:36 +0100 Subject: [PATCH 109/308] Fix misspelled meta.maintainers attributes --- .../color-theme-solarized/default.nix | 2 +- .../pidgin-plugins/otr/default.nix | 2 +- .../pidgin-opensteamworks/default.nix | 2 +- .../purple-plugin-pack/default.nix | 2 +- .../telegram/cutegram/default.nix | 2 +- .../libqtelegram-aseman-edition/default.nix | 2 +- .../telegram/telegram-qml/default.nix | 2 +- .../window-managers/compton/git.nix | 2 +- pkgs/data/fonts/google-fonts/default.nix | 2 +- pkgs/data/fonts/powerline-fonts/default.nix | 2 +- pkgs/data/misc/media-player-info/default.nix | 2 +- .../libraries/openjpeg/generic.nix | 2 +- .../phonon-backend-gstreamer/qt5/default.nix | 2 +- .../tools/ocaml/ocaml-top/default.nix | 2 +- pkgs/games/gzdoom/default.nix | 2 +- pkgs/games/zandronum/bin.nix | 2 +- pkgs/games/zandronum/default.nix | 2 +- pkgs/games/zdoom/default.nix | 2 +- pkgs/misc/themes/vertex/default.nix | 2 +- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 2 +- pkgs/servers/mail/rmilter/default.nix | 2 +- pkgs/servers/mail/rspamd/default.nix | 2 +- pkgs/tools/misc/cpulimit/default.nix | 2 +- pkgs/tools/misc/trash-cli/default.nix | 2 +- pkgs/tools/networking/nethogs/default.nix | 2 +- pkgs/tools/text/colordiff/default.nix | 2 +- pkgs/top-level/python-packages.nix | 30 +++++++++---------- 27 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index 9a0f6855567..ef006439a55 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Precision colors for machines and people"; homepage = http://ethanschoonover.com/solarized; - maintainer = "Samuel Rivas "; + maintainers = "Samuel Rivas "; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 7b80ec85661..c6801105a84 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Plugin for Pidgin 2.x which implements OTR Messaging"; license = licenses.gpl2; platforms = platforms.linux; - maintainters = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index e03b61b6182..e4c0697605d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility"; license = licenses.gpl3; platforms = platforms.linux; - maintainters = with maintainers; [ arobyn ]; + maintainers = with maintainers; [ arobyn ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index 149f62bb981..8022d32a081 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "Plugin pack for Pidgin 2.x"; license = licenses.gpl2; platforms = platforms.linux; - maintainters = with maintainers; [ bdimcheff ]; + maintainers = with maintainers; [ bdimcheff ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 26a7eb49279..507094f7c05 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Telegram client forked from sigram"; homepage = "http://aseman.co/en/products/cutegram/"; license = licenses.gpl3; - maintainer = [ maintainers.profpatsch ]; + maintainers = [ maintainers.profpatsch ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix index 3149ac3279a..8166514bb3a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A fork of libqtelegram by Aseman, using qmake"; homepage = src.meta.homepage; license = stdenv.lib.licenses.gpl3; - maintainer = [ maintainers.profpatsch ]; + maintainers = [ maintainers.profpatsch ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix index b51f8435ce1..6bf550d4766 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Telegram API tools for QtQml and Qml"; homepage = src.meta.homepage; license = stdenv.lib.licenses.gpl3; - maintainer = [ maintainers.profpatsch ]; + maintainers = [ maintainers.profpatsch ]; }; } diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index be2586c9e27..b715b3a4cf3 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { additional features, such as additional effects, and a fork at a well-defined and proper place. ''; - maintainer = maintainers.ertes; + maintainers = maintainers.ertes; platforms = platforms.linux; }; } diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 9f14f945e35..e4c655877c8 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Font files available from Google Font"; license = with licenses; [ asl20 ofl ufl ]; platforms = platforms.all; - maintainer = with maintainers; [ manveru ]; + maintainers = with maintainers; [ manveru ]; }; } diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 6d620c09f06..2e576cf6dc8 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { ''; license = with licenses; [ asl20 free ofl ]; platforms = platforms.all; - maintainer = with maintainers; [ malyn ]; + maintainers = with maintainers; [ malyn ]; }; } diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 9abe5d6ea8e..f31c7c503a2 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -27,6 +27,6 @@ in description = "A repository of data files describing media player capabilities"; homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/"; license = licenses.bsd3; - maintainer = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 717e5a4de2c..1b4b4af7f41 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "Open-source JPEG 2000 codec written in C language"; homepage = http://www.openjpeg.org/; license = licenses.bsd2; - maintainer = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix index 9866c0a67ce..98aa7d81b36 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; - maintainer = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index cf0a16cef68..79c81c5c447 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; platforms = ocamlPackages.ocaml.meta.platforms; - maintainer = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 66d01905aaf..3f8744d75cb 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/coelckers/gzdoom; description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; - maintainer = [ stdenv.lib.maintainers.lassulus ]; + maintainers = [ stdenv.lib.maintainers.lassulus ]; }; } diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix index 92f93d8f778..ae6ab99dad2 100644 --- a/pkgs/games/zandronum/bin.nix +++ b/pkgs/games/zandronum/bin.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://zandronum.com/; description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play."; - maintainer = [ stdenv.lib.maintainers.lassulus ]; + maintainers = [ stdenv.lib.maintainers.lassulus ]; # Binary version has different version string than source code version. license = stdenv.lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index ecdf8cfdbd2..479a6abe9a4 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://zandronum.com/; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software."; - maintainer = with maintainers; [ lassulus ]; + maintainers = with maintainers; [ lassulus ]; platforms = platforms.linux; license = licenses.bsdOriginal; }; diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index 0bc63855299..8feb78ad969 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { homepage = http://zdoom.org/; description = "Enhanced port of the official DOOM source code"; - maintainer = [ stdenv.lib.maintainers.lassulus ]; + maintainers = [ stdenv.lib.maintainers.lassulus ]; }; } diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index 60269c8dfbf..ea79426d47e 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon"; license = licenses.gpl3; - maintainer = [ maintainers.rycee ]; + maintainers = [ maintainers.rycee ]; platforms = platforms.unix; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 2b0e3017979..6a1d8da5a92 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -7,7 +7,7 @@ import ./generic.nix (args // rec { extraMeta = { branch = "3.18"; - maintainer = stdenv.lib.maintainers.layus; + maintainers = stdenv.lib.maintainers.layus; }; src = fetchurl { diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix index 45c62546628..ad40b57f8a6 100644 --- a/pkgs/servers/mail/rmilter/default.nix +++ b/pkgs/servers/mail/rmilter/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/vstakhov/rmilter"; license = licenses.bsd2; description = "server, used to integrate rspamd and milter compatible MTA, for example postfix or sendmail"; - maintainer = maintainers.avnik; + maintainers = maintainers.avnik; }; } diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index a3b20820a6e..1f9c36b7377 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/vstakhov/rspamd"; license = licenses.bsd2; description = "advanced spam filtering system"; - maintainer = maintainers.avnik; + maintainers = maintainers.avnik; }; } diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 72656d2969d..1bae4b16bd8 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; - maintainer = [maintainers.rycee]; + maintainers = [maintainers.rycee]; }; } diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 1c8a2e495b6..78835afddef 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -34,7 +34,7 @@ python2Packages.buildPythonPackage rec { meta = with stdenv.lib; { homepage = https://github.com/andreafrancia/trash-cli; description = "Command line tool for the desktop trash can"; - maintainer = [ maintainers.rycee ]; + maintainers = [ maintainers.rycee ]; license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index c8ff0c7a160..dfa9b26a38e 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://nethogs.sourceforge.net/; platforms = platforms.linux; - maintainer = [ maintainers.rycee ]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 53e683561fb..b22a1da2264 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = http://www.colordiff.org/; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; - maintainer = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa2abffd552..717604a7278 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1815,7 +1815,7 @@ in modules // { description = "Composable style cycles"; homepage = http://github.com/matplotlib/cycler; license = licenses.bsd3; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; }; @@ -10664,7 +10664,7 @@ in modules // { description = "Line-by-line profiler"; homepage = https://github.com/rkern/line_profiler; license = licenses.bsd3; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; }; @@ -12589,7 +12589,7 @@ in modules // { meta = { description = "Numerical traits for Python objects"; license = licenses.bsd2; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; homepage = https://github.com/astrofrog/numtraits; }; }; @@ -14905,7 +14905,7 @@ in modules // { description = "An audio library based on libsndfile, CFFI and NumPy"; license = licenses.bsd3; homepage = https://github.com/bastibe/PySoundFile; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; prePatch = '' @@ -15994,7 +15994,7 @@ in modules // { description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = http://hgomersall.github.com/pyFFTW/; license = with licenses; [ bsd2 bsd3 ]; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; }; @@ -17727,7 +17727,7 @@ in modules // { description = "A docutils-compatibility bridge to CommonMark"; homepage = https://github.com/rtfd/recommonmark; license = licenses.mit; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; }; @@ -19794,7 +19794,7 @@ in modules // { description = "Statistical computations and models for use with SciPy"; homepage = "https://www.github.com/statsmodels/statsmodels"; license = licenses.bsd3; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; # Many tests fail when using latest numpy and pandas. @@ -20072,7 +20072,7 @@ in modules // { description = "Pretty-print tabular data"; homepage = https://bitbucket.org/astanin/python-tabulate; license = licenses.mit; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; }; @@ -21083,7 +21083,7 @@ in modules // { meta = { description = "Tree widgets for urwid"; license = licenses.gpl3; - maintainer = with maintainters; [ profpatsch ]; + maintainers = with maintainers; [ profpatsch ]; }; }; @@ -25019,7 +25019,7 @@ in modules // { # license can actually be either bsd3 or gpl3 # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt license = licenses.bsd3; - maintainer = with maintainers; [ np ]; + maintainers = with maintainers; [ np ]; }; }; @@ -25038,7 +25038,7 @@ in modules // { description = "Implementation of Bitcoin BIP-0039"; homepage = https://github.com/trezor/python-mnemonic; license = licenses.mit; - maintainer = with maintainers; [ np ]; + maintainers = with maintainers; [ np ]; }; }; @@ -25062,7 +25062,7 @@ in modules // { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = https://github.com/trezor/python-trezor; license = licenses.gpl3; - maintainer = with maintainers; [ np ]; + maintainers = with maintainers; [ np ]; }; }; @@ -25086,7 +25086,7 @@ in modules // { description = "KeepKey Python client"; homepage = https://github.com/keepkey/python-keepkey; license = licenses.gpl3; - maintainer = with maintainers; [ np ]; + maintainers = with maintainers; [ np ]; }; }; @@ -25139,7 +25139,7 @@ in modules // { description = "Using Trezor as hardware SSH agent"; homepage = https://github.com/romanz/trezor-agent; license = licenses.gpl3; - maintainer = with maintainers; [ np ]; + maintainers = with maintainers; [ np ]; }; }; @@ -25156,7 +25156,7 @@ in modules // { description = "Binding for X11 proof of work hashing"; homepage = https://github.com/mazaclub/x11_hash; license = licenses.mit; - maintainer = with maintainers; [ np ]; + maintainers = with maintainers; [ np ]; }; }; From 813d45663cc7d9f166809411834c43207c91a411 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 10 Feb 2016 17:02:07 +0300 Subject: [PATCH 110/308] dwarf-fortress-packages.cla-theme: fix comment --- pkgs/games/dwarf-fortress/themes/cla.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index f3c6b7dd279..09b2cc8b647 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -# On upgrade check https://github.com/fricy/Phoebus/blob/master/manifest.json +# On upgrade check https://github.com/DFgraphics/CLA/blob/master/manifest.json # for compatibility information. stdenv.mkDerivation { From ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Feb 2016 13:50:31 +0100 Subject: [PATCH 111/308] Reduce the size of the Nixpkgs/NixOS jobsets This cuts nixpkgs:trunk from 78K to 31K jobs by disabling builds of {node,go,python,emacs,coq,r,ocaml,perl}Packages. Thus these are now only built if they are dependencies of top-level packages (such as end-user applications). I left haskellPackages because they take typically longer to build than the others (which are mostly interpreted languages), so disabling them would be more painful to users. This is a temporary measure until we have a binary cache based Hydra running on faster hardware, necessitated by the fact that evaluations now regularly time out after 6 hours. --- pkgs/top-level/all-packages.nix | 24 ++++++++++++------------ pkgs/top-level/release.nix | 16 +++++++++++----- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40e92629064..8e91dee299c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2155,7 +2155,7 @@ let nodePackages_5_x = callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; }; - nodePackages_4_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; }); + nodePackages_4_x = callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; }; nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; @@ -9034,23 +9034,23 @@ let ### DEVELOPMENT / GO MODULES - go14Packages = recurseIntoAttrs (callPackage ./go-packages.nix { + go14Packages = callPackage ./go-packages.nix { go = go_1_4; buildGoPackage = callPackage ../development/go-modules/generic { go = go_1_4; govers = go14Packages.govers.bin; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; - }); + }; - go15Packages = recurseIntoAttrs (callPackage ./go-packages.nix { + go15Packages = callPackage ./go-packages.nix { go = go_1_5; buildGoPackage = callPackage ../development/go-modules/generic { go = go_1_5; govers = go15Packages.govers.bin; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; - }); + }; goPackages = go15Packages; @@ -9124,20 +9124,20 @@ let self = python33Packages; }; - python34Packages = recurseIntoAttrs (callPackage ./python-packages.nix { + python34Packages = callPackage ./python-packages.nix { python = python34; self = python34Packages; - }); + }; python35Packages = recurseIntoAttrs (callPackage ./python-packages.nix { python = python35; self = python35Packages; }); - pypyPackages = recurseIntoAttrs (callPackage ./python-packages.nix { + pypyPackages = callPackage ./python-packages.nix { python = pypy; self = pypyPackages; - }); + }; bsddb3 = pythonPackages.bsddb3; @@ -11831,7 +11831,7 @@ let cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); + emacs24Packages = emacsPackagesGen emacs24 pkgs.emacs24Packages; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { overrides = (config.emacsPackageOverrides or (p: {})) pkgs; @@ -15173,8 +15173,8 @@ let }; - coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages); - coqPackages_8_5 = recurseIntoAttrs (mkCoqPackages_8_5 coqPackages_8_5); + coqPackages = mkCoqPackages_8_4 coqPackages; + coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; }); diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index a555dcbf4fa..6c510ea029f 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -233,7 +233,7 @@ let zsh = linux; zsnes = ["i686-linux"]; - emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg; + #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg; gnome = { gnome_panel = linux; @@ -244,7 +244,7 @@ let haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; - rPackages = packagePlatforms pkgs.rPackages; + #rPackages = packagePlatforms pkgs.rPackages; strategoPackages = { sdf = linux; @@ -254,9 +254,15 @@ let dryad = linux; }; - pythonPackages = { - zfec = linux; - }; + ocamlPackages = { }; + + perlPackages = { }; + + pythonPackages = { }; + python2Packages = { }; + python27Packages = { }; + python3Packages = { }; + python35Packages = { }; xorg = { fontadobe100dpi = linux ++ darwin; From 2f5ced3f1c3915accb1da8638ec12da78812cfaa Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Wed, 10 Feb 2016 17:03:21 +0100 Subject: [PATCH 112/308] wlc: remove linuxPackages_4_2 --- pkgs/development/libraries/wlc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 9b5fa32bf00..b219bd2f44d 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchgit, cmake, pkgconfig , glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs -, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm, linuxPackages_4_2 +, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm }: stdenv.mkDerivation rec { From 5c19830b77c00f87fa67121dadeb16096a6d18e2 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Wed, 10 Feb 2016 17:29:36 +0100 Subject: [PATCH 113/308] tinc: chroot option --- nixos/modules/services/networking/tinc.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index a26b998b915..9330e6c92ba 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -95,6 +95,16 @@ in ''; }; + chroot = mkOption { + default = true; + type = types.bool; + description = '' + Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security. + The chroot is performed after all the initialization is done, after writing pid files and opening network sockets. + + Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment. + ''; + }; }; }; }; @@ -166,7 +176,7 @@ in fi ''; script = '' - tincd -R -D -U tinc.${network} -n ${network} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel} + tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel} ''; }) ); From 4ef8288dfc145d963ce4770b87b0b613f89517c2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 10 Feb 2016 19:42:31 +0300 Subject: [PATCH 114/308] zathura: use mupdf by default --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e91dee299c..e5959283e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14074,7 +14074,7 @@ let zathuraCollection = recurseIntoAttrs (callPackage ../applications/misc/zathura { callPackage = newScope pkgs.zathuraCollection; - useMupdf = config.zathura.useMupdf or false; + useMupdf = config.zathura.useMupdf or true; }); zathura = zathuraCollection.zathuraWrapper; From 007c558be8a488e49fd1c00f8c800f5f67604e36 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Wed, 10 Feb 2016 18:25:48 +0000 Subject: [PATCH 115/308] prosody: 0.9.8 -> 0.9.10 --- pkgs/servers/xmpp/prosody/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 631073da4d4..45c42947c5a 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { - version = "0.9.8"; + version = "0.9.10"; name = "prosody-${version}"; src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "0wbq4ps69l09fjb5dfjzab6i30hzpi4bvyj5kc44gf70arf42w4l"; + sha256 = "0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8"; }; communityModules = fetchhg { From c093bf9b9b1bae7e786326d004b1e0d2f8cc4641 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 30 Jan 2016 10:18:40 +0000 Subject: [PATCH 116/308] python-mpd2: init at 0.5.5 --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04312ca1f23..d39b742b627 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11457,6 +11457,31 @@ in modules // { }; }; + mpd2 = buildPythonPackage rec { + name = "mpd2-${version}"; + version = "0.5.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-mpd2/python-mpd2-${version}.tar.bz2"; + sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a"; + }; + + propagatedBuildInputs = [ pkgs.mpd_clientlib ]; + + buildInputs = with self; [ mock ]; + patchPhase = '' + sed -i -e '/tests_require/d' \ + -e 's/cmdclass.*/test_suite="mpd_test",/' setup.py + ''; + + meta = { + description = "A Python client module for the Music Player Daemon"; + homepage = "https://github.com/Mic92/python-mpd2"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ rvl ]; + }; + }; + mpv = buildPythonPackage rec { name = "mpv-0.1"; From 5a50fd4660cbbc68f6ec13b8d6acfa8ac5f856b8 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 30 Jan 2016 10:28:12 +0000 Subject: [PATCH 117/308] sonata: init at 1.7b1 --- pkgs/applications/audio/sonata/default.nix | 73 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 77 insertions(+) create mode 100644 pkgs/applications/audio/sonata/default.nix diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix new file mode 100644 index 00000000000..74ce6a2c15f --- /dev/null +++ b/pkgs/applications/audio/sonata/default.nix @@ -0,0 +1,73 @@ +{ pkgs, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook, + python, buildPythonPackage, isPy3k, + gnome3, gtk3, gobjectIntrospection, + dbus, pygobject3, mpd2 }: + +with pkgs.lib; + +buildPythonPackage rec { + name = "sonata-${version}"; + version = "1.7b1"; + namePrefix = ""; + + src = fetchFromGitHub { + owner = "multani"; + repo = "sonata"; + rev = "v${version}"; + sha256 = "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh"; + }; + + disabled = !isPy3k; + + buildInputs = [ + pkgconfig intltool wrapGAppsHook + gnome3.gnome_themes_standard gnome3.defaultIconTheme + gnome3.gsettings_desktop_schemas + ]; + + postPatch = '' + # Remove "Local MPD" tab which is not suitable for NixOS. + sed -i '/localmpd/d' sonata/consts.py + ''; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + propagatedBuildInputs = [ + gobjectIntrospection gtk3 pygobject3 + ]; + + # The optional tagpy dependency (for editing metadata) is not yet + # included because it's difficult to build. + pythonPath = [ dbus pygobject3 mpd2 ]; + + meta = { + description = "An elegant client for the Music Player Daemon"; + longDescription = '' + Sonata is an elegant client for the Music Player Daemon. + + Written in Python and using the GTK+ 3 widget set, its features + include: + + - Expanded and collapsed views + - Automatic remote and local album art + - Library browsing by folders, or by genre/artist/album + - User-configurable columns + - Automatic fetching of lyrics + - Playlist and stream support + - Support for editing song tags (not in NixOS version) + - Drag and drop to copy files + - Popup notification + - Library and playlist searching, filter as you type + - Audioscrobbler (last.fm) 1.2 support + - Multiple MPD profiles + - Keyboard friendly + - Support for multimedia keys + - Commandline control + - Available in 24 languages + ''; + homepage = "http://www.nongnu.org/sonata/"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.rvl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be51cff6fe5..50e4a7e177a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3161,6 +3161,10 @@ let solvespace = callPackage ../applications/graphics/solvespace { }; + sonata = callPackage ../applications/audio/sonata { + inherit (python3Packages) buildPythonPackage python isPy3k dbus pygobject3 mpd2; + }; + sparsehash = callPackage ../development/libraries/sparsehash { }; spiped = callPackage ../tools/networking/spiped { }; From 0d1d91efdd3de291cabba23b5c28a04dc4f9e3d6 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Tue, 9 Feb 2016 00:00:05 +0000 Subject: [PATCH 118/308] sunxi-tools: init at 1.3 --- lib/maintainers.nix | 3 +- .../development/tools/sunxi-tools/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/sunxi-tools/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 49304e27f5b..e78f03b1e27 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -94,10 +94,11 @@ eduarrrd = "Eduard Bachmakov "; edwtjo = "Edward Tjörnhammar "; eelco = "Eelco Dolstra "; + ehmry = "Emery Hemingway "; eikek = "Eike Kettner "; elasticdog = "Aaron Bull Schaefer "; + elitak = "Eric Litak "; ellis = "Ellis Whitehead "; - ehmry = "Emery Hemingway "; epitrochoid = "Mabry Cervin "; ericbmerritt = "Eric Merritt "; ericsagnes = "Eric Sagnes "; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix new file mode 100644 index 00000000000..f27b9500319 --- /dev/null +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, pkgconfig, libusb }: +stdenv.mkDerivation { + name = "sunxi-tools-1.3"; + + src = fetchgit { + url = "https://github.com/linux-sunxi/sunxi-tools"; + rev = "be1b4c7400161b90437432076360c1f99970f54f"; + sha256 = "0qbl4v66a3mvqai29q2y60zf2b5lj32mh9gyn44gfp0w2bsb10yj"; + }; + + buildInputs = [ pkgconfig libusb ]; + + buildPhase = '' + make all misc + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin2fex fex2bin phoenix_info sunxi-bootinfo sunxi-fel sunxi-fexc sunxi-nand-part sunxi-pio $out/bin + ''; + + meta = with stdenv.lib; { + description = "Tools for Allwinner A10 devices"; + homepage = http://linux-sunxi.org/; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ elitak ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dddbdedf5a2..6e2dfdff37e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3207,6 +3207,8 @@ let sundtek = callPackage ../misc/drivers/sundtek { }; + sunxi-tools = callPackage ../development/tools/sunxi-tools { }; + super = callPackage ../tools/security/super { }; supertux-editor = callPackage ../applications/editors/supertux-editor { }; From 310a20eda83261f72f670770f232b3bb0ed3cdf5 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Wed, 10 Feb 2016 20:34:05 +0100 Subject: [PATCH 119/308] waf --- .../tools/build-managers/waf/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/build-managers/waf/default.nix diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix new file mode 100644 index 00000000000..6956c97db50 --- /dev/null +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, python2 }: + +stdenv.mkDerivation rec { + name = "waf-${version}"; + version = "1.8.19"; + + src = fetchurl { + url = "https://waf.io/waf-${version}.tar.bz2"; + sha256 = "e5df90556d1f70aca82bb5c5f46aa68d2377bae16b0db044eaa0559df8668c6f"; + }; + + buildInputs = [ python2 ]; + + configurePhase = '' + python waf-light configure + ''; + buildPhase = '' + python waf-light build + ''; + installPhase = '' + install waf $out + ''; + + meta = { + description = "Meta build system"; + homepage = "https://waf.io/"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33caf0a6b56..18f717f2e02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3639,6 +3639,8 @@ let volumeicon = callPackage ../tools/audio/volumeicon { }; + waf = callPackage ../development/tools/build-managers/waf { }; + wakelan = callPackage ../tools/networking/wakelan { }; wavemon = callPackage ../tools/networking/wavemon { }; From 60969ab93712f1edf1ccc2e55b17aa9e2944564c Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Wed, 10 Feb 2016 20:34:28 +0100 Subject: [PATCH 120/308] pflask: use waf package --- pkgs/os-specific/linux/pflask/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index 931b074534e..b4f93e9de3f 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, python -}: +{ lib, stdenv, fetchurl, python, waf }: stdenv.mkDerivation rec { name = "pflask-${version}"; @@ -14,10 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; configurePhase = '' - ln -s ${fetchurl { - url = "http://ftp.waf.io/pub/release/waf-1.8.6"; - sha256 = "81c4e6a3144c7b2021a839e7277bdaf1cedbbc87302186897b4ae03f4effcbf5"; - }} waf + ln -s ${waf} waf python waf configure --prefix=$out ''; buildPhase = '' From e81fd09b85e60f537587a6f6a185dd5ef3a4f7d9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Feb 2016 21:48:45 +0000 Subject: [PATCH 121/308] gradle: 2.10 -> 2.11 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 8e517930cfc..82d0d402698 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -35,11 +35,11 @@ rec { }; gradleLatest = gradleGen rec { - name = "gradle-2.10"; + name = "gradle-2.11"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "66406247f745fc6f05ab382d3f8d3e120c339f34ef54b86f6dc5f6efc18fbb13"; + sha256 = "1mhydg6mj9y7qr2s9bkdaijkjrq7nf6rqix415izvjan4c43fx4d"; }; }; From 99913c2820290f0c9960ead2b60f48ff72f03e67 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 10 Feb 2016 21:37:54 +0300 Subject: [PATCH 122/308] dwarf-fortress-wrapper: make data/dipscript writable --- pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in index c5157e82d8a..093dae562c2 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in @@ -40,3 +40,4 @@ forcecopy_path data/index # For some reason, it's needed to be writable... forcecopy_path data/announcement forcecopy_path data/help +forcecopy_path data/dipscript From 4538e70661b1f9fb9f8aad1cb71a14913da6f512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 10 Feb 2016 23:02:18 +0100 Subject: [PATCH 123/308] smartgithg: update 7_0_2 -> 7_1_0 --- .../version-management/smartgithg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 778ae995f3d..420031a8101 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "7_0_2"; + version = "7_1_0"; src = fetchurl { - url = "http://www.syntevo.com/downloads/smartgit/smartgit-generic-${version}.tar.gz"; - sha256 = "1jpi424aqy6niq31j750rgbspwii013c8kbi965i4jzjpba1pagi"; + url = "http://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz"; + sha256 = "0nlv2ipmv3z1j4642gfsrpsgc2y4mxngiz6mz3nidrbrkz0ylsvy"; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install_freedesktop_items = ./install_freedesktop_items.sh; runtime_paths = lib.makeSearchPath "bin" [ jre - git mercurial subversion + #git mercurial subversion # the paths are requested in configuration which ]; runtime_lib_paths = lib.makeLibraryPath [ From 7383abff09be375b009143655180b7739838dfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 10 Feb 2016 23:04:41 +0000 Subject: [PATCH 124/308] pythonPackages: bump some zope packages --- pkgs/top-level/python-packages.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 717604a7278..42eac4716b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22035,15 +22035,18 @@ in modules // { zope_exceptions = buildPythonPackage rec { name = "zope.exceptions-${version}"; - version = "4.0.5"; + version = "4.0.8"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz"; - md5 = "c95569fcb444ae541777de7ae5297492"; + sha256 = "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl"; }; propagatedBuildInputs = with self; [ zope_interface ]; + # circular deps + doCheck = false; + meta = { description = "Exception interfaces and implementations"; homepage = http://pypi.python.org/pypi/zope.exceptions; @@ -22139,15 +22142,18 @@ in modules // { zope_proxy = buildPythonPackage rec { - name = "zope.proxy-4.1.4"; + name = "zope.proxy-4.1.6"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.tar.gz"; - md5 = "3bcaf8b8512a99649ecf2f158c11d05b"; + sha256 = "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4"; }; propagatedBuildInputs = with self; [ zope_interface ]; + # circular deps + doCheck = false; + meta = { maintainers = with maintainers; [ goibhniu ]; }; @@ -22276,18 +22282,12 @@ in modules // { propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit; - # https://github.com/zopefoundation/zope.testrunner/issues/35 - doCheck = !(isPy27 || isPy34); - meta = { description = "A flexible test runner with layer support"; homepage = http://pypi.python.org/pypi/zope.testrunner; license = licenses.zpt20; maintainers = with maintainers; [ goibhniu ]; }; - - # Python 3.5 is not yet supported. - disabled = isPy35; }; @@ -22311,11 +22311,11 @@ in modules // { zope_interface = buildPythonPackage rec { - name = "zope.interface-4.1.1"; + name = "zope.interface-4.1.3"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz"; - md5 = "edcd5f719c5eb2e18894c4d06e29b6c6"; + sha256 = "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if"; }; propagatedBuildInputs = with self; [ zope_event ]; From 37e1a9c844e3b554e18ba0bf784e908481055d95 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 11 Feb 2016 02:36:09 +0300 Subject: [PATCH 125/308] ejabberd: 15.11 -> 16.01 --- pkgs/servers/xmpp/ejabberd/default.nix | 147 ++++++++++++++----------- 1 file changed, 81 insertions(+), 66 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 2fb6f7a4b2d..f1fa6bed00c 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -17,154 +17,162 @@ let ctlpath = lib.makeSearchPath "bin" [ bash gnused gnugrep coreutils utillinux procps ]; fakegit = writeScriptBin "git" '' - #! ${stdenv.shell} - exit 0 + #! ${stdenv.shell} -e + if [ "$1" = "describe" ]; then + [ -r .rev ] && cat .rev || true + fi ''; - # These can be extracted from `rebar.config.script` + # These can be extracted from `rebar.config` # Some dependencies are from another packages. Try commenting them out; then during build # you'll get necessary revision information. ejdeps = { - p1_cache_tab = fetchFromGitHub { + cache_tab = fetchFromGitHub { owner = "processone"; repo = "cache_tab"; - rev = "f7ea12b0ba962a3d2f9a406d2954cf7de4e27230"; - sha256 = "043rz66s6vhcbk02qjhn1r8jv8yyy4gk0gsknmk7ya6wq2v1farw"; + rev = "1.0.1"; + sha256 = "1mq5vgqskb0v2pdn6i3610hzd9iyjznh8143pdbz8z57rrhxpxg4"; }; p1_tls = fetchFromGitHub { owner = "processone"; repo = "tls"; - rev = "e56321afd974e9da33da913cd31beebc8e73e75f"; - sha256 = "0k8dx8mww2ilr4y5m2llhqh673l0z7r73f0lh7klyf57wfqy7hzk"; + rev = "1.0.0"; + sha256 = "1q6l5drgmwj4fp4nfh0075lczplia4n40sirk9pd5x76d59qcmnj"; }; p1_stringprep = fetchFromGitHub { owner = "processone"; repo = "stringprep"; - rev = "3c640237a3a7831dc39de6a6d329d3a9af25c579"; - sha256 = "0mwlkivkfj16bdv80jr8kqa0vcqglxkq90m9qn0m6zp4bjc3jm3n"; + rev = "1.0.0"; + sha256 = "105xc0af61xrd4vjxrg49gxbij8x0fq4yribywa8qly303d1nwwa"; }; p1_xml = fetchFromGitHub { owner = "processone"; repo = "xml"; - rev = "1c8b016b0ac7986efb823baf1682a43565449e65"; - sha256 = "192jhj0cwwypbiass3rm2449410pqyk3mgrdg7yyvqwmjzzkmh87"; + rev = "1.1.1"; + sha256 = "07zxc8ky78sd2mcbhhrxha68arbbk8vyayn9gwi402avnqcic7cx"; }; esip = fetchFromGitHub { owner = "processone"; repo = "p1_sip"; - rev = "d662d3fe7f6288b444ea321d854de0bd6d40e022"; - sha256 = "1mwzkkv01vr9n13h6h3100jrrlgb683ncq9jymnbxqxk6rn7xjd1"; + rev = "1.0.0"; + sha256 = "02k920995b0js6srarx0rabavs428rl0dp7zz90x74l8b589zq9a"; }; p1_stun = fetchFromGitHub { owner = "processone"; repo = "stun"; - rev = "061bdae484268cbf0457ad4797e74b8516df3ad1"; - sha256 = "0zaw8yq4sk7x4ybibcq93k9b6rb7fn03i0k8gb2dnlipmbcdd8cf"; + rev = "0.9.0"; + sha256 = "0ghf2p6z1m55f5pm4pv5gj7h7fdcwcsyqz1wzax4w8bgs9id06dm"; }; p1_yaml = fetchFromGitHub { owner = "processone"; repo = "p1_yaml"; - rev = "79f756ba73a235c4d3836ec07b5f7f2b55f49638"; - sha256 = "05jjw02ay8v34izwgi5zizqp1mj68ypjilxn59c262xj7c169pzh"; + rev = "1.0.0"; + sha256 = "0is0vr8ygh3fbiyf0jb85cfpfakxmx31fqk6s4j90gmfhlbm16f8"; }; p1_utils = fetchFromGitHub { owner = "processone"; repo = "p1_utils"; - rev = "d7800881e6702723ce58b7646b60c9e4cd25d563"; - sha256 = "07p47ccrdjymjmn6rn9jlcyg515bs9l0iwfbc75qsk10ddnmbvdi"; + rev = "1.0.2"; + sha256 = "11b71bnc90riy1qplkpwx6l1yr9849jai3ckri35cavfsk35j687"; }; jiffy = fetchFromGitHub { owner = "davisp"; repo = "jiffy"; - rev = "cfc61a2e952dc3182e0f9b1473467563699992e2"; - sha256 = "1c2x71x90jlx4585znxz8fg46q3jxm80nk7v184lf4pqa1snk8kk"; + rev = "0.14.5"; + sha256 = "1xs01cl4gq1x6sjj7d1qgg4iq9iwzv3cjqjrj0kr7rqrbfqx2nq3"; }; oauth2 = fetchFromGitHub { - owner = "prefiks"; + owner = "kivra"; repo = "oauth2"; - rev = "e6da9912e5d8f658e7e868f41a102d085bdbef59"; - sha256 = "0di33bkj8xc7h17z1fs4birp8a88c1ds72jc4xz2qmz8kh7q9m3k"; + rev = "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"; + sha256 = "0mbmw6668l945iqppba991793nmmkyvvf18zxgdahxcwgxg1majn"; }; xmlrpc = fetchFromGitHub { owner = "rds13"; repo = "xmlrpc"; - rev = "42e6e96a0fe7106830274feed915125feb1056f3"; - sha256 = "10dk480s6z653lr5sap4rcx3zsfmg68hgapvc4jvcyf7vgg12d3s"; + rev = "1.15"; + sha256 = "0ihwag2hgw9rswxygallc4w1yipgpd6arw3xpr799ib7ybsn8x81"; }; p1_mysql = fetchFromGitHub { owner = "processone"; repo = "mysql"; - rev = "dfa87da95f8fdb92e270741c2a53f796b682f918"; - sha256 = "1nw7n1xvid4yqp57s94drdjf6ffap8zpy8hkrz9yffzkhk9biz5y"; + rev = "1.0.0"; + sha256 = "1v3g75hhfpv5bnrar23y7lsk3pd02xl5cy4mj13j0qxl6bc4dgss"; }; p1_pgsql = fetchFromGitHub { owner = "processone"; repo = "pgsql"; - rev = "e72c03c60bfcb56bbb5d259342021d9cb3581dac"; - sha256 = "0y89995h7g8bi12qi1m4cdzcswsljbv7y8zb43rjg5ss2bcq7kb6"; + rev = "1.0.0"; + sha256 = "1r7dkjzxhwplmhvgvdx990xn98gpslckah5jpkx8c2gm9nj3xi33"; }; sqlite3 = fetchFromGitHub { owner = "alexeyr"; repo = "erlang-sqlite3"; - rev = "8350dc603804c503f99c92bfd2eab1dd6885758e"; - sha256 = "0d0pbqmi3hsvzjp4vjp7a6bq3pjvkfv0spszh6485x9cmxsbwfpc"; + rev = "cbc3505f7a131254265d3ef56191b2581b8cc172"; + sha256 = "1xrvygv0zhslsqf8044m5ml1zr6di7znvv2zycg3amsz190w0w2g"; }; p1_pam = fetchFromGitHub { owner = "processone"; repo = "epam"; - rev = "d3ce290b7da75d780a03e86e7a8198a80e9826a6"; - sha256 = "0s0czrgjvc1nw7j66x8b9rlajcap0yfnv6zqd4gs76ky6096qpb0"; + rev = "1.0.0"; + sha256 = "0dlbmfwndhyg855vnhwyccxcjqzf2wcgc7522mjb9q38cva50rpr"; }; p1_zlib = fetchFromGitHub { owner = "processone"; repo = "zlib"; - rev = "e3d4222b7aae616d7ef2e7e2fa0bbf451516c602"; - sha256 = "0z960nwva8x4lw1k91i53kpn2bjbf1v1amslkyp8sx2gc5zf0gbn"; + rev = "1.0.0"; + sha256 = "1a6m7wz6cbb8526fwhmgm7mva62absmvyjm8cjnq7cs0mzp18r0m"; + }; + hamcrest = fetchFromGitHub { + owner = "hyperthunk"; + repo = "hamcrest-erlang"; + rev = "908a24fda4a46776a5135db60ca071e3d783f9f6"; + sha256 = "0irxidwrb37m0xwls6q9nn2zfs3pyxrgbnjgrhnh7gm35ib51hkj"; }; riakc = fetchFromGitHub { owner = "basho"; repo = "riak-erlang-client"; - rev = "1.4.2"; - sha256 = "128jz83n1990m9c2fzwsif6hyapmq46720nzfyyb4z2j75vn85zz"; + rev = "527722d12d0433b837cdb92a60900c2cb5df8942"; + sha256 = "13rkwibsjsl2gdysvf11r1hqfrf89hjgpa0x0hz2910f2ryqll3y"; }; # dependency of riakc riak_pb = fetchFromGitHub { owner = "basho"; repo = "riak_pb"; - rev = "1.4.4.0"; - sha256 = "054fg9gaxk4n0id0qs6k8i919qvxsvmh76m6fgfbmixyfxh5jp3w"; + rev = "2.1.0.7"; + sha256 = "1p0qmjq069f7j1m29dv36ayvz8m0pcm94ccsnv5blykfg2c5ja0c"; }; # dependency of riak_pb protobuffs = fetchFromGitHub { owner = "basho"; repo = "erlang_protobuffs"; - rev = "0.8.1p1"; - sha256 = "1x75a26y1gx6pzr829i4sx2mxm5w40kb6hfd5y511him56jcczna"; + rev = "0.8.2"; + sha256 = "0w4jmsnc9x2ykqh1q6b12pl8a9973dxdhqk3y0ph17n83q5xz3h7"; }; rebar_elixir_plugin = fetchFromGitHub { - owner = "yrashk"; + owner = "processone"; repo = "rebar_elixir_plugin"; - rev = "7058379b7c7e017555647f6b9cecfd87cd50f884"; - sha256 = "1s5bvbrhal866gbp72lgp0jzphs2cmgmafmka0pylwj30im41c71"; + rev = "0.1.0"; + sha256 = "0x04ff53mxwd9va8nl4m70dbamp6p4dpxs646c168iqpnpadk3sk"; }; elixir = fetchFromGitHub { owner = "elixir-lang"; repo = "elixir"; - rev = "1d9548fd285d243721b7eba71912bde2ffd1f6c3"; - sha256 = "1lxn9ly73rm797p6slfx7grsq32nn6bz15qhkbra834rj01fqzh8"; + rev = "v1.1.0"; + sha256 = "0r5673x2qdvfbwmvyvj8ddvzgxnkl3cv9jsf1yzsxgdifjbrzwx7"; }; p1_iconv = fetchFromGitHub { owner = "processone"; repo = "eiconv"; - rev = "8b7542b1aaf0a851f335e464956956985af6d9a2"; - sha256 = "1w3k41fpynqylc2vnirz0fymlidpz0nnym0070f1f1s3pd6g5906"; + rev = "0.9.0"; + sha256 = "1ikccpj3aq6mip6slrq8c7w3kilpb82dr1jdy8kwajmiy9cmsq97"; }; lager = fetchFromGitHub { owner = "basho"; repo = "lager"; - rev = "4d2ec8c701e1fa2d386f92f2b83b23faf8608ac3"; - sha256 = "03aav3cid0qpl1n8dn83hk0p70rw05nqvhq1abdh219nrlk9gfmx"; + rev = "3.0.2"; + sha256 = "04l40dlqpl2y6ddpbpknmnjf537bjvrmg8r0jnmw1h60dgyb2ydk"; }; # dependency of lager goldrush = fetchFromGitHub { @@ -176,31 +184,31 @@ let p1_logger = fetchFromGitHub { owner = "processone"; repo = "p1_logger"; - rev = "3e19507fd5606a73694917158767ecb3f5704e3f"; - sha256 = "0mq86gh8x3bgqcpwdjkdn7m3bj2006gbarnj7cn5dfs21m2h2mdn"; + rev = "1.0.0"; + sha256 = "0z11xsr139a75w09syjws4sja6ky2l9rsrwkjr6wcl7p1jz02h4r"; }; meck = fetchFromGitHub { owner = "eproxus"; repo = "meck"; - rev = "fc362e037f424250130bca32d6bf701f2f49dc75"; - sha256 = "056yca394f8mbg8vwxxlq47dbjx48ykdrg4lvnbi5gfijl786i3s"; + rev = "0.8.2"; + sha256 = "0s4qbvryap46cz63awpbv5zzmlcay5pn2lixgmgvcjarqv70cbs7"; }; eredis = fetchFromGitHub { owner = "wooga"; repo = "eredis"; - rev = "770f828918db710d0c0958c6df63e90a4d341ed7"; - sha256 = "0qv8hldn5972328pa1qz2lbblw1p2283js5y98dc8papldkicvmm"; + rev = "v1.0.8"; + sha256 = "10fr3kbc2nd2liggsq4y77nfirndzapcxzkjgyp06bpr9cjlvhlm"; }; }; in stdenv.mkDerivation rec { - version = "15.11"; + version = "16.01"; name = "ejabberd-${version}"; src = fetchurl { url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "0sll1si9pd4v7yibzr8hp18hfrbxsa5nj9h7qsldvy7r4md4n101"; + sha256 = "10fnsw52gxybw731yka63ma8mj39g4i0nsancwp9nlvhb2flgk72"; }; nativeBuildInputs = [ fakegit ]; @@ -216,13 +224,13 @@ in stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; depsNames = - [ "p1_cache_tab" "p1_tls" "p1_stringprep" "p1_xml" "esip" "p1_stun" "p1_yaml" "p1_utils" "jiffy" "oauth2" "xmlrpc" ] + [ "cache_tab" "p1_tls" "p1_stringprep" "p1_xml" "esip" "p1_stun" "p1_yaml" "p1_utils" "jiffy" "oauth2" "xmlrpc" ] ++ lib.optional withMysql "p1_mysql" ++ lib.optional withPgsql "p1_pgsql" ++ lib.optional withSqlite "sqlite3" ++ lib.optional withPam "p1_pam" ++ lib.optional withZlib "p1_zlib" - ++ lib.optionals withRiak [ "riakc" "riak_pb" "protobuffs" ] + ++ lib.optionals withRiak [ "hamcrest" "riakc" "riak_pb" "protobuffs" ] ++ lib.optionals withElixir [ "rebar_elixir_plugin" "elixir" ] ++ lib.optional withIconv "p1_iconv" ++ lib.optionals withLager [ "lager" "goldrush" ] @@ -232,8 +240,7 @@ in stdenv.mkDerivation rec { ; configureFlags = - [ "--enable-nif" - (lib.enableFeature withMysql "mysql") + [ (lib.enableFeature withMysql "mysql") (lib.enableFeature withPgsql "pgsql") (lib.enableFeature withSqlite "sqlite") (lib.enableFeature withPam "pam") @@ -247,6 +254,7 @@ in stdenv.mkDerivation rec { ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}"; depsPaths = map (x: builtins.getAttr x ejdeps) depsNames; + depsRevs = map (x: x.rev) depsPaths; enableParallelBuilding = true; @@ -254,12 +262,19 @@ in stdenv.mkDerivation rec { mkdir deps depsPathsA=( $depsPaths ) depsNamesA=( $depsNames ) + depsRevsA=( $depsRevs ) for i in {0..${toString (builtins.length depsNames - 1)}}; do - cp -R ''${depsPathsA[$i]} deps/''${depsNamesA[$i]} + path="deps/''${depsNamesA[$i]}" + cp -R ''${depsPathsA[$i]} "$path" + chmod -R +w "$path" + echo "''${depsRevsA[$i]}" > "$path/.rev" done - chmod -R +w deps touch deps/.got patchShebangs . + + for i in deps/*; do + [ -x "$i/configure" ] && ( cd "$i"; ./configure ) || true + done ''; postInstall = '' From 6a0f9ba6f6444d7d42f87d4a6b013ec61f862e37 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Thu, 11 Feb 2016 05:53:03 +0000 Subject: [PATCH 126/308] htop: 1.0.3-239-229d0058 -> 2.0.0 --- pkgs/os-specific/linux/htop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix index da41c95dda2..b722815f295 100644 --- a/pkgs/os-specific/linux/htop/default.nix +++ b/pkgs/os-specific/linux/htop/default.nix @@ -1,11 +1,11 @@ { fetchFromGitHub, stdenv, autoreconfHook, ncurses }: stdenv.mkDerivation rec { - name = "htop-1.0.3-239-229d0058"; + name = "htop-2.0.0"; src = fetchFromGitHub { - sha256 = "1bym6ligd8db4iyv2m1y7aylh7f9fmk71v67rkhird05hx1xb80r"; - rev = "229d005851af8dca595b3df8e385375fb9c382b4"; + sha256 = "1z8rzf3ndswk3090qypl0bqzq9f32w0ik2k5x4zd7jg4hkx66k7z"; + rev = "2.0.0"; repo = "htop"; owner = "hishamhm"; }; From 2d7375e64989912dd622eb9cb7385fb3a1902054 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 11 Feb 2016 15:54:19 +0900 Subject: [PATCH 127/308] libao: add dependencies for Darwin frameworks --- pkgs/development/libraries/libao/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index a8948e8ae8c..c0a6d4b6b1f 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap +, CoreAudio, CoreServices, AudioUnit , usePulseAudio }: stdenv.mkDerivation rec { @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ] ++ lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++ - lib.optional stdenv.isLinux libcap; + lib.optional stdenv.isLinux libcap ++ + lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; meta = { longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 046d3cdaa1f..f541c5feac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7074,6 +7074,7 @@ let libao = callPackage ../development/libraries/libao { usePulseAudio = config.pulseaudio or true; + inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; libabw = callPackage ../development/libraries/libabw { }; From 86c2a0f783b3225bf46828d677b65c95cc544b3f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Feb 2016 11:21:20 +0100 Subject: [PATCH 128/308] mediawiki: 1.23.9 -> 1.23.13 --- nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 52d8c89baff..0fe8d1a89cf 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -83,11 +83,11 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.23.9"; + name= "mediawiki-1.23.13"; src = pkgs.fetchurl { url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz"; - sha256 = "1l7k4g0pgz92yvrfr52w26x740s4362v0gc95pk0i30vn2sp5bql"; + sha256 = "168wpf53n4ksj2g5q5r0hxapx6238dvsfng5ff9ixk6axsn0j5d0"; }; skins = config.skins; From b061225c54356e5ae6ec8c5cf9de40f01d8e8fae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Feb 2016 11:22:15 +0100 Subject: [PATCH 129/308] php: 5.6.17 -> 5.6.18 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index c963c01e65b..66a686d78ec 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -298,8 +298,8 @@ in { }; php56 = generic { - version = "5.6.17"; - sha256 = "0fyxg95m918ngi6lnxyfb4y0ii4f8f5znb5l4axpagp6l5b5zd3p"; + version = "5.6.18"; + sha256 = "1vgl2zjq6ws5cjjb3llhwpfwg9gasq3q84ibdv9hj8snm4llmkf3"; }; php70 = generic { From 42634fe6ccc62341de56f738e412951af389f84c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Feb 2016 11:22:51 +0100 Subject: [PATCH 130/308] php: 5.5.31 -> 5.5.32 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 66a686d78ec..1c06ecaef2e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -293,8 +293,8 @@ in { }; php55 = generic { - version = "5.5.31"; - sha256 = "0xx23gb70jsgbd772hy8f79wh2rja617s17gnx4vgklxk8mkhjpv"; + version = "5.5.32"; + sha256 = "1vljdvyqsq0vas4yhvpqycqyxl2gfndbmak6cfgxn1cfvc4c3wmh"; }; php56 = generic { From fc84ee22df2a6d14b638a93c0e802c033233f21e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Feb 2016 11:27:34 +0100 Subject: [PATCH 131/308] php: Remove version 5.4 which is EOL --- pkgs/development/interpreters/php/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 6 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 1c06ecaef2e..5503ee9c887 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -287,11 +287,6 @@ let in { - php54 = generic { - version = "5.4.45"; - sha256 = "10k59j7zjx2mrldmgfvjrrcg2cslr2m68azslspcz5acanqjh3af"; - }; - php55 = generic { version = "5.5.32"; sha256 = "1vljdvyqsq0vas4yhvpqycqyxl2gfndbmak6cfgxn1cfvc4c3wmh"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f541c5feac8..74488951ad7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5309,7 +5309,6 @@ let }); inherit (callPackages ../development/interpreters/php { }) - php54 php55 php56 php70; From ccece1ca88cac4f665cb956164de48eadd2c3907 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 11 Feb 2016 13:46:33 +0300 Subject: [PATCH 132/308] dspam service: restart on failure --- nixos/modules/services/mail/dspam.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index 10352ba6abc..f18fd489f23 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -109,6 +109,9 @@ in { Group = cfg.group; RuntimeDirectory = optional (cfg.domainSocket == defaultSock) "dspam"; PermissionsStartOnly = true; + # DSPAM segfaults on just about every error + Restart = "on-failure"; + RestartSec = "1s"; }; preStart = '' From 39711944906d17ad1127e39cf2d9b634b4f3b195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 11 Feb 2016 11:29:10 -0200 Subject: [PATCH 133/308] opensmtpd: compile with support for 'db' tables --- pkgs/servers/mail/opensmtpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index cb098a84a94..1d92a5edc44 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "--with-queue-user=smtpq" "--with-ca-file=/etc/ssl/certs/ca-certificates.crt" "--with-libevent-dir=${libevent}" + "--enable-table-db" ]; installFlags = [ From f8d0ba744732f1840d7f38a3b35c1895bfce96e0 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 9 Feb 2016 16:47:04 +0100 Subject: [PATCH 134/308] nntp-proxy: init at 2014-01-06 (0358e7a) --- lib/maintainers.nix | 1 + .../networking/nntp-proxy/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/nntp-proxy/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index db6a55a283f..f3a5717c649 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -105,6 +105,7 @@ ertes = "Ertugrul Söylemez "; exi = "Reno Reckling "; exlevan = "Alexey Levan "; + fadenb = "Tristan Helmich "; falsifian = "James Cook "; flosse = "Markus Kohlhase "; fluffynukeit = "Daniel Austin "; diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix new file mode 100644 index 00000000000..05333f67ecf --- /dev/null +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }: + +stdenv.mkDerivation rec { + name = "nntp-proxy-${version}"; + version = "2014-01-06"; + + src = fetchFromGitHub { + owner = "nieluj"; + repo = "nntp-proxy"; + rev = "0358e7ad6c4676f90ac5074320b16e1461b0011a"; + sha256 = "0jwxh71am83fbnq9mn06jl06rq8qybm506js79xmmc3xbk5pqvy4"; + }; + + buildInputs = [ libconfig pkgconfig libevent openssl ]; + + installFlags = "INSTALL_DIR=\${out}/bin/"; + + preInstall = '' + mkdir -p $out/bin + substituteInPlace Makefile \ + --replace /usr/bin/install $(type -P install) + ''; + + meta = { + description = "Simple NNTP proxy with SSL support"; + homepage = https://github.com/nieluj/nntp-proxy; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74488951ad7..1e94b1ca90c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8044,6 +8044,8 @@ let nix = pkgs.nixUnstable; }; + nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; + non = callPackage ../applications/audio/non { }; nspr = callPackage ../development/libraries/nspr { }; From 4f7555683a5fdefa7c7e25e1943c60c57102d21e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 11 Feb 2016 16:28:02 +0100 Subject: [PATCH 135/308] youtube-dl: remove all-packages deprecation yt-dl is both a library and an executable, as such it should have a reference in all-packages. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 662905129e5..df56303c774 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14073,6 +14073,8 @@ let inherit (gnome3) yelp; + inherit (pythonPackages) youtube-dl; + qgis = callPackage ../applications/gis/qgis {}; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { @@ -16040,7 +16042,6 @@ aliases = with self; rec { x11 = xlibsWrapper; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 - youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 vimbWrapper = vimb; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01 From a7a49539839a7dec8658641b17847639f9e5e3c2 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 11 Feb 2016 16:31:43 +0100 Subject: [PATCH 136/308] alot: create top-level binding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since it’s an executable. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 662905129e5..55c77464fc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11216,6 +11216,8 @@ let alock = callPackage ../misc/screensavers/alock { }; + inherit (python2Packages) alot; + alpine = callPackage ../applications/networking/mailreaders/alpine { tcl = tcl-8_5; }; From 53f231d9e0a07dbdc7bc5fd19b323b6bfd4ea3b7 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Thu, 11 Feb 2016 17:36:48 +0100 Subject: [PATCH 137/308] synergy: 1.7.4 -> 1.7.5 repository has moved --- pkgs/applications/misc/synergy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index ac60d928587..16323bd2257 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "synergy-${version}"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { - owner = "synergy"; + owner = "symless"; repo = "synergy"; rev = "v${version}-stable"; - sha256 = "0pxj0qpnsaffpaxik8vc5rjfinmx8ab3b2lssrxkfbs7isskvs33"; + sha256 = "02zv8m7yagx80wi7m0ckglfqjqyrj6rd1gywxzqzl6841scmf87n"; }; postPatch = '' From fc8a16f4edf052ba71ec7dcd289769fdf512ae87 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Thu, 11 Feb 2016 08:44:00 -0800 Subject: [PATCH 138/308] unifi: LD_LIBRARY_PATH hack for embedded libsnappyjava.so, fixes #12897 --- nixos/modules/services/networking/unifi.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index be8f12ecd32..4dc0cd96904 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -61,6 +61,8 @@ in partOf = systemdMountPoints; bindsTo = systemdMountPoints; unitConfig.RequiresMountsFor = stateDir; + # This a HACK to fix missing dependencies of dynamic libs extracted from jars + environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc}/lib"; preStart = '' # Ensure privacy of state From 930fce89018526946b9f16db373fddf1f565e8f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Feb 2016 19:01:40 +0100 Subject: [PATCH 139/308] mcelog: 130 -> 131 Don't error out when MCE write fails. --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 9abd6397e85..c185d69c554 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "130"; + version = "131"; src = fetchFromGitHub { - sha256 = "05yszlhd6kljx371nlgrzjs0fi44wwgxcv2j5rwwgklm6ifp2zza"; + sha256 = "1hqb06gdx5bw4jh6xix0z5qhi4956asykf43zk1m1mjsj8lkzaps"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From fce433a6c04237d64037b48744e1cb6abf5cf8e7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Feb 2016 19:23:05 +0100 Subject: [PATCH 140/308] wcslib: 5.13 -> 5.14 --- pkgs/development/libraries/wcslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 12741379aaa..b6ca281f053 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "5.13"; + version = "5.14"; name = "wcslib-${version}"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; - sha256 ="1rxlp7p1b84r9fnk7m9p2ivg2cajfj88afyccrg64zlrqn5kx66n"; + sha256 ="0zz3747m6gjzglgsqrrslwk2qkb6swsx8gmaxa459dvbcg914gsd"; }; enableParallelBuilding = true; From 8a35315a2000336f0f785022cd56968889d8f1e0 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Thu, 11 Feb 2016 19:49:33 +0100 Subject: [PATCH 141/308] gollum: init at 4.0.1 --- pkgs/applications/misc/gollum/Gemfile | 2 + pkgs/applications/misc/gollum/Gemfile.lock | 55 +++++++ pkgs/applications/misc/gollum/default.nix | 18 +++ pkgs/applications/misc/gollum/gemset.nix | 170 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 247 insertions(+) create mode 100644 pkgs/applications/misc/gollum/Gemfile create mode 100644 pkgs/applications/misc/gollum/Gemfile.lock create mode 100644 pkgs/applications/misc/gollum/default.nix create mode 100644 pkgs/applications/misc/gollum/gemset.nix diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/applications/misc/gollum/Gemfile new file mode 100644 index 00000000000..525f54838b7 --- /dev/null +++ b/pkgs/applications/misc/gollum/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'gollum' diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock new file mode 100644 index 00000000000..074a0c6fa43 --- /dev/null +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -0,0 +1,55 @@ +GEM + remote: https://rubygems.org/ + specs: + charlock_holmes (0.7.3) + diff-lcs (1.2.5) + github-markup (1.3.3) + gitlab-grit (2.7.3) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (~> 1.15) + posix-spawn (~> 0.3) + gollum (4.0.1) + gollum-lib (~> 4.0, >= 4.0.1) + kramdown (~> 1.8.0) + mustache (>= 0.99.5, < 1.0.0) + sinatra (~> 1.4, >= 1.4.4) + useragent (~> 0.14.0) + gollum-grit_adapter (1.0.0) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.1.0) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.9) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + kramdown (1.8.0) + mime-types (1.25.1) + mini_portile2 (2.0.0) + mustache (0.99.8) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + posix-spawn (0.3.11) + rack (1.6.4) + rack-protection (1.5.3) + rack + rouge (1.10.1) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + stringex (2.5.2) + tilt (2.0.2) + useragent (0.14.0) + +PLATFORMS + ruby + +DEPENDENCIES + gollum + +BUNDLED WITH + 1.10.6 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix new file mode 100644 index 00000000000..1c58aec0233 --- /dev/null +++ b/pkgs/applications/misc/gollum/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, bundlerEnv, ruby_2_2, icu, zlib }: + +bundlerEnv rec { + name = "gollum-${version}"; + version = "4.0.1"; + + ruby = ruby_2_2; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A simple, Git-powered wiki"; + license = licenses.mit; + maintainers = with maintainers; [ jgillich ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix new file mode 100644 index 00000000000..f0c71fa455c --- /dev/null +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -0,0 +1,170 @@ +{ + useragent = { + version = "0.14.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "124r3mgkw1zjymsqq9r25zh1vwjrjgiji5fm620z53lpmmryj22j"; + }; + }; + tilt = { + version = "2.0.2"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84"; + }; + }; + stringex = { + version = "2.5.2"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17"; + }; + }; + sinatra = { + version = "1.4.7"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; + }; + }; + sanitize = { + version = "2.1.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + }; + }; + rouge = { + version = "1.10.1"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz"; + }; + }; + rack-protection = { + version = "1.5.3"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + }; + }; + rack = { + version = "1.6.4"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + }; + }; + posix-spawn = { + version = "0.3.11"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr"; + }; + }; + nokogiri = { + version = "1.6.7.2"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; + }; + }; + mustache = { + version = "0.99.8"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + }; + }; + mini_portile2 = { + version = "2.0.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; + }; + }; + mime-types = { + version = "1.25.1"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + }; + }; + kramdown = { + version = "1.8.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0ryqq055h5n10c1cfba6pxsssa907l2hkw29anp0d41ryh47ca2l"; + }; + }; + gollum-lib = { + version = "4.1.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm"; + }; + }; + gollum-grit_adapter = { + version = "1.0.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7"; + }; + }; + gollum = { + version = "4.0.1"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "02pgx083sns75zgnqx94p5h5bpr7cfiw5mys4ayb4k33hcjm6ydg"; + }; + }; + gitlab-grit = { + version = "2.7.3"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b"; + }; + }; + github-markup = { + version = "1.3.3"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq"; + }; + }; + diff-lcs = { + version = "1.2.5"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; + }; + }; + charlock_holmes = { + version = "0.7.3"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 662905129e5..be33897d1a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12225,6 +12225,8 @@ let inherit (gnome) GConf; }; + gollum = callPackage ../applications/misc/gollum { }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; }; googleearth = callPackage_i686 ../applications/misc/googleearth { }; From b861bf8ddff677031e93a8e1c55311be63e0eb63 Mon Sep 17 00:00:00 2001 From: Ben Booth Date: Thu, 11 Feb 2016 12:05:15 -0800 Subject: [PATCH 142/308] Remove double-backslashes from grub conf file The double-backspashes in the splashimage, kernel, and initrd sections serve no purpose and confuse pygrub --- nixos/modules/system/boot/loader/grub/install-grub.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index b8ef02da4bc..8da564bda15 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -228,7 +228,7 @@ if ($grubVersion == 1) { "; if ($splashImage) { copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n"; - $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n"; + $conf .= "splashimage " . Cwd::abs_path($grubBoot->path . "/background.xpm.gz") . "\n"; } } @@ -327,9 +327,9 @@ sub addEntry { my ($name, $path) = @_; return unless -e "$path/kernel" && -e "$path/initrd"; - my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); - my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd")); - my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; + my $kernel = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/kernel"))); + my $initrd = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/initrd"))); + my $xen = -e "$path/xen.gz" ? Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/xen.gz"))) : undef; # FIXME: $confName From 39bd42e650b5a6496b4ba2553fda5f1f4dfff2b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Feb 2016 21:34:49 +0100 Subject: [PATCH 143/308] libpsl: list 2016-02-06 -> 2016-02-09 --- pkgs/development/libraries/libpsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index d4d24db84b9..535c5cfeb65 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-02-06"; + listVersion = "2016-02-09"; listSources = fetchFromGitHub { - sha256 = "0jh1fbfyi9zdhw77brfdkw7mcbr03dqww8yv703kp69fqhyf2pln"; - rev = "0efc1a2f0ec93163273f6c5c2f511a19f5cd5805"; + sha256 = "17jxkwdd2l6aycg2q5img8gad3pb9k6fgikf87dybl3ydn0bpdja"; + rev = "73668f743df8125477d38690807e3a9a1e1e9f19"; repo = "list"; owner = "publicsuffix"; }; From be0abb32f6a049fc5713f6b9235f01e4c6a1efcf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Feb 2016 21:36:33 +0100 Subject: [PATCH 144/308] miniupnpd: 1.9.20160113 -> 1.9.20160209 Changes: https://github.com/miniupnp/miniupnp/blob/master/miniupnpd/Changelog.txt --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index e88ae7a1403..7334ecc3e92 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-1.9.20160113"; + name = "miniupnpd-1.9.20160209"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "084ii5vb54rr8sg50cqvsw5rj6linj23p3gnxwfyl100dkkgvcaa"; + sha256 = "0r4giqsr39s17mn9lmmy3zawrfj7kj9im7nzv7mx3rgz2ncw092z"; name = "${name}.tar.gz"; }; From 2671d4ffdbdb016439ce978aef5534367c407413 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 12 Feb 2016 00:14:01 +0100 Subject: [PATCH 145/308] wireless-regdb: 2015-12-14 -> 2016-02-08 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 123cb7a6208..3c74123d605 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "wireless-regdb-${version}"; - version = "2015-12-14"; + version = "2016-02-08"; src = fetchgit { - sha256 = "1ldfcxn3mdb104czy78b7nj1clsbfp8fc6mshix98zq0bg4k7rsm"; + sha256 = "0cqnkkcni27ya6apy2ba4im7xj4nrhbcgrahlarvrzbbjkp740m9"; url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git; rev = "refs/tags/master-${version}"; }; From ccf73a5f675cf969ef78f948495a8156501bceff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 12 Feb 2016 00:17:39 +0100 Subject: [PATCH 146/308] cassandra: 2.1.12 -> 2.1.13 --- pkgs/servers/nosql/cassandra/2.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index cac8eb3fba8..d0f70a554f7 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -11,8 +11,8 @@ let - version = "2.1.12"; - sha256 = "0ngibzw7lx2nppzsq5hn6adbkyzns6bnhsrkllqpimyjf27sjfq1"; + version = "2.1.13"; + sha256 = "09b3vf5jsv70xlfimj30v8l1zw7c5xdgpw5fpmn6jh8n3gigybqh"; in From 447851b9d28211f93faf41a0cd9809aee14241e4 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 11 Feb 2016 23:31:41 +0000 Subject: [PATCH 147/308] jruby: 1.7.21 -> 9.0.5.0 --- pkgs/development/interpreters/jruby/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index bc76abb4546..1d05f9406b4 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "1.7.21"; + version = "9.0.5.0"; src = fetchurl { - url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha1 = "4955b69a913b22f96bd599eff2a133d8d1ed42c6"; + url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; + sha256 = "1wysymqzc7591743f2ycgwpm232y6i050izn72lck44nhnyr5wwy"; }; buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -pv $out + mkdir -pv $out/docs mv * $out rm $out/bin/*.{bat,dll,exe,sh} mv $out/COPYING $out/LICENSE* $out/docs From 6d3f909975c8288c8ff8bcbcbd849725a40a86f6 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 12 Feb 2016 10:15:23 +0900 Subject: [PATCH 148/308] firefox-bin: 44.0.1 -> 44.0.2 --- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index ba9bae4ff92..31ec6f313a8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_sources.rb > sources.nix { - version = "44.0.1"; + version = "44.0.2"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha256 = "eefd2889153dc96737781580089fb0db11e02118d9b6e57da3f25ae586e56597"; } - { locale = "ach"; arch = "linux-x86_64"; sha256 = "80c7e6efe4334fbdc7060f779a4cb559ebc4516adcd6bdf9f22a986e75e809cd"; } - { locale = "af"; arch = "linux-i686"; sha256 = "452595636217272dde5adc98202fd39204fe6e9d5fb82c942499b5b27db38bd2"; } - { locale = "af"; arch = "linux-x86_64"; sha256 = "1e746adb9cadaa0ae7014b9b88076ae622f846f117465609367808ee351b33c2"; } - { locale = "an"; arch = "linux-i686"; sha256 = "4bbcc5ba7d917ff4a824c917a204710305bc500b990c0449a905adb967a2e851"; } - { locale = "an"; arch = "linux-x86_64"; sha256 = "2f724f9ccf43b419df2b70d9dfc4ebe779c332a398d17a38e761367de56ed658"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "a9827a7430453c0485708d4473e5267f00127940c9878b9ba67a4698d3efbe1a"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "3422c0378d7fd37efdcdf56fecfc0295414ed3911ceac1f96fc21e6d7775363d"; } - { locale = "as"; arch = "linux-i686"; sha256 = "5c6d72b827db06cf813d80ebfb78a79b24e1037ba53e61b1fb51ed43bb841671"; } - { locale = "as"; arch = "linux-x86_64"; sha256 = "09132af34d7ada1657a466243a17517de4aa7f6f62bf10af777da3a619b465a1"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "b544ded04a9fc7c7cc2d67cc70a3290c483cec18fe443f51d0f897aa3f60c416"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "6dda16d4f4eb05674cf6b29940241d99322793b5d306fe7c61ad17573ffdc3f0"; } - { locale = "az"; arch = "linux-i686"; sha256 = "c115cbdbf94d7fa0c008e676c9c39429d13f702fca70f656cd571ac008a74772"; } - { locale = "az"; arch = "linux-x86_64"; sha256 = "639547d368a06150405ae8bb12354db3c03fbe602410a89e21709b7f6617f24a"; } - { locale = "be"; arch = "linux-i686"; sha256 = "7144c4b0dffec65578b4211a04962bcd93b312977dc61356f0d4f6f6a75c872d"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "57504daaa8d8d02877949dbc14a6791ef6205712e3dfe70e6a46cc76f9b6725a"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "e198c83f7986bee52b772bd44d8642d0b4385262c93cd73423fbb8d9b97c96e6"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "cb66cc10fba3ea5cfab4461f0bd2d26cc1f0816770baf16fd74bda27f6566c8e"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "c31e2c1aa1ce0965f800b13e88127b02d47657519edead877a5c32c5420acabb"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "00bfd63c8950879217ed045caa5d19839e1c9fb38eeeaad933c23eaadeba7296"; } - { locale = "bn-IN"; arch = "linux-i686"; sha256 = "580d9f884aba059968d25e25c2c112318d8015eb5fa29013cf96f49fd620b039"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "30029721b59b1e7fbce580e58019922e61ae751712ca27300c9a125a453e7853"; } - { locale = "br"; arch = "linux-i686"; sha256 = "67e682bfca447d11d2433fa1977e482a9693842e3f98c199afb1b8e41774e9e7"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "8442b995879ab6120bdd259606231b0daf8619abe099a1525f826611a5c34347"; } - { locale = "bs"; arch = "linux-i686"; sha256 = "72f78a32441a03232ae22d86ac0023674b7d6ed57ea9990244252bea35a8b681"; } - { locale = "bs"; arch = "linux-x86_64"; sha256 = "cfdf126ffbfb3b8359c8d01e72fb1e462df102eb458021e66295b5754065b72a"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "53bccb498b5510de99f4d54a5c279f499a92a8fbbec79be68737ef06e5c18325"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "6905d7d8f8cae2192af022cbfe158b77ee02afa26f25e5ade6cfd747a8836119"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "7d8e61f1021064c41f8f6b82ae50dff272f64242d6ab289722a0ee246b141b1f"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "409d1b2c1ce1ae294c530acde139bca076fa20d71825007f08698b51ef0a30b2"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "fc982e9355ea15ff40c998def2f3983933077fc726eab348fbd6ec72d3369cec"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "6a61f1ec194b6235561f2420fba7477a549eeadc3b54dd013c7754dc3c75180b"; } - { locale = "da"; arch = "linux-i686"; sha256 = "7ffbbc279ee6bf587847b4f66c8a5ab968163410a6c9c84227f0df25366f892b"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "7601928a20df30262df46ed1a1127fcfa4710ee7bdc951cb3ef295e20a2e2fea"; } - { locale = "de"; arch = "linux-i686"; sha256 = "b3a079e15c3551b9b62c4cf11decacfaafac6f8e1765c6d19c53aaadbeaa9e8d"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "0b13215b6f1768735cf58b87dc76b3248d196acfd21377da2095177ea8e6072d"; } - { locale = "dsb"; arch = "linux-i686"; sha256 = "568c330a6c397b45cc416d7b4f0086ec75077690ca6902bc7931e795b6eb9848"; } - { locale = "dsb"; arch = "linux-x86_64"; sha256 = "17a0be9e81a35aee281c32a78cfd3c7d34455560d29c423cdf91e8142cc1389d"; } - { locale = "el"; arch = "linux-i686"; sha256 = "77e4a8fe8da982bda24767d7ff499ffb835ac28599933bba7465e7fa90232461"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "8b48f3a412c60c4619c210724372611b7b701c5db21b805ca854aef3c823d83d"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "def26268d266206a8c2b8f5f0b91a74224a1b2d54c70790e00389593e703d09c"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9c1f7d3ab81a025434023551b77021750634f9a468bc8d892be7e13ccaa7914c"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "fda066d70c87669f69c035af9bef327948f71b07c347633967bdd5c78c02beff"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "bf9d192670b516f393c20292580661b323e2ac88c90771b6834d0f46e86823c1"; } - { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9e643d372d31cd1cbc376f7cd3a8e8da95adfdec62057e789bb4be7cda5afe66"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "b109109d6c2efa55c68778eaa21d7ada28074ad3008fe4a123107f962240a2ad"; } - { locale = "eo"; arch = "linux-i686"; sha256 = "8ae463d0f9608689bc4f9d60ceaa30260cf40b6408a2477a542e8fccb2c94b6b"; } - { locale = "eo"; arch = "linux-x86_64"; sha256 = "6853d5d4834839070325a2a5cfbb0610891cf774d015f2d43d9cf42435e0f2df"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "fa0a952c771cd5e124c66066854767141667678cc281f783ab179f71c0a935b0"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "434fd1e7a9ce25a649c7078396319a8234e96bb535b45b2edc02fc9c9e38c04b"; } - { locale = "es-CL"; arch = "linux-i686"; sha256 = "d95d1cbfd606be0b41d6281c6e2c60d53fb96bb1afcbaf3bc8331cc2dca4041a"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "118dca4966717667718b08b238466cab116683e91bcc9c3260990b89192e3e3e"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "efbe0a6c224d2593df791fbcd3b149dc157d9ae114aa8e2ad170e987da6d74e7"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "80d5a5dcfa14b1bf77b665e668fd7734d51251a5f908fcacbe73690116dac466"; } - { locale = "es-MX"; arch = "linux-i686"; sha256 = "7786740923cb23542f0c9fc94169f4850e4f47c9ef4ee190e6995e6593374858"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "e8e281e6594bd3d6f8b6ac0fd13ce8794df59a72f33396247183aa10c5a33f75"; } - { locale = "et"; arch = "linux-i686"; sha256 = "71d575d33f9f4cea252e87d000c9d0660174c247b2ccb41421891eede42bcb1f"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "5408fb992704293a2da2ebf1c671adb919c5b81e3031be81b51d18a470276d94"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "d11baf3547455e0d9c6ee5bef5a8cd421cead916e70eb83f451fcfadeea87a46"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "04c0c262f965d995f5ec0954d160c86ab5c9404f6b443b7309f6588174a348c5"; } - { locale = "fa"; arch = "linux-i686"; sha256 = "97f8929a4d73e726d11c79b539ba8bf7d9ee7662416e1ab3ab7ed9215bd4c028"; } - { locale = "fa"; arch = "linux-x86_64"; sha256 = "77074015a70137a14a86079cae6d548d8b1d5aaef7c1d729a6681289bbc74905"; } - { locale = "ff"; arch = "linux-i686"; sha256 = "e9f29243dc0b1d82a749383e6608a7e166dda840695321ee79d4bdca001f2683"; } - { locale = "ff"; arch = "linux-x86_64"; sha256 = "8debed13660e6565b4f80d0c7383642db5e38cc0a69baeb26a3fa54d3e5299a4"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "f9832f9093953cada6091157c55f3d4ceff8c8fefa4c8c2f8db51d25b7d6d4d1"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "e01613a01cfc5ae121f16b58321d94a202d3e07e8a09793c307d48eccc176c93"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "11c923e8565c7275656486e44e0109b15037ea9fb3476e53a353b9a8c6896c62"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "483944f87a6b6d9f9e5ad1720b497ea47e4260b0e87e91f9d7ef1f274f38506e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "60e177657a81b5b1378563519b9dd0d23f2268b5b77d4880ea289522ef2fae14"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "6e4eaa7dbeae9090e0bce8dbabcb3b83c97822a387cfa940029f9bc3610532e9"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9638bd74f130f13e16da5e743f484b4f5e8672bd4b196c646932dfd0e13e71b8"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f8166135dea1d167c2eb686786d39ac32c2a9765b3fdf23a26b17550a2e93adb"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "1111deb031ed3b4a8954184ac34a03e765ee044712f921f63d15a5e6def971c0"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "7c9866a8220186ae5c573871829521815241ecba134ebeabd5c18d58f494b414"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "5c7739d6299b19b4cda00daea19e81efc7b9ae6d3a4716de8ade143e8e053c3d"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "02f4090f0c010121b3731ca8a92e0f29c10f97db7fe96309bae4b88e16e853e4"; } - { locale = "gu-IN"; arch = "linux-i686"; sha256 = "fc771898a75e7f8ace3d9093db82bd2648e91480d686bcebe4d6496555af2ff6"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "5492053dea2f4d809b5025d77cd38a710414b06e7e37bf2840b2ec4f6039e591"; } - { locale = "he"; arch = "linux-i686"; sha256 = "92a45496fdf3da5dd1ccb640d5223c1275e0e23f56246b1d82f0dd1856fe3954"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "b79a5112eaaed46b32cc9c54a3c0419cccf342ea8cfb421466e0837d6096a269"; } - { locale = "hi-IN"; arch = "linux-i686"; sha256 = "c7b2e3acb3b6707060ee0b62477a41ba0714a2b3d22e095abefab6938da4bd39"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "1f4492a3c7d0a2b4f88cd256a68c2038d6d145b461b40ffe79e3e7452af06b55"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "d7e2291798e6a54c87fa53409f530cbb36ddea001534eaa0c038305e8aa46d38"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "9295c24919f3094cdbe89e840e5fdfe73ce9588d0b1108d328c6613ae3b1e829"; } - { locale = "hsb"; arch = "linux-i686"; sha256 = "cc38ff9f7e0746b2412cbfebec60c44cb0f0c4a92a8b80cd61d5f9eb3e22cb4a"; } - { locale = "hsb"; arch = "linux-x86_64"; sha256 = "8d9afe825ef721726edab87e6f648ed136eb7e13c5acaa59499a55898e2b74cd"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "0e6829af6f5e955cbcd7192e94a613909369ef302349e7d8a45f8cd11df51613"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "16779aa3f754ca4a211d5489d54c15c49673d96fdfa4b64f0e6050b8f1517973"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "3e4cefe678a7f30153690f9d8b1545fc5805c62ccd0af7f1c3172a0dc4dc6772"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "363cac6106e008fe83b80f1c1c2981b46b890c1c2447b7ad4bde9cf7eea19e45"; } - { locale = "id"; arch = "linux-i686"; sha256 = "e3710c2b10ce747e15fa07a426fb2f97983637e9f73eeb0c3d064f2b8bacda6e"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "dfc2a2c1306b624e2cf9b6b4fc3c33ba9b622612f455760674103a78beebfc14"; } - { locale = "is"; arch = "linux-i686"; sha256 = "302d96499bf095bfe7c6c765edb197c5d5bf1c90e1dc86ad966f6185aee6873b"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "409fcec5ed65941cd60e78c4321f7c4d80bf8fd225065cf651d4e7db92649506"; } - { locale = "it"; arch = "linux-i686"; sha256 = "52e17f9210042f1eb116ec4328b136ece380ebb93fbd05190d475b7cf5617e14"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "cbf8b9c62616b19c448995c22563bcc4c68b6c5cbb6e59ab232115ec8bd0bc6b"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "8da7f153541aa283454e4143ca09e3307660b429a48bca3122b7df87b4122812"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "0eaf62dc5d97ddb35ae1c7589e3cef92a345d89f6cb8f0ac177f3991123eee2c"; } - { locale = "kk"; arch = "linux-i686"; sha256 = "22ea4fba5f7b2a64c7f71b68488a00fb1d18a2cc05bdfdede7481ba8fc2b5b53"; } - { locale = "kk"; arch = "linux-x86_64"; sha256 = "0bd0fed9e8ed8531e8b7759021afdd08ff45a3d235193c6434c630efa72f2073"; } - { locale = "km"; arch = "linux-i686"; sha256 = "957958b0b411c7a92bb00cadec9cd766884f9900907420d976eb84c435de22c2"; } - { locale = "km"; arch = "linux-x86_64"; sha256 = "c8cbef947210e4a4c397ebd366128166ba16c59f960eed9ebe1c044918169c9d"; } - { locale = "kn"; arch = "linux-i686"; sha256 = "0616551d7e9622227dac6d95f188fd3d11ff3b93b042c3b793447622b6affebc"; } - { locale = "kn"; arch = "linux-x86_64"; sha256 = "a4914b4b950884b8bdf2b4ba65a017f813d136d0c30ed1199a51ab7394504cb1"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "c47331bb4a65f2a024b9c2d283f9a289e623e0713e4e7a715124ca3e042f1c57"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "bc11ea2d206ab1588c01e862770b321f99a6947a5c13baab266c1ac5104ae4be"; } - { locale = "lij"; arch = "linux-i686"; sha256 = "ea8ad910b666fca73c7312fb338108b2c8d9413595094ae3fe3aa359d2032147"; } - { locale = "lij"; arch = "linux-x86_64"; sha256 = "dedde2eae271be10923ab62e56575c5f9216d9c2b9126e745248f9744177ad94"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "b106645051269bd594418f71b237b569d51cf85de2cf656d787ace395823fd72"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "914b64772231951b41dc3a2cd4e625098809046f7f156f958e170d2f72d50511"; } - { locale = "lv"; arch = "linux-i686"; sha256 = "03dffd9f7f24533034828f4c7cbf5c14337927b930b814e010c187797ce995c5"; } - { locale = "lv"; arch = "linux-x86_64"; sha256 = "c29d6ffd56da153e87da73ddf5ea3db7de143949809081db9f2efdc7bd79d828"; } - { locale = "mai"; arch = "linux-i686"; sha256 = "db4a4f3414491641de0e91b0f66eee7f6262640fc258d3ba15cabdf9b3deb5eb"; } - { locale = "mai"; arch = "linux-x86_64"; sha256 = "a39711b8769a8e9b2e78dc587e364d7c731538202cd72c0257fbda9cc691196d"; } - { locale = "mk"; arch = "linux-i686"; sha256 = "01eb8c625a3ffb68f7dd5fbaac8333bdfbfb6f4284510fc163d3d3db39e1465c"; } - { locale = "mk"; arch = "linux-x86_64"; sha256 = "3cb0b8c6655714ca24e345093ba1b5a5380856ec1f9df04ed2b6f0399c61e2b5"; } - { locale = "ml"; arch = "linux-i686"; sha256 = "b00a9d53bc27950ec451a7861ac0e34d9d1d04c7e6417c767f47f799380cefaf"; } - { locale = "ml"; arch = "linux-x86_64"; sha256 = "e2b53074478efc093e21e5f74ceeaac796a32bb0be347d4023b6d9a8fda99b98"; } - { locale = "mr"; arch = "linux-i686"; sha256 = "2d3b2ee4a0a6527ee284a29b38040208639e31fcae75acac94789f0eae0b7ca2"; } - { locale = "mr"; arch = "linux-x86_64"; sha256 = "4262cccf8feb6cabe08b2e4d0932666d962ad42214b69a6cf0d55e9c9fc04219"; } - { locale = "ms"; arch = "linux-i686"; sha256 = "f957096ac48ffec8430a5351c0697155847ca59ea391d64c6d8111713ff20453"; } - { locale = "ms"; arch = "linux-x86_64"; sha256 = "0e69c0a2f3de0207a0cf0ca3e27fcf6141920bdaa9759bf5567b40ed0e33032c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "8c77863e64a57c4435e50e349eccc8934e128b9ae78904e93e7beb03d8632847"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "7a64b47f81a484970ea7ff5aa49936deb5ea4db6cefcbaf30c6bbe4c5caf2fc6"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "a6c3e8aa9c9f59d41c098b7db0ee4b5a1deee33fac7934bf99880d35f97b855b"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "261c4401ede66816fb58aadab5c335841bd7c416a6fc1f2bed6c7dae4e987c54"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "d8c567a1d99c9d353d046219a9377236a046f4184e2af1c976a7cd000bc2adda"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "9a1356a688e7b9a6c0cbdc26585098310c9c2ca28f8ad1cad89f8dc4fcd157ca"; } - { locale = "or"; arch = "linux-i686"; sha256 = "cf46bd9016a66144c16f455feaa7c019f06c3514319b3f524c6abf05862e4245"; } - { locale = "or"; arch = "linux-x86_64"; sha256 = "18eed44e7431dd291b77f269e1b5c97142bc8928a8db09bb160999dafa3fdeca"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "4786b4b875da508bafe22c946e0c970f6f1024154c17b80411333ee2ab9b0ee1"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "075fe980df865eb6832956938c76fad0890edbaf22a6514997004fbb591fac66"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "2b36f39eb98c2fde698df2bdb7e93efb8f54df2758a8fa0b8cec9ff4c084def9"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "de3e50631b67a5f3a52c92a9e5aae88397f957367808ebc753eef1f759a135a2"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "db9b2610264f93b2202de4794c1b109ef52d45bd453ed9907058e334c54e2616"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "b3424f2d933a9435ba8db2910c8f13c722beacaeb34f3c47b7369d41e1ef8a67"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "99368ef9c5f580973bd8eb21b24acf1794e9337a6faea98690378888b9185fa8"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "1e2b0c75b2451fdfb355f2ce7d1a7068106c1228aa1eb8f8c56d789e02bec5d5"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "0da9cf51a6be5e25c9e711618f15743bee1a735eaa6fb4804589fa9d4b0513fe"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "fb6b8af9cb51a5bbde5345ed2814fd22b73c25905a8fb9ec304fcaf4b6589584"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "8e6d9f35fbc8da78e0074cb830245804450fc6beebd049f9a4db18c627ee543b"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "b93817243d9709106148143f052c103758bc6290aecc6282a73b8e81632dc1de"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "db0048c6ce2ab732513e09bb216b4d8732c9647f29729ebac1f95a7bda3f41b8"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "79d37bb0d64ff0c723063b4130a9a7b81e59518ed3416bd9fcf623e045c45013"; } - { locale = "si"; arch = "linux-i686"; sha256 = "a69dcffbc4e48881eac39f6708dfa419748852c315b232ee5f20df8daf3bb772"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "22b0dfecf78b254960f12d52d8e41ae4e54a73efc50bda2bec73306b6eabb967"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "9e8d8766f8814bdeaed905cb8b58ece1b346ce8a57f3d7f21a3371cabbd8a994"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "b40d8fc6d23ec5d1b11c46354d5b3cb0e8d661880fce50dbf030bda50794f8b1"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "e58fec03764019c33718bb520c76e8032548543f1bd25b6d8d6f6861a3a902a3"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "505a59db3c1db1e96a3f99d828c0c43dc812f58e83b1cd6cb067d3628df49f2b"; } - { locale = "son"; arch = "linux-i686"; sha256 = "feeea081020fccecbaeb90b79aff7ce2d132f3f9a7d0e848dab3060a06c7e876"; } - { locale = "son"; arch = "linux-x86_64"; sha256 = "bf98080f7ca39d9bfc1a5bafe38a66efbbf4a657019306321e13427d813ad3ab"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "858790b16a8c642cd5f76e4d57de5f215514e470bdfa0449e44a4c97d1245b7e"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "c7f6c20a9436f3a0210010c6f90a1330ca4f3afa4091c6a2256c23021651d898"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "77352b54412e869c66bbb73bc66dd333a1f5675d8f13d114486186a9478f92c5"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "158171775a7b9f8dc0ae87226faac2626a25f8debb5b4d3b0beac3fab2f502d0"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "70ea2d79b1c27615c7d021bdbf0e2a355f46c6e80a91485b6488b03b61266322"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "1aecd8b1a86bccba2a5cff18346bae5c2bc0e2ea8565f30fcc85bdcca2ec4eb2"; } - { locale = "ta"; arch = "linux-i686"; sha256 = "cd97638e80460532e1ca0b14608f0bca63e019fd2c9fa39330410a7763894cf8"; } - { locale = "ta"; arch = "linux-x86_64"; sha256 = "06a46a9292681557c308aa44e09bfb6cd1a2c3af742a635aa6cc101aa8d6964f"; } - { locale = "te"; arch = "linux-i686"; sha256 = "fe15c02885127189ccf444e7ddd4aaab0d70b67c5e90c17ac46ba1e78956ffed"; } - { locale = "te"; arch = "linux-x86_64"; sha256 = "2858c26770951a4d449bfa3d5be2421e34bf26132d34efd933f15397b572b7ae"; } - { locale = "th"; arch = "linux-i686"; sha256 = "eaf57742712cc584f0a436aa545db0753bc23c6f023a1199886efc11946e7566"; } - { locale = "th"; arch = "linux-x86_64"; sha256 = "0a24697e91b6e69fcfb0dba89eac2001766d28b7a02ab3d889ed18e3af05e3ed"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "395e18eb8c77cf20cc99de961b6c09b1d2a4a987384225f0d13c8cefbb5edd65"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "cdf8a47e0b38af8e6749ce8efff8811e6f0fc8fd497bb046cda9523757976edb"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "2b34e068f9a4b48ea20d8173b5fc68de631454646482834393266fef258358bb"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "38afe18c3a167477a060a089d5eaf910295d293619c1627eae161e14741dfcda"; } - { locale = "uz"; arch = "linux-i686"; sha256 = "6d71613a41e37e077974b0806f48f483a62cb79ab7deffb3d0ce7f1874557fbd"; } - { locale = "uz"; arch = "linux-x86_64"; sha256 = "28d09105d86af87750539899cd010d7edc410d7a06671dbf9d7a9633efbf0d1e"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "3ef1bc04ad1d08551f741e676c9fd9d4a42d4b5c78f0dde4297be4321ef64a27"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "38a77586718cdc82b7b71d945cd565a075c3b3c5bb983bee0bc8c1ae25086eb2"; } - { locale = "xh"; arch = "linux-i686"; sha256 = "c6385ae5bb00ed59bc89fab1026b3f9fcee93fffe045564bef116d7700d78092"; } - { locale = "xh"; arch = "linux-x86_64"; sha256 = "480dc73f7cc41db7c0171eeb3139d50830b8dec916111ee4f8af3ad67cf95bf8"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "f06897413ac62dda69242b09be1f44b8bb722a53c1aa1bd6350964ce9a7ae682"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3f551ae58bdeaa0212cfc6d4e033e67a4aa379576f983e6e195c0e962e3fd466"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "ba422c4c436a06b3e4da1d48767c4ea5aed80d7e65e593b3302d76450f0f19f6"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "c6fbbbb71110415f606ffbf44cc3709975e8504e86f3baeac4b086fd1438fff6"; } + { locale = "ach"; arch = "linux-i686"; sha256 = "2d0ab9fba584576d67ccb600339efeb5ad7aac1629b2d7865e121825b1a5a6d5"; } + { locale = "ach"; arch = "linux-x86_64"; sha256 = "188b9aab64ab1beda84dbe7b36d899210472a3e445dd827b64ca7083ae3c0b32"; } + { locale = "af"; arch = "linux-i686"; sha256 = "e6b5fb28e5ad03240f0e156c81db1df16bfaf99a946ffab9672c06d8561de9c3"; } + { locale = "af"; arch = "linux-x86_64"; sha256 = "c2856308c9e87bf82f621c5d4c96e9c5a70e5ebb86a8e4ba8ecb4d08c1ae98ec"; } + { locale = "an"; arch = "linux-i686"; sha256 = "f138b17a230e9b42b334d3900bebf23156fe1dec1f4ec75f9a3b94348523e241"; } + { locale = "an"; arch = "linux-x86_64"; sha256 = "82d24b07dc8d887837e8fbd610c2feb1ff4975917d8a19836ec0d0db56522de8"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "b530e58161331bff3222083298ddc5af0055c6b3337b58b1a4eb1d5d4e348d62"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "67c0e4ce7dfe54d0e4fedb168342ea86a82458e2d3ce6aca78b4497f4e813bfd"; } + { locale = "as"; arch = "linux-i686"; sha256 = "f17e991e97e85b981c3191a0becad6df457a29b7042d31a667fd227dadc24e80"; } + { locale = "as"; arch = "linux-x86_64"; sha256 = "2d955443b785a65d2f9f914232d521aeb9082b4dead8fedc89cfa29329ab8e2a"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "c9e2784047b58eddfd72c1e56964eea8ac098240436d029665bc940c7b8d8f8d"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "4bd5cc7c34f0a1fc1e2e899942c4ebec6bdab2fbd9e3d331ecc0c67a6f8c16e4"; } + { locale = "az"; arch = "linux-i686"; sha256 = "1789f6c5524314df239e4b4beb677adf48ce926a097128e053b352067d13016f"; } + { locale = "az"; arch = "linux-x86_64"; sha256 = "4881ccb7521512b4275faa2598efda6bbcc3d7838b6200e79c8fcae358d32c23"; } + { locale = "be"; arch = "linux-i686"; sha256 = "e9e31e92e0732188f6c4494023de260e5b64e97c56ff07857b290355c50e25f4"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "00ef0cea013cdb8606d8786bb5a21e502a6054ab57b2fad4d24161c47768f418"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "6428fa1d4f2bd0b703f207a1571e425f8076438954f955f60c0e8c1525743823"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "fc156d3d76582c95eb6a0a7ee88dbdbd6c99d46ca42b011e1d789b0552bb5885"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "d0b69158e5ce85eec29dc70c4942bfc76eaf2d8e3359c45de5783d39fe1ccaf0"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "928575b759e4ae89d3e5ee475ffa18c69e945846981102d540de01c9bd87582e"; } + { locale = "bn-IN"; arch = "linux-i686"; sha256 = "a92a902e4380ddda37b8e70922e91ee029d47f866adea53220dd76182c52b596"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "022b9ff7141cd89df35477d357df74556bc4a24639141d21111eccfbf8e2f98c"; } + { locale = "br"; arch = "linux-i686"; sha256 = "c398c00b98edcaa2618363637075ccf749a4d3567dfdae070b4b0cbe23832f56"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "60f471fdf1b71072751396049f12a198c73d11892ec69fc142f925a12c6515f4"; } + { locale = "bs"; arch = "linux-i686"; sha256 = "d9e3c1b5c94ad207071cea86295ef3f98d4bd9201e896f6b9d67a2e475ea2898"; } + { locale = "bs"; arch = "linux-x86_64"; sha256 = "2ea3bb1c14a849b5039b633963687629839174ea886d3f8314f67eddafa2b16b"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "bf1c1c3aaa900d66c4684cf48623bb0c9e0313cd919ad0e67e8a2e3ca5987aa6"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "30c0217722c599ed8fc0e713e0b763a01dc0da37dc2f290a2a4d02cb2a86b6a3"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "5ebd809827cdc85da0e6c973855c60426ab98e2cb898c030acd403577d3bb78a"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "a1d55b7c54fd7eb89bcf5dbdadcaea0f5d2da7110a090c424c52a55ae23150f2"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "55df045619bbe01af6f33c6cd563d6097b9c9023ab9133fa7def0800cc9aec83"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "2ddb8bcd515aad4ddb029cf4e5c49e771aa1da14394924c4ec532c5125b7ca7b"; } + { locale = "da"; arch = "linux-i686"; sha256 = "b322bef3e95b24337f294b2786fc5a819d954adb43f98dee69674d41fd234b5c"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "3e5164351808ef2f8f4e9cea6bb1121c4d3394de56536d17869a56df3b783d3b"; } + { locale = "de"; arch = "linux-i686"; sha256 = "a404bf7c19dbc65adea8872b8bd080a17417bc0f1ffa3015513d86750b2903a9"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "3590e100bf84f2734d1b3c81508d8fa137fd100bdd1e764ae5da1f88602d5b9d"; } + { locale = "dsb"; arch = "linux-i686"; sha256 = "c4be1a5cc431f3aeb26694bfd0749da0dfc85c119f75b551e69083a384042833"; } + { locale = "dsb"; arch = "linux-x86_64"; sha256 = "36f451bb07af47aff7c930a2810ef628e3382f92560efbe396133735275f7075"; } + { locale = "el"; arch = "linux-i686"; sha256 = "736ee0dffe7c5dc0d5abc7755a83e29da718901252034ee503775fc3f11e31c1"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "1638e1fd69d1887bbfd2de95ffe7945f52934055f8e15eb919d9ccac930959e0"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "1f9c8404fd01c1cac530c0e2b1fb488a2b4f7a02d8c2f0e568e0db050dc66f18"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "4f7491b919ca7a0563cd3444bd4a1abf48a4448ccdd743c5b5eb58584e5b1e94"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "abe3e5d23cf557ee81e7064d6d1b2d3a8f6b6e1a5f80947fc7229f0b2b631380"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "a4b439e28274feb4bf5494ba180143e6b8617428a63d11fa2fd0e650dda41908"; } + { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9de2931e926e0b0667f6916283a7ef019d1c067b29d6bd5b4b903fdf87ad9c17"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "6ada8b6a9a2b19f9515a1aaf63ad66cf35a1ab5491fc8ffc86a17fe1378ab553"; } + { locale = "eo"; arch = "linux-i686"; sha256 = "92db868c78ae49a8275d217327ca442ef6733b955ddc5b4940183c9a596da3de"; } + { locale = "eo"; arch = "linux-x86_64"; sha256 = "2e8267fb43ba6b7636c98fe386c35ddb9032265565844dcbc90f3dba18a2bc05"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "6343bacb35c929c8f7c5cb554aa0e5f67100032c71bc24203b663409e45cbf40"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0b5a07e745aab7d1e0bb8bcf0afe12ab71a88679024ef6e9edd53bab7518df7f"; } + { locale = "es-CL"; arch = "linux-i686"; sha256 = "7288765c2222624e69b367ab83686c21a348330a8f26eff7c6ea8dca03a3aabf"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "543778259a5d7c4198c8125b72f9e66e9ae98b398bc3b07ac0e103f07ab7ef2c"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "c1aec91c45591eaa6df8b15ba13ea58d15ab2cce20361719ea2549896d26ea1f"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "ee3b11c04ca280ff77e3cedd3dc2040b7b1722384639c02507bedc927c7b558b"; } + { locale = "es-MX"; arch = "linux-i686"; sha256 = "8adb9435f57da461150d8b283161760683e46b068eaade916119c2240f0a9c66"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "b624c4345794a22a7c63b4f6b7a1ed6f52472fa5cba4173f69f3c12ee3b4cbe1"; } + { locale = "et"; arch = "linux-i686"; sha256 = "efb6c6753e8a9d8174e8bd1ae7cbf3f75b479e5da3ebe07dbbbb4ac140e60eb9"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "c84bb0597fa14e8a7a2d086f24d71ad2f3c04b3fca794b76977d1a4cb1aea479"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "d116553c492ec41b811befb35393553b9174da3960034ce5106558befbf9728a"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "16c922f152d5e14c46277e23d30cfe0792c8e9828b8862df603aeff242c7ec96"; } + { locale = "fa"; arch = "linux-i686"; sha256 = "744ad5a8cb4473d502d1db50b6bf343e23525927b3a982677dd8a68aea111b3f"; } + { locale = "fa"; arch = "linux-x86_64"; sha256 = "968fea07386b96215af400524062447245fa038766caf0b133c932db6f105077"; } + { locale = "ff"; arch = "linux-i686"; sha256 = "0fdf06aa42cbd4d031fdad74d8ac9d6056708fc783180d72c5806cc45c5b8eec"; } + { locale = "ff"; arch = "linux-x86_64"; sha256 = "bfb65ec25192288b2f04f94bdcc9ce36a40a27c8a1f35f728f932c071b6756ce"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "334c121cbd9a1469996ebc5535d838e3fecfcc419861cc70d5cdeb0cd584d5f5"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "44883a9b819a24bef03c3322681e1b9f3fe61779e382a740900dfc16a5f7db06"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "cd196dff293aabc39156e82deb5163e139a4b0173de92a2ba72df49bb4b0afe5"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "77da207f48d7af908cb5e95767e61a2e6c04f1851e55430820ff8207da172361"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "39e8da569f2a6f67abac7782a938a906c810f8474fbb2c799dd26fb846c82707"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "44dbf644b3f96dd607e5c88eece8aaafd61ec42af9f7ba4c6ed06a272a45fa4a"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "783532acf3967f94232f42c9cd559e288db499c0ff74776543b59d71d281a74c"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "39509082dbeb935f481e95d6038943a17c5053f7001fbf71bdb0edea536adb9d"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "dd73e1bf159f3d437d69306c5daeb7a06c951d6c5841315363c354f9aa1570c5"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "a2fb4aa1ba4a50bdb308e8c12090158c5e040ae85617171786e93852d4f48de5"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "8ac3fd13e0f173aa1dfffd44c91511bd457c6a751daa978fbaae3f9901427cae"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "cf52827a18b400f8c3e426b00e2984bd5835014f3e97e9c1279f0b285ca5a5dc"; } + { locale = "gu-IN"; arch = "linux-i686"; sha256 = "1ef44836085733b52c338fdcaea78e7df5f78a0f0f470b9de3ac7b13e3ec4844"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "374280216142897536979fff6f876253caaf0eeb12a3d12d17b013e7ab3ba722"; } + { locale = "he"; arch = "linux-i686"; sha256 = "1dcca6ae796da1a1317a4f094f06369242cdf7c0f8ce3df7c9fabd22910996ab"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "e032513a673ba091207996b8a6a6b9da6ef05d5c080a93ed326fc4ac4ca6976a"; } + { locale = "hi-IN"; arch = "linux-i686"; sha256 = "2057287b406513a332d162f03f75ef7ff4c83834809163c8b870d9e5ab3f8cdf"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "8d19043416484c382fc9caec5dff4914fbc28feefd41a089591ef2b21f822a43"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "995a6dd027a5a6b2123c62b74f524db53940e2c8fa6c7254dc41dca236f7889b"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "4410e7d1cbce028de083b82ee68f442d27c2219544ec1be72ef2c274cb7c445a"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "0dcb0de11e35475cab33e11b08b88ff766915d7d98ceeb466a0fee90883ebaed"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "1695167eea386aec4fca23bb0bf4e5b83876a22f8c584f4e81886be229e9a43b"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "31026a26c9fa9b3777c2f9dd1d55da7e0204e4d98586f887b67588ccb86c3843"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "82d8fbe932765f100a116b6d572035297be2f027b4f0e0ba84ef88cb4b651000"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "864c112f13628bd9bc715a6a405dc92c3f8027b0e505722d819b84775fb27066"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "dddd71e651056c373225baab9bb190810f8ed6849abfa76587fcd05cc5060d89"; } + { locale = "id"; arch = "linux-i686"; sha256 = "3425906d6513d3e06286b9b3c62c30d702a47a3d7a31638a58f926e2fa4a254f"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "095d970add8bf54fc2fb2581532013f4792f648b58fa12d49a6a859f26a0e579"; } + { locale = "is"; arch = "linux-i686"; sha256 = "f3687eb0e7ce24e14621345543abdf2b92435466ededc98a4ec4a117c4593c3c"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "dbac8774c64e6c978a3eb900cf61d85a210d0c39c28df4a21e4295ba5febd0ea"; } + { locale = "it"; arch = "linux-i686"; sha256 = "62091c6f5214f4717462d9e2f6bacd7f30417b7e714de3fdec6fc2f703970eb7"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "480b9ffd4326a9a2e2002510027a15d4fdaf8ba1ea023ee6e55b2aa78b119a6c"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "ef143bf31fa67cab3ccafc0083d81ffa8997e3365312b12312623755eb24f48d"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "f74808de8fb999dceb067b3fda64e891c37bde7190e9eff68f1693f5b5feae0d"; } + { locale = "kk"; arch = "linux-i686"; sha256 = "a532d49011b632aa83f6b881b39c74bcb66fab0237e3e4f8682445aa0a053d4c"; } + { locale = "kk"; arch = "linux-x86_64"; sha256 = "7f32ee329e8281e89472b092248a26e1d38089bdc9830d2d1d0b1af8230ca20b"; } + { locale = "km"; arch = "linux-i686"; sha256 = "34ecf596b0870aca2db30513ef5d6522d86caf70fce38b23a7bff08c55551b69"; } + { locale = "km"; arch = "linux-x86_64"; sha256 = "6e7efd621e941674038887d1e8d90c36d0ac06a095386caa01d228494228be14"; } + { locale = "kn"; arch = "linux-i686"; sha256 = "062ebd6b27ef9094e65e60ad64be30470ed58eb2d92f247a87a781b97e0654d9"; } + { locale = "kn"; arch = "linux-x86_64"; sha256 = "e88428b1cd2e1919336dda303d8795bd02e4967ba8c6d2830205f68fa4c528d0"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "6c43a7f86f908cccc7ca3a7ed45f95ea84b69e4a21ff1e1d58136ea19bf7bd2c"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "9db2bfd818d82ee0c9bc35b6fd651ad8fe80f8d73d51326fde25fc4c2aaa295c"; } + { locale = "lij"; arch = "linux-i686"; sha256 = "be87fc2a6863f33f9ff9ad2990e1e6425a65002f2ee411a254dde80cbd5a31c4"; } + { locale = "lij"; arch = "linux-x86_64"; sha256 = "9cfb239df8195cfa355bc8ddaf63accd865de21086c5bc3180b2ad9886445f3e"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "11e18e6baac8f31c62a301e8ee51056c707ca47332fbeb6f3492e8eaffa25c57"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "3bb4dca607abc4e08300dfa61667d2f2b06661f47cf0029d078e14fa4686d4b8"; } + { locale = "lv"; arch = "linux-i686"; sha256 = "bc484992f230229ab4ab6d47fab9664f43341ad1202010f5dea91d2d78200c85"; } + { locale = "lv"; arch = "linux-x86_64"; sha256 = "42bdc60ad7edf2ed3e82f765abfc3815f98095adc2988f8d809a8834eada63ef"; } + { locale = "mai"; arch = "linux-i686"; sha256 = "628f0685185f91e695af5ce9a536d9263305cfd747683ef33dccd0c90f3e1bfb"; } + { locale = "mai"; arch = "linux-x86_64"; sha256 = "688c33b159b4fcd23fb4c6d3a7f845d03929b4a8b02eaa2ebb93682b396c73a2"; } + { locale = "mk"; arch = "linux-i686"; sha256 = "a59b2a8ee82513ef78f3509afc4dba75ec3128f0f42c657bbbfbad117b981b36"; } + { locale = "mk"; arch = "linux-x86_64"; sha256 = "3058ff9ac581a65ee0713fe3707f8b98eace0f833b8e7b901fa397538e9503f0"; } + { locale = "ml"; arch = "linux-i686"; sha256 = "43c80f530ad3eaf7c138e16b23b9eb32afc1f774374fe213f580cf68e4d0e245"; } + { locale = "ml"; arch = "linux-x86_64"; sha256 = "43f061317f9eb5a174cd13539bb3972535b552113d38c05d9888e7a37346ef22"; } + { locale = "mr"; arch = "linux-i686"; sha256 = "30c0ee68eadffcc95271f1e7c1c1b0151ee21ca3744fad61a723a9a6bfb751b0"; } + { locale = "mr"; arch = "linux-x86_64"; sha256 = "d9dd27af41ca021f323499be556d208f69b706aff079c8d7392c7f19092705d8"; } + { locale = "ms"; arch = "linux-i686"; sha256 = "adb5e1968c66378ff9b59dc57c00a2c953ad1f54f67e1bc40abc499bcf79653f"; } + { locale = "ms"; arch = "linux-x86_64"; sha256 = "3e4b43a88b3aa2887673e1962fa4ccbd895640113e683c849a3c9733677e1fe1"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "f4be0cff21abdc80fba10db2bf781fecfb4e503c70cb95a8b083c5f7123f8dc8"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "e9b191268a6694805a5ba86559e798c9a4e29eae39a7f64dab92a925fb31611d"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "581c73084993be0bf1ab23bb468674d062fb98e99573d823e977a263b4cfaa91"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "3fd8929341ae048187379b7648ec8e008ace53e4a5f0af1421ecabcb5ad3bf61"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "b2104d5895a727903f6a273888989887542ad9e61c998cc651bb24d64efc6cfd"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "1bf582e66da985cbb01c22f865fc291196c55b14d2f84516f68f184ea842a664"; } + { locale = "or"; arch = "linux-i686"; sha256 = "1ffbc776fb3ae030e6dedea009b71873bff57f9294e63331404b53e1ba36499c"; } + { locale = "or"; arch = "linux-x86_64"; sha256 = "b988f433a238b2cb3766042d911a1f002a5f91a47dbed5b937f70cb59ed060d2"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "6ba4941b5bef7b860194114c2704662a42f9f3007a0b634662e42f38c0aa601a"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0d9920d4b358cfdcf8cdf4b2d2e07ceb191709eee9dbae4c59f9dbfcfffbf0f5"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "e080fb35bf49f9eb2fc39a435a188164eedf2ea7a24f8e950d62567620a91954"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "cc37624f0c1e82d2de2048129f58e85fe8a518ee4b0ebdbee0a5205517602cf9"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "d19bf65889c686cbb284e697e8ba1315b6ec004b57096725fb576898ef105346"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "0d00d2d0bbc6045117c4df93045f70ebe0468e004504a06dfc508bfca6c6df1f"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "5225afadf2ea62792376dfda1d2b3533d986f1ee3a281781a5be294b8883ac8b"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0c1d841ba80e32d51d41c99b551e68c6b591e97af4ccee4d7c7d6ef03f8707ea"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "2cc9200a132c967a7158f5422dad8f4b2d90dfc7e46ada305daebabc44806de8"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "0dff628773d4f2e24b767501b9c768586a27e82c0e8b259ef1cc676985ad0125"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "500142fe612fe6144a14ebaad486da04050940a755e205297473c1be6b9dc428"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "f3a57abec8553c8b9d8db9fb5600cd7b6e1189ebf0225df96608eaf2863e41b3"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "1266ed09db881af90794bef049cdfee777d7179026de8c0de2931275f3f288e9"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "0f1b44177633149aaa31574ba3cf343971bd4e11ac6b4bb92a5875b6a30a42af"; } + { locale = "si"; arch = "linux-i686"; sha256 = "e027afd86b00379c12e014b8d0d11a05811c598f53490edf7070e7acccbf0d79"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "518c19c5351a2c1bd05afe63e9d8c2a0be3a9cedccf7aa1d84d1af9de7ecf7fd"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "e3dcda7406d00166a601b77fbdf0b84181ba5372f760eb08d5476fe9d219caef"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "019c03ecd24f394b0ff76aff5cd9f0db017ffd3b8dd65388c4f5ee3188e77a6c"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "a88391cc29643277f9d8c58a205ac959af825326b61c16361d4def6f7da31235"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "fcf45e13a0bc543988495a83e5e96400707564d2ed4fcd0579219c999ee71e83"; } + { locale = "son"; arch = "linux-i686"; sha256 = "a75e273e01df51ffbe2c8666545f1e6f4d00af373d7aac08978947d7afc1e5f4"; } + { locale = "son"; arch = "linux-x86_64"; sha256 = "9f28df29d980e6c7467e99b2b81740cb078ce8e6896fe4e2a6b1473770e6bef5"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "2243773d7d38608e17233e1d98e4fc1ca19f40f27a3e87557ad7fbd958c080ba"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "c18faf9d8971c43db18fcc66329a85018a04e8cf4819c4843d826bc86414cadb"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "0cd5e6a3910923aed9a88fafd95bc11263de7359c38685e209212339bb2f50dc"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "1ec48c65323b15332932060ec5193908d89715736bd0abd88472dc05e639a62a"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "6718eb3e71a3d4f5487b80bbd784fd61422345f94d3271f6de6f6feab9e2f6da"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "5b356a6334d424b5e47ea4b1c32403a858ff5dc8727bbc0b2f72e6a29c9b625f"; } + { locale = "ta"; arch = "linux-i686"; sha256 = "fdb4e36497a61af9badb848a067eff4e4dada7dfffefbfe6bb7266ad89a8707a"; } + { locale = "ta"; arch = "linux-x86_64"; sha256 = "de5f0b871425412f9f261eff5b1abb3ddbd40f588647fd8e174e2d6c5ba17b90"; } + { locale = "te"; arch = "linux-i686"; sha256 = "0cc82774a46580c9e2f890848f705b1dc4effac197a902f9d244f0b6f6258650"; } + { locale = "te"; arch = "linux-x86_64"; sha256 = "65ceda67a572053dd4d9e15b9bd47c91364651736417414d4ca4a0a7ded9775a"; } + { locale = "th"; arch = "linux-i686"; sha256 = "1c0084ed26218713c4606ab073bf09de888051e9dcc49652a87fb58209a8c614"; } + { locale = "th"; arch = "linux-x86_64"; sha256 = "5a70e29d282961e27350d26cf164472fe51247db1d7d1228dca693423c32d0a6"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "f7fa2029a36eda63544beebb6534fc2f8432c87d7a8d08d4c8927275e659b686"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "1e3744f5908164e163818522fa902bd57edb62837b2b399983ea5a4ed487cda8"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "0f465eda0f7e87eef88bc17b3e6868ad90a270e6993d327fecca532637442df4"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "6530af36cfab509fff37519b435c7939110c000dbdd94000fe964283a14b1622"; } + { locale = "uz"; arch = "linux-i686"; sha256 = "7ee5997bcb4915c3907cee90e350e3bc2b67965975faecffa738a728cf2e12e3"; } + { locale = "uz"; arch = "linux-x86_64"; sha256 = "d7b34e36bcb423977a2a7667504c096730ca684c9f2e861b17e8f0174f5bb0d0"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "e9497a8eed98ec34b31e3b1ec7086a4d219121f0edf21fd8f6a01599afa41f12"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "b94fbaee83014b88490bf19cc37dbda87fb9260ed5879be3b688a2abbe709a87"; } + { locale = "xh"; arch = "linux-i686"; sha256 = "d5a86db6b9f3bb5162a86f976cbbc01f542a924c05729eb54a2c24dabc711065"; } + { locale = "xh"; arch = "linux-x86_64"; sha256 = "d765b2d324e89119fee522ad8972031c8727841c2fa2700d010be7d23633bbbc"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "fb3bbc44952207f42112c291dccb82f02fbd23bba7b54b06a1047809d2bb18d2"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "255d19959cb0e0efbcb2eeceb39b43bbb567ab2474af4da6675574a0110781e1"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "cfc90ac621dc57d7eb922c564aa3a7d5ad7f2aacc95196606d34cba7b7e30d1a"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "ff119be821acb8f99a485a60de506123c76a7a3a13ac678576248f97ff1ab882"; } ]; } From 40c7d554d42d544005afb5c35dc3552b9e4d29df Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 7 Jan 2016 22:38:22 -0500 Subject: [PATCH 149/308] postfix service: implement DNS blacklist support --- nixos/modules/services/mail/postfix.nix | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index f2d8189de6e..e03aabd6f2b 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -13,6 +13,18 @@ let haveTransport = cfg.transport != ""; haveVirtual = cfg.virtual != ""; + clientAccess = + if (cfg.dnsBlacklistOverrides != "") + then [ "check_client_access hash:/etc/postfix/client_access" ] + else []; + + dnsBl = + if (cfg.dnsBlacklists != []) + then [ (concatStringsSep ", " (map (s: "reject_rbl_client " + s) cfg.dnsBlacklists)) ] + else []; + + clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); + mainCf = '' compatibility_level = 2 @@ -104,6 +116,9 @@ let + optionalString haveVirtual '' virtual_alias_maps = hash:/etc/postfix/virtual '' + + optionalString (cfg.dnsBlacklists != []) '' + smtpd_client_restrictions = ${clientRestrictions} + '' + cfg.extraConfig; masterCf = '' @@ -161,6 +176,7 @@ let aliasesFile = pkgs.writeText "postfix-aliases" aliases; virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual; + checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides; mainCfFile = pkgs.writeText "postfix-main.cf" mainCf; masterCfFile = pkgs.writeText "postfix-master.cf" masterCf; transportFile = pkgs.writeText "postfix-transport" cfg.transport; @@ -366,6 +382,17 @@ in "; }; + dnsBlacklists = mkOption { + default = []; + type = with types; listOf string; + description = "dns blacklist servers to use with smtpd_client_restrictions"; + }; + + dnsBlacklistOverrides = mkOption { + default = ""; + description = "contents of check_client_access for overriding dnsBlacklists"; + }; + extraMasterConf = mkOption { type = types.lines; default = ""; @@ -494,6 +521,9 @@ in (mkIf haveVirtual { services.postfix.mapFiles."virtual" = virtualFile; }) + (mkIf (cfg.dnsBlacklists != []) { + services.postfix.mapFiles."client_access" = checkClientAccessFile; + }) ]); } From 81b5223c977ecf391c13c66f4eafc33f60a3eb4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 12 Feb 2016 06:58:31 +0100 Subject: [PATCH 150/308] nixos: gitit, wrong type restriction redacted --- nixos/modules/services/misc/gitit.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index ab4d385ba16..befd8c628f1 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -35,7 +35,6 @@ let }; haskellPackages = mkOption { - type = types.attrsOf types.package; default = pkgs.haskellPackages; defaultText = "pkgs.haskellPackages"; example = literalExample "pkgs.haskell.packages.ghc784"; From 5bb195bda222965b47ce07ad172f034c27ce42f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 12 Feb 2016 06:59:55 +0100 Subject: [PATCH 151/308] i2pd: 2.3.0 -> 2.4.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index ff41beaeb05..2d490b917a4 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "0gb6bdsyb7m0jkilln9h7z2l8gr8ia10jah17ygc15jzycygijis"; + sha256 = "1nkf3dplvyg2lgygd3jd4bqh5s4nm6ppyks3a05a1dcbwm8ws42y"; }; buildInputs = [ boost zlib openssl ]; From 70925f0a921df7ce801c50d931462a4d83277691 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 12 Feb 2016 08:00:04 +0100 Subject: [PATCH 152/308] firefox: 44.0 -> 44.0.2 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 7451297f8d2..f281b51fbfd 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -133,8 +133,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "44.0"; - sha256 = "07ac1h6ib36nm4a0aykh1z36vgw6wqlblil0zsj0lchdhksb10pa"; + version = "44.0.2"; + sha256 = "17id7ala1slb2mjqkikryqjadcsmdzqmkxrrnb5m1316m50qichb"; }; firefox-esr-unwrapped = common { From 657c56678c0d5a415f9062c30a27f3e399352b92 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 12 Feb 2016 08:00:26 +0100 Subject: [PATCH 153/308] firefox-esr: 38.5.2esr -> 38.6.1esr --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index f281b51fbfd..834c6ed339c 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -139,8 +139,8 @@ in { firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "38.5.2esr"; - sha256 = "0xqirpiys2pgzk9hs4s93svknc0sss8ry60zar7n9jj74cgz590m"; + version = "38.6.1esr"; + sha256 = "1zyhzczhknplxfmk2r7cczavbsml8ckyimibj2sphwdc300ls5wi"; }; } From b9c13dcbc7c512194d98926a82afba4e70fcc2f0 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 12 Feb 2016 09:56:02 +0100 Subject: [PATCH 154/308] bundix: 2.0.4 -> 2.0.5 Fixes issue with the -d flag creating duplicated `dependencies` properties. --- pkgs/development/interpreters/ruby/bundix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix index 88679f74753..245090e66e1 100644 --- a/pkgs/development/interpreters/ruby/bundix/default.nix +++ b/pkgs/development/interpreters/ruby/bundix/default.nix @@ -5,9 +5,9 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.0.4"; + version = "2.0.5"; - sha256 = "0i7fdxi6w29yxnblpckczazb79m5x03hja8sfnabndg4yjc868qs"; + sha256 = "0bsynhr44jz6nih0xn7v32h1qvywnb5335ka208gn7jp6bjwabhy"; buildInputs = [bundler]; From 1d6f590844ccf95acbe6dec567b7235e195f4334 Mon Sep 17 00:00:00 2001 From: Jinjing Wang Date: Fri, 12 Feb 2016 18:44:08 +0800 Subject: [PATCH 155/308] pdnsd: enable IPv6 by default --- pkgs/tools/networking/pdnsd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index 40d57cd65b6..b1e7e92e815 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sed -i 's/.*(cachedir).*/:/' Makefile.in ''; + configureFlags = [ "--enable-ipv6" ]; + meta = { description = "Permanent DNS caching"; homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html; From 73b9a9662df21ad7c1a372edfda403a8f4b529aa Mon Sep 17 00:00:00 2001 From: Jinjing Wang Date: Thu, 11 Feb 2016 19:02:11 +0800 Subject: [PATCH 156/308] pdnsd service: init --- lib/maintainers.nix | 1 + .../doc/manual/release-notes/rl-unstable.xml | 1 + nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/pdnsd.nix | 93 +++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 nixos/modules/services/networking/pdnsd.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 808d78d499d..934a58b0aab 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -220,6 +220,7 @@ nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; nequissimus = "Tim Steinbach "; + nfjinjing = "Jinjing Wang "; nico202 = "Nicolò Balzarotti "; notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c814d61bcf4..a4f25cdc51f 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -41,6 +41,7 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos; services/monitoring/longview.nix + services/networking/pdnsd.nix services/web-apps/pump.io.nix services/security/haka.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 064b4cbc4b3..29e269e3094 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -248,6 +248,7 @@ matrix-synapse = 224; rspamd = 225; rmilter = 226; + pdnsd = 227; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -473,6 +474,7 @@ matrix-synapse = 224; rspamd = 225; rmilter = 226; + pdnsd = 227; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0011544988d..42de820951d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -340,6 +340,7 @@ ./services/networking/openntpd.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix + ./services/networking/pdnsd.nix ./services/networking/polipo.nix ./services/networking/prayer.nix ./services/networking/privoxy.nix diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix new file mode 100644 index 00000000000..f4467b81895 --- /dev/null +++ b/nixos/modules/services/networking/pdnsd.nix @@ -0,0 +1,93 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.pdnsd; + pdnsd = pkgs.pdnsd; + pdnsdUser = "pdnsd"; + pdnsdGroup = "pdnsd"; + pdnsdConf = pkgs.writeText "pdnsd.conf" + '' + global { + run_as=${pdnsdUser}; + cache_dir="${cfg.cacheDir}"; + ${cfg.globalConfig} + } + + server { + ${cfg.serverConfig} + } + ${cfg.extraConfig} + ''; +in + +{ options = + { services.pdnsd = + { enable = mkEnableOption "pdnsd"; + + cacheDir = mkOption { + type = types.str; + default = "/var/cache/pdnsd"; + description = "Directory holding the pdnsd cache"; + }; + + globalConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Global configuration that should be added to the global directory + of pdnsd.conf. + ''; + }; + + serverConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Server configuration that should be added to the server directory + of pdnsd.conf. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration directives that should be added to + pdnsd.conf. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers = singleton { + name = pdnsdUser; + uid = config.ids.uids.pdnsd; + group = pdnsdGroup; + description = "pdnsd user"; + }; + + users.extraGroups = singleton { + name = pdnsdGroup; + gid = config.ids.gids.pdnsd; + }; + + systemd.services.pdnsd = + { wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + preStart = + '' + mkdir -p "${cfg.cacheDir}" + touch "${cfg.cacheDir}/pdnsd.cache" + chown -R ${pdnsdUser}:${pdnsdGroup} "${cfg.cacheDir}" + ''; + description = "pdnsd"; + serviceConfig = + { + ExecStart = "${pdnsd}/bin/pdnsd -c ${pdnsdConf}"; + }; + }; + }; +} From a1fa485378f3c17946c138935fd46be2178da389 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Feb 2016 13:14:34 +0100 Subject: [PATCH 157/308] Revert "Remove double-backslashes from grub conf file". This reverts commit b861bf8ddff67703, because according to @mdorman [1] this change rendered his NixOS systems unbootable, and we probably don't want that. [1] https://github.com/NixOS/nixpkgs/commit/b861bf8ddff677031e93a8e1c55311be63e0eb63#commitcomment-16058598 --- nixos/modules/system/boot/loader/grub/install-grub.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 8da564bda15..b8ef02da4bc 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -228,7 +228,7 @@ if ($grubVersion == 1) { "; if ($splashImage) { copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n"; - $conf .= "splashimage " . Cwd::abs_path($grubBoot->path . "/background.xpm.gz") . "\n"; + $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n"; } } @@ -327,9 +327,9 @@ sub addEntry { my ($name, $path) = @_; return unless -e "$path/kernel" && -e "$path/initrd"; - my $kernel = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/kernel"))); - my $initrd = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/initrd"))); - my $xen = -e "$path/xen.gz" ? Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/xen.gz"))) : undef; + my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); + my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd")); + my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; # FIXME: $confName From 0140591eabc8bf7c50adc673da0348313e6d1a2b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Feb 2016 13:10:02 +0100 Subject: [PATCH 158/308] postgresql: Remove EOL 9.0 branch --- pkgs/servers/sql/postgresql/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 9a5b07e9f89..9b26b5ed41f 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -58,12 +58,6 @@ let in { - postgresql90 = common { - version = "9.0.23"; - psqlSchema = "9.0"; - sha256 = "1pnpni95r0ry112z6ycrqk5m6iw0vd4npg789czrl4qlr0cvxg1x"; - }; - postgresql91 = common { version = "9.1.19"; psqlSchema = "9.1"; From 5e6962ff2eba9142280f9a8be4ca40c6272af584 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Feb 2016 13:12:10 +0100 Subject: [PATCH 159/308] postgresql: Update to 9.5.1, 9.4.6, 9.3.11, 9.2.15, 9.1.20 --- pkgs/servers/sql/postgresql/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 9b26b5ed41f..bba2bf2d682 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -59,33 +59,33 @@ let in { postgresql91 = common { - version = "9.1.19"; + version = "9.1.20"; psqlSchema = "9.1"; - sha256 = "1ihf9h353agsm5p2dr717dvraxvsw6j7chbn3qxdcz8la5s0bmfb"; + sha256 = "0dr9hz1a0ax30f6jvnv2rck0zzxgk9x7nh4n1xgshrf26i1nq7kd"; }; postgresql92 = common { - version = "9.2.14"; + version = "9.2.15"; psqlSchema = "9.2"; - sha256 = "0bi9zfsfhj84mnaa41ar63j9qgzsnac1wwgjhy2c6j0a68zhphjl"; + sha256 = "0q1yahkfys78crf59avp02ibd0lp3z7h626xchyfi6cqb03livbw"; }; postgresql93 = common { - version = "9.3.10"; + version = "9.3.11"; psqlSchema = "9.3"; - sha256 = "0c8mailildnqnndwpmnqf8ymxmk1qf5w5dq02hjqmydgfq7lyi75"; + sha256 = "08ba951nfiy516flaw352shj1zslxg4ryx3w5k0adls1r682l8ix"; }; postgresql94 = common { - version = "9.4.5"; + version = "9.4.6"; psqlSchema = "9.4"; - sha256 = "0faav7k3nlhh1z7j1r3adrhx1fpsji3jixmm2abjm93fdg350z5q"; + sha256 = "19j0845i195ksg9pvnk3yc2fr62i7ii2bqgbidfjq556056izknb"; }; postgresql95 = common { - version = "9.5.0"; + version = "9.5.1"; psqlSchema = "9.5"; - sha256 = "f1c0d3a1a8aa8c92738cab0153fbfffcc4d4158b3fee84f7aa6bfea8283978bc"; + sha256 = "1ljvijaja5zy4i5b1450drbj8m3fcm3ly1zzaakp75x30s2rsc3b"; }; From fd8bd17c3e393185533c2c87008e17546e72c404 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Feb 2016 13:18:35 +0100 Subject: [PATCH 160/308] postgresql: Bump default version to 9.5 --- nixos/modules/services/databases/postgresql.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 957fb4723a5..31ffe51c11e 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -158,7 +158,7 @@ in # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing # systems! - mkDefault pkgs.postgresql94; + mkDefault (if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 else pkgs.postgresql94); services.postgresql.authentication = mkAfter '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65f68feae72..fe0aaf41e3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9603,7 +9603,7 @@ let libmemcached = null; # Detection is broken upstream }; - postgresql = postgresql94; + postgresql = postgresql95; inherit (callPackages ../servers/sql/postgresql { }) postgresql90 From 99178d968b8a59694467940b5447d449269661da Mon Sep 17 00:00:00 2001 From: = Date: Fri, 12 Feb 2016 13:37:51 +0100 Subject: [PATCH 161/308] jamin: init at 0.95.0 --- pkgs/applications/audio/jamin/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/audio/jamin/default.nix diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix new file mode 100644 index 00000000000..d9f79a754fa --- /dev/null +++ b/pkgs/applications/audio/jamin/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2 +, makeWrapper, pkgconfig, perl, perlXMLParser }: + +stdenv.mkDerivation { + name = "jamin-0.95.0"; + + src = fetchurl { + url = mirror://sourceforge/jamin/jamin-0.95.0.tar.gz; + sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; + }; + + buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 + pkgconfig perl perlXMLParser makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa + ''; + + meta = with stdenv.lib; { + homepage = http://jamin.sourceforge.net; + description = "JACK Audio Mastering interface"; + license = licenses.gpl2; + maintainers = [ maintainers.nico202 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe0aaf41e3d..4550582d100 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12439,6 +12439,8 @@ let jalv = callPackage ../applications/audio/jalv { }; + jamin = callPackage ../applications/audio/jamin { }; + jedit = callPackage ../applications/editors/jedit { }; jigdo = callPackage ../applications/misc/jigdo { }; From 57d63ad5376db331b51cc3ce630d20853ecb4186 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 12 Feb 2016 12:42:00 +0000 Subject: [PATCH 162/308] mupen64plus1_5: removed This was the same as mupen64plus, alias added. --- pkgs/misc/emulators/mupen64plus/1.5.nix | 33 ------------------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 pkgs/misc/emulators/mupen64plus/1.5.nix diff --git a/pkgs/misc/emulators/mupen64plus/1.5.nix b/pkgs/misc/emulators/mupen64plus/1.5.nix deleted file mode 100644 index 571e14347b4..00000000000 --- a/pkgs/misc/emulators/mupen64plus/1.5.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}: - -stdenv.mkDerivation { - name = "mupen64plus-1.5"; - src = fetchurl { - url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz; - sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq"; - }; - - buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ]; - - preConfigure = '' - # Some C++ incompatibility fixes - sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp - sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp - - # Fix some hardcoded paths - sed -i -e "s|/usr/local|$out|g" main/main.c - - # Remove PATH environment variable from install script - sed -i -e "s|export PATH=|#export PATH=|" ./install.sh - ''; - - buildPhase = "make all"; - installPhase = "PREFIX=$out make install"; - - meta = { - description = "A Nintendo 64 Emulator"; - license = stdenv.lib.licenses.gpl2Plus; - homepage = http://code.google.com/p/mupen64plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe0aaf41e3d..b71577207d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15607,8 +15607,6 @@ let mupen64plus = callPackage ../misc/emulators/mupen64plus { }; - mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { }; - inherit (callPackages ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; @@ -16030,6 +16028,8 @@ aliases = with self; rec { midoriWrapper = midori; # added 2015-01 mlt-qt5 = qt5.mlt; # added 2015-12-19 multipath_tools = multipath-tools; # added 2016-01-21 + mupen64plus1_5 = mupen64plus; # added 2016-02-12 + ncat = nmap; # added 2016-01-26 nfsUtils = nfs-utils; # added 2014-12-06 phonon_qt5 = qt5.phonon; # added 2015-12-19 phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19 From 928035378d82de9641adc60e188c3b9313667729 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Feb 2016 14:31:06 +0100 Subject: [PATCH 163/308] Fix typo --- nixos/modules/tasks/network-interfaces-scripted.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index f07e7baeb11..c960e401f9b 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -144,15 +144,12 @@ in fi ${config.systemd.package}/bin/systemctl start ip-up.target ''; - preStop = - '' - echo "releasing configured ip's..." - '' + flip concatMapStrings (ips) (ip: + preStop = flip concatMapStrings (ips) (ip: let address = "${ip.address}/${toString ip.prefixLength}"; in '' - echo -n "Deleting ${address}..." + echo -n "deleting ${address}..." ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" echo "" ''); From abdbdbebf613da18cb1b89e6c9b2216227046c0a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Feb 2016 14:31:23 +0100 Subject: [PATCH 164/308] nixos/tests/simple.nix: Include minimal.nix This reduces the amount of rebuilds (particularly some X11 stuff) after changing some dependencies like systemd. --- nixos/tests/simple.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix index 287712be316..04d624adcfe 100644 --- a/nixos/tests/simple.nix +++ b/nixos/tests/simple.nix @@ -4,7 +4,9 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ eelco ]; }; - machine = { config, pkgs, ... }: { }; + machine = { config, pkgs, ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + }; testScript = '' From fb589faa0835838f41dcd94740dfbb82c6cb261b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Feb 2016 14:34:36 +0100 Subject: [PATCH 165/308] systemd: 228 -> 229 --- pkgs/os-specific/linux/systemd/default.nix | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c95e6002e84..ec5a85ef4ad 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux -, glib, kbd, libxslt, coreutils, libgcrypt, libapparmor, audit, lz4 +, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4 , kexectools, libmicrohttpd, linuxHeaders, libseccomp , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , enableKDbus ? false @@ -8,24 +8,22 @@ assert stdenv.isLinux; -# FIXME: When updating, please remove makeFlags -- `hwdb_bin` flag is not supported anymore. - stdenv.mkDerivation rec { - version = "228"; + version = "229"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "b737c07cc0234acfa87282786025d556bca91c3f"; - sha256 = "0wca8zkn39914c232andvf3v0ni6ylv154kz3s9fcvg47rhpd5n1"; + rev = "4936f6e6c05162516a685ebd227b55816cf2b670"; + sha256 = "1q0pyrljmq73qcan9rfqsiw66l1g159m5in5qgb8zwlwhl928670"; }; outputs = [ "out" "man" "doc" ]; buildInputs = [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libxslt libgcrypt + /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libgpgerror libmicrohttpd kexectools libseccomp audit lz4 libapparmor /* FIXME: we may be able to prevent the following dependencies by generating an autoconf'd tarball, but that's probably not @@ -66,7 +64,7 @@ stdenv.mkDerivation rec { "--with-sysvinit-path=" "--with-sysvrcnd-path=" "--with-rc-local-script-path-stop=/etc/halt.local" - ] ++ stdenv.lib.optional enableKDbus "--enable-kdbus"; + ] ++ (if enableKDbus then [ "--enable-kdbus" ] else [ "--disable-kdbus" ]); preConfigure = '' @@ -109,13 +107,6 @@ stdenv.mkDerivation rec { "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" ]; - # Use /var/lib/udev rather than /etc/udev for the generated hardware - # database. Upstream doesn't want this (see commit - # 1e1954f53386cb773e2a152748dd31c4d36aa2d8) because using /var is - # forbidden in early boot, but in NixOS the initrd guarantees that - # /var is mounted. - makeFlags = "hwdb_bin=/var/lib/udev/hwdb.bin"; - installFlags = [ "localstatedir=$(TMPDIR)/var" "sysconfdir=$(out)/etc" From 6f9d3f197b5577b7aaecd85ed2dbeabed69fef99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Feb 2016 15:11:09 +0100 Subject: [PATCH 166/308] all-packages.nix: drop postgresql90 attribute PostgreSQL 9.0 was removed in 0140591eabc8bf7c50adc673da0348313e6d1a2b. --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b71577207d4..7c6f9f104b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9606,7 +9606,6 @@ let postgresql = postgresql95; inherit (callPackages ../servers/sql/postgresql { }) - postgresql90 postgresql91 postgresql92 postgresql93 From aa31d99d2929eeb1082eb8bc05cc0ebbe49c9a09 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Feb 2016 15:19:59 +0100 Subject: [PATCH 167/308] nix: 1.11.1 -> 1.11.2 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d615ac10646..60fb6fc7e29 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -89,10 +89,10 @@ in rec { nix = nixStable; nixStable = common rec { - name = "nix-1.11.1"; + name = "nix-1.11.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a"; + sha256 = "fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6"; }; }; From c9d38164b76c6ee65f96c314f1ab7fdad10dda29 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Feb 2016 17:37:03 +0300 Subject: [PATCH 168/308] dspam service: make maintenance script verbose --- nixos/modules/services/mail/dspam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index f18fd489f23..2d8aebe2057 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -139,7 +139,7 @@ in { restartTriggers = [ cfgfile ]; serviceConfig = { - ExecStart = "${dspam}/bin/dspam_maintenance"; + ExecStart = "${dspam}/bin/dspam_maintenance --verbose"; Type = "oneshot"; User = cfg.user; Group = cfg.group; From 59d1339c800b4816fd55f686b43202cd832c939e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Feb 2016 17:58:53 +0300 Subject: [PATCH 169/308] dspam: fix maintenance script --- pkgs/servers/mail/dspam/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 2b594995951..99f8d45b4c1 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper -, gawk, gnused, gnugrep, coreutils +, gawk, gnused, gnugrep, coreutils, which , perl, NetSMTP , withMySQL ? false, zlib, libmysql , withPgSQL ? false, postgresql @@ -15,7 +15,7 @@ let ++ lib.optional withSQLite "sqlite3_drv" ++ lib.optional withDB "libdb4_drv" ); - maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils ]; + maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils which ]; in stdenv.mkDerivation rec { name = "dspam-3.10.2"; @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { # Install maintenance script install -Dm755 contrib/dspam_maintenance/dspam_maintenance.sh $out/bin/dspam_maintenance sed -i \ - -e '2iexport PATH=${maintenancePath}:$PATH' \ + -e "2iexport PATH=$out/bin:${maintenancePath}:\$PATH" \ -e 's,/usr/[a-z0-9/]*,,g' \ -e 's,^DSPAM_CONFIGDIR=.*,DSPAM_CONFIGDIR=/etc/dspam,' \ -e "s,^DSPAM_HOMEDIR=.*,DSPAM_HOMEDIR=/var/lib/dspam," \ @@ -93,6 +93,7 @@ in stdenv.mkDerivation rec { -e "s,^PGSQL_BIN_DIR=.*,PGSQL_BIN_DIR=/run/current-system/sw/bin," \ -e "s,^SQLITE_BIN_DIR=.*,SQLITE_BIN_DIR=/run/current-system/sw/bin," \ -e "s,^SQLITE3_BIN_DIR=.*,SQLITE3_BIN_DIR=/run/current-system/sw/bin," \ + -e 's,^DSPAM_CRON_LOCKFILE=.*,DSPAM_CRON_LOCKFILE=/run/dspam/dspam_maintenance.pid,' \ $out/bin/dspam_maintenance ''; From e674356c4673b0012d548a8d03bb7ea9f58e1f72 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Feb 2016 16:10:18 +0100 Subject: [PATCH 170/308] nix: Fix indentation --- pkgs/tools/package-management/nix/default.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 60fb6fc7e29..3b303bab3b7 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -86,25 +86,25 @@ let in rec { - nix = nixStable; + nix = nixStable; - nixStable = common rec { - name = "nix-1.11.2"; - src = fetchurl { - url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6"; - }; - }; + nixStable = common rec { + name = "nix-1.11.2"; + src = fetchurl { + url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + sha256 = "fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6"; + }; + }; - nixUnstable = nixStable; - /* - nixUnstable = lib.lowPrio (common rec { - name = "nix-1.11pre4379_786046c"; - src = fetchurl { - url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz"; - sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5"; - }; - }); - */ + nixUnstable = nixStable; + /* + nixUnstable = lib.lowPrio (common rec { + name = "nix-1.11pre4379_786046c"; + src = fetchurl { + url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz"; + sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5"; + }; + }); + */ } From 1f952e0172818b2185125b7775111040777f69e4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Feb 2016 16:10:49 +0100 Subject: [PATCH 171/308] nss: 3.21 -> 3.22 --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index ee8e38a7296..d3c2deb609e 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.21"; + version = "3.22"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${name}.tar.gz"; - sha256 = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_22_RTM/src/${name}.tar.gz"; + sha256 = "30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611"; }; buildInputs = [ nspr perl zlib sqlite ]; From 0137d4c6ff8a25041e49e37e62524e9edd3452f9 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Fri, 12 Feb 2016 18:43:19 +0100 Subject: [PATCH 172/308] irssi-otr: fetchFromGithub --- .../applications/networking/irc/irssi/otr/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 33fe5b799db..bf462c09f54 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: with stdenv.lib; stdenv.mkDerivation rec { name = "irssi-otr-${version}"; version = "1.0.0"; - src = fetchurl { - url = "https://github.com/cryptodotis/irssi-otr/archive/v${version}.tar.gz"; - name = "${name}.tar.gz"; - sha256 = "bad09a2853ea6fb1a7af42c8f15868fd3ce45f973be90c78944ddf04f8ab517e"; + src = fetchFromGitHub { + owner = "cryptodotis"; + repo = "irssi-otr"; + rev = "v${version}"; + sha256 = "139jawz3la6k91fy5kpgr6zvljl14n0fdpz72n2zw6wql69xlnnl"; }; patchPhase = '' From 67fd55b5613ce4e844c5129c82de5f15fd29424d Mon Sep 17 00:00:00 2001 From: = Date: Fri, 12 Feb 2016 18:54:25 +0100 Subject: [PATCH 173/308] non: 2015-12-16 -> 2016-02-07 --- pkgs/applications/audio/non/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 84fcd50adc0..5a54c94f1f9 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -4,12 +4,12 @@ ladspaH, liblrdf, liblo, libsigcxx stdenv.mkDerivation rec { name = "non-${version}"; - version = "2015-12-16"; + version = "2016-02-07"; src = fetchFromGitHub { owner = "original-male"; repo = "non"; - rev = "5d274f430c867f73ed1dcb306b49be0371d28128"; - sha256 = "1yckac3r1hqn5p450j4lf4349v4knjj7n9s5p3wdcvxhs0pjv2sy"; + rev = "1ef382fbbea598fdb56b25244a703c64ecaf8446"; + sha256 = "1mi3nm0nrrqlk36920irvqf5080lbnj1qc8vnxspgwkjjqgdc22g"; }; buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile From c0a02801d7635a03022c6cb6b4d1c3efb516a0a9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Feb 2016 21:26:11 +0300 Subject: [PATCH 174/308] bluez5: enable parallel building --- pkgs/os-specific/linux/bluez/bluez5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 21925a5e1dd..2b73dc798c3 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -73,6 +73,8 @@ stdenv.mkDerivation rec { ln -s ../libexec/bluetooth/obexd $out/sbin/obexd ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.bluez.org/; repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; From 1f20ca1f74e3f80624bf4a81022558e6434543d5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Feb 2016 22:44:15 +0300 Subject: [PATCH 175/308] bluez: default to bluez5 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c6f9f104b7..a760c007ea0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9858,16 +9858,16 @@ let batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; - bluez4 = callPackage ../os-specific/linux/bluez { + bluez4 = lowPrio (callPackage ../os-specific/linux/bluez { pygobject = pygobject3; - }; + }); - bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { }); + bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { }; # Needed for LibreOffice bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); - bluez = bluez4; + bluez = bluez5; inherit (pythonPackages) bedup; From bd4b54557dcceb7d7d1a77009a717abb7b96883f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Feb 2016 22:44:55 +0300 Subject: [PATCH 176/308] openobex: cleanup, add license --- pkgs/tools/bluetooth/openobex/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 7baf1ac3ed9..ec5ca0706f4 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, bluez, libusb, cmake}: +{ stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }: stdenv.mkDerivation rec { name = "openobex-1.7.1"; @@ -8,18 +8,20 @@ stdenv.mkDerivation rec { sha256 = "0mza0mrdrbcw4yix6qvl31kqy7bdkgxjycr0yx7yl089v5jlc9iv"; }; - buildInputs = [pkgconfig bluez libusb cmake]; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ bluez libusb ]; - configureFlags = "--enable-apps"; + configureFlags = [ "--enable-apps" ]; patchPhase = '' sed -i "s!/lib/udev!$out/lib/udev!" udev/CMakeLists.txt sed -i "/if ( PKGCONFIG_UDEV_FOUND )/,/endif ( PKGCONFIG_UDEV_FOUND )/d" udev/CMakeLists.txt ''; - meta = { + meta = with stdenv.lib; { homepage = http://dev.zuckschwerdt.org/openobex/; description = "An open source implementation of the Object Exchange (OBEX) protocol"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.lgpl2Plus; }; } From 4a00e1f70b62e406a0c9cc27f6e25477b1884764 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Feb 2016 22:45:14 +0300 Subject: [PATCH 177/308] obexftp: fix pkgconfig file, add license --- pkgs/tools/bluetooth/obexftp/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 4a40b4393c3..12b021d5d3b 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, openobex, bluez, cmake}: +{ stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }: stdenv.mkDerivation rec { name = "obexftp-0.24"; @@ -8,13 +8,21 @@ stdenv.mkDerivation rec { sha256 = "0szy7p3y75bd5h4af0j5kf0fpzx2w560fpy4kg3603mz11b9c1xr"; }; - buildInputs = [pkgconfig bluez cmake]; + nativeBuildInputs = [ pkgconfig cmake ]; - propagatedBuildInputs = [openobex]; + buildInputs = [ bluez ]; - meta = { + propagatedBuildInputs = [ openobex ]; + + # There's no such thing like "bluetooth" library; possibly they meant "bluez" but it links correctly without this. + postFixup = '' + sed -i 's,^Requires: bluetooth,Requires:,' $out/lib/pkgconfig/obexftp.pc + ''; + + meta = with stdenv.lib; { homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp; description = "A library and tool to access files on OBEX-based devices (such as Bluetooth phones)"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.lgpl2Plus; }; } From 62365ecf1ab3c8d115d9e2fcb9009d7b07b35aba Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Feb 2016 22:45:29 +0300 Subject: [PATCH 178/308] obexfs: cleanup, add license --- pkgs/tools/bluetooth/obexfs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix index aeeeb4bf8d0..94c011152da 100644 --- a/pkgs/tools/bluetooth/obexfs/default.nix +++ b/pkgs/tools/bluetooth/obexfs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, fuse, obexftp}: +{ stdenv, fetchurl, pkgconfig, fuse, obexftp }: stdenv.mkDerivation rec { name = "obexfs-0.12"; @@ -8,12 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj"; }; - buildInputs = [pkgconfig fuse obexftp]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse obexftp ]; - NIX_LDFLAGS = "-lobexftp"; - - meta = { + meta = with stdenv.lib; { homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFs; description = "A tool to mount OBEX-based devices (such as Bluetooth phones)"; + platforms = platforms.linux; + license = licenses.lgpl2Plus; }; } From 08361aa43e723ed5fa1554c2dccd9f7595555c03 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 12 Feb 2016 22:46:28 +0300 Subject: [PATCH 179/308] blueman: 1.23 -> 2.0.3 --- pkgs/tools/bluetooth/blueman/default.nix | 68 +++++++++++++----------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 5330dfb82bd..82d9f085f78 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,43 +1,49 @@ -{ stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk -, notify, pythonDBus, bluez, glib, gtk, libstartup_notification -, makeWrapper, xdg_utils, obex_data_server -, libpulseaudio -}: - -stdenv.mkDerivation rec { - name = "blueman-1.23"; +{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 +, obex_data_server, xdg_utils, libnotify, dconf +, withPulseAudio ? true, libpulseaudio }: + +let + binPath = lib.makeBinPath [ xdg_utils ]; + +in stdenv.mkDerivation rec { + name = "blueman-${version}"; + version = "2.0.3"; src = fetchurl { - url = "http://download.tuxfamily.org/blueman/${name}.tar.gz"; - sha256 = "04ghlh4h5bwp9mqr5jxcmjm01595l5fq5561qxvf369fvjy63cjh"; + url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; + sha256 = "09aqlk4c2qzqpmyf7b40sic7d45c1l8fyrb9f3s22b8w83j0adi4"; }; - configureFlags = "--disable-polkit"; + nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ]; - buildInputs = - [ pkgconfig intltool python pyrex pygobject pygtk notify pythonDBus - bluez glib gtk libstartup_notification makeWrapper - ]; + buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf ] + ++ pythonPath + ++ lib.optional withPulseAudio libpulseaudio; - # !!! Ugly. - PYTHONPATH = "${pygobject}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${notify}/lib/${python.libPrefix}/site-packages/gtk-2.0"; + postPatch = lib.optionalString withPulseAudio '' + sed -i 's,CDLL(",CDLL("${libpulseaudio}/lib/,g' blueman/main/PulseAudioUtils.py + ''; - postInstall = - '' - # Create wrappers that set the environment correctly. - for i in $out/bin/* $out/libexec/*; do - wrapProgram $i \ - --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \ - --set LD_LIBRARY_PATH "${libpulseaudio}/lib:" \ - --prefix PATH : ${xdg_utils}/bin - done + pythonPath = with pythonPackages; [ dbus pygobject3 ]; - mkdir -p $out/nix-support - echo ${obex_data_server} > $out/nix-support/propagated-user-env-packages - ''; # */ + propagatedUserEnvPkgs = [ obex_data_server ]; - meta = { - homepage = http://blueman-project.org/; + configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ]; + + postFixup = '' + makeWrapperArgs="\ + --prefix PATH ':' ${binPath} \ + --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \ + --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ + --prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" + wrapPythonPrograms + ''; + + meta = with lib; { + homepage = https://github.com/blueman-project; description = "GTK+-based Bluetooth Manager"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a760c007ea0..856ee80916e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1012,7 +1012,8 @@ let bittornado = callPackage ../tools/networking/p2p/bit-tornado { }; blueman = callPackage ../tools/bluetooth/blueman { - inherit (pythonPackages) notify; + inherit (gnome3) dconf; + withPulseAudio = config.pulseaudio or true; }; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; From dc82532eb8fdf86ea37852bc846bf69ba03987b3 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 12 Feb 2016 20:49:26 +0100 Subject: [PATCH 180/308] timemachine: init at 0.3.1 --- .../audio/timemachine/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/audio/timemachine/default.nix diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix new file mode 100644 index 00000000000..55e95c0fc15 --- /dev/null +++ b/pkgs/applications/audio/timemachine/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2 +, libjack2, libsndfile +}: + +stdenv.mkDerivation rec { + name = "timemachine-${version}"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "swh"; + repo = "timemachine"; + rev = "1966d8524d4e4c47c525473bab3b010a168adc98"; + sha256 = "0w5alysixnvlkfl79wf7vs5wsw2vgxl3gqxxcm0zbmhjdpmjpcal"; + }; + + buildInputs = [ autoconf automake pkgconfig gtk2 libjack2 + libsndfile + ]; + + preConfigure = "./autogen.sh"; + + meta = { + description = "JACK audio recorder"; + homepage = http://plugin.org.uk/timemachine/; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21dbbd6e996..9ef4dd250ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3324,6 +3324,8 @@ let tiled = qt5.callPackage ../applications/editors/tiled { }; + timemachine = callPackage ../applications/audio/timemachine { }; + tinc = callPackage ../tools/networking/tinc { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; From d6f38f5fd8eee01927831efc59c8ee1e8686b9ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Feb 2016 20:33:15 +0100 Subject: [PATCH 181/308] xmonad-contrib: drop obsolete overrides --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bbf98df8079..33914203b2e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -627,14 +627,6 @@ self: super: { # https://github.com/haskell/haddock/issues/378 haddock-library = dontCheck super.haddock-library; - # Already fixed in upstream darcs repo. - xmonad-contrib = overrideCabal super.xmonad-contrib (drv: { - postPatch = '' - sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs - sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs - ''; - }); - # https://github.com/anton-k/csound-expression-dynamic/issues/1 csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; From e771dc4b06b940c00f53244de5cbd356091d7829 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Feb 2016 21:03:17 +0100 Subject: [PATCH 182/308] haskell-hans: drop obsolete patch --- .../haskell-modules/configuration-common.nix | 3 --- .../patches/hans-disable-webserver.patch | 11 ----------- 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/hans-disable-webserver.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 33914203b2e..6030ec11afd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -765,9 +765,6 @@ self: super: { elm-server = markBroken super.elm-server; elm-yesod = markBroken super.elm-yesod; - # https://github.com/GaloisInc/HaNS/pull/8 - hans = appendPatch super.hans ./patches/hans-disable-webserver.patch; - # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; diff --git a/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch b/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch deleted file mode 100644 index 14f7e51fdf2..00000000000 --- a/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur hans-2.5.0.0/hans.cabal hans-2.5.0.1/hans.cabal ---- hans-2.5.0.0/hans.cabal 2015-08-06 14:48:45.453072822 +0300 -+++ hans-2.5.0.1/hans.cabal 2015-08-06 14:49:13.044391528 +0300 -@@ -30,6 +30,7 @@ - description: Build the example program - - flag web-server -+ default: False - description: Build a simple web-server example - - flag word32-in-random From 328d9967d350f4542c5befa049c9c2cec4bf8d3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Feb 2016 21:07:11 +0100 Subject: [PATCH 183/308] haskell-pandoc: drop obsolete override --- .../haskell-modules/configuration-common.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6030ec11afd..18b7dbfc03b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -605,14 +605,8 @@ self: super: { # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; - # https://github.com/jgm/pandoc/issues/2190 - pandoc = overrideCabal super.pandoc (drv: { - enableSharedExecutables = false; - postInstall = '' # install man pages - mv man $out/ - find $out/man -type f ! -name "*.[0-9]" -exec rm {} + - ''; - }); + # https://github.com/jgm/pandoc/issues/2709 + pandoc = disableSharedExecutables super.pandoc; # Tests attempt to use NPM to install from the network into # /homeless-shelter. Disabled. From 7f1b6d8a315042500e565fcf01023fd263e22080 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 12 Feb 2016 21:46:43 +0100 Subject: [PATCH 184/308] calibre: 2.50.1 -> 2.51.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 010deb0b17e..5e1bebf900c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.50.1"; + version = "2.51.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0fy5fwj53hl8bcl412d2y61xm1nmkry24dlanj07nn6dhmrs0cm9"; + sha256 = "1rhpcxic4g2zyr5s3xn8dayyb45l9r8zyniaig8j7pl5kmsfjijn"; }; inherit python; From d9739ebcc21a778eb0971361943126ab4b3043c9 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 12 Feb 2016 20:51:13 +0000 Subject: [PATCH 185/308] plot.ly: upgrade to 1.9.5 (cherry picked from commit 104fde593d26c4497fec227aabf5d9bb84ef44de) --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e18bf816725..5694d65a016 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6628,13 +6628,13 @@ in modules // { }; }; - plotly = buildPythonPackage rec { - name = "plotly-1.9.1"; + plotly = self.buildPythonPackage rec { + name = "plotly-1.9.5"; disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/plotly/${name}.tar.gz"; - md5 = "84fe80b294b639357f12fa210ce09f95"; + md5 = "56fb77dff80325413c8cf40cf229ce90"; }; propagatedBuildInputs = with self; [ self.pytz self.six self.requests ]; From b7b6a672df1af5e2ae6e040cbcd7d6107f7c5aa3 Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Fri, 12 Feb 2016 20:59:55 +0000 Subject: [PATCH 186/308] {lib}mediainfo{-gui}: 0.7.81 -> 0.7.82 Built and tested locally. From the changelog: ``` Version 0.7.82, 2016-01-27 + Matroska: CRC-32 validation + Matroska: support of padding/junk at the start of a segment + Matroska: trace is activated for all elements (but report is still based on the first element met) + Matroska: add an intermediate level in the trace for the raw stream parser x FLV: potential infinite loop fixed x #B966, DTS: DTS-HD HR 3840 not detected anymore x AC-3: wrong sample rate with 32 kHz streams x #B948, EBUCore 1.6: invalid output due to position of containerEncoding element x #B957, MPEG-7 output: No XML encoded value output ``` --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 687584de553..ffb4c147c77 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.81"; + version = "0.7.82"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07"; + sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 50454308fd2..5d953fed53a 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.81"; + version = "0.7.82"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07"; + sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 19d0b84f69e..2bc18a5a61d 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.81"; + version = "0.7.82"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0hzfrg7n7wlnwq28hmpxczis1k8x73wbwlsmfkshvqcwi7lva0cs"; + sha256 = "1mqmk1q2phwqwrak54jc9hfwjllhhr4nqyigisrh9rcvd6wx6r86"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; From 16d6eb45f18fe94885d25a729313a2387765d60f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Feb 2016 05:13:49 +0100 Subject: [PATCH 187/308] imv: 1.2.0 -> 2.0.0 --- pkgs/applications/graphics/imv/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 9298c764d28..5be5a8b161d 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchFromGitHub, - SDL2, freeimage -}: +{ stdenv, fetchgit, SDL2, SDL2_ttf, freeimage }: stdenv.mkDerivation rec { name = "imv-${version}"; - version = "1.1.0"; + version = "2.0.0"; - src = fetchFromGitHub { - owner = "eXeC64"; - repo = "imv"; - rev = "4d1a6d581b70b25d9533c5c788aab6900ebf82bb"; - sha256 = "1c5r4pqqypir8ymicxyn2k7mhq8nl88b3x6giaafd77ssjn0vz9r"; + src = fetchgit { + url = "https://github.com/eXeC64/imv.git"; + rev = "bc90a0adcc5b22d2bf0158333eb6dfb34c402d48"; + sha256 = "1bzx57d9mcxw9s72pdbdbwq9pns946jl6p2g881z43w68gimlpw7"; }; - buildInputs = [ SDL2 freeimage ]; + buildInputs = [ SDL2 SDL2_ttf freeimage ]; configurePhase = "substituteInPlace Makefile --replace /usr $out"; From d12399f3f5e58b11402c43ef7616c57022963d67 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Sat, 13 Feb 2016 05:50:09 +0100 Subject: [PATCH 188/308] irssi-otr: 1.0.0 -> 1.0.1 --- pkgs/applications/networking/irc/irssi/otr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index bf462c09f54..6bbe9c6c140 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "irssi-otr-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "cryptodotis"; repo = "irssi-otr"; - rev = "v${version}"; - sha256 = "139jawz3la6k91fy5kpgr6zvljl14n0fdpz72n2zw6wql69xlnnl"; + rev = "4ad3b7b6c85be0154ab3694fe9831796db20c4fe"; + sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg"; }; patchPhase = '' From 9c249a3adfbe07d31b2693ab9a3081cf37371435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 13 Feb 2016 15:22:19 +0100 Subject: [PATCH 189/308] nixos: i2pd, make config options adhere to version 2.4.0 --- nixos/modules/services/networking/i2pd.nix | 294 ++++++++------------- 1 file changed, 108 insertions(+), 186 deletions(-) diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index af9424ecfea..e73316a9b1e 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -12,21 +12,69 @@ let toOneZero = b: if b then "1" else "0"; + mkEndpointOpt = name: addr: port: { + name = mkOption { + type = types.str; + default = name; + description = "The endpoint name."; + }; + address = mkOption { + type = types.str; + default = addr; + description = "Bind address for ${name} endpoint. Default: " + addr; + }; + port = mkOption { + type = types.int; + default = port; + description = "Bind port for ${name} endoint. Default: " + toString port; + }; + }; + + commonTunOpts = let + i2cpOpts = { + length = mkOption { + type = types.int; + description = "Guaranteed minimum hops."; + default = 3; + }; + quantity = mkOption { + type = types.int; + description = "Number of simultaneous tunnels."; + default = 5; + }; + }; + in name: { + outbound = i2cpOpts; + inbound = i2cpOpts; + crypto.tagsToSend = mkOption { + type = types.int; + description = "Number of ElGamal/AES tags to send."; + default = 40; + }; + destination = mkOption { + type = types.str; + description = "Remote endpoint, I2P hostname or b32.i2p address."; + }; + keys = mkOption { + type = types.str; + default = name + "-keys.dat"; + description = "Keyset used for tunnel identity."; + }; + } // mkEndpointOpt name "127.0.0.1" 0; + i2pdConf = pkgs.writeText "i2pd.conf" '' - v6 = ${toOneZero cfg.enableIPv6} - unreachable = ${toOneZero cfg.unreachable} + ipv6 = ${toOneZero cfg.enableIPv6} + notransit = ${toOneZero cfg.notransit} floodfill = ${toOneZero cfg.floodfill} ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} - httpproxyport = ${toString cfg.proxy.httpPort} - socksproxyport = ${toString cfg.proxy.socksPort} - ircaddress = ${cfg.irc.host} - ircport = ${toString cfg.irc.port} - ircdest = ${cfg.irc.dest} - irckeys = ${cfg.irc.keyFile} - eepport = ${toString cfg.eep.port} - ${if isNull cfg.sam.port then "" else "--samport=${toString cfg.sam.port}"} - eephost = ${cfg.eep.host} - eepkeys = ${cfg.eep.keyFile} + ${flip concatMapStrings + (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) + (proto: let portStr = toString proto.port; in '' + [${proto.name}] + address = ${proto.address} + port = ${toString proto.port} + '') + } ''; i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" '' @@ -39,10 +87,15 @@ let keys = ${tun.keys} address = ${tun.address} port = ${toString tun.port} + inbound.length = ${toString tun.inbound.length} + outbound.length = ${toString tun.outbound.length} + inbound.quantity = ${toString tun.inbound.quantity} + outbound.quantity = ${toString tun.outbound.quantity} + crypto.tagsToSend = ${toString tun.crypto.tagsToSend} '') } ${flip concatMapStrings - (collect (tun: tun ? port && tun ? host) cfg.outTunnels) + (collect (tun: tun ? port && tun ? host) cfg.inTunnels) (tun: let portStr = toString tun.port; in '' [${tun.name}] type = server @@ -59,10 +112,10 @@ let i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh ${if isNull cfg.extIp then extip else ""} - ${pkgs.i2pd}/bin/i2pd --log=1 --daemon=0 --service=0 \ + ${pkgs.i2pd}/bin/i2pd --log=1 \ --host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \ --conf=${i2pdConf} \ - --tunnelscfg=${i2pdTunnelConf} + --tunconf=${i2pdTunnelConf} ''; in @@ -91,11 +144,11 @@ in ''; }; - unreachable = mkOption { + notransit = mkOption { type = types.bool; default = false; description = '' - If the router is declared to be unreachable and needs introduction nodes. + Tells the router to not accept transit tunnels during startup. ''; }; @@ -111,7 +164,7 @@ in type = with types; nullOr int; default = null; description = '' - I2P listen port. If no one is given the router will pick between 9111 and 30777. + I2P listen port. If no one is given the router will pick between 9111 and 30777. ''; }; @@ -123,184 +176,53 @@ in ''; }; - http = { - port = mkOption { - type = types.int; - default = 7070; - description = '' - HTTP listen port. - ''; - }; - }; - - proxy = { - httpPort = mkOption { - type = types.int; - default = 4446; - description = '' - HTTP proxy listen port. - ''; - }; - socksPort = mkOption { - type = types.int; - default = 4447; - description = '' - SOCKS proxy listen port. - ''; - }; - }; - - irc = { - host = mkOption { - type = types.str; - default = "127.0.0.1"; - description = '' - Address to forward incoming traffic to. 127.0.0.1 by default. - ''; - }; - dest = mkOption { - type = types.str; - default = "irc.postman.i2p"; - description = '' - Destination I2P tunnel endpoint address of IRC server. irc.postman.i2p by default. - ''; - }; - port = mkOption { - type = types.int; - default = 6668; - description = '' - Local IRC tunnel endoint port to listen on. 6668 by default. - ''; - }; - keyFile = mkOption { - type = types.str; - default = "privKeys.dat"; - description = '' - File name containing destination keys. privKeys.dat by default. - ''; - }; - }; - - eep = { - host = mkOption { - type = types.str; - default = "127.0.0.1"; - description = '' - Address to forward incoming traffic to. 127.0.0.1 by default. - ''; - }; - port = mkOption { - type = types.int; - default = 80; - description = '' - Port to forward incoming traffic to. 80 by default. - ''; - }; - keyFile = mkOption { - type = types.str; - default = "privKeys.dat"; - description = '' - File name containing destination keys. privKeys.dat by default. - ''; - }; - }; - - sam = { - port = mkOption { - type = with types; nullOr int; - default = null; - description = '' - Local SAM tunnel endpoint. Usually 7656. SAM is disabled if not specified. - ''; - }; - }; + proto.http = mkEndpointOpt "http" "127.0.0.1" 7070; + proto.sam = mkEndpointOpt "sam" "127.0.0.1" 7656; + proto.bob = mkEndpointOpt "bob" "127.0.0.1" 2827; + proto.i2pControl = mkEndpointOpt "i2pcontrol" "127.0.0.1" 7650; + proto.httpProxy = mkEndpointOpt "httpproxy" "127.0.0.1" 4446; + proto.socksProxy = mkEndpointOpt "socksproxy" "127.0.0.1" 4447; outTunnels = mkOption { default = {}; - type = with types; loaOf optionSet; - description = '' - ''; - options = [ ({ name, config, ... }: { - - options = { - name = mkOption { - type = types.str; - description = "The name of the tunnel."; - }; - destination = mkOption { - type = types.str; - description = "Remote endpoint, I2P hostname or b32.i2p address."; - }; - keys = mkOption { - type = types.str; - default = name + "-keys.dat"; - description = "Keyset used for tunnel identity."; - }; - address = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Local bind address for tunnel."; - }; - port = mkOption { - type = types.int; - default = 0; - description = "Local tunnel listen port."; - }; - }; - - config = { - name = mkDefault name; - }; - - }) ]; + type = with types; loaOf optionSet; + description = '' + Connect to someone as a client and establish a local accept endpoint + ''; + options = [ ({ name, config, ... }: { + options = commonTunOpts name; + config = { + name = mkDefault name; + }; + }) ]; }; inTunnels = mkOption { default = {}; - type = with types; loaOf optionSet; - description = '' - ''; - options = [ ({ name, config, ... }: { + type = with types; loaOf optionSet; + description = '' + Serve something on I2P network at port and delegate requests to address inPort. + ''; + options = [ ({ name, config, ... }: { - options = { + options = { + inPort = mkOption { + type = types.int; + default = 0; + description = "Service port. Default to the tunnel's listen port."; + }; + accessList = mkOption { + type = with types; listOf str; + default = []; + description = "I2P nodes that are allowed to connect to this service."; + }; + } // commonTunOpts name; - name = mkOption { - type = types.str; - description = "The name of the tunnel."; - }; - keys = mkOption { - type = types.path; - default = name + "-keys.dat"; - description = "Keyset used for tunnel identity."; - }; - address = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Local service IP address."; - }; - port = mkOption { - type = types.int; - default = 0; - description = "Local tunnel listen port."; - }; - inPort = mkOption { - type = types.int; - default = 0; - description = "I2P service port. Default to the tunnel's listen port."; - }; - accessList = mkOption { - type = with types; listOf str; - default = []; - description = "I2P nodes that are allowed to connect to this service."; - }; + config = { + name = mkDefault name; + }; - }; - - config = { - name = mkDefault name; - }; - - }) ]; + }) ]; }; }; }; From 02f5a01c196bd68700d1122b4a88dbdad48e1393 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 24 Jan 2016 14:49:08 +0000 Subject: [PATCH 190/308] nix-prefetch-git: use fetchgit's naming heuristic This commit fixes #6651. Before this change the `nix-prefetch-git` script would use a different store name than nix's `fetchgit` function. Because of that it was not possible to use `nix-prefetch-git` as a way to pre-populate the store (for example when the user it using private git dependencies that needs access to the ssh agent) --- pkgs/build-support/fetchgit/nix-prefetch-git | 23 +++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 945ba592a0a..2c5852c646e 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -102,6 +102,23 @@ hash_from_ref(){ git ls-remote origin | sed -n "\,\t$ref, { s,\(.*\)\t\(.*\),\1,; p; q}" } +# Returns a name based on the url and reference +# +# This function needs to be in sync with nix's fetchgit implementation +# of urlToName() to re-use the same nix store paths. +url_to_name(){ + local url=$1 + local ref=$2 + # basename removes the / and .git suffixes + local base=$(basename "$url" .git) + + if [[ $ref =~ [a-z0-9]+ ]]; then + echo "$base-${ref:0:7}" + else + echo $base + fi +} + # Fetch everything and checkout the right sha1 checkout_hash(){ local hash="$1" @@ -288,7 +305,7 @@ else # If the hash was given, a file with that hash may already be in the # store. if test -n "$expHash"; then - finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export) + finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$(url_to_name "$url" "$rev")") if ! nix-store --check-validity "$finalPath" 2> /dev/null; then finalPath= fi @@ -302,7 +319,7 @@ else tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")" trap "rm -rf \"$tmpPath\"" EXIT - tmpFile="$tmpPath/git-export" + tmpFile="$tmpPath/$(url_to_name "$url" "$rev")" mkdir "$tmpFile" # Perform the checkout. @@ -313,7 +330,7 @@ else if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi # Add the downloaded file to the Nix store. - finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile) + finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile") if test -n "$expHash" -a "$expHash" != "$hash"; then echo "hash mismatch for URL \`$url'" From e1493f2ba77f17dd397d798752a49408956a38c8 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 13 Feb 2016 13:54:27 +0000 Subject: [PATCH 191/308] logstash module: use literalExample --- nixos/modules/services/logging/logstash.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index e019e6c3f23..d27456e59e8 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -85,7 +85,7 @@ in type = types.lines; default = ''stdin { type => "example" }''; description = "Logstash input configuration."; - example = '' + example = literalExample '' # Read from journal pipe { command => "''${pkgs.systemd}/bin/journalctl -f -o json" @@ -98,7 +98,7 @@ in type = types.lines; default = ''noop {}''; description = "logstash filter configuration."; - example = '' + example = literalExample '' if [type] == "syslog" { # Keep only relevant systemd fields # http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html @@ -114,7 +114,7 @@ in outputConfig = mkOption { type = types.lines; - default = ''stdout { debug => true debug_format => "json"}''; + default = literalExample ''stdout { debug => true debug_format => "json"}''; description = "Logstash output configuration."; example = '' redis { host => "localhost" data_type => "list" key => "logstash" codec => json } From c2b578386ea6950f23b2085848b3797c37608108 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 13 Feb 2016 14:01:45 +0000 Subject: [PATCH 192/308] kibana: fix pkg and module --- nixos/modules/services/search/kibana.nix | 59 ++++++++----------- .../development/tools/misc/kibana/default.nix | 1 + 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 4263ed22a8d..033b8139d34 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -7,37 +7,33 @@ let cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON ( (filterAttrsRecursive (n: v: v != null) ({ - server = { - host = cfg.listenAddress; - port = cfg.port; - ssl = { - cert = cfg.cert; - key = cfg.key; - }; - }; + host = cfg.listenAddress; + port = cfg.port; + ssl_cert_file = cfg.cert; + ssl_key_file = cfg.key; - kibana = { - index = cfg.index; - defaultAppId = cfg.defaultAppId; - }; + kibana_index = cfg.index; + default_app_id = cfg.defaultAppId; - elasticsearch = { - url = cfg.elasticsearch.url; - username = cfg.elasticsearch.username; - password = cfg.elasticsearch.password; - ssl = { - cert = cfg.elasticsearch.cert; - key = cfg.elasticsearch.key; - ca = cfg.elasticsearch.ca; - }; - }; + elasticsearch_url = cfg.elasticsearch.url; + kibana_elasticsearch_username = cfg.elasticsearch.username; + kibana_elasticsearch_password = cfg.elasticsearch.password; + kibana_elasticsearch_cert = cfg.elasticsearch.cert; + kibana_elasticsearch_key = cfg.elasticsearch.key; + ca = cfg.elasticsearch.ca; - logging = { - verbose = cfg.logLevel == "verbose"; - quiet = cfg.logLevel == "quiet"; - silent = cfg.logLevel == "silent"; - dest = "stdout"; - }; + bundled_plugin_ids = [ + "plugins/dashboard/index" + "plugins/discover/index" + "plugins/doc/index" + "plugins/kibana/index" + "plugins/markdown_vis/index" + "plugins/metric_vis/index" + "plugins/settings/index" + "plugins/table_vis/index" + "plugins/vis_types/index" + "plugins/visualize/index" + ]; } // cfg.extraConf) ))); in { @@ -118,12 +114,6 @@ in { }; }; - logLevel = mkOption { - description = "Kibana log level"; - default = "normal"; - type = types.enum ["verbose" "normal" "silent" "quiet"]; - }; - package = mkOption { description = "Kibana package to use"; default = pkgs.kibana; @@ -149,6 +139,7 @@ in { description = "Kibana Service"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "elasticsearch.service" ]; + environment = { BABEL_CACHE_PATH = "${cfg.dataDir}/.babelcache.json"; }; serviceConfig = { ExecStart = "${cfg.package}/bin/kibana --config ${cfgFile}"; User = "kibana"; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index 699ddd16c23..188c3df78fc 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { rm -r $out/libexec/kibana/node makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ --prefix PATH : "${nodejs}/bin:${coreutils}/bin:${which}/bin" + sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana ''; meta = { From 4bc9e8a785b9e8754ca533f64df30a040b195d30 Mon Sep 17 00:00:00 2001 From: Markus Wotringer Date: Fri, 4 Dec 2015 01:12:25 +0100 Subject: [PATCH 193/308] elasticsearch2: init at 2.2.0 changes by @globin: * updated 2.1.0 to 2.2.0 * moved to a new derivation closes #11446 Signed-off-by: Robin Gloster --- .../modules/services/search/elasticsearch.nix | 13 ++++-- pkgs/servers/search/elasticsearch/2.x.nix | 41 +++++++++++++++++++ .../search/elasticsearch/es-home-2.x.patch | 31 ++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/search/elasticsearch/2.x.nix create mode 100644 pkgs/servers/search/elasticsearch/es-home-2.x.patch diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 356cfd409ad..31332489a78 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -9,6 +9,8 @@ let network.host: ${cfg.listenAddress} network.port: ${toString cfg.port} network.tcp.port: ${toString cfg.tcp_port} + # TODO: find a way to enable security manager + security.manager.enabled: false cluster.name: ${cfg.cluster_name} ${cfg.extraConf} ''; @@ -39,8 +41,8 @@ in { package = mkOption { description = "Elasticsearch package to use."; - default = pkgs.elasticsearch; - defaultText = "pkgs.elasticsearch"; + default = pkgs.elasticsearch2; + defaultText = "pkgs.elasticsearch2"; type = types.package; }; @@ -129,7 +131,9 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; path = [ pkgs.inetutils ]; - environment = { ES_HOME = cfg.dataDir; }; + environment = { + ES_HOME = cfg.dataDir; + }; serviceConfig = { ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; User = "elasticsearch"; @@ -137,10 +141,11 @@ in { }; preStart = '' mkdir -m 0700 -p ${cfg.dataDir} - if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi # Install plugins ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins + ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib + if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi ''; postStart = mkBefore '' until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix new file mode 100644 index 00000000000..a37703ae7fd --- /dev/null +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "2.2.0"; + name = "elasticsearch-${version}"; + + src = fetchurl { + url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz"; + sha256 = "0c2d0mpcr8lpvifvgp2pfj7avdi7fa8a5vib0gqdap7mw60wqw7d"; + }; + + patches = [ ./es-home-2.x.patch ]; + + buildInputs = [ makeWrapper jre ] ++ + (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + + installPhase = '' + mkdir -p $out + cp -R bin config lib $out + + # don't want to have binary with name plugin + mv $out/bin/plugin $out/bin/elasticsearch-plugin + wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin) + then ''--prefix PATH : "${utillinux}/bin/"'' + else ''--prefix PATH : "${getopt}/bin"''} \ + --set JAVA_HOME "${jre}" + wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}" + ''; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ + maintainers.offline + maintainers.markWot + ]; + }; +} diff --git a/pkgs/servers/search/elasticsearch/es-home-2.x.patch b/pkgs/servers/search/elasticsearch/es-home-2.x.patch new file mode 100644 index 00000000000..0c80e865114 --- /dev/null +++ b/pkgs/servers/search/elasticsearch/es-home-2.x.patch @@ -0,0 +1,31 @@ +diff -rupN a/bin/elasticsearch b/bin/elasticsearch +--- a/bin/elasticsearch 2015-11-18 21:48:18.000000000 +0100 ++++ b/bin/elasticsearch 2015-12-04 00:52:21.032475098 +0100 +@@ -72,7 +72,11 @@ while [ -h "$SCRIPT" ] ; do + done + + # determine elasticsearch home +-ES_HOME=`dirname "$SCRIPT"`/.. ++ ++if [ -z "$ES_HOME" ]; then ++ echo "You must set the ES_HOME var" >&2 ++ exit 1 ++fi + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` +diff -rupN a/bin/plugin b/bin/plugin +--- a/bin/plugin 2015-11-18 21:48:18.000000000 +0100 ++++ b/bin/plugin 2015-12-04 00:52:55.947453619 +0100 +@@ -17,7 +17,10 @@ while [ -h "$SCRIPT" ] ; do + done + + # determine elasticsearch home +-ES_HOME=`dirname "$SCRIPT"`/.. ++if [ -z "$ES_HOME" ]; then ++ echo "You must set the ES_HOME var" >&2 ++ exit 1 ++fi + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21dbbd6e996..5e8312764dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1437,6 +1437,7 @@ let evemu = callPackage ../tools/system/evemu { }; elasticsearch = callPackage ../servers/search/elasticsearch { }; + elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; elasticsearchPlugins = recurseIntoAttrs ( callPackage ../servers/search/elasticsearch/plugins.nix { } From 4374ffa19adcded710873da4e76109e6e11303ec Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 13 Feb 2016 14:58:32 +0000 Subject: [PATCH 194/308] kibana: 4.1.2 -> 4.4.1 --- pkgs/development/tools/misc/kibana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index 188c3df78fc..ce138014408 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "4.1.2"; + version = "4.4.1"; src = fetchurl { url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz"; - sha256 = "00ag4wnlw6h2j6zcz0irz6j1s51fr9ix2g1smrhrdw44z5gb6wrh"; + sha256 = "0kxvrhrkcvx7pcn7myvabhcm4nj8gi86ij4a1xi392lfds2v350z"; }; buildInputs = [ makeWrapper ]; From 8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39 Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Sat, 13 Feb 2016 15:56:35 +0000 Subject: [PATCH 195/308] fix fceux fceux needs lua 5.1; 5.2 seems to have introduced breaking API changes. I removed the SYSTEM_LUA argument because we do want to build with the system-provided lua, not the lua bundled in the fceux tarball. --- pkgs/misc/emulators/fceux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 48860f17aaf..64d5dfd69a7 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, scons, zlib, SDL, lua5, pkgconfig}: +{stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}: stdenv.mkDerivation { name = "fceux-2.2.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ - scons zlib SDL lua5 pkgconfig + scons zlib SDL lua5_1 pkgconfig ]; phases = "unpackPhase buildPhase"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { export CC="gcc" export CXX="g++" mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps" - scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false SYSTEM_LUA=false install + scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false install ''; meta = { From 47282a0ee64630695d7f89051e9aed374a1acebf Mon Sep 17 00:00:00 2001 From: Sean Lee Date: Fri, 12 Feb 2016 16:12:41 -0500 Subject: [PATCH 196/308] spectrojack: init at 0.4 spectrojack - moved in all-packages spectrojack: init at 0.4 updated spectrojack: init at 0.4 --- lib/maintainers.nix | 1 + .../audio/spectrojack/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/applications/audio/spectrojack/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f73312db99e..59a7c0349b2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -286,6 +286,7 @@ sjmackenzie = "Stewart Mackenzie "; sjourdois = "Stéphane ‘kwisatz’ Jourdois "; skeidel = "Sven Keidel "; + sleexyz = "Sean Lee "; smironov = "Sergey Mironov "; spacefrogg = "Michael Raitza "; spencerjanssen = "Spencer Janssen "; diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix new file mode 100644 index 00000000000..83848671a3e --- /dev/null +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }: + +stdenv.mkDerivation rec { + name = "spectrojack-${version}"; + version = "0.4"; + + src = fetchurl { + url = "http://sed.free.fr/spectrojack/${name}.tar.gz"; + sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx"; + }; + buildInputs = [ pkgconfig libjack2 fftwFloat gtk2 ]; + configurePhase= '' + sed -i 's/.*home.*/#&/' ./Makefile + substituteInPlace ./Makefile \ + --replace "/usr/share" "$out/usr/share" + ''; + installPhase= '' + install -Dm755 spectrojack $out/bin/spectrojack + install -Dm644 spectrojack_icon.svg $out/usr/share/spectrojack/icon.svg + install -Dm644 -t $out/usr/share/spectrojack/colormaps colormaps/* + ''; + + meta = { + description = "A little spectrogram/audiogram/sonogram/whatever for JACK"; + homepage = http://sed.free.fr/spectrojack; + license = stdenv.lib.licenses.publicDomain; + maintainers = with stdenv.lib.maintainers; [ sleexyz ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92fd1d49a66..ca4eb5e7b0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15568,6 +15568,8 @@ let refind = callPackage ../tools/bootloaders/refind { }; + spectrojack = callPackage ../applications/audio/spectrojack { }; + xlockmore = callPackage ../misc/screensavers/xlockmore { }; xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { }; From 70c339dd47e1fc67bb1e2319f5619e36ded45b59 Mon Sep 17 00:00:00 2001 From: Thomas Levine <_@thomaslevine.com> Date: Fri, 12 Feb 2016 19:48:38 +0000 Subject: [PATCH 197/308] gnucash: enable dbi My accounts are stored in the DBI backend (SQLite, specifically). Before the present change, GnuCash would be compiled without DBI support (`--disable-dbi` flag), so I could only use the XML backend. Now I can use either backend. I made the change only for 2.6. It looks like 2.4 works the same way, so maybe I'll enable DBI for that one later. Making nix packages is delightful! It might replace my accounting hobby! --- pkgs/applications/office/gnucash/2.6.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index df6eabbcff0..3c2348bfa8b 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile , intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file -, gettext, swig, slibGuile, enchant, bzip2, isocodes +, gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers }: /* @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { perl perlPackages.FinanceQuote perlPackages.DateManip # guile guile slibGuile + # database backends + libdbi libdbiDrivers # build makeWrapper ]; @@ -41,8 +43,14 @@ stdenv.mkDerivation rec { patchShebangs ./src ''; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; - + configureFlags = [ + "CFLAGS=-O3" + "CXXFLAGS=-O3" + "--enable-dbi" + "--with-dbi-dbd-dir=${libdbiDrivers}/lib/dbd/" + "--enable-ofx" + "--enable-aqbanking" + ]; postInstall = '' # Auto-updaters don't make sense in Nix. From eb684127475e86298a74f22478626c874a2ceafe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Feb 2016 19:30:09 +0100 Subject: [PATCH 198/308] mendeley: 1.15.2 -> 1.15.3 --- pkgs/applications/office/mendeley/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 7b4b20e897f..d9505c17e8d 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -12,14 +12,14 @@ let then "i386" else "amd64"; - shortVersion = "1.15.2-stable"; + shortVersion = "1.15.3-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "64e72b5749ea54f75cb0400732af68d1044037c6233a6bc0ba7a560acd3503cb" - else "cd13e39ad665b243fa5ca04c30cdc4c7da3ddaa259ea1af8fd1ff60f85f4eb25"; + then "7d0737eb28cb4238fafdd6cf973ad899dd6a7622bc1a5c44f32a9c1790eaf6af" + else "0hvvyvbkbz8hg8s532rrrcv7jf07zh4axjzk18bvr6p9cgcdirl8"; deps = [ gcc.cc From b6586ee69433f9ae60698d10a1ffcb09040282d1 Mon Sep 17 00:00:00 2001 From: Jason Ziglar Date: Sat, 13 Feb 2016 13:25:31 -0500 Subject: [PATCH 199/308] Updating ZeroMQ to 4.1.4 --- pkgs/development/libraries/zeromq/4.x.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 22e2e8716a6..d99879d14a7 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,24 +1,16 @@ { stdenv, fetchurl, libuuid, pkgconfig, libsodium }: stdenv.mkDerivation rec { - name = "zeromq-4.1.3"; + name = "zeromq-4.1.4"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "04gligbgr0phipjkwc0dyk1vr9306r6s4dbj85z7fxxk1n1ircv1"; + sha256 = "0y73dxgf4kaysmkvrkxqq9qk5znklxyghh749jw4qbjwwbyl97z9"; }; - # Fix zeromq-4.1.3 with libsodium-1.0.6 - postPatch = '' - sed -i 's/libzmq_werror="yes"/libzmq_werror="no"/' configure - ''; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libuuid libsodium ]; - # https://github.com/zeromq/libzmq/commit/479db2113643e459c11db392e0fefd6400657c9e - patches = [ ./sodium_warning.patch ]; - meta = with stdenv.lib; { branch = "4"; homepage = "http://www.zeromq.org"; From 6e56e09c379122ecbb871e38588416ed88e67b56 Mon Sep 17 00:00:00 2001 From: Tony White Date: Sat, 13 Feb 2016 19:04:41 +0000 Subject: [PATCH 200/308] alsa : 1.0.9 -> 1.1.0 - Bump versions for the following packages within alsa - alsa-utils - alsa-tools - alsa-plugins - alsa-lib Please see http://www.alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0 for the full changelog this update brings. --- pkgs/os-specific/linux/alsa-lib/default.nix | 4 ++-- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++-- pkgs/os-specific/linux/alsa-tools/default.nix | 4 ++-- pkgs/os-specific/linux/alsa-utils/default.nix | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index ed72e701166..c4fd46b3c7d 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "alsa-lib-1.0.29"; + name = "alsa-lib-1.1.0"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2" "http://alsa.cybermirror.org/lib/${name}.tar.bz2" ]; - sha256 = "1l5xzhq7xjy8xap087zbbyi14gr1bhil18pn987vwdlnxcskq13k"; + sha256 = "dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15"; }; patches = [ diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 0450a44dae7..22c3d464774 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.0.29"; + name = "alsa-plugins-1.1.0"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2" "http://alsa.cybermirror.org/plugins/${name}.tar.bz2" ]; - sha256 = "0ck5xa0vnjhn5w23gf87y30h7bcb6hzsx4817sw35xl5qb58ap9j"; + sha256 = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee"; }; # ToDo: a52, etc.? diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index a2e49f465e4..193c919e3b2 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "alsa-tools-${version}"; - version = "1.0.29"; + version = "1.1.0"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2" "http://alsa.cybermirror.org/tools/${name}.tar.bz2" ]; - sha256 = "1lgvyb81md25s9ciswpdsbibmx9s030kvyylf0673w3kbamz1awl"; + sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1"; }; buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ]; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index bcac888d471..d47c9fa2c1a 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils}: +{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}: stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.0.29"; + version = "1.1.0"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2" "http://alsa.cybermirror.org/utils/${name}.tar.bz2" ]; - sha256 = "16ryhgbapp4pxyvsjc258mcj14wk7x3xs6g9bpnkqj0l7s7haq2i"; + sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1"; }; patchPhase = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace "which" "type -p" \ --replace "lspci" "${pciutils}/bin/lspci" ''; - buildInputs = [ gettext alsaLib ncurses libsamplerate ]; + buildInputs = [ gettext alsaLib ncurses libsamplerate fftw ]; configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; From e7565363921eb4a8041fecaeb5a2d717ab3232b0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 13 Feb 2016 17:13:33 -0800 Subject: [PATCH 201/308] doc: Fix URL to ghc-paths patch --- doc/haskell-users-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md index b11e4cf09f8..b9b2fe9e3bc 100644 --- a/doc/haskell-users-guide.md +++ b/doc/haskell-users-guide.md @@ -234,7 +234,7 @@ library promises to give its users access to GHC's installation paths. Only, the library can't possible know that path when it's compiled, because the path GHC considers its own is determined only much later, when the user configures it through `ghcWithPackages`. So we [patched -ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/ghc-paths-nix.patch) +ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch) to return the paths found in those environment variables at run-time rather than trying to guess them at compile-time. From 2cee5a42b0d278577e791bbed51521ec0d103192 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Feb 2016 09:59:11 +0300 Subject: [PATCH 202/308] dspam service: set ClientHost --- nixos/modules/services/mail/dspam.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index 2d8aebe2057..96b0e165c4d 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -19,7 +19,10 @@ let SystemLog on UserLog on - ${optionalString (cfg.domainSocket != null) ''ServerDomainSocketPath "${cfg.domainSocket}"''} + ${optionalString (cfg.domainSocket != null) '' + ServerDomainSocketPath "${cfg.domainSocket}" + ClientHost "${cfg.domainSocket}" + ''} ${cfg.extraConfig} ''; From a0afc49f0f199c73e1173ede7d58d74842c4551d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 14 Feb 2016 10:08:56 +0300 Subject: [PATCH 203/308] dspam service: restrict socket access --- nixos/modules/services/mail/dspam.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index 96b0e165c4d..46e6f216b21 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -111,6 +111,7 @@ in { User = cfg.user; Group = cfg.group; RuntimeDirectory = optional (cfg.domainSocket == defaultSock) "dspam"; + RuntimeDirectoryMode = optional (cfg.domainSocket == defaultSock) "0750"; PermissionsStartOnly = true; # DSPAM segfaults on just about every error Restart = "on-failure"; From 16d7237beb651575860dd59d907636fca4127ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 14 Feb 2016 08:36:25 +0100 Subject: [PATCH 204/308] pstree: add a working mirror to fix #12989 /cc maintainer @mornfall. --- pkgs/applications/misc/pstree/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 3d526e3f3e7..cfa772e8b5e 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "pstree-2.39"; src = fetchurl { - url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"; + urls = [ + "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" + "http://distfiles.macports.org/pstree/${name}.tar.gz" + ]; sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; }; From 63bd1cbb6ee5756a07dbca9655341e9f5df79622 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 14 Feb 2016 13:48:15 +0100 Subject: [PATCH 205/308] btfs: init at 2.7 --- pkgs/os-specific/linux/btfs/default.nix | 33 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/btfs/default.nix diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix new file mode 100644 index 00000000000..46b015cd08a --- /dev/null +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, + python, boost, fuse, libtorrentRasterbar, curl }: + +stdenv.mkDerivation rec { + name = "btfs-${version}"; + version = "2.7"; + + src = fetchFromGitHub { + owner = "johang"; + repo = "btfs"; + rev = "e816b4718bd5c9d88a99805d19d2ad91971b2338"; + sha256 = "1mac2dwg0pzpmg0x503a8d8gx3ridi4m1qx4jk6ssvl4g9v6p7fl"; + }; + + buildInputs = [ + pkgconfig autoconf automake boost + fuse libtorrentRasterbar curl + ]; + + preConfigure = '' + autoreconf -i + substituteInPlace scripts/btplay \ + --replace /usr/bin/python ${python}/bin/python + ''; + + meta = with stdenv.lib; { + description = "A bittorrent filesystem based on FUSE"; + homepage = "https://github.com/johang/btfs"; + license = licenses.gpl3; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21dbbd6e996..39ade26f543 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -762,6 +762,8 @@ let sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; }; + btfs = callPackage ../os-specific/linux/btfs { }; + cabal2nix = haskellPackages.cabal2nix; capstone = callPackage ../development/libraries/capstone { }; From d5ed1637b6259d394cd35fc7a1b97807abd843e2 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 23 Jan 2016 09:49:19 -0500 Subject: [PATCH 206/308] mesos: 0.23.0 -> 0.26.0 Update mesos to 0.26.0 and build with SSL support. --- .../networking/cluster/mesos/default.nix | 42 ++++++++++++------- .../networking/cluster/mesos/maven_repo.patch | 13 ++++++ 2 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 pkgs/applications/networking/cluster/mesos/maven_repo.patch diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index cb6be73ec9b..25bd659d63a 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf -, automake114x, libtool, unzip, gnutar, jdk, maven, python, wrapPython -, setuptools, boto, pythonProtobuf, apr, subversion -, leveldb, glog, perf, utillinux, libnl, iproute +, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython +, setuptools, boto, pythonProtobuf, apr, subversion, gzip +, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent }: let @@ -9,25 +9,26 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.23.0"; + version = "0.26.0"; name = "mesos-${version}"; dontDisableStatic = true; src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr"; + sha256 = "0csvaql9gky15w23gmiw6cvlfnrlhfxvdqd2pv3j3grr44ph0ab5"; }; patches = [ # https://reviews.apache.org/r/36610/ ./rb36610.patch + ./maven_repo.patch ]; buildInputs = [ - makeWrapper autoconf automake114x libtool curl sasl jdk maven + makeWrapper autoconf automake115x libtool curl sasl jdk maven python wrapPython boto setuptools leveldb - subversion apr glog + subversion apr glog openssl libevent ] ++ lib.optionals stdenv.isLinux [ libnl ]; @@ -37,17 +38,18 @@ in stdenv.mkDerivation rec { ]; preConfigure = '' - export MAVEN_OPTS="-Dmaven.repo.local=${mavenRepo}" + substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo} substituteInPlace src/launcher/fetcher.cpp \ + --replace '"gzip' '"${gzip}/bin/gzip' \ --replace '"tar' '"${gnutar}/bin/tar' \ --replace '"unzip' '"${unzip}/bin/unzip' substituteInPlace src/cli/mesos-scp \ --replace "'scp " "'${openssh}/bin/scp " - substituteInPlace src/cli/python/mesos/cli.py \ - --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" + substituteInPlace src/python/cli/src/mesos/cli.py \ + --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" '' + lib.optionalString (stdenv.isLinux) '' @@ -57,13 +59,13 @@ in stdenv.mkDerivation rec { substituteInPlace src/linux/perf.cpp \ --replace '"perf ' '"${perf}/bin/perf ' - substituteInPlace src/slave/containerizer/isolators/filesystem/shared.cpp \ + substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \ --replace '"mount ' '"${utillinux}/bin/mount ' \ - substituteInPlace src/slave/containerizer/isolators/namespaces/pid.cpp \ + substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \ --replace '"mount ' '"${utillinux}/bin/mount ' \ - substituteInPlace src/slave/containerizer/isolators/network/port_mapping.cpp \ + substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \ --replace '"tc ' '"${iproute}/bin/tc ' \ --replace '"ip ' '"${iproute}/bin/ip ' \ --replace '"mount ' '"${utillinux}/bin/mount ' \ @@ -79,6 +81,10 @@ in stdenv.mkDerivation rec { "--with-glog=${glog}" "--enable-optimize" "--disable-python-dependency-install" + "--enable-ssl" + "--with-ssl=${openssl}" + "--enable-libevent" + "--with-libevent=${libevent}" ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" ]; @@ -107,6 +113,14 @@ in stdenv.mkDerivation rec { --prefix="$out" rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* popd + + # optional python dependency for mesos cli + pushd src/python/cli + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --old-and-unmanageable \ + --prefix="$out" + popd ''; postFixup = '' @@ -127,7 +141,7 @@ in stdenv.mkDerivation rec { # wrap the python programs for prog in mesos-cat mesos-ps mesos-scp mesos-tail; do wrapProgram "$out/bin/$prog" \ - --prefix PYTHONPATH ":" "$out/libexec/mesos/python" + --prefix PYTHONPATH ":" "$out/lib/${python.libPrefix}/site-packages" true done ''; diff --git a/pkgs/applications/networking/cluster/mesos/maven_repo.patch b/pkgs/applications/networking/cluster/mesos/maven_repo.patch new file mode 100644 index 00000000000..9ee12976fde --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/maven_repo.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index ae2740a..1df91a7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1310,7 +1310,7 @@ if HAS_JAVA + + $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom + @echo "Building mesos-$(PACKAGE_VERSION).jar ..." +- @cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom clean package ++ @cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package + + # Convenience library for JNI bindings. + # TODO(Charles Reiss): We really should be building the Java library From 9ba8e9a9daaffa11f3f9bce4452ec4ec3a8fdd58 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 14 Feb 2016 14:41:27 +0100 Subject: [PATCH 207/308] slock: 1.2 -> 1.3 --- pkgs/misc/screensavers/slock/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 5c731ff20d7..4ff0a90ed02 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, xproto, libX11, libXext }: +{ stdenv, fetchurl, xproto, libX11, libXext, libXrandr }: stdenv.mkDerivation rec { - name = "slock-1.2"; + name = "slock-1.3"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il"; + sha256 = "065xa9hl7zn0lv2f7yjxphqsa35rg6dn9hv10gys0sh4ljpa7d5s"; }; - buildInputs = [ xproto libX11 libXext ]; + buildInputs = [ xproto libX11 libXext libXrandr ]; installFlags = "DESTDIR=\${out} PREFIX="; meta = { homepage = http://tools.suckless.org/slock; From d9837dbd892ba51ab439ea7e8af62887988bc520 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 14 Feb 2016 14:43:45 +0100 Subject: [PATCH 208/308] slock: fix license --- pkgs/misc/screensavers/slock/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 4ff0a90ed02..4e419b6cbb6 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ xproto libX11 libXext libXrandr ]; installFlags = "DESTDIR=\${out} PREFIX="; - meta = { + meta = with stdenv.lib; { homepage = http://tools.suckless.org/slock; description = "Simple X display locker"; longDescription = '' Simple X display locker. This is the simplest X screen locker. ''; - license = "bsd"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.mit; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.linux; }; } From 400ade95ff735b5d9a58617edc85db2d7a1ddb1f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 14 Feb 2016 14:49:33 +0100 Subject: [PATCH 209/308] calibre: switch to qt-5.5, fixes #12793 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74cb1e7f59b..635f0125f2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11399,7 +11399,7 @@ let calcurse = callPackage ../applications/misc/calcurse { }; - calibre = qt5.callPackage ../applications/misc/calibre { + calibre = qt55.callPackage ../applications/misc/calibre { inherit (pythonPackages) pyqt5 sip_4_16; }; From 60a8dd4ffaefdb55ba034df0d91a2ffd0f8c7ec5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 14 Feb 2016 10:34:58 -0600 Subject: [PATCH 210/308] kde5_latest.frameworks: 5.18 -> 5.19 --- .../libraries/kde-frameworks-5.19/attica.nix | 11 + .../libraries/kde-frameworks-5.19/baloo.nix | 25 + .../kde-frameworks-5.19/bluez-qt.nix | 17 + .../kde-frameworks-5.19/breeze-icons.nix | 10 + .../libraries/kde-frameworks-5.19/default.nix | 118 ++++ .../0001-extra-cmake-modules-paths.patch | 74 +++ .../extra-cmake-modules/default.nix | 18 + .../extra-cmake-modules/setup-hook.sh | 27 + .../kde-frameworks-5.19/fetchsrcs.sh | 57 ++ .../frameworkintegration.nix | 17 + .../kde-frameworks-5.19/kactivities.nix | 22 + .../libraries/kde-frameworks-5.19/kapidox.nix | 12 + .../kde-frameworks-5.19/karchive.nix | 11 + .../kde-frameworks-5.19/kauth/default.nix | 16 + .../kauth/kauth-policy-install.patch | 13 + .../kde-frameworks-5.19/kbookmarks.nix | 25 + .../0001-qdiriterator-follow-symlinks.patch | 25 + .../kde-frameworks-5.19/kcmutils/default.nix | 17 + .../libraries/kde-frameworks-5.19/kcodecs.nix | 11 + .../kde-frameworks-5.19/kcompletion.nix | 14 + .../libraries/kde-frameworks-5.19/kconfig.nix | 16 + .../0001-qdiriterator-follow-symlinks.patch | 25 + .../kconfigwidgets/default.nix | 17 + .../kde-frameworks-5.19/kcoreaddons.nix | 16 + .../libraries/kde-frameworks-5.19/kcrash.nix | 16 + .../kde-frameworks-5.19/kdbusaddons.nix | 17 + .../kde-frameworks-5.19/kdeclarative.nix | 22 + .../libraries/kde-frameworks-5.19/kded.nix | 19 + .../kde-frameworks-5.19/kdelibs4support.nix | 32 + .../kde-frameworks-5.19/kdesignerplugin.nix | 34 ++ .../libraries/kde-frameworks-5.19/kdesu.nix | 13 + .../kde-frameworks-5.19/kdewebkit.nix | 13 + .../libraries/kde-frameworks-5.19/kdnssd.nix | 13 + .../kde-frameworks-5.19/kdoctools/default.nix | 20 + .../kdoctools-no-find-docbook-xml.patch | 12 + .../kdoctools/setup-hook.sh | 5 + .../kde-frameworks-5.19/kemoticons.nix | 17 + .../kde-frameworks-5.19/kfilemetadata.nix | 13 + .../kde-frameworks-5.19/kglobalaccel.nix | 23 + .../kde-frameworks-5.19/kguiaddons.nix | 13 + .../libraries/kde-frameworks-5.19/khtml.nix | 21 + .../libraries/kde-frameworks-5.19/ki18n.nix | 17 + .../kiconthemes/default-theme-breeze.patch | 13 + .../kiconthemes/default.nix | 18 + .../kde-frameworks-5.19/kiconthemes/series | 1 + .../kde-frameworks-5.19/kidletime.nix | 15 + .../kde-frameworks-5.19/kimageformats.nix | 13 + .../kinit/0001-kinit-libpath.patch | 42 ++ .../kde-frameworks-5.19/kinit/default.nix | 17 + .../kde-frameworks-5.19/kio/default.nix | 33 + .../kio/samba-search-path.patch | 28 + .../libraries/kde-frameworks-5.19/kio/series | 1 + .../kde-frameworks-5.19/kitemmodels.nix | 11 + .../kde-frameworks-5.19/kitemviews.nix | 11 + .../kde-frameworks-5.19/kjobwidgets.nix | 16 + .../libraries/kde-frameworks-5.19/kjs.nix | 16 + .../kde-frameworks-5.19/kjsembed.nix | 17 + .../kde-frameworks-5.19/kmediaplayer.nix | 15 + .../kde-frameworks-5.19/knewstuff.nix | 17 + .../kde-frameworks-5.19/knotifications.nix | 21 + .../kde-frameworks-5.19/knotifyconfig.nix | 13 + .../kpackage/allow-external-paths.patch | 13 + .../kde-frameworks-5.19/kpackage/default.nix | 23 + .../qdiriterator-follow-symlinks.patch | 26 + .../kde-frameworks-5.19/kpackage/series | 2 + .../libraries/kde-frameworks-5.19/kparts.nix | 17 + .../libraries/kde-frameworks-5.19/kpeople.nix | 15 + .../kde-frameworks-5.19/kplotting.nix | 11 + .../libraries/kde-frameworks-5.19/kpty.nix | 10 + .../libraries/kde-frameworks-5.19/kross.nix | 14 + .../libraries/kde-frameworks-5.19/krunner.nix | 16 + .../0001-qdiriterator-follow-symlinks.patch | 25 + .../kservice/0002-no-canonicalize-path.patch | 25 + .../kde-frameworks-5.19/kservice/default.nix | 19 + .../kservice/setup-hook.sh | 43 ++ .../ktexteditor/default.nix | 22 + .../ktexteditor/no-qcoreapplication.patch | 36 ++ .../kde-frameworks-5.19/ktexteditor/series | 1 + .../kde-frameworks-5.19/ktextwidgets.nix | 16 + .../kde-frameworks-5.19/kunitconversion.nix | 10 + .../libraries/kde-frameworks-5.19/kwallet.nix | 21 + .../kde-frameworks-5.19/kwidgetsaddons.nix | 11 + .../kde-frameworks-5.19/kwindowsystem.nix | 13 + .../libraries/kde-frameworks-5.19/kxmlgui.nix | 18 + .../kde-frameworks-5.19/kxmlrpcclient.nix | 10 + .../kde-frameworks-5.19/modemmanager-qt.nix | 13 + .../kde-frameworks-5.19/networkmanager-qt.nix | 13 + .../kde-frameworks-5.19/oxygen-icons5.nix | 13 + .../plasma-framework/default.nix | 25 + .../libraries/kde-frameworks-5.19/solid.nix | 17 + .../libraries/kde-frameworks-5.19/sonnet.nix | 13 + .../libraries/kde-frameworks-5.19/srcs.nix | 565 ++++++++++++++++++ .../kde-frameworks-5.19/threadweaver.nix | 11 + pkgs/top-level/all-packages.nix | 11 +- 94 files changed, 2349 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/attica.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/baloo.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh create mode 100755 pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/karchive.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kded.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/khtml.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kio/series create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kjs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/series create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kparts.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpty.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kross.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/krunner.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/solid.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/srcs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix new file mode 100644 index 00000000000..98721876c12 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "attica"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix new file mode 100644 index 00000000000..38c41d9271d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig +, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime +, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid +}: + +kdeFramework { + name = "baloo"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ + kconfig kcrash kdbusaddons lmdb qtquick1 solid + ]; + propagatedBuildInputs = [ + kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase + ]; + postInstall = '' + wrapQtProgram "$out/bin/baloo_file" + wrapQtProgram "$out/bin/baloo_file_extractor" + wrapQtProgram "$out/bin/balooctl" + wrapQtProgram "$out/bin/baloosearch" + wrapQtProgram "$out/bin/balooshow" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix new file mode 100644 index 00000000000..f981b0516f7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtdeclarative +}: + +kdeFramework { + name = "bluez-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtdeclarative ]; + preConfigure = '' + substituteInPlace CMakeLists.txt \ + --replace /lib/udev/rules.d "$out/lib/udev/rules.d" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix new file mode 100644 index 00000000000..879262c56a4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix @@ -0,0 +1,10 @@ +{ kdeFramework +, extra-cmake-modules +, qtsvg +}: + +kdeFramework { + name = "breeze-icons"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedUserEnvPkgs = [ qtsvg ]; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/default.nix new file mode 100644 index 00000000000..cd314e27cac --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/default.nix @@ -0,0 +1,118 @@ +# Maintainer's Notes: +# +# Minor updates: +# 1. Edit ./fetchsrcs.sh to point to the updated URL. +# 2. Run ./fetchsrcs.sh. +# 3. Build and enjoy. +# +# Major updates: +# We prefer not to immediately overwrite older versions with major updates, so +# make a copy of this directory first. After copying, be sure to delete ./tmp +# if it exists. Then follow the minor update instructions. Be sure to check if +# any new components have been added and package them as necessary. + +{ pkgs, debug ? false }: + +let + + inherit (pkgs) lib makeSetupHook stdenv; + + mirror = "mirror://kde"; + srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; + + packages = self: with self; { + kdeFramework = args: + let + inherit (args) name; + inherit (srcs."${name}") src version; + in stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); + + attica = callPackage ./attica.nix {}; + baloo = callPackage ./baloo.nix {}; + bluez-qt = callPackage ./bluez-qt.nix {}; + breeze-icons = callPackage ./breeze-icons.nix {}; + extra-cmake-modules = callPackage ./extra-cmake-modules {}; + frameworkintegration = callPackage ./frameworkintegration.nix {}; + kactivities = callPackage ./kactivities.nix {}; + kapidox = callPackage ./kapidox.nix {}; + karchive = callPackage ./karchive.nix {}; + kauth = callPackage ./kauth {}; + kbookmarks = callPackage ./kbookmarks.nix {}; + kcmutils = callPackage ./kcmutils {}; + kcodecs = callPackage ./kcodecs.nix {}; + kcompletion = callPackage ./kcompletion.nix {}; + kconfig = callPackage ./kconfig.nix {}; + kconfigwidgets = callPackage ./kconfigwidgets {}; + kcoreaddons = callPackage ./kcoreaddons.nix {}; + kcrash = callPackage ./kcrash.nix {}; + kdbusaddons = callPackage ./kdbusaddons.nix {}; + kdeclarative = callPackage ./kdeclarative.nix {}; + kded = callPackage ./kded.nix {}; + kdelibs4support = callPackage ./kdelibs4support.nix {}; + kdesignerplugin = callPackage ./kdesignerplugin.nix {}; + kdewebkit = callPackage ./kdewebkit.nix {}; + kdesu = callPackage ./kdesu.nix {}; + kdnssd = callPackage ./kdnssd.nix {}; + kdoctools = callPackage ./kdoctools {}; + kemoticons = callPackage ./kemoticons.nix {}; + kfilemetadata = callPackage ./kfilemetadata.nix {}; + kglobalaccel = callPackage ./kglobalaccel.nix {}; + kguiaddons = callPackage ./kguiaddons.nix {}; + khtml = callPackage ./khtml.nix {}; + ki18n = callPackage ./ki18n.nix {}; + kiconthemes = callPackage ./kiconthemes {}; + kidletime = callPackage ./kidletime.nix {}; + kimageformats = callPackage ./kimageformats.nix {}; + kinit = callPackage ./kinit {}; + kio = callPackage ./kio {}; + kitemmodels = callPackage ./kitemmodels.nix {}; + kitemviews = callPackage ./kitemviews.nix {}; + kjobwidgets = callPackage ./kjobwidgets.nix {}; + kjs = callPackage ./kjs.nix {}; + kjsembed = callPackage ./kjsembed.nix {}; + kmediaplayer = callPackage ./kmediaplayer.nix {}; + knewstuff = callPackage ./knewstuff.nix {}; + knotifications = callPackage ./knotifications.nix {}; + knotifyconfig = callPackage ./knotifyconfig.nix {}; + kpackage = callPackage ./kpackage {}; + kparts = callPackage ./kparts.nix {}; + kpeople = callPackage ./kpeople.nix {}; + kplotting = callPackage ./kplotting.nix {}; + kpty = callPackage ./kpty.nix {}; + kross = callPackage ./kross.nix {}; + krunner = callPackage ./krunner.nix {}; + kservice = callPackage ./kservice {}; + ktexteditor = callPackage ./ktexteditor {}; + ktextwidgets = callPackage ./ktextwidgets.nix {}; + kunitconversion = callPackage ./kunitconversion.nix {}; + kwallet = callPackage ./kwallet.nix {}; + kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; + kwindowsystem = callPackage ./kwindowsystem.nix {}; + kxmlgui = callPackage ./kxmlgui.nix {}; + kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; + modemmanager-qt = callPackage ./modemmanager-qt.nix {}; + networkmanager-qt = callPackage ./networkmanager-qt.nix {}; + oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; + plasma-framework = callPackage ./plasma-framework {}; + solid = callPackage ./solid.nix {}; + sonnet = callPackage ./sonnet.nix {}; + threadweaver = callPackage ./threadweaver.nix {}; + }; + +in packages diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch new file mode 100644 index 00000000000..9717716faf5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch @@ -0,0 +1,74 @@ +From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Fri, 20 Feb 2015 23:17:39 -0600 +Subject: [PATCH] extra-cmake-modules paths + +--- + kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- + 1 file changed, 4 insertions(+), 33 deletions(-) + +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index b7cd34d..2f868ac 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -193,37 +193,8 @@ + # (To distribute this file outside of extra-cmake-modules, substitute the full + # License text for the above reference.) + +-# Figure out what the default install directory for libraries should be. +-# This is based on the logic in GNUInstallDirs, but simplified (the +-# GNUInstallDirs code deals with re-configuring, but that is dealt with +-# by the _define_* macros in this module). ++# The default library directory on NixOS is *always* /lib. + set(_LIBDIR_DEFAULT "lib") +-# Override this default 'lib' with 'lib64' iff: +-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling +-# - we are NOT on debian +-# - we are on a 64 bits system +-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf +-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if +-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" +-# See http://wiki.debian.org/Multiarch +-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") +- AND NOT CMAKE_CROSSCOMPILING) +- if (EXISTS "/etc/debian_version") # is this a debian system ? +- if(CMAKE_LIBRARY_ARCHITECTURE) +- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +- endif() +- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: +- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) +- message(AUTHOR_WARNING +- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " +- "Please enable at least one language before including KDEInstallDirs.") +- else() +- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") +- set(_LIBDIR_DEFAULT "lib64") +- endif() +- endif() +- endif() +-endif() + + set(_gnu_install_dirs_vars + BINDIR +@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) + "QtQuick2 imports" + QML_INSTALL_DIR) + else() +- _define_relative(QTPLUGINDIR LIBDIR "plugins" ++ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" + "Qt plugins" + QT_PLUGIN_INSTALL_DIR) + +- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" ++ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" + "QtQuick1 imports" + IMPORTS_INSTALL_DIR) + +- _define_relative(QMLDIR LIBDIR "qml" ++ _define_relative(QMLDIR LIBDIR "qt5/qml" + "QtQuick2 imports" + QML_INSTALL_DIR) + endif() +-- +2.3.0 + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix new file mode 100644 index 00000000000..4e1b1aff3bd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }: + +kdeFramework { + name = "extra-cmake-modules"; + patches = [ ./0001-extra-cmake-modules-paths.patch ]; + + setupHook = ./setup-hook.sh; + + # It is OK to propagate these inputs as long as + # extra-cmake-modules is never a propagated input + # of some other derivation. + propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; + + meta = { + license = stdenv.lib.licenses.bsd2; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh new file mode 100644 index 00000000000..a6fa6189240 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh @@ -0,0 +1,27 @@ +addMimePkg() { + local propagated + + if [[ -d "$1/share/mime" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + + propagated= + for pkg in $propagatedUserEnvPkgs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + fi + done + if [[ -z $propagated ]]; then + propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" + fi + fi +} + +envHooks+=(addMimePkg) diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh new file mode 100755 index 00000000000..7937e6f8bed --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh @@ -0,0 +1,57 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils findutils gnused nix wget + +set -x + +# The trailing slash at the end is necessary! +RELEASE_URL="http://download.kde.org/stable/frameworks/5.19/" +EXTRA_WGET_ARGS='-A *.tar.xz' + +mkdir tmp; cd tmp + +rm -f ../srcs.csv + +wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS + +find . | while read src; do + if [[ -f "${src}" ]]; then + # Sanitize file name + filename=$(basename "$src" | tr '@' '_') + nameVersion="${filename%.tar.*}" + name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') + version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') + echo "$name,$version,$src,$filename" >>../srcs.csv + fi +done + +cat >../srcs.nix <>../srcs.nix <>../srcs.nix + +rm -f ../srcs.csv + +cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix new file mode 100644 index 00000000000..26987c385ad --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion +, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications +, kwidgetsaddons, libXcursor, qtx11extras +}: + +kdeFramework { + name = "frameworkintegration"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kbookmarks kcompletion kconfig knotifications kwidgetsaddons + libXcursor + ]; + propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix new file mode 100644 index 00000000000..3225098f439 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig +, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n +, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative +}: + +kdeFramework { + name = "kactivities"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ + boost kcmutils kconfig kcoreaddons kdbusaddons kservice + kxmlgui + ]; + propagatedBuildInputs = [ + kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative + ]; + postInstall = '' + wrapQtProgram "$out/bin/kactivitymanagerd" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix new file mode 100644 index 00000000000..647be8f052c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix @@ -0,0 +1,12 @@ +{ kdeFramework, lib +, extra-cmake-modules +, python +}: + +kdeFramework { + name = "kapidox"; + nativeBuildInputs = [ extra-cmake-modules python ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix new file mode 100644 index 00000000000..a8d9a0003c3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "karchive"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix new file mode 100644 index 00000000000..2b000ff3c04 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, polkit-qt +}: + +kdeFramework { + name = "kauth"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ polkit-qt ]; + propagatedBuildInputs = [ kcoreaddons ]; + patches = [ ./kauth-policy-install.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch new file mode 100644 index 00000000000..340155256f2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch @@ -0,0 +1,13 @@ +diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in +index e859ec7..9a8ab18 100644 +--- a/KF5AuthConfig.cmake.in ++++ b/KF5AuthConfig.cmake.in +@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") + + set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") + set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") +-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") ++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") + set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") + + find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix new file mode 100644 index 00000000000..1a469ab4db6 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcodecs +, kconfig +, kconfigwidgets +, kcoreaddons +, kiconthemes +, kxmlgui +}: + +kdeFramework { + name = "kbookmarks"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcodecs + kconfig + kconfigwidgets + kcoreaddons + kiconthemes + kxmlgui + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..0d861fa9501 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:43:53 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + src/kpluginselector.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp +index 9c3431d..d6b1ee2 100644 +--- a/src/kpluginselector.cpp ++++ b/src/kpluginselector.cpp +@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName, + QStringList desktopFileNames; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + desktopFileNames.append(it.next()); + } +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix new file mode 100644 index 00000000000..dbbb783ac61 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets +, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews +, kpackage, kservice, kxmlgui +}: + +kdeFramework { + name = "kcmutils"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons kiconthemes kitemviews kpackage kxmlgui + ]; + propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix new file mode 100644 index 00000000000..53a69a69b69 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kcodecs"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix new file mode 100644 index 00000000000..e393774f16a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix @@ -0,0 +1,14 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kwidgetsaddons +}: + +kdeFramework { + name = "kcompletion"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kwidgetsaddons ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix new file mode 100644 index 00000000000..e132afe5988 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, makeQtWrapper +}: + +kdeFramework { + name = "kconfig"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + postInstall = '' + wrapQtProgram "$out/bin/kreadconfig5" + wrapQtProgram "$out/bin/kwriteconfig5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..7a6c0ee9053 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:47:01 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + src/khelpclient.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp +index 53a331e..80fbb01 100644 +--- a/src/khelpclient.cpp ++++ b/src/khelpclient.cpp +@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) + QString docPath; + const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); + Q_FOREACH (const QString &dir, desktopDirs) { +- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString desktopPath(it.next()); + KDesktopFile desktopFile(desktopPath); +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix new file mode 100644 index 00000000000..0e14d06edd3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig +, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper +}: + +kdeFramework { + name = "kconfigwidgets"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ kguiaddons ]; + propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + postInstall = '' + wrapQtProgram "$out/bin/preparetips5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix new file mode 100644 index 00000000000..f3a1db7bd48 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib, makeQtWrapper +, extra-cmake-modules +, shared_mime_info +}: + +kdeFramework { + name = "kcoreaddons"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ shared_mime_info ]; + postInstall = '' + wrapQtProgram "$out/bin/desktoptojson" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix new file mode 100644 index 00000000000..bbab78ccb40 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, kwindowsystem +, qtx11extras +}: + +kdeFramework { + name = "kcrash"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix new file mode 100644 index 00000000000..d2ceab31d14 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, makeQtWrapper +, qtx11extras +}: + +kdeFramework { + name = "kdbusaddons"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + propagatedBuildInputs = [ qtx11extras ]; + postInstall = '' + wrapQtProgram "$out/bin/kquitapp5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix new file mode 100644 index 00000000000..74d107466cf --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig +, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage +, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig +, qtdeclarative +}: + +kdeFramework { + name = "kdeclarative"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ + epoxy kguiaddons kiconthemes kwidgetsaddons + ]; + propagatedBuildInputs = [ + kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative + ]; + postInstall = '' + wrapQtProgram "$out/bin/kpackagelauncherqml" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix new file mode 100644 index 00000000000..47ae2d68c68 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix @@ -0,0 +1,19 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kdoctools +, kinit +, kservice +}: + +kdeFramework { + name = "kded"; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix new file mode 100644 index 00000000000..e61c4bb86e7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix @@ -0,0 +1,32 @@ +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth +, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons +, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels +, kinit, knotifications, kparts, kservice, ktextwidgets +, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui +, networkmanager, qtsvg, qtx11extras, xlibs +}: + +# TODO: debug docbook detection + +kdeFramework { + name = "kdelibs4support"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kconfig kded kservice kwidgetsaddons + kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM + ]; + propagatedBuildInputs = [ + kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons + kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio + kiconthemes kitemmodels kinit knotifications kparts ktextwidgets + kunitconversion kwindowsystem + ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix new file mode 100644 index 00000000000..cbc114ccca0 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix @@ -0,0 +1,34 @@ +{ kdeFramework, lib, makeQtWrapper +, extra-cmake-modules +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdewebkit +, kdoctools +, kiconthemes +, kio +, kitemviews +, kplotting +, ktextwidgets +, kwidgetsaddons +, kxmlgui +, sonnet +}: + +kdeFramework { + name = "kdesignerplugin"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit + kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons + kxmlgui + ]; + propagatedBuildInputs = [ kio sonnet ]; + postInstall = '' + wrapQtProgram "$out/bin/kgendesignerplugin" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix new file mode 100644 index 00000000000..364fbd6a720 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty +, kservice +}: + +kdeFramework { + name = "kdesu"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kservice ]; + propagatedBuildInputs = [ ki18n kpty ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix new file mode 100644 index 00000000000..d361313d1d4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit +}: + +kdeFramework { + name = "kdewebkit"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ]; + propagatedBuildInputs = [ ki18n kio qtwebkit ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix new file mode 100644 index 00000000000..f00432b0c9c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, avahi +}: + +kdeFramework { + name = "kdnssd"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ avahi ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix new file mode 100644 index 00000000000..138c3fc33b9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix @@ -0,0 +1,20 @@ +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 +, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages +}: + +kdeFramework { + name = "kdoctools"; + setupHook = ./setup-hook.sh; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive ]; + propagatedBuildInputs = [ ki18n ]; + propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + ]; + patches = [ ./kdoctools-no-find-docbook-xml.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch new file mode 100644 index 00000000000..4e3a33efab3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c4863c..f731775 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES + ) + + +-find_package(DocBookXML4 "4.5") + + set_package_properties(DocBookXML4 PROPERTIES + TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh new file mode 100644 index 00000000000..5cfffbd622d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh @@ -0,0 +1,5 @@ +addXdgData() { + addToSearchPath XDG_DATA_DIRS "$1/share" +} + +envHooks+=(addXdgData) diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix new file mode 100644 index 00000000000..d165f84e3a2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kservice +}: + +kdeFramework { + name = "kemoticons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive kconfig kcoreaddons ]; + propagatedBuildInputs = [ kservice ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix new file mode 100644 index 00000000000..be99c58d550 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 +, ffmpeg, karchive, ki18n, poppler, qtbase, taglib +}: + +kdeFramework { + name = "kfilemetadata"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ]; + propagatedBuildInputs = [ qtbase ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix new file mode 100644 index 00000000000..c535b3590a3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix @@ -0,0 +1,23 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kwindowsystem +, makeQtWrapper +, qtx11extras +}: + +kdeFramework { + name = "kglobalaccel"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; + postInstall = '' + wrapQtProgram "$out/bin/kglobalaccel5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix new file mode 100644 index 00000000000..bc4e9ab1184 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtx11extras +}: + +kdeFramework { + name = "kguiaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix new file mode 100644 index 00000000000..d40df466ebb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib, extra-cmake-modules, giflib, karchive +, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs +, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons +, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet +}: + +kdeFramework { + name = "khtml"; + nativeBuildInputs = [ extra-cmake-modules perl ]; + buildInputs = [ + giflib karchive kiconthemes knotifications kwallet kwidgetsaddons + kxmlgui phonon + ]; + propagatedBuildInputs = [ + kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets + kwindowsystem qtx11extras sonnet + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix new file mode 100644 index 00000000000..268006512e7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, gettext +, python +, qtdeclarative +, qtscript +}: + +kdeFramework { + name = "ki18n"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtdeclarative qtscript ]; + propagatedNativeBuildInputs = [ gettext python ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch new file mode 100644 index 00000000000..5b3b15d5d5b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch @@ -0,0 +1,13 @@ +Index: kiconthemes-5.17.0/src/kicontheme.cpp +=================================================================== +--- kiconthemes-5.17.0.orig/src/kicontheme.cpp ++++ kiconthemes-5.17.0/src/kicontheme.cpp +@@ -557,7 +557,7 @@ void KIconTheme::reconfigure() + // static + QString KIconTheme::defaultThemeName() + { +- return QStringLiteral("oxygen"); ++ return QStringLiteral("breeze"); + } + + void KIconTheme::assignIconsToContextMenu(ContextMenus type, diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix new file mode 100644 index 00000000000..b78b25582be --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, makeQtWrapper +, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg +}: + +kdeFramework { + name = "kiconthemes"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ kconfigwidgets kitemviews qtsvg ]; + propagatedBuildInputs = [ breeze-icons ki18n ]; + postInstall = '' + wrapQtProgram "$out/bin/kiconfinder5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series new file mode 100644 index 00000000000..ab5cc8a3edb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series @@ -0,0 +1 @@ +default-theme-breeze.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix new file mode 100644 index 00000000000..fc086560023 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtbase +, qtx11extras +}: + +kdeFramework { + name = "kidletime"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix new file mode 100644 index 00000000000..49d66bbcc2c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, ilmbase +}: + +kdeFramework { + name = "kimageformats"; + nativeBuildInputs = [ extra-cmake-modules ]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch new file mode 100644 index 00000000000..9c76079a382 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch @@ -0,0 +1,42 @@ +From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 13 Jun 2015 08:57:55 -0500 +Subject: [PATCH] kinit libpath + +--- + src/kdeinit/kinit.cpp | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 9e775b6..0ac5646 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, + if (!libpath.isEmpty()) { + if (!l.load()) { + if (libpath_relative) { +- // NB: Because Qt makes the actual dlopen() call, the +- // RUNPATH of kdeinit is *not* respected - see +- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 +- // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); ++ // Use QT_PLUGIN_PATH to find shared library directories ++ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 ++ // shared libraries should be in /lib/qt5/plugins/../../ ++ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); ++ const QString up = QString::fromLocal8Bit("/../../"); ++ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); ++ Q_FOREACH (const QString &path, paths) { ++ l.setFileName(path + up + libpath); + l.load(); ++ if (l.isLoaded()) break; ++ } + } + } + if (!l.isLoaded()) { +-- +2.4.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix new file mode 100644 index 00000000000..5f644d7c424 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash +, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap +, libcap_progs +}: + +# TODO: setuid wrapper + +kdeFramework { + name = "kinit"; + nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; + buildInputs = [ kconfig kcrash kservice libcap ]; + propagatedBuildInputs = [ ki18n kio kwindowsystem ]; + patches = [ ./0001-kinit-libpath.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix new file mode 100644 index 00000000000..a2131ff3385 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix @@ -0,0 +1,33 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, acl, karchive +, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews +, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet +, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper +, qtscript, qtx11extras, solid +}: + +kdeFramework { + name = "kio"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + acl karchive kconfig kcoreaddons kdbusaddons kiconthemes + knotifications ktextwidgets kwallet kwidgetsaddons + qtscript + ]; + propagatedBuildInputs = [ + kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets + kservice kwindowsystem kxmlgui solid qtx11extras + ]; + postInstall = '' + wrapQtProgram "$out/bin/kcookiejar5" + wrapQtProgram "$out/bin/ktelnetservice5" + wrapQtProgram "$out/bin/ktrash5" + wrapQtProgram "$out/bin/kmailservice5" + wrapQtProgram "$out/bin/protocoltojson" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch new file mode 100644 index 00000000000..c9ad46b41bb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch @@ -0,0 +1,28 @@ +Index: kio-5.17.0/src/core/ksambashare.cpp +=================================================================== +--- kio-5.17.0.orig/src/core/ksambashare.cpp ++++ kio-5.17.0/src/core/ksambashare.cpp +@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( + + bool KSambaSharePrivate::isSambaInstalled() + { +- if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) +- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { +- return true; ++ const QByteArray pathEnv = qgetenv("PATH"); ++ if (!pathEnv.isEmpty()) { ++ QLatin1Char pathSep(':'); ++ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/smbd"); ++ if (QFile::exists(*it)) { ++ return true; ++ } ++ } + } + +- //qDebug() << "Samba is not installed!"; +- + return false; + } + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/development/libraries/kde-frameworks-5.19/kio/series new file mode 100644 index 00000000000..77ca1545004 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/series @@ -0,0 +1 @@ +samba-search-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix new file mode 100644 index 00000000000..a9024d771cc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kitemmodels"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix new file mode 100644 index 00000000000..931019ce495 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kitemviews"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix new file mode 100644 index 00000000000..746edf12eea --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, kwidgetsaddons +, qtx11extras +}: + +kdeFramework { + name = "kjobwidgets"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kwidgetsaddons ]; + propagatedBuildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix new file mode 100644 index 00000000000..768720f178c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kdoctools +, makeQtWrapper +}: + +kdeFramework { + name = "kjs"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + postInstall = '' + wrapQtProgram "$out/bin/kjs5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix new file mode 100644 index 00000000000..22eef2d47bd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs +, makeQtWrapper, qtsvg +}: + +kdeFramework { + name = "kjsembed"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ qtsvg ]; + propagatedBuildInputs = [ ki18n kjs ]; + postInstall = '' + wrapQtProgram "$out/bin/kjscmd5" + wrapQtProgram "$out/bin/kjsconsole" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix new file mode 100644 index 00000000000..460458b2232 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kparts +, kxmlgui +}: + +kdeFramework { + name = "kmediaplayer"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kxmlgui ]; + propagatedBuildInputs = [ kparts ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix new file mode 100644 index 00000000000..5bcd6f30146 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, attica, karchive +, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio +, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui +}: + +kdeFramework { + name = "knewstuff"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + karchive kcompletion kconfig kcoreaddons kiconthemes + kitemviews ktextwidgets kwidgetsaddons + ]; + propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix new file mode 100644 index 00000000000..7e301dd0f26 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcodecs +, kconfig +, kcoreaddons +, kwindowsystem +, phonon +, qtx11extras +}: + +kdeFramework { + name = "knotifications"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcodecs kconfig kcoreaddons phonon + ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix new file mode 100644 index 00000000000..dd99d2d4f1e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +, ki18n, kio, phonon +}: + +kdeFramework { + name = "knotifyconfig"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcompletion kconfig phonon ]; + propagatedBuildInputs = [ ki18n kio ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch new file mode 100644 index 00000000000..e9d74444814 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch @@ -0,0 +1,13 @@ +Index: kpackage-5.18.0/src/kpackage/package.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/package.cpp ++++ kpackage-5.18.0/src/kpackage/package.cpp +@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix new file mode 100644 index 00000000000..aea1b0d31a0 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix @@ -0,0 +1,23 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kdoctools +, ki18n +, makeQtWrapper +}: + +kdeFramework { + name = "kpackage"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ karchive kconfig ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + postInstall = '' + wrapQtProgram "$out/bin/kpackagetool5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..ddbf17d0006 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch @@ -0,0 +1,26 @@ +Index: kpackage-5.18.0/src/kpackage/packageloader.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp ++++ kpackage-5.18.0/src/kpackage/packageloader.cpp +@@ -241,7 +241,7 @@ QList PackageLoader::li + } else { + //qDebug() << "Not cached"; + // If there's no cache file, fall back to listing the directory +- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; ++ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; + const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json"); + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp ++++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir, + + QJsonArray plugins; + +- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); ++ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + const QString path = it.fileInfo().absoluteFilePath(); diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series new file mode 100644 index 00000000000..9b7f076efc7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series @@ -0,0 +1,2 @@ +allow-external-paths.patch +qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix new file mode 100644 index 00000000000..1c3e0b2cbc5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice +, ktextwidgets, kwidgetsaddons, kxmlgui +}: + +kdeFramework { + name = "kparts"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons kiconthemes kjobwidgets knotifications + kservice kwidgetsaddons + ]; + propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix new file mode 100644 index 00000000000..4c3877e7efd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n +, kitemviews, kservice, kwidgetsaddons, qtdeclarative +}: + +kdeFramework { + name = "kpeople"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons kitemviews kservice kwidgetsaddons + ]; + propagatedBuildInputs = [ ki18n qtdeclarative ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix new file mode 100644 index 00000000000..c16f51b5ac3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kplotting"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix new file mode 100644 index 00000000000..2e34e6f674c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix @@ -0,0 +1,10 @@ +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: + +kdeFramework { + name = "kpty"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix new file mode 100644 index 00000000000..7c6f079feaa --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix @@ -0,0 +1,14 @@ +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons +, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons +, kxmlgui, qtscript +}: + +kdeFramework { + name = "kross"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcompletion kcoreaddons kxmlgui ]; + propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix new file mode 100644 index 00000000000..12d2b54d0eb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kio, kservice, plasma-framework, qtquick1, solid +, threadweaver +}: + +kdeFramework { + name = "krunner"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons kservice qtquick1 solid threadweaver + ]; + propagatedBuildInputs = [ ki18n kio plasma-framework ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..3d8397d8ee2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:28:57 -0500 +Subject: [PATCH 1/2] qdiriterator follow symlinks + +--- + src/sycoca/kbuildsycoca.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp +index 1deae14..250baa8 100644 +--- a/src/sycoca/kbuildsycoca.cpp ++++ b/src/sycoca/kbuildsycoca.cpp +@@ -208,7 +208,7 @@ bool KBuildSycoca::build() + QStringList relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch new file mode 100644 index 00000000000..685c6852611 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch @@ -0,0 +1,25 @@ +From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:31:29 -0500 +Subject: [PATCH 2/2] no canonicalize path + +--- + src/sycoca/vfolder_menu.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp +index d3e31c3..d15d743 100644 +--- a/src/sycoca/vfolder_menu.cpp ++++ b/src/sycoca/vfolder_menu.cpp +@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR + } + + if (!relative) { +- QString resolved = QDir(dir).canonicalPath(); ++ QString resolved = QDir::cleanPath(dir); + if (!resolved.isEmpty()) { + dir = resolved; + } +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix new file mode 100644 index 00000000000..03b7c7c2f51 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix @@ -0,0 +1,19 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem +}: + +kdeFramework { + name = "kservice"; + setupHook = ./setup-hook.sh; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcrash kdbusaddons ]; + propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; + propagatedUserEnvPkgs = [ kcoreaddons ]; + patches = [ + ./0001-qdiriterator-follow-symlinks.patch + ./0002-no-canonicalize-path.patch + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh new file mode 100644 index 00000000000..c28e862ff8a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh @@ -0,0 +1,43 @@ +addServicePkg() { + local propagated + for dir in "share/kservices5" "share/kservicetypes5"; do + if [[ -d "$1/$dir" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + + propagated= + for pkg in $propagatedUserEnvPkgs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" + fi + + break + fi + done +} + +envHooks+=(addServicePkg) + +local propagated +for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z@out@" ]]; then + propagated=1 + break + fi +done +if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs @out@" +fi diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix new file mode 100644 index 00000000000..b8df6a5f4c0 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, makeQtWrapper, perl +, karchive, kconfig, kguiaddons, kiconthemes, kparts +, libgit2 +, qtscript, qtxmlpatterns +, ki18n, kio, sonnet +}: + +kdeFramework { + name = "ktexteditor"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ]; + buildInputs = [ + karchive kconfig kguiaddons kiconthemes kparts + libgit2 + qtscript qtxmlpatterns + ]; + propagatedBuildInputs = [ ki18n kio sonnet ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch new file mode 100644 index 00000000000..19ab1e1e551 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch @@ -0,0 +1,36 @@ +Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp +=================================================================== +--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp ++++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp +@@ -55,19 +55,16 @@ QStringList readListing(const QString &f + + int main(int argc, char *argv[]) + { +- // get app instance +- QCoreApplication app(argc, argv); +- + // ensure enough arguments are passed +- if (app.arguments().size() < 3) ++ if (argc < 3) + return 1; + + // open schema + QXmlSchema schema; +- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) ++ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) + return 2; + +- const QString hlFilenamesListing = app.arguments().value(3); ++ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); + if (hlFilenamesListing.isEmpty()) { + return 1; + } +@@ -152,7 +149,7 @@ int main(int argc, char *argv[]) + return anyError; + + // create outfile, after all has worked! +- QFile outFile(app.arguments().at(1)); ++ QFile outFile(QString::fromLocal8Bit(argv[1])); + if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) + return 7; + diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series new file mode 100644 index 00000000000..46cd23829a2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series @@ -0,0 +1 @@ +no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix new file mode 100644 index 00000000000..e332d4ff9a8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem +, sonnet +}: + +kdeFramework { + name = "ktextwidgets"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcompletion kconfig kconfigwidgets kiconthemes kservice + ]; + propagatedBuildInputs = [ ki18n kwindowsystem sonnet ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix new file mode 100644 index 00000000000..3cf0f847d83 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix @@ -0,0 +1,10 @@ +{ kdeFramework, lib, extra-cmake-modules, ki18n }: + +kdeFramework { + name = "kunitconversion"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix new file mode 100644 index 00000000000..46e3cb37d11 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets +, kcoreaddons, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications +, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper +}: + +kdeFramework { + name = "kwallet"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes + knotifications kservice kwidgetsaddons libgcrypt + ]; + propagatedBuildInputs = [ ki18n kwindowsystem ]; + postInstall = '' + wrapQtProgram "$out/bin/kwalletd5" + wrapQtProgram "$out/bin/kwallet-query" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix new file mode 100644 index 00000000000..d95f44d3fec --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kwidgetsaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix new file mode 100644 index 00000000000..09ab1f2200d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtx11extras +}: + +kdeFramework { + name = "kwindowsystem"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix new file mode 100644 index 00000000000..f081d5f9170 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, extra-cmake-modules, attica, kconfig +, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews +, ktextwidgets, kwindowsystem, sonnet +}: + +kdeFramework { + name = "kxmlgui"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + attica kconfig kiconthemes kitemviews ktextwidgets + ]; + propagatedBuildInputs = [ + kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix new file mode 100644 index 00000000000..20a300b68bc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix @@ -0,0 +1,10 @@ +{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: + +kdeFramework { + name = "kxmlrpcclient"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ ki18n kio ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix new file mode 100644 index 00000000000..7d7f769d6a9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, modemmanager +}: + +kdeFramework { + name = "modemmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ modemmanager ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix new file mode 100644 index 00000000000..333378bd143 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, networkmanager +}: + +kdeFramework { + name = "networkmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ networkmanager ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix new file mode 100644 index 00000000000..ee350f8e153 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix @@ -0,0 +1,13 @@ +{ kdeFramework +, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "oxygen-icons5"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix new file mode 100644 index 00000000000..d8846f77723 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative +, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio +, knotifications, kpackage, kservice, kwindowsystem, kxmlgui +, makeQtWrapper, qtscript, qtx11extras +}: + +kdeFramework { + name = "plasma-framework"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons + kiconthemes knotifications kxmlgui qtscript + ]; + propagatedBuildInputs = [ + kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem + qtx11extras + ]; + postInstall = '' + wrapQtProgram "$out/bin/plasmapkg2" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix new file mode 100644 index 00000000000..afd125e3c59 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, makeQtWrapper +, qtdeclarative +}: + +kdeFramework { + name = "solid"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ qtdeclarative ]; + postInstall = '' + wrapQtProgram "$out/bin/solid-hardware5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix new file mode 100644 index 00000000000..943fe04a1c9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, hunspell +}: + +kdeFramework { + name = "sonnet"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ hunspell ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix new file mode 100644 index 00000000000..b86c0b71224 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix @@ -0,0 +1,565 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz"; + sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv"; + name = "attica-5.19.0.tar.xz"; + }; + }; + baloo = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz"; + sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg"; + name = "baloo-5.19.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz"; + sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv"; + name = "bluez-qt-5.19.0.tar.xz"; + }; + }; + breeze-icons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz"; + sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0"; + name = "breeze-icons-5.19.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz"; + sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63"; + name = "extra-cmake-modules-5.19.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz"; + sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3"; + name = "frameworkintegration-5.19.0.tar.xz"; + }; + }; + kactivities = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz"; + sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3"; + name = "kactivities-5.19.0.tar.xz"; + }; + }; + kapidox = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz"; + sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz"; + name = "kapidox-5.19.0.tar.xz"; + }; + }; + karchive = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz"; + sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv"; + name = "karchive-5.19.0.tar.xz"; + }; + }; + kauth = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz"; + sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss"; + name = "kauth-5.19.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz"; + sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd"; + name = "kbookmarks-5.19.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz"; + sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8"; + name = "kcmutils-5.19.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz"; + sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66"; + name = "kcodecs-5.19.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz"; + sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd"; + name = "kcompletion-5.19.0.tar.xz"; + }; + }; + kconfig = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz"; + sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm"; + name = "kconfig-5.19.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz"; + sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv"; + name = "kconfigwidgets-5.19.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz"; + sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw"; + name = "kcoreaddons-5.19.0.tar.xz"; + }; + }; + kcrash = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz"; + sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl"; + name = "kcrash-5.19.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz"; + sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28"; + name = "kdbusaddons-5.19.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz"; + sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g"; + name = "kdeclarative-5.19.0.tar.xz"; + }; + }; + kded = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz"; + sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz"; + name = "kded-5.19.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz"; + sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn"; + name = "kdelibs4support-5.19.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz"; + sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5"; + name = "kdesignerplugin-5.19.0.tar.xz"; + }; + }; + kdesu = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz"; + sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz"; + name = "kdesu-5.19.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz"; + sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj"; + name = "kdewebkit-5.19.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz"; + sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314"; + name = "kdnssd-5.19.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz"; + sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn"; + name = "kdoctools-5.19.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz"; + sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5"; + name = "kemoticons-5.19.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz"; + sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr"; + name = "kfilemetadata-5.19.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz"; + sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d"; + name = "kglobalaccel-5.19.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz"; + sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy"; + name = "kguiaddons-5.19.0.tar.xz"; + }; + }; + khtml = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz"; + sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145"; + name = "khtml-5.19.0.tar.xz"; + }; + }; + ki18n = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz"; + sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05"; + name = "ki18n-5.19.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz"; + sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n"; + name = "kiconthemes-5.19.0.tar.xz"; + }; + }; + kidletime = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz"; + sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6"; + name = "kidletime-5.19.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz"; + sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5"; + name = "kimageformats-5.19.0.tar.xz"; + }; + }; + kinit = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz"; + sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm"; + name = "kinit-5.19.0.tar.xz"; + }; + }; + kio = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz"; + sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv"; + name = "kio-5.19.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz"; + sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7"; + name = "kitemmodels-5.19.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz"; + sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn"; + name = "kitemviews-5.19.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz"; + sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji"; + name = "kjobwidgets-5.19.0.tar.xz"; + }; + }; + kjs = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz"; + sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf"; + name = "kjs-5.19.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz"; + sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48"; + name = "kjsembed-5.19.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz"; + sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay"; + name = "kmediaplayer-5.19.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz"; + sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4"; + name = "knewstuff-5.19.0.tar.xz"; + }; + }; + knotifications = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz"; + sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av"; + name = "knotifications-5.19.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz"; + sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj"; + name = "knotifyconfig-5.19.0.tar.xz"; + }; + }; + kpackage = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz"; + sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv"; + name = "kpackage-5.19.0.tar.xz"; + }; + }; + kparts = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz"; + sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l"; + name = "kparts-5.19.0.tar.xz"; + }; + }; + kpeople = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz"; + sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98"; + name = "kpeople-5.19.0.tar.xz"; + }; + }; + kplotting = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz"; + sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq"; + name = "kplotting-5.19.0.tar.xz"; + }; + }; + kpty = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz"; + sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03"; + name = "kpty-5.19.0.tar.xz"; + }; + }; + kross = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz"; + sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p"; + name = "kross-5.19.0.tar.xz"; + }; + }; + krunner = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz"; + sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx"; + name = "krunner-5.19.0.tar.xz"; + }; + }; + kservice = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz"; + sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm"; + name = "kservice-5.19.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz"; + sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp"; + name = "ktexteditor-5.19.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz"; + sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp"; + name = "ktextwidgets-5.19.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz"; + sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb"; + name = "kunitconversion-5.19.0.tar.xz"; + }; + }; + kwallet = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz"; + sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm"; + name = "kwallet-5.19.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz"; + sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm"; + name = "kwidgetsaddons-5.19.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz"; + sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch"; + name = "kwindowsystem-5.19.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz"; + sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah"; + name = "kxmlgui-5.19.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz"; + sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g"; + name = "kxmlrpcclient-5.19.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz"; + sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w"; + name = "modemmanager-qt-5.19.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz"; + sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13"; + name = "networkmanager-qt-5.19.0.tar.xz"; + }; + }; + oxygen-icons5 = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz"; + sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0"; + name = "oxygen-icons5-5.19.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz"; + sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497"; + name = "plasma-framework-5.19.0.tar.xz"; + }; + }; + solid = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz"; + sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz"; + name = "solid-5.19.0.tar.xz"; + }; + }; + sonnet = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz"; + sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7"; + name = "sonnet-5.19.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.19.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz"; + sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw"; + name = "threadweaver-5.19.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix new file mode 100644 index 00000000000..52817921cc7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "threadweaver"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d91d975689f..f6b0f06aa28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14996,7 +14996,16 @@ let in recurseIntoAttrs (lib.makeScope qt55.newScope merged); - kde5_latest = kde5; + kde5_latest = + let + frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; }; + plasma = import ../desktops/plasma-5.5 { inherit pkgs; }; + apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; + named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; }; + merged = self: + named self // frameworks self // plasma self // apps self // kde5PackagesFun self; + in + recurseIntoAttrs (lib.makeScope qt55.newScope merged); theme-vertex = callPackage ../misc/themes/vertex { }; From 9acbb9021b1477a0a7f25d54d79811dc33b16e15 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 14 Feb 2016 16:58:51 +0000 Subject: [PATCH 211/308] bundix: cleaner substitution Use the builtin substituteInPlace instead of sed --- .../interpreters/ruby/bundix/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix index 245090e66e1..1ce2528291e 100644 --- a/pkgs/development/interpreters/ruby/bundix/default.nix +++ b/pkgs/development/interpreters/ruby/bundix/default.nix @@ -1,4 +1,4 @@ -{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-scripts }: +{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-git }: buildRubyGem rec { inherit ruby; @@ -12,19 +12,19 @@ buildRubyGem rec { buildInputs = [bundler]; postInstall = '' - gem_root=$GEM_HOME/gems/${gemName}-${version} - sed \ - -e 's|NIX_INSTANTIATE =.*|NIX_INSTANTIATE = "${nix}/bin/nix-instantiate"|' \ - -i $gem_root/lib/bundix.rb - sed \ - -e 's|NIX_HASH =.*|NIX_HASH = "${nix}/bin/nix-hash"|' \ - -i $gem_root/lib/bundix.rb - sed \ - -e 's|NIX_PREFETCH_URL =.*|NIX_PREFETCH_URL = "${nix}/bin/nix-prefetch-url"|' \ - -i $gem_root/lib/bundix.rb - sed \ - -e 's|NIX_PREFETCH_GIT =.*|NIX_PREFETCH_GIT = "${nix-prefetch-scripts}/bin/nix-prefetch-git"|' \ - -i $gem_root/lib/bundix.rb + substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \ + --replace \ + "'nix-instantiate'" \ + "'${nix}/bin/nix-instantiate'" \ + --replace \ + "'nix-hash'" \ + "'${nix}/bin/nix-hash'" \ + --replace \ + "'nix-prefetch-url'" \ + "'${nix}/bin/nix-prefetch-url'" \ + --replace \ + "'nix-prefetch-git'" \ + "'${nix-prefetch-git}/bin/nix-prefetch-git'" ''; meta = { From 6738c22a462823c56bf97909c41ab06c4ff1ec47 Mon Sep 17 00:00:00 2001 From: = Date: Wed, 6 Jan 2016 19:36:00 +0000 Subject: [PATCH 212/308] Added aeolus virtual organ --- pkgs/applications/audio/aeolus/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/audio/aeolus/default.nix diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix new file mode 100644 index 00000000000..9fe781f1769 --- /dev/null +++ b/pkgs/applications/audio/aeolus/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2 +, libclxclient, libX11, libXft, readline}: + +stdenv.mkDerivation rec { + name = "aeolus-${version}"; + version = "0.9.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "0dkkibza25a6z9446njqlaynx8gfk5wb828pl9v1snmi5390iggp"; + }; + + buildInputs = [ libclthreads zita-alsa-pcmi alsaLib libjack2 libclxclient + libX11 libXft readline ]; + + patchPhase = ''sed "s@ldconfig.*@@" -i source/Makefile''; + + preBuild = "cd source"; + + makeFlags = "DESTDIR= PREFIX=$(out)"; + + meta = { + description = "Synthetized (not sampled) pipe organ emulator"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acbb0f68e43..acd942650ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11013,6 +11013,8 @@ let adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; + aeolus = callPackage ../applications/audio/aeolus { }; + aewan = callPackage ../applications/editors/aewan { }; afterstep = callPackage ../applications/window-managers/afterstep { From ad50cbe8bb41e9f9ac93813db33bf756871f02f4 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 14 Feb 2016 10:24:46 -0800 Subject: [PATCH 213/308] minecraft: add desktop entry; add ryantm as maintainer --- lib/maintainers.nix | 1 + pkgs/games/minecraft/default.nix | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f73312db99e..c0b1573f82d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -271,6 +271,7 @@ rushmorem = "Rushmore Mushambi "; rvl = "Rodney Lorrimar "; rvlander = "Gaëtan André "; + ryantm = "Ryan Mulligan "; rycee = "Robert Helgesson "; samuelrivas = "Samuel Rivas "; sander = "Sander van der Burg "; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 218a84d591d..6f3093585b4 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,10 +1,27 @@ -{ stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm +{ stdenv, fetchurl, makeDesktopItem +, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm , mesa, openal , useAlsa ? false, alsaOss ? null }: assert useAlsa -> alsaOss != null; -stdenv.mkDerivation { +let + icon = fetchurl { + url = "https://hydra-media.cursecdn.com/minecraft.gamepedia.com/c/c5/Grass.png"; + sha256 = "438c0f63e379e92af1b5b2e06cc5e3365ee272810af65ebc102304bce4fa8c4b"; + }; + + desktopItem = makeDesktopItem { + name = "minecraft"; + exec = "minecraft"; + icon = "${icon}"; + comment = "A sandbox-building game"; + desktopName = "Minecraft"; + genericName = "minecraft"; + categories = "Game;"; + }; + +in stdenv.mkDerivation { name = "minecraft-2015.07.24"; src = fetchurl { @@ -29,12 +46,15 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/minecraft + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; meta = { description = "A sandbox-building game"; homepage = http://www.minecraft.net; - maintainers = [ stdenv.lib.maintainers.page ]; + maintainers = with stdenv.lib.maintainers; [ page ryantm ]; license = stdenv.lib.licenses.unfreeRedistributable; }; } From f13333d43c84184c4fdc70e2935e36c88823f62f Mon Sep 17 00:00:00 2001 From: Gitolite Admin Date: Sun, 14 Feb 2016 21:22:47 +0300 Subject: [PATCH 214/308] gammu: add some DB support --- pkgs/applications/misc/gammu/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 36e45bd0485..fc88bb3e354 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl -, libiconv, gettext, sqlite }: +, libiconv, gettext, sqlite +, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null +, postgresSupport ? false, postgresql ? null +}: with stdenv.lib; @@ -14,13 +17,15 @@ stdenv.mkDerivation rec { patches = [ ./bashcomp-dir.patch ]; - buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ]; + buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ] + ++ optionals dbiSupport [ libdbi libdbiDrivers ] + ++ optionals postgresSupport [ postgresql ]; enableParallelBuilding = true; meta = { homepage = "http://wammu.eu/gammu/"; - description = "Command line utility and library to control mobil phones"; + description = "Command line utility and library to control mobile phones"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.coroa ]; From 39e0909f8f0dfe14dfc0191b8b927c3a5ed6cc6f Mon Sep 17 00:00:00 2001 From: = Date: Sat, 13 Feb 2016 01:03:58 +0100 Subject: [PATCH 215/308] IanniX: init at 0.9.17b (latest git) --- pkgs/applications/audio/iannix/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/audio/iannix/default.nix diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix new file mode 100644 index 00000000000..b2dde5b5b31 --- /dev/null +++ b/pkgs/applications/audio/iannix/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qt5 +}: + +stdenv.mkDerivation rec { + name = "iannix-${version}"; + version = "2016-01-31"; + src = fetchFromGitHub { + owner = "iannix"; + repo = "IanniX"; + rev = "f84becdcbe154b20a53aa2622068cb8f6fda0755"; + sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; + }; + + buildInputs = [ alsaLib pkgconfig qt5.qtbase qt5.qtscript ]; + + configurePhase = ''qmake PREFIX=/''; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + enableParallelBuilding = true; + + meta = { + description = "Graphical open-source sequencer,"; + homepage = http://www.iannix.org/; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21dbbd6e996..7c8b78854d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1940,6 +1940,8 @@ let iasl = callPackage ../development/compilers/iasl { }; + iannix = callPackage ../applications/audio/iannix { }; + icecast = callPackage ../servers/icecast { }; darkice = callPackage ../tools/audio/darkice { }; From 126bdab696f15d871f12d3d91edaaad109860f47 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 14:39:42 +0100 Subject: [PATCH 216/308] botanUnstable: 1.11.25 -> 1.11.28 --- pkgs/development/libraries/botan/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index 172c18480ad..b3fd76ab20c 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "25"; - sha256 = "1spjryza9yznbsa26i1kg3hz4ifjdi6cjhfd2h2lqg07xyf2a66c"; + revision = "28"; + sha256 = "0cjr3zkara8js1fbm8ddcbd5mkizxh1wm6fja13psw5j8mpwj554"; openssl = null; }) From 4e27311fbfe5aeabfb8fc0c5472c65c3139805bf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 14:40:04 +0100 Subject: [PATCH 217/308] botan: 1.10.10 -> 1.10.12 --- pkgs/development/libraries/botan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 6eba16847f8..3a3acbf67b9 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; - revision = "10"; - sha256 = "0qs1ps25k79jnzm31zjl6hj8kxzfwwjsdrlc9bz621218r3v2rvb"; + revision = "12"; + sha256 = "09xcbrs48c9sgy6cj37qbc69gi6wlkjd6r3fi4zr8xwmj5wkmz5g"; extraConfigureFlags = "--with-gnump"; }) From 1e80424799901cc1aa4b5cfb6132fd8c023ffadb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 14:42:37 +0100 Subject: [PATCH 218/308] sysdig: 0.6.0 -> 0.8.0; unpack kernel module when needed --- pkgs/os-specific/linux/sysdig/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 62e2a48adc9..c9a594e684c 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.6.0"; + version = "0.8.0"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0729mjs9gpd7kb495q80zlp23zczm8ka3xcq4571c0sm732sa3g3"; + sha256 = "1939k3clwxg09m1bn0szqiy2nxg66srl72n7476jc58hgaraq3dr"; }; buildInputs = [ cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl @@ -32,7 +32,13 @@ stdenv.mkDerivation { kernel_dev=${kernel.dev} kernel_dev=''${kernel_dev#/nix/store/} kernel_dev=''${kernel_dev%%-linux*dev*} - sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko + if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko"; then + sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko + else + xz -d $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko.xz + sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko + xz $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko + fi ''; meta = with stdenv.lib; { From 9e7c28cb56e08cadc88d5bcfcc3c27348005ca0a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 14:43:15 +0100 Subject: [PATCH 219/308] nginxUnstable: 1.9.10 -> 1.9.11 --- pkgs/servers/http/nginx/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 994a3a29480..5840dee0ba5 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -7,10 +7,10 @@ with stdenv.lib; let - version = "1.9.10"; + version = "1.9.11"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1n9icvi9hq7gak21ixlhcyazjx2yjqlbws07i2habc6a8ildf57v"; + sha256 = "07x5d2ryf547xrj4wp8w90kz2d93sxjhkfjb0vdscmxgmzs74p3a"; }; in From 67ba412a8dde0f66e85407c23c46036980cddd7c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 14:44:07 +0100 Subject: [PATCH 220/308] gluseterfs: 3.7.6 -> 3.7.8 --- pkgs/tools/filesystems/glusterfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 2563c4428a4..7fd56e7dd7f 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.7.6"; + version="3.7.8"; name="${baseName}-${version}"; - hash="01fg132k4gvvx5p0bi88956yzd77pcnw3iyi88vrsncmpnvg10xv"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.6/glusterfs-3.7.6.tar.gz"; - sha256="01fg132k4gvvx5p0bi88956yzd77pcnw3iyi88vrsncmpnvg10xv"; + hash="0r5l8ax1gavhl06k30lg88xs8fj7w6iyd69s5qq5fw1jvavkx709"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.8/glusterfs-3.7.8.tar.gz"; + sha256="0r5l8ax1gavhl06k30lg88xs8fj7w6iyd69s5qq5fw1jvavkx709"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline From 4715783d2ed25428565f8fe1910874a6b1b8882f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 14:44:52 +0100 Subject: [PATCH 221/308] getmail: 4.48.0 -> 4.49.0 --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index a05b3ccfa9a..8dd288b5588 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - version = "4.48.0"; + version = "4.49.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0k5rm5kag14izng2ajcagvli9sns5mzvkyfa65ri4xymxs91wi29"; + sha256 = "1m0yzxd05fklwbmjj1n2q4sx397c1j5qi9a0r5fv3h8pplz4lv0w"; }; doCheck = false; From 4f450829151f94f5688dd3321570e32dbfcc0ce7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 14:49:27 +0100 Subject: [PATCH 222/308] firejail: 0.9.36 -> 0.9.38 --- pkgs/os-specific/linux/firejail/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 4d0a066d2c3..57820f92cc4 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -1,15 +1,16 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, which}: let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.36"; + version="0.9.38"; name="${baseName}-${version}"; - hash="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.36-rc1.tar.bz2"; - sha256="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k"; + hash="0j0zvff9rwjwxcxddfhgzimjgmr99kd04nl40dllkrv3apv5ag4i"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.38-rc1.tar.bz2"; + sha256="0j0zvff9rwjwxcxddfhgzimjgmr99kd04nl40dllkrv3apv5ag4i"; }; buildInputs = [ + which ]; in stdenv.mkDerivation { @@ -21,6 +22,7 @@ stdenv.mkDerivation { preConfigure = '' sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .) + sed -e "s@/bin/cp@$(which cp)@g" -i $( grep -lr /bin/cp .) sed -e '/void fs_var_run(/achar *vrcs = get_link("/var/run/current-system")\;' -i ./src/firejail/fs_var.c sed -e '/ \/run/iif(vrcs!=NULL){symlink(vrcs, "/var/run/current-system")\;free(vrcs)\;}' -i ./src/firejail/fs_var.c ''; From 4f1822bfb56d435ddf92fff0c2dc82e423bd680c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 15:07:12 +0100 Subject: [PATCH 223/308] asymptote: 2.35 -> 2.36 --- pkgs/tools/graphics/asymptote/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index c28349a31cc..db7fad78a49 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -10,11 +10,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.35"; + version="2.36"; name="${baseName}-${version}"; - hash="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z"; - url="mirror://sourceforge/asymptote/2.35/asymptote-2.35.src.tgz"; - sha256="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z"; + hash="0l0pznrn4k3v07cmn5rx8nq088zjs9bv2mkcks65z5lqlk5pccnd"; + url="mirror://sourceforge/project/asymptote/2.36/asymptote-2.36.src.tgz"; + sha256="0l0pznrn4k3v07cmn5rx8nq088zjs9bv2mkcks65z5lqlk5pccnd"; }; buildInputs = [ freeglut ghostscriptX imagemagick fftw From 874721defa47c972470dc6354b7c0ae2ebac4b8a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 15:07:31 +0100 Subject: [PATCH 224/308] baresip: 0.4.16 -> 0.4.17 --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index a2f9ebc8317..2935979ebb9 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid }: stdenv.mkDerivation rec { - version = "0.4.16"; + version = "0.4.17"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "04a9d7il39b1kfqh7al0g0q8v32hphgjx8gkixrlp5qsqlzvk876"; + sha256 = "106nagdyayyxj3q68bs3fsps5wnwzjh82vcmy98fp42j33q6yzny"; }; buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good From eba068da620d6ccc81b024ea135cd2e2fd52be8f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 18:26:02 +0100 Subject: [PATCH 225/308] julia: add julia-git, a snapshot from mid-February with LLVM-3.7 (so it actually works in fresh NixPkgs) --- .../julia/0001.1-use-system-utf8proc.patch | 29 +++ pkgs/development/compilers/julia/git.nix | 170 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 + 3 files changed, 205 insertions(+) create mode 100644 pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch create mode 100644 pkgs/development/compilers/julia/git.nix diff --git a/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch b/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch new file mode 100644 index 00000000000..be4391399f5 --- /dev/null +++ b/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch @@ -0,0 +1,29 @@ +From 54a66b5728ec98f44a1768f064509be4fd3f2ef6 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 10 Oct 2015 13:09:48 -0500 +Subject: [PATCH 1/3] use system utf8proc + +--- + src/flisp/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/flisp/Makefile b/src/flisp/Makefile +index bec8624..5437b5c 100644 +--- a/src/flisp/Makefile ++++ b/src/flisp/Makefile +@@ -24,9 +24,9 @@ DOBJS = $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj) + LLTDIR := ../support + LLT_release := $(BUILDDIR)/$(LLTDIR)/libsupport.a + LLT_debug := $(BUILDDIR)/$(LLTDIR)/libsupport-debug.a +-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC) +-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC) +-LIBS := ++LIBFILES_release := $(LLT_release) $(LIBUV) ++LIBFILES_debug := $(LLT_debug) $(LIBUV) ++LIBS := $(LIBUTF8PROC) + ifneq ($(OS),WINNT) + LIBS += -lpthread + endif +-- +2.5.2 + diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix new file mode 100644 index 00000000000..2f4ce2f4b9e --- /dev/null +++ b/pkgs/development/compilers/julia/git.nix @@ -0,0 +1,170 @@ +{ stdenv, fetchgit, fetchurl +# build tools +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +# libjulia dependencies +, libunwind, llvm, readline, utf8proc, zlib +# standard library dependencies +, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 +# linear algebra +, openblas, arpack, suitesparse +}: + +with stdenv.lib; + +# All dependencies must use the same OpenBLAS. +let + arpack_ = arpack; + suitesparse_ = suitesparse; +in +let + arpack = arpack_.override { inherit openblas; }; + suitesparse = suitesparse_.override { inherit openblas; }; +in + +let + dsfmtVersion = "2.2.3"; + dsfmt = fetchurl { + url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; + sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; + }; + + libuvVersion = "07730c4bd595b4d45a498a8ee0bcd53878ff7c10"; + libuv = fetchurl { + url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; + sha256 = "19nk8vdvx2mxyrwpndb7888c3b237ja5xvxr3jk5ah77ix3srr3h"; + }; + + rmathVersion = "0.1"; + rmath-julia = fetchurl { + url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; + sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + }; + + virtualenvVersion = "1.11.6"; + virtualenv = fetchurl { + url = "https://pypi.python.org/packages/source/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; + sha256 = "1xq4prmg25n9cz5zcvbqx68lmc3kl39by582vd8pzs9f3qalqyiy"; + }; +in + +stdenv.mkDerivation rec { + pname = "julia"; + version = "0.4.4-pre-2016-02-08"; + name = "${pname}-${version}"; + + src = fetchgit { + url = "https://github.com/JuliaLang/${pname}"; + rev = "cb93e6b70b4b1313b4de8c54e55e85c8eb43daa3"; + sha256 = "11dmbjqiidlbh8sj5s09zsbfslm3zs0kw7iq40281hl5dfsr7zm6"; + }; + + prePatch = '' + mkdir deps/srccache + cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" + cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" + cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" + cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" + ''; + + patches = [ + ./0001.1-use-system-utf8proc.patch + ./0002-use-system-suitesparse.patch + ]; + + postPatch = '' + patchShebangs . contrib + ''; + + buildInputs = [ + arpack fftw fftwSinglePrec gmp libgit2 libunwind llvm mpfr + pcre2 openblas openlibm openspecfun readline suitesparse utf8proc + zlib + ]; + + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + + makeFlags = + let + arch = head (splitString "-" stdenv.system); + march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}" + or (throw "unsupported architecture: ${arch}"); + # Julia requires Pentium 4 (SSE2) or better + cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + or (throw "unsupported architecture: ${arch}"); + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${cpuTarget}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + + "USE_SYSTEM_BLAS=1" + "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas" + + "USE_SYSTEM_LAPACK=1" + "LIBLAPACK=-lopenblas" + "LIBLAPACKNAME=libopenblas" + + "USE_SYSTEM_SUITESPARSE=1" + "SUITESPARSE_LIB=-lsuitesparse" + "SUITESPARSE_INC=-I${suitesparse}/include" + + "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GMP=1" + "USE_SYSTEM_LIBGIT2=1" + "USE_SYSTEM_LIBUNWIND=1" + "USE_SYSTEM_LLVM=1" + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_OPENLIBM=1" + "USE_SYSTEM_OPENSPECFUN=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" + ]; + + NIX_CFLAGS_COMPILE = [ "-fPIC" ]; + + LD_LIBRARY_PATH = makeSearchPath "lib" [ + arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + openspecfun pcre2 suitesparse + ]; + + dontStrip = true; + dontPatchELF = true; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "testall"; + # Julia's tests require read/write access to $HOME + preCheck = '' + export HOME="$NIX_BUILD_TOP" + ''; + + preBuild = '' + sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile + sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + ''; + + postInstall = '' + for prog in "$out/bin/julia" "$out/bin/julia-debug"; do + wrapProgram "$prog" \ + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ + --prefix PATH : "${curl}/bin" + done + ''; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "http://julialang.org/"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebef4484aca..298bbfc1800 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4390,6 +4390,12 @@ let openblas = openblasCompat; }; + julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { + gmp = gmp6; + llvm = llvm_37; + openblas = openblasCompat; + }); + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { From 4262d1800ca854e244d4bac8c3c17cfda0236bb3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 21:13:49 +0100 Subject: [PATCH 226/308] libexttextcat: 3.3.1 -> 3.4.1 --- .../libraries/libexttextcat/default.nix | 6 +-- .../libexttextcat/memory-leaks.patch | 37 ------------------- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 pkgs/development/libraries/libexttextcat/memory-leaks.patch diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index a75fada7484..6aaadb0b02e 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libexttextcat-3.3.1"; + name = "libexttextcat-3.4.1"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; - sha256 = "1a7ablpipfbiyhl6wsraj5z8pj3qkqgnrms73wzsqhpbyww334h4"; + sha256 = "0g1spzpsfbv3y8k9m1v53imz18437q93iq101hind7m4x00j6wpl"; }; - patches = [ ./memory-leaks.patch ]; - meta = { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; homepage = http://www.freedesktop.org/wiki/Software/libexttextcat; diff --git a/pkgs/development/libraries/libexttextcat/memory-leaks.patch b/pkgs/development/libraries/libexttextcat/memory-leaks.patch deleted file mode 100644 index 0be4ffdc93a..00000000000 --- a/pkgs/development/libraries/libexttextcat/memory-leaks.patch +++ /dev/null @@ -1,37 +0,0 @@ -Combined upstream commits 980592386f23db8b0dc84c434805cb167d0cc091 and -5ef4ad86ec934282cba891922ec2d13784da3354. -diff -u b/src/textcat.c b/src/textcat.c ---- b/src/textcat.c -+++ b/src/textcat.c -@@ -212,8 +212,6 @@ - sizeof(char) * (tmp_size + 1)); - if (tmp == NULL) - { -- free(finger_print_file_name); -- finger_print_file_name_size = 0; - goto BAILOUT; - } - else -@@ -226,10 +224,7 @@ - strcat(finger_print_file_name, segment[0]); - - if (fp_Read(h->fprint[h->size], finger_print_file_name, 400) == 0) -- { -- textcat_Done(h); - goto BAILOUT; -- } - h->fprint_disable[h->size] = 0xF0; /* 0xF0 is the code for enabled - languages, 0x0F is for disabled - */ -@@ -242,9 +237,10 @@ - return h; - - BAILOUT: -+ free(finger_print_file_name); - fclose(fp); -+ textcat_Done(h); - return NULL; -- - } - - extern candidate_t *textcat_GetClassifyFullOutput(void *handle) From 9f3a1cc2de61cede8703c99a6044f4f4f760f4a5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 21:15:26 +0100 Subject: [PATCH 227/308] librevenge: 0.0.3 -> 0.0.4 --- pkgs/development/libraries/librevenge/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index dc7634c958c..ac5feb1ddc8 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="librevenge"; - version="0.0.3"; + version="0.0.4"; name="${baseName}-${version}"; - hash="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw"; - url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.3/librevenge-0.0.3.tar.xz"; - sha256="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw"; + hash="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"; + url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz"; + sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"; }; buildInputs = [ boost pkgconfig cppunit zlib From 481b1da3efe5dbd97747eaf0947d2ee594bb5c7e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 21:15:44 +0100 Subject: [PATCH 228/308] libre: 0.4.14 -> 0.4.15 --- pkgs/development/libraries/libre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 17226ef17c4..243b4b9420a 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.14"; + version = "0.4.15"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "0ylv7v77jsny0a5wfc8i6dxsp8bjlmlz2gcyyv7x49c76pk0gdcy"; + sha256 = "0yvjc3hvjk29irdii2h1hpq4cg9l1c71jfvglz67y1pc89z63yax"; }; buildInputs = [zlib openssl]; makeFlags = [ From c42b19e95d7f125095f2534491d959a87749e486 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Feb 2016 21:16:53 +0100 Subject: [PATCH 229/308] libreoffice: 5.0.4.2 -> 5.1.0.3; disable one more fragile test --- .../office/libreoffice/default.nix | 32 +++-- .../office/libreoffice/libreoffice-srcs.nix | 117 +++++++++--------- 2 files changed, 80 insertions(+), 69 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 30a4a47896a..7c73e7b808c 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw @@ -11,7 +11,7 @@ , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging +, gdb, commonsLogging, librdf_rasqal , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] , withHelp ? true }: @@ -19,9 +19,9 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "5"; - minor = "0"; - patch = "4"; - tweak = "2"; + minor = "1"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -47,14 +47,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha"; + sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x"; + sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2"; }; }; @@ -63,12 +63,17 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34"; + sha256 = "1csphxpbpc7bxrwnl5i9nvm3bh3p0j7r3h9ivsdl7cys13q066xl"; }; # Openoffice will open libcups dynamically, so we link it directly # to make its dlopen work. - NIX_LDFLAGS = "-lcups"; + # It also seems not to mention libdl explicitly in some places. + NIX_LDFLAGS = "-lcups -ldl"; + + # For some reason librdf_redland sometimes refers to rasqal.h instead + # of rasqal/rasqal.h + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. @@ -112,6 +117,8 @@ in stdenv.mkDerivation rec { # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk + # one more fragile test? + sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx ''; makeFlags = "SHELL=${bash}/bin/bash"; @@ -181,7 +188,6 @@ in stdenv.mkDerivation rec { # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though - "--disable-kde" "--disable-odk" "--disable-postgresql-sdbc" "--disable-firebird-sdbc" @@ -213,18 +219,18 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk + freetype GConf getopt gnome_vfs gperf gtk3 gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base - neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler + neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends tcsh unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew - libodfgen CoinMP + libodfgen CoinMP librdf_rasqal ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index a70d5a7c77c..21a16a5fc69 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -4,21 +4,6 @@ md5 = "7a3815b506d064313ba309617b6f5a0b"; brief = true; } -{ - name = "commons-codec-1.6-src.tar.gz"; - md5 = "2e482c7567908d334785ce7d69ddfff7"; - brief = false; -} -{ - name = "commons-httpclient-3.1-src.tar.gz"; - md5 = "2c9b0f83ed5890af02c0df1c1776f39b"; - brief = false; -} -{ - name = "commons-lang-2.4-src.tar.gz"; - md5 = "625ff5f2f968dd908bca43c9469d6e6b"; - brief = false; -} { name = "commons-logging-1.2-src.tar.gz"; md5 = "ce977548f1cbf46918e93cd38ac35163"; @@ -35,23 +20,28 @@ brief = true; } { - name = "boost_1_55_0.tar.bz2"; - md5 = "d6eef4b4cacb2183f2bf265a5a03a354"; - brief = false; + name = "boost_1_59_0.tar.bz2"; + md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87"; + brief = true; } { name = "bsh-2.0b5-src.zip"; md5 = "ec1941a74d3ef513c4ce57a9092b74e1"; brief = false; } +{ + name = "bzip2-1.0.6.tar.gz"; + md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; + brief = false; +} { name = "cairo-1.10.2.tar.gz"; md5 = "f101a9e88b783337b20b2e26dfd26d5f"; brief = false; } { - name = "libcdr-0.1.1.tar.bz2"; - md5 = "b33fd0be3befdd1b37777e08ce058bd9"; + name = "libcdr-0.1.2.tar.bz2"; + md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; brief = true; } { @@ -100,8 +90,8 @@ brief = false; } { - name = "libetonyek-0.1.3.tar.bz2"; - md5 = "e5947373dd7834f27e93f1636faa419f"; + name = "libetonyek-0.1.6.tar.bz2"; + md5 = "77ff46936dcc83670557274e7dd2aa33"; brief = true; } { @@ -110,8 +100,8 @@ brief = false; } { - name = "Firebird-2.5.2.26540-0.tar.bz2"; - md5 = "21154d2004e025c8a3666625b0357bb5"; + name = "Firebird-2.5.4.26856-0.tar.bz2"; + md5 = "7a17ec9889424b98baa29e001a054434"; brief = true; } { @@ -130,8 +120,8 @@ brief = false; } { - name = "dejavu-fonts-ttf-2.34.zip"; - md5 = "a4e565e220b5de082c23995e256e3c12"; + name = "dejavu-fonts-ttf-2.35.zip"; + md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; brief = false; } { @@ -185,8 +175,8 @@ brief = false; } { - name = "glew-1.10.0.zip"; - md5 = "594eb47b4b1210e25438d51825404d5a"; + name = "glew-1.12.0.zip"; + md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; brief = false; } { @@ -195,9 +185,14 @@ brief = false; } { - name = "graphite2-1.2.4.tgz"; - md5 = "2ef839348fe28e3b923bf8cced440227"; - brief = true; + name = "glyphy-0.2.0.tar.bz2"; + md5 = "5d303fb955beb9bf112267316ca9d021"; + brief = false; +} +{ + name = "graphite2-minimal-1.3.4.tgz"; + md5 = "5c0c9ac0996fbb4a0e17780ff5441959"; + brief = false; } { name = "harfbuzz-0.9.40.tar.bz2"; @@ -220,8 +215,8 @@ brief = false; } { - name = "icu4c-54_1-src.tgz"; - md5 = "e844caed8f2ca24c088505b0d6271bc0"; + name = "icu4c-56_1-src.tgz"; + md5 = "c4a2d71ff56aec5ebfab2a3f059be99d"; brief = false; } { @@ -285,8 +280,8 @@ brief = true; } { - name = "libjpeg-turbo-1.3.1.tar.gz"; - md5 = "2c3a68129dac443a72815ff5bb374b05"; + name = "libjpeg-turbo-1.4.2.tar.gz"; + md5 = "86b0d5f7507c2e6c21c00219162c3c44"; brief = true; } { @@ -326,8 +321,8 @@ subDir = "libgltf/"; } { - name = "liblangtag-0.5.1.tar.bz2"; - md5 = "36271d3fa0d9dec1632029b6d7aac925"; + name = "liblangtag-0.5.8.tar.bz2"; + md5 = "aa899eff126216dafe721149fbdb511b"; brief = false; } { @@ -366,8 +361,8 @@ brief = true; } { - name = "libmwaw-0.3.5.tar.bz2"; - md5 = "bdc58bbf89aaaf6d29b3516d96830a06"; + name = "libmwaw-0.3.7.tar.bz2"; + md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; brief = true; } { @@ -391,8 +386,8 @@ brief = false; } { - name = "libodfgen-0.1.4.tar.bz2"; - md5 = "8716be5c22ae8353f9aaa380d74840dc"; + name = "libodfgen-0.1.6.tar.bz2"; + md5 = "32572ea48d9021bbd6fa317ddb697abc"; brief = true; } { @@ -411,9 +406,14 @@ brief = true; } { - name = "liborcus-0.7.0.tar.bz2"; - md5 = "7681383be6ce489d84c1c74f4e7f9643"; - brief = false; + name = "liborcus-0.9.2.tar.gz"; + md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0"; + brief = true; +} +{ + name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + md5 = "593f0aa47bf2efc0efda2d28fae063b2"; + brief = true; } { name = "libpagemaker-0.0.2.tar.bz2"; @@ -426,8 +426,8 @@ brief = false; } { - name = "libpng-1.5.24.tar.gz"; - md5 = "6652e428d1d3fc3c6cb1362159b1cf3b"; + name = "libpng-1.6.19.tar.gz"; + md5 = "3121bdc77c365a87e054b9f859f421fe"; brief = true; } { @@ -445,6 +445,11 @@ md5 = "803a75927f8f241ca78633890c798021"; brief = true; } +{ + name = "Python-3.5.0.tgz"; + md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; + brief = true; +} { name = "raptor2-2.0.9.tar.gz"; md5 = "4ceb9316488b0ea01acf011023cf7fff"; @@ -461,8 +466,8 @@ brief = false; } { - name = "librevenge-0.0.2.tar.bz2"; - md5 = "2d4183bf17aea1a71842468a71a68c47"; + name = "librevenge-0.0.4.tar.bz2"; + md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; brief = true; } { @@ -491,23 +496,23 @@ brief = false; } { - name = "libvisio-0.1.1.tar.bz2"; - md5 = "726c1f5be65eb7d649e0d48b63d920e7"; + name = "libvisio-0.1.5.tar.bz2"; + md5 = "cbee198a78b842b2087f32d33c522818"; brief = true; } { - name = "libwpd-0.10.0.tar.bz2"; - md5 = "0773d79a1f240ef9f4f20242b13c5bb7"; + name = "libwpd-0.10.1.tar.bz2"; + md5 = "79b56bcc349264d686a67994506ad199"; brief = true; } { - name = "libwpg-0.3.0.tar.bz2"; - md5 = "17da9770cb8b317b7633f9807b32b71a"; + name = "libwpg-0.3.1.tar.bz2"; + md5 = "dfd066658ec9d2fb2262417039a8a1c3"; brief = true; } { - name = "libwps-0.4.0.tar.bz2"; - md5 = "e9162d2566421d9d71b3ad2377a68fd5"; + name = "libwps-0.4.2.tar.bz2"; + md5 = "8a6c55542ce80203dd6d3b1cba99d4e5"; brief = true; } { From 7b7cf281d3bb3ddf21aefd8afb6304673de8bcc5 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Sat, 13 Feb 2016 22:19:31 +0300 Subject: [PATCH 230/308] gammu-smsd service: init --- nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/gammu-smsd.nix | 253 +++++++++++++++++++++ 3 files changed, 255 insertions(+) create mode 100644 nixos/modules/services/misc/gammu-smsd.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 064b4cbc4b3..cea1340e84f 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -248,6 +248,7 @@ matrix-synapse = 224; rspamd = 225; rmilter = 226; + gammu-smsd = 227; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2ff61877c23..d475bccf498 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -210,6 +210,7 @@ ./services/misc/etcd.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix + ./services/misc/gammu-smsd.nix #./services/misc/gitit.nix ./services/misc/gitlab.nix ./services/misc/gitolite.nix diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix new file mode 100644 index 00000000000..91047ead436 --- /dev/null +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -0,0 +1,253 @@ +{ pkgs, lib, config, ... }: + +with lib; +let + cfg = config.services.gammu-smsd; + + configFile = pkgs.writeText "gammu-smsd.conf" '' + [gammu] + Device = ${cfg.device.path} + Connection = ${cfg.device.connection} + SynchronizeTime = ${if cfg.device.synchronizeTime then "yes" else "no"} + LogFormat = ${cfg.log.format} + ${if (cfg.device.pin != null) then "PIN = ${cfg.device.pin}" else ""} + ${cfg.extraConfig.gammu} + + + [smsd] + LogFile = ${cfg.log.file} + Service = ${cfg.backend.service} + + ${optionalString (cfg.backend.service == "files") '' + InboxPath = ${cfg.backend.files.inboxPath} + OutboxPath = ${cfg.backend.files.outboxPath} + SentSMSPath = ${cfg.backend.files.sentSMSPath} + ErrorSMSPath = ${cfg.backend.files.errorSMSPath} + ''} + + ${optionalString (cfg.backend.service == "sql" && cfg.backend.sql.driver == "sqlite") '' + Driver = ${cfg.backend.sql.driver} + DBDir = ${cfg.backend.sql.database} + ''} + + ${optionalString (cfg.backend.service == "sql" && cfg.backend.sql.driver == "native_pgsql") ( + with cfg.backend; '' + Driver = ${sql.driver} + ${if (sql.database!= null) then "Database = ${sql.database}" else ""} + ${if (sql.host != null) then "Host = ${sql.host}" else ""} + ${if (sql.user != null) then "User = ${sql.user}" else ""} + ${if (sql.password != null) then "Password = ${sql.password}" else ""} + '')} + + ${cfg.extraConfig.smsd} + ''; + + initDBDir = "share/doc/gammu/examples/sql"; + + gammuPackage = with cfg.backend; (pkgs.gammu.override { + dbiSupport = (service == "sql" && sql.driver == "sqlite"); + postgresSupport = (service == "sql" && sql.driver == "native_pgsql"); + }); + +in { + options = { + services.gammu-smsd = { + + enable = mkEnableOption "gammu-smsd daemon"; + + user = mkOption { + type = types.str; + default = "smsd"; + description = "User that has access to the device"; + }; + + device = { + path = mkOption { + type = types.path; + description = "Device node or address of the phone"; + example = "/dev/ttyUSB2"; + }; + + group = mkOption { + type = types.str; + default = "root"; + description = "Owner group of the device"; + example = "dialout"; + }; + + connection = mkOption { + type = types.str; + default = "at"; + description = "Protocol which will be used to talk to the phone"; + }; + + synchronizeTime = mkOption { + type = types.bool; + default = true; + description = "Whether to set time from computer to the phone during starting connection"; + }; + + pin = mkOption { + type = types.nullOr types.str; + default = null; + description = "PIN code for the simcard"; + }; + }; + + + log = { + file = mkOption { + type = types.str; + default = "syslog"; + description = "Path to file where information about communication will be stored"; + }; + + format = mkOption { + type = types.enum [ "nothing" "text" "textall" "textalldate" "errors" "errorsdate" "binary" ]; + default = "errors"; + description = "Determines what will be logged to the LogFile"; + }; + }; + + + extraConfig = { + gammu = mkOption { + type = types.lines; + default = ""; + description = "Extra config lines to be added into [gammu] section"; + }; + + + smsd = mkOption { + type = types.lines; + default = ""; + description = "Extra config lines to be added into [smsd] section"; + }; + }; + + + backend = { + service = mkOption { + type = types.enum [ "null" "files" "sql" ]; + default = "null"; + description = "Service to use to store sms data."; + }; + + files = { + inboxPath = mkOption { + type = types.path; + default = "/var/spool/sms/inbox/"; + description = "Where the received SMSes are stored"; + }; + + outboxPath = mkOption { + type = types.path; + default = "/var/spool/sms/outbox/"; + description = "Where SMSes to be sent should be placed"; + }; + + sentSMSPath = mkOption { + type = types.path; + default = "/var/spool/sms/sent/"; + description = "Where the transmitted SMSes are placed"; + }; + + errorSMSPath = mkOption { + type = types.path; + default = "/var/spool/sms/error/"; + description = "Where SMSes with error in transmission is placed"; + }; + }; + + sql = { + driver = mkOption { + type = types.enum [ "native_mysql" "native_pgsql" "odbc" "dbi" ]; + description = "DB driver to use"; + }; + + sqlDialect = mkOption { + type = types.nullOr types.str; + default = null; + description = "SQL dialect to use (odbc driver only)"; + }; + + database = mkOption { + type = types.str; + default = null; + description = "Database name to store sms data"; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "Database server address"; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + description = "User name used for connection to the database"; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = "User password used for connetion to the database"; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers.${cfg.user} = { + description = "gammu-smsd user"; + uid = config.ids.uids.gammu-smsd; + extraGroups = [ "${cfg.device.group}" ]; + }; + + environment.systemPackages = with cfg.backend; [ gammuPackage ] + ++ optionals (service == "sql" && sql.driver == "sqlite") [ pkgs.sqlite ]; + + systemd.services.gammu-smsd = { + description = "gammu-smsd daemon"; + + wantedBy = [ "multi-user.target" ]; + + wants = with cfg.backend; [ ] + ++ optionals (service == "sql" && sql.driver == "native_pgsql") [ "postgresql.service" ]; + + preStart = with cfg.backend; + + optionalString (service == "files") (with files; '' + mkdir -m 755 -p ${inboxPath} ${outboxPath} ${sentSMSPath} ${errorSMSPath} + chown ${cfg.user} -R ${inboxPath} + chown ${cfg.user} -R ${outboxPath} + chown ${cfg.user} -R ${sentSMSPath} + chown ${cfg.user} -R ${errorSMSPath} + '') + + optionalString (service == "sql" && sql.driver == "sqlite") '' + cat "${gammuPackage}/${initDBDir}/sqlite.sql" \ + | ${pkgs.sqlite}/bin/sqlite3 ${sql.database} + '' + + (let execPsql = extraArgs: concatStringsSep " " [ + (optionalString (sql.password != null) "PGPASSWORD=${sql.password}") + "${config.services.postgresql.package}/bin/psql" + (optionalString (sql.host != null) "-h ${sql.host}") + (optionalString (sql.user != null) "-U ${sql.user}") + "$extraArgs" + "${sql.database}" + ]; in optionalString (service == "sql" && sql.driver == "native_pgsql") '' + echo '\i '"${gammuPackage}/${initDBDir}/pgsql.sql" | ${execPsql ""} + ''); + + serviceConfig = { + User = "${cfg.user}"; + Group = "${cfg.device.group}"; + PermissionsStartOnly = true; + ExecStart = "${gammuPackage}/bin/gammu-smsd -c ${configFile}"; + }; + + }; + }; +} From af64bedaca73c660d6a3d0424981f9fe58ee9a52 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 9 Feb 2016 22:34:31 +0100 Subject: [PATCH 231/308] add armv7l-linux to mesaPlatforms --- lib/platforms.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/platforms.nix b/lib/platforms.nix index 750829da375..5ac0b528714 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -13,7 +13,7 @@ rec { all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; none = []; allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"]; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux"]; x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; From 976895c0d04b998a66853158ab312b9fda42d596 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 11 Feb 2016 09:33:42 +0100 Subject: [PATCH 232/308] mesa: remove broken dependency on libdrm_intel on armv7l-linux does this work for other arm systems or should it be applied for system.isArm? --- pkgs/development/libraries/mesa/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c6af00d08b8..f2b53fc2e59 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -86,12 +86,16 @@ stdenv.mkDerivation { # TODO: Figure out how to enable opencl without having a runtime dependency on clang "--disable-opencl" - "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast" + (if "armv7l-linux" == stdenv.system + then null + else "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast") "--enable-shared-glapi" "--enable-sysfs" "--enable-driglx-direct" # seems enabled anyway "--enable-glx-tls" - "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast" + (if "armv7l-linux" == stdenv.system + then "--with-dri-drivers=" + else "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast") "--with-egl-platforms=x11,wayland,drm" "--enable-gallium-llvm" From 6c532624808336b853f31d27ef3309e6feab4ac1 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Sun, 14 Feb 2016 21:13:51 +0100 Subject: [PATCH 233/308] ImageMagick: build also on armv7l-linux --- pkgs/applications/graphics/ImageMagick/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8fa86041414..e75e86a4d53 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -7,6 +7,7 @@ let arch = if stdenv.system == "i686-linux" then "i686" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" + else if stdenv.system == "armv7l-linux" then "armv7l" else throw "ImageMagick is not supported on this platform."; in From d48f117d06dbf1b4e414a16672e998289298f34a Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 14 Feb 2016 23:03:26 +0000 Subject: [PATCH 234/308] linux-testing: 4.5-rc3 -> 4.5-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 8dc55f6e6a8..5b2034d2191 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.5-rc3"; - modDirVersion = "4.5.0-rc3"; + version = "4.5-rc4"; + modDirVersion = "4.5.0-rc4"; extraMeta.branch = "4.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "fae5b3b318d6ca7d142b2947e8df3e4091e2330dc509ba19503abf4b9c314986"; + sha256 = "02kzcz2gblbjr0ixjdbwdbk4yix8wyd0xjpqk5mk78132pgj3w0a"; }; features.iwlwifi = true; From edd63763e158d55caf90dfa4f5caf979cf85e560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 15 Feb 2016 00:42:16 +0100 Subject: [PATCH 235/308] Jamin: adjust to standard code conventions --- pkgs/applications/audio/jamin/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index d9f79a754fa..4af53389ffd 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2 -, makeWrapper, pkgconfig, perl, perlXMLParser }: +, makeWrapper, pkgconfig, perl, perlXMLParser +}: stdenv.mkDerivation { name = "jamin-0.95.0"; @@ -9,11 +10,13 @@ stdenv.mkDerivation { sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; - buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 - pkgconfig perl perlXMLParser makeWrapper ]; + buildInputs = [ + fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 pkgconfig perl + perlXMLParser makeWrapper + ]; postInstall = '' - wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa + wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa ''; meta = with stdenv.lib; { From 6b9ae8badaa5e3f24b13fd20e17458f0ff4169bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2016 01:11:48 +0100 Subject: [PATCH 236/308] debian_devscripts: 2.15.10 -> 2.16.1 Changes: http://metadata.ftp-master.debian.org/changelogs/main/d/devscripts/devscripts_2.16.1_changelog --- pkgs/tools/misc/debian-devscripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 9a4dcae7dd2..9430b1349a1 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.15.10"; + version = "2.16.1"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "1yb26xpjxp9q5vsjzc9bv8vydpx2rs1v0i7phxhylfjn0fgpfnc6"; + sha256 = "096f26b0z6kwv47qy99gak40wcc8mp24n0nvqwgifcicr18qv4rz"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile From 54e82445cb49ec4af359905383fbf6c8606a61c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2016 01:18:35 +0100 Subject: [PATCH 237/308] miniupnpd: 1.9.20160209 -> 1.9.20160212 Changes: - return error 729 - ConflictWithOtherMechanisms if IGD v2 is enabled. - add iptc_init() check in iptcrdr.c/init_redirect() - add update_portmapping() / update_portmapping_desc_timestamp() functions - use Linux libuuid uuid_generate() / BSD uuid_create() API Changes: https://github.com/miniupnp/miniupnp/blob/master/miniupnpd/Changelog.txt --- pkgs/tools/networking/miniupnpd/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 7334ecc3e92..8eb96913bca 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, iptables, pkgconfig }: +{ stdenv, fetchurl, iptables, libuuid, pkgconfig }: assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-1.9.20160209"; + name = "miniupnpd-1.9.20160212"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0r4giqsr39s17mn9lmmy3zawrfj7kj9im7nzv7mx3rgz2ncw092z"; + sha256 = "1fsl46f7lrhpb597m0a905nwijpf188cchgg6pz39fx2mgjjjk9l"; name = "${name}.tar.gz"; }; - buildInputs = [ iptables ]; + buildInputs = [ iptables libuuid ]; nativeBuildInputs= [ pkgconfig ]; - NIX_CFLAGS_LINK = "-liptc"; - makefile = "Makefile.linux"; buildFlags = "miniupnpd genuuid"; From ffef91e914ce8990884aae1c2fd38ea11b2b25f1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Feb 2016 18:37:29 +0100 Subject: [PATCH 238/308] torbrowser: 5.5 -> 5.5.2 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index ced4d868ee0..dfde2b57aa6 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "5.5"; + version = "5.5.2"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "0glv2zffls1as71idbfg3l34kmsv48f3sk59swl6k8l75nvxlzjk" else - "0xbsixxs1hj0ydmazgi796xgvlsvbrkh8vfgaiyqcvgx4vf4ggwf"; + "1zb5fssy9c37cb0ab083f2jifw47wnck32nc6zpijmqm059yccxc" else + "1gjc6prx3n769nj4gzhfjrb2qpw3ypvsb3pp0a130db1ssgnzqqr"; }; desktopItem = makeDesktopItem { From fe4b0a4801c35af316c643bebf51a6841e6e61b5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 7 Feb 2016 18:40:15 +0100 Subject: [PATCH 239/308] unbound service: retab --- nixos/modules/services/networking/unbound.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 73b10c1d561..677cc2ce0c3 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -38,28 +38,28 @@ in services.unbound = { enable = mkOption { - default = false; - description = "Whether to enable the Unbound domain name server."; + default = false; + description = "Whether to enable the Unbound domain name server."; }; allowedAccess = mkOption { - default = ["127.0.0.0/24"]; - description = "What networks are allowed to use unbound as a resolver."; + default = ["127.0.0.0/24"]; + description = "What networks are allowed to use unbound as a resolver."; }; interfaces = mkOption { - default = [ "127.0.0.1" "::1" ]; - description = "What addresses the server should listen on."; + default = [ "127.0.0.1" "::1" ]; + description = "What addresses the server should listen on."; }; forwardAddresses = mkOption { - default = [ ]; - description = "What servers to forward queries to."; + default = [ ]; + description = "What servers to forward queries to."; }; extraConfig = mkOption { - default = ""; - description = "Extra lines of unbound config."; + default = ""; + description = "Extra lines of unbound config."; }; }; @@ -88,9 +88,9 @@ in preStart = '' mkdir -m 0755 -p ${stateDir}/dev/ - cp ${confFile} ${stateDir}/unbound.conf - chown unbound ${stateDir} - touch ${stateDir}/dev/random + cp ${confFile} ${stateDir}/unbound.conf + chown unbound ${stateDir} + touch ${stateDir}/dev/random ${pkgs.utillinux}/bin/mount --bind -n /dev/random ${stateDir}/dev/random ''; From 9ba533ee4a68db8afda83b6f6584424c1aee8b76 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 15 Feb 2016 03:37:45 +0100 Subject: [PATCH 240/308] unbound service: add types to options --- nixos/modules/services/networking/unbound.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 677cc2ce0c3..bad0d2d4e85 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -39,26 +39,31 @@ in enable = mkOption { default = false; + type = types.bool; description = "Whether to enable the Unbound domain name server."; }; allowedAccess = mkOption { default = ["127.0.0.0/24"]; + type = types.listOf types.str; description = "What networks are allowed to use unbound as a resolver."; }; interfaces = mkOption { default = [ "127.0.0.1" "::1" ]; + type = types.listOf types.str; description = "What addresses the server should listen on."; }; forwardAddresses = mkOption { default = [ ]; + type = types.listOf types.str; description = "What servers to forward queries to."; }; extraConfig = mkOption { default = ""; + type = types.str; description = "Extra lines of unbound config."; }; From 483e78d0f078d9449f892058b914a864d80d09f8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 15 Feb 2016 03:35:25 +0100 Subject: [PATCH 241/308] unbound service: add fetching root anchor for DNSSEC --- nixos/modules/services/networking/unbound.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index bad0d2d4e85..e154aed0843 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -16,6 +16,11 @@ let "forward-zone:\n name: .\n" + concatMapStrings (x: " forward-addr: ${x}\n") cfg.forwardAddresses; + rootTrustAnchorFile = "${stateDir}/root.key"; + + trustAnchor = optionalString cfg.enableRootTrustAnchor + "auto-trust-anchor-file: ${rootTrustAnchorFile}"; + confFile = pkgs.writeText "unbound.conf" '' server: directory: "${stateDir}" @@ -24,6 +29,7 @@ let pidfile: "" ${interfaces} ${access} + ${trustAnchor} ${cfg.extraConfig} ${forward} ''; @@ -61,6 +67,12 @@ in description = "What servers to forward queries to."; }; + enableRootTrustAnchor = mkOption { + default = true; + type = types.bool; + description = "Use and update root trust anchor for DNSSEC validation."; + }; + extraConfig = mkOption { default = ""; type = types.str; @@ -94,7 +106,8 @@ in preStart = '' mkdir -m 0755 -p ${stateDir}/dev/ cp ${confFile} ${stateDir}/unbound.conf - chown unbound ${stateDir} + ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} + chown unbound ${stateDir} ${rootTrustAnchorFile} touch ${stateDir}/dev/random ${pkgs.utillinux}/bin/mount --bind -n /dev/random ${stateDir}/dev/random ''; From 7bf80c9875e0b9fba892c9e50046a9914bf172f5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 8 Feb 2016 02:20:00 +0100 Subject: [PATCH 242/308] unbound: 1.5.3 -> 1.5.7 --- pkgs/tools/networking/unbound/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index b15473ddf4c..035b637031c 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.5.3"; + version = "1.5.7"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "1jly2apag4yg649w3flaq73wdrcfyxnhx5py9j73y7adxmswigbn"; + sha256 = "1a0wfgp6wqpf7cxlcbprqhnjx6z9ywf0rhrpcf7x98l1mbjqh82b"; }; buildInputs = [ openssl expat libevent ]; @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; - meta = { + meta = with stdenv.lib; { description = "Validating, recursive, and caching DNS resolver"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; homepage = http://www.unbound.net; - maintainers = [ stdenv.lib.maintainers.ehmry ]; + maintainers = with maintainers; [ ehmry fpletz ]; platforms = stdenv.lib.platforms.unix; }; } From f415c07703496a468ebee17e90b05f3b9a69cc93 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 15 Feb 2016 04:27:49 +0100 Subject: [PATCH 243/308] unbound: enable compilation with PIE & relro/now --- pkgs/tools/networking/unbound/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 035b637031c..4819c004c1b 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { "--with-libevent=${libevent}" "--localstatedir=/var" "--sysconfdir=/etc" + "--enable-pie" + "--enable-relro-now" ]; installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; From 745a11fad56964b0ce6e9a7bf5a8baab745f9184 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 8 Feb 2016 10:53:02 +0200 Subject: [PATCH 244/308] connman: 1.30 -> 1.31 --- pkgs/tools/networking/connman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 6142f53c056..7af692f782e 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.30"; + version = "1.31"; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/connman/connman.git"; rev = "refs/tags/${version}"; - sha256 = "715474351e22b52334d37c146fd5eb87d692be8501d8dac33a0e330437235295"; + sha256 = "90dab6b11841cb4b6400711d234b59fb4fad4e8778bed6e7ad3ac7ac135d6893"; }; buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit From bb4e68b9d48ba3e91c201165a43f8198848d702f Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 15 Feb 2016 10:22:12 +0100 Subject: [PATCH 245/308] easytag: 2.3.2 -> 2.4.1 --- pkgs/applications/audio/easytag/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index cb1def12dfd..83ff7ecffa1 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -5,11 +5,12 @@ stdenv.mkDerivation rec { name = "easytag-${version}"; - version = "2.3.2"; + majorVersion = "2.4"; + version = "${majorVersion}.1"; src = fetchurl { - url = "mirror://gnome/sources/easytag/2.3/${name}.tar.xz"; - sha256 = "0bj3sj4yzlnhan38j84acs7qv27fl3xy4rdrfq6dnpz4q6qccm84"; + url = "mirror://gnome/sources/easytag/${majorVersion}/${name}.tar.xz"; + sha256 = "1mbpwp3lh6yz5xkaq3a329x4r3chmjsr83r349crhi1gax3mzvxr"; }; preFixup = '' From 2099b95d9c13728d82a4982627ff3347aae8c4c0 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 12 Feb 2016 16:30:52 +0100 Subject: [PATCH 246/308] patchage: init at 1.0.1 --- pkgs/applications/audio/patchage/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/audio/patchage/default.nix diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix new file mode 100644 index 00000000000..1deb11d9925 --- /dev/null +++ b/pkgs/applications/audio/patchage/default.nix @@ -0,0 +1,30 @@ +{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm, gtk2 +, gtkmm, libjack2, pkgconfig, python2 +}: + +stdenv.mkDerivation rec { + name = "patchage-${version}"; + version = "1.0.1"; + src = fetchsvn { + url = http://svn.drobilla.net/lad/trunk/patchage/; + rev = "5821"; + sha256 = "1ar64l0sg468qzxj7i6ppgfqjpm92awcp5lzskamrf3ln17lrgj7"; + }; + + buildInputs = [ + alsaLib boost dbus_glib ganv glibmm gtk2 gtkmm libjack2 + pkgconfig python2 + ]; + + configurePhase = "python waf configure --prefix=$out"; + buildPhase = "python waf build"; + installPhase = "python waf install"; + + meta = { + description = "Modular patch bay for Jack and ALSA systems"; + homepage = http://non.tuxfamily.org; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c6f9f104b7..1e10fff0ffa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2729,6 +2729,8 @@ let patch = gnupatch; + patchage = callPackage ../applications/audio/patchage { }; + pbzip2 = callPackage ../tools/compression/pbzip2 { }; pciutils = callPackage ../tools/system/pciutils { }; From 55b18ac486336da8f9bfe352afd3fac564b2671b Mon Sep 17 00:00:00 2001 From: Marcin Falkiewicz Date: Mon, 15 Feb 2016 11:22:29 +0100 Subject: [PATCH 247/308] thin-provisioning-tools: init at 0.6.1 --- .../linux/thin-provisioning-tools/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/os-specific/linux/thin-provisioning-tools/default.nix diff --git a/pkgs/os-specific/linux/thin-provisioning-tools/default.nix b/pkgs/os-specific/linux/thin-provisioning-tools/default.nix new file mode 100644 index 00000000000..c075c3f1667 --- /dev/null +++ b/pkgs/os-specific/linux/thin-provisioning-tools/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, autoconf, pkgconfig, utillinux, coreutils, expat, libaio, boost}: + +let + version = "0.6.1"; +in + +stdenv.mkDerivation { + name = "thin-provisioning-tools-${version}"; + + src = fetchFromGitHub { + owner = "jthornber"; + repo = "thin-provisioning-tools"; + rev = "e46bdfd4cc6cdb13852de8aba4e3019425ab0a89"; + sha256 = "061rw33nw16g71ij05axl713wimawx54h2ggpqxvzy7iyi6lhdcm"; + }; + + nativeBuildInputs = [ autoconf pkgconfig expat libaio boost ]; + + preConfigure = + '' + autoconf + ''; + + meta = { + homepage = https://github.com/jthornber/thin-provisioning-tools; + descriptions = "Tools for manipulating the metadata of the device-mapper targets (dm-thin-pool, dm-cache, dm-era)"; + platforms = stdenv.lib.platforms.linux; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ed1bbc21de..0d770791edb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10509,6 +10509,8 @@ let lvm2 = callPackage ../os-specific/linux/lvm2 { }; + thin_provisioning_tools = callPackage ../os-specific/linux/thin-provisioning-tools { }; + mbpfan = callPackage ../os-specific/linux/mbpfan { }; mdadm = callPackage ../os-specific/linux/mdadm { }; From 314e4edf59880c138468f5a7c271fdee9a37843f Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Mon, 15 Feb 2016 13:15:48 +0100 Subject: [PATCH 248/308] qtile: 0.10.2 -> 0.10.4 --- .../qtile/0002-Restore-PATH-and-PYTHONPATH.patch | 14 ++++++-------- .../applications/window-managers/qtile/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch index ba408b1f05b..b620bfb2501 100644 --- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch +++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch @@ -48,13 +48,14 @@ index 84f6a2d..da31b12 100755 import logging import os diff --git a/libqtile/utils.py b/libqtile/utils.py -index d5f975b..0fdb080 100644 +index 284089b..ec3539e 100644 --- a/libqtile/utils.py +++ b/libqtile/utils.py -@@ -208,3 +208,10 @@ def get_cache_dir(): - if not os.path.exists(cache_directory): - os.makedirs(cache_directory) - return cache_directory +@@ -227,3 +227,11 @@ def describe_attributes(obj, attrs, func=None): + pairs.append('%s=%s' % (attr, value)) + + return ', '.join(pairs) ++ + +def restore_os_environment(): + pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "") @@ -62,6 +63,3 @@ index d5f975b..0fdb080 100644 + path = os.environ.pop("QTILE_SAVED_PATH", None) + if path: + os.environ["PATH"] = path --- -2.6.3 - diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 3f38be66927..0dae8a76c77 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -7,13 +7,13 @@ in buildPythonPackage rec { name = "qtile-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "02252sfcniijkpk5rfgb800wvdpl223xrx1bhrxpzgggpgfbnmn6"; + sha256 = "0rwklzgkp3x242xql6qmfpfnhr788hd3jc1l80pc5ybxlwyfx59i"; }; patches = [ From fb1b8464f87a502603e07228aeee0e1a00dba145 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 15 Feb 2016 13:36:34 +0100 Subject: [PATCH 249/308] gpodder: 3.8.4 -> 3.9.0 Changes in 3.8.5 (without bug IDs): * vimeo: Fix vimeo feed discovery * vimeo: Allow both http and https URLs * youtube: Improve channel migration code * youtube: Fix cover art downloading * Make the YouTube key button link to the gPodder Wiki * Add pattern to YouTube feed URL list * CLI: Cleanup old downloads on CLI startup * Gtk UI: Fix model column data types * Device sync: Handle sync failure when no space left * model: Limit filenames to 120 characters for eCryptFS * rename_download: Add add_sortdate and add_podcast_title option * Remove the unused 'pipe' IPC module * Fix coverage usage * Use Travis CI for running basic sanity tests * Various small code improvements and fixes Release announcement for 3.8.5: http://blog.gpodder.org/2015/12/gpodder-385-casting-agents-and-cowgirls.html Changes in 3.9.0 (without bug IDs): * Added Korean translation * Device sync: Only fail if we can determine free disk space * Enqueue episodes after download * Ubuntu AppIndicator extension: 'visible' config option * gpodder.download: Ignore non-ASCII content-disposition header * Win32-launcher: Remove download feature (works around Norton warning) * Remove WebUI, QML UI and MeeGo 1.2 Harmattan support * Remove broken Flattr integration (use gpodder.net's Flattr support) * Redesign about dialog * Preferences: Move video services to separate tab * Vimeo: Fix Vimeo integration Release announcement for 3.9.0: http://blog.gpodder.org/2016/02/gpodder-390-helium-levitator-released.html Built and tested locally on my machine. Signed-off-by: aszlig Cc: @svenkeidel --- pkgs/applications/audio/gpodder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index c2ea3510582..216259deb43 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -7,11 +7,11 @@ let inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3; in buildPythonPackage rec { - name = "gpodder-3.8.4"; + name = "gpodder-3.9.0"; src = fetchurl { url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "0cjpk92qjsws7ddbnq0r2h7vm5019zlpafgbxwsgllmjzkknj6pn"; + sha256 = "1ik954idi0ldnw0wrv7mm71smyb6x66332jxcaf1dxsl12ccm44l"; }; buildInputs = [ From d9470c9e194ba612133498d8b4259a6e23cb1d6a Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 15 Feb 2016 14:16:01 +0100 Subject: [PATCH 250/308] gpodder: Clean up package expression We don't need to wrap twice, because we can actually pass the additional XDG_DATA_DIRS via makeWrapperArgs. The reason why I'm doing this within the patchPhase is because we can't add shell variables from the current builder to makeWrapperArgs as that content is going to end up in the wrapper verbatim. In addition to this, gpodder was trying to search for its own directory using the current program name, which I guess was another reason for the double-wrap. We fix this now by setting gpodder_dir explicitly in the main script. Another main change is that we no longer set the "pythonX.Y-" prefix, so the derivation name now is just "gpodder-3.9.0". Last but not least, we enable the unit tests for gpodder in checkPhase. Signed-off-by: aszlig Cc: @svenkeidel --- pkgs/applications/audio/gpodder/default.nix | 55 +++++++++------------ 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 216259deb43..55337bf1d3a 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,50 +1,43 @@ -{ pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool, - ipodSupport ? true, libgpod, gnome3 }: +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, mygpoclient, intltool +, ipodSupport ? true, libgpod +, gnome3 +}: -with pkgs.lib; +buildPythonPackage rec { + name = "gpodder-${version}"; + namePrefix = ""; -let - inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3; - -in buildPythonPackage rec { - name = "gpodder-3.9.0"; + version = "3.9.0"; src = fetchurl { url = "http://gpodder.org/src/${name}.tar.gz"; sha256 = "1ik954idi0ldnw0wrv7mm71smyb6x66332jxcaf1dxsl12ccm44l"; }; + postPatch = with stdenv.lib; '' + sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder + + makeWrapperArgs="--suffix XDG_DATA_DIRS : '${concatStringsSep ":" [ + "${gnome3.gnome_themes_standard}/share" + "$XDG_ICON_DIRS" + "$GSETTINGS_SCHEMAS_PATH" + ]}'" + ''; + buildInputs = [ - coverage minimock sqlite3 mygpoclient intltool + intltool pythonPackages.coverage pythonPackages.minimock gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = with pythonPackages; [ + feedparser dbus mygpoclient sqlite3 pygtk eyeD3 + ] ++ stdenv.lib.optional ipodSupport libgpod; - pythonPath = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ] - ++ stdenv.lib.optional ipodSupport libgpod; - - postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile"; - - preFixup = '' - wrapProgram $out/bin/gpodder \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + checkPhase = '' + LC_ALL=C python -m gpodder.unittests ''; - # The `wrapPythonPrograms` script in the postFixup phase breaks gpodder. The - # easiest way to fix this is to call wrapPythonPrograms and then to clean up - # the wrapped file. - postFixup = '' - wrapPythonPrograms - - sed -i "$out/bin/..gpodder-wrapped-wrapped" -e '{ - /import sys; sys.argv/d - }' - ''; - - installPhase = "DESTDIR=/ PREFIX=$out make install"; - meta = { description = "A podcatcher written in python"; longDescription = '' From 2d3940bd662f0bb858a2da7c2f9bfa28743f5544 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Wed, 10 Feb 2016 10:45:47 +0100 Subject: [PATCH 251/308] scrot: 0.8 -> 0.8-17 (Debian patches), fixes #12954 --- pkgs/tools/graphics/scrot/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index aa8958bb63d..55a63712c1e 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,13 +1,27 @@ -{ stdenv, fetchurl, giblib, xlibsWrapper }: +{ stdenv, fetchurl, fetchzip, giblib, xlibsWrapper }: +let + debPatch = fetchzip { + url = mirror://debian/pool/main/s/scrot/scrot_0.8-17.debian.tar.xz; + sha256 = "0ydsr3vah5wkcbnp91knkdbil4hx0cn0iy57frl03azqzc29bkw5"; + }; +in stdenv.mkDerivation rec { - name = "scrot-0.8"; + name = "scrot-0.8-17"; src = fetchurl { url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; }; + inherit debPatch; + + postPatch = '' + for patch in $(cat $debPatch/patches/series); do + patch -p1 < "$debPatch/patches/$patch" + done + ''; + buildInputs = [ giblib xlibsWrapper ]; meta = { From 6b1a91e04f7f1017700a7f16301574500529088c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 15 Feb 2016 15:46:51 +0100 Subject: [PATCH 252/308] scrot: adding garbas as maintainer --- pkgs/tools/graphics/scrot/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 55a63712c1e..5e4fd3ff062 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { buildInputs = [ giblib xlibsWrapper ]; - meta = { + meta = with stdenv.lib; { homepage = http://linuxbrit.co.uk/scrot/; description = "A command-line screen capture utility"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ garbas ]; }; } From bc00989ca54f94bb9cef0ed731f11a3f35f80fe2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2016 15:37:23 +0100 Subject: [PATCH 253/308] simple-scan: 3.19.4 -> 3.19.90 --- pkgs/applications/graphics/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 5f8a8ac6b9a..658df21a654 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.19.4"; + version = "3.19.90"; src = fetchurl { - sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83"; + sha256 = "16s8855sqrn5iiirpqva0mys8abfpzk9xryrb6rpjbynvx2lanmd"; url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; From f4a32be72988441cc67d0325cd85991505f547e2 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sun, 14 Feb 2016 22:14:00 +0100 Subject: [PATCH 254/308] love: 0.8 -> 0.10.1 --- pkgs/development/interpreters/love/0.10.nix | 38 +++++++++++++++++++ .../love/{default.nix => 0.8.nix} | 0 pkgs/top-level/all-packages.nix | 5 ++- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/love/0.10.nix rename pkgs/development/interpreters/love/{default.nix => 0.8.nix} (100%) diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix new file mode 100644 index 00000000000..ed5aa1e60de --- /dev/null +++ b/pkgs/development/interpreters/love/0.10.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, mesa, openal, luajit, + libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, + libtheora, which, autoconf, automake, libtool +}: + +let + pname = "love"; + version = "0.10.1"; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + src = fetchFromBitbucket { + owner = "rude"; + repo = "love"; + rev = "${version}"; + sha256 = "10a2kkyx7x9jkcj9xrqgmvp0b6gbapjqjx9fib9f6a0nbz0xaswj"; + }; + + buildInputs = [ + pkgconfig SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 + libvorbis libogg libtheora autoconf which libtool automake + ]; + + preConfigure = "$shell ./platform/unix/automagic"; + + configureFlags = [ + "--with-lua=luajit" + ]; + + meta = { + homepage = "http://love2d.org"; + description = "A Lua-based 2D game engine/scripting language"; + license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/0.8.nix similarity index 100% rename from pkgs/development/interpreters/love/default.nix rename to pkgs/development/interpreters/love/0.8.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 298bbfc1800..b16ae4744f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5221,9 +5221,10 @@ let lolcode = callPackage ../development/interpreters/lolcode { }; - love = callPackage ../development/interpreters/love {lua=lua5_1;}; - love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; + love_0_8 = callPackage ../development/interpreters/love/0.8.nix { }; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; + love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; + love = love_0_10; ### LUA MODULES From 50bd1a0e8f388ba64b5f8fca39ed332c051ff7b2 Mon Sep 17 00:00:00 2001 From: Christoph-Simon Senjak Date: Fri, 12 Feb 2016 14:40:49 +0100 Subject: [PATCH 255/308] bluez-tools: init 2015-09-10 (close #12936) vcunat only fixed whitespace and changed the authorship e-mail from dummy address you@example.com to the one recorded in maintainers.nix. (Now github should recognize the commit as yours.) --- lib/maintainers.nix | 1 + pkgs/tools/bluetooth/bluez-tools/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/tools/bluetooth/bluez-tools/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e9a55ef834d..89fe97f5feb 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -75,6 +75,7 @@ cstrahan = "Charles Strahan "; cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; + dasuxullebt = "Christoph-Simon Senjak "; davidak = "David Kleuker "; davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix new file mode 100644 index 00000000000..4469ba67b3b --- /dev/null +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -0,0 +1,24 @@ +{ stdenv, autoconf, automake, glib, pkgconfig, readline, fetchgit }: + +stdenv.mkDerivation rec { + date = "2015-09-10"; + name = "bluez-tools-${date}"; + rev = "193ad6bb3db"; + + src = fetchgit { + inherit rev; + url = "https://github.com/khvzak/bluez-tools.git"; + sha256 = "3f264d14ba8ef1b0d3c45e621a5c685035a60d789da64f64d25055047f45c55b"; + }; + preConfigure = '' + ./autogen.sh + ''; + buildInputs = [ stdenv autoconf automake glib pkgconfig readline ]; + + meta = with stdenv.lib; { + description = "Command line bluetooth manager for Bluez5"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.dasuxullebt ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0df4ce21a6e..6f17bdab528 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -721,6 +721,8 @@ let blockdiag = pythonPackages.blockdiag; + bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; + bmon = callPackage ../tools/misc/bmon { }; bochs = callPackage ../applications/virtualization/bochs { }; From eef111fee8215895afe0b34e96a4dc910d27d1f1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 15 Feb 2016 17:04:37 +0100 Subject: [PATCH 256/308] checkstyle: 6.14.1 -> 6.15 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 8341f1a5bd9..f9131cf2af2 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.14.1"; + version = "6.15"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "1dcg7libqs797v6x5vdvvc44rqfvwcjh125wczy9v87nl8imc2l3"; + sha256 = "1bazjgfr1mq6qfg4nmack467zg7s4z8v7zfzw46d2dk04mv8y9b8"; }; installPhase = '' From 29e819ab6f4566c9e0612fb8dd7bb126e13716a2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 15 Feb 2016 17:11:58 +0100 Subject: [PATCH 257/308] colm: 0.12.0 -> 0.13.0.3 --- pkgs/development/compilers/colm/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index ebfee6c4188..3a3670279c6 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { name = "colm-${version}"; - version = "0.12.0"; + version = "0.13.0.3"; src = fetchurl { url = "http://www.colm.net/files/colm/${name}.tar.gz"; - sha256 = "0kbfipxv3nvggd1a2nahk3jg22iifp2l7lkm55i5r7qkpms5sm3v"; + sha256 = "0dadfsnkbxcrf5kihvncbprb6w64jz2myylfmj952gdmcsim4zj2"; }; buildInputs = [ makeWrapper ]; doCheck = true; - checkPhase = ''sh ./test/runtests.sh''; postInstall = '' wrapProgram $out/bin/colm \ From abb07a9cdce36bce51fd9b0c6dcb9f8f26d53807 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 15 Feb 2016 17:34:52 +0100 Subject: [PATCH 258/308] pdfpc: 4.0.1 -> 4.0.2 --- pkgs/applications/misc/pdfpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 9e908b5a2db..7dceaeb8a96 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "06m30xz9jzfj6ljnsgqqg1myj13nqpc7ria9wr8aa62kp4n7bcfp"; + sha256 = "0151i9msagcqcfaddgd1vkmman0qgqy6s3714sqas568r4r9ngdk"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 5a7324ba131c725a178d5b01890c601a18cedc46 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 15 Feb 2016 16:47:58 +0000 Subject: [PATCH 259/308] kotlin: 1.0.0-rc-1036 -> 1.0.0 --- pkgs/development/compilers/kotlin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index a6f5dcc2159..2433f5ab579 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, jre, unzip }: +{ stdenv, fetchurl, makeWrapper, jre, unzip, which }: stdenv.mkDerivation rec { - version = "1.0.0-rc-1036"; + version = "1.0.0"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip"; - sha256 = "8d72ff925678a2172fbbefcb6f0c5a195a300dccf240e5add16c3e8d86e13d67"; + sha256 = "0dp5mab35sv3nsgj488ibyn6x6xw2rka76s7kygbhqhjc429kpgy"; }; propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper unzip ] ; + buildInputs = [ makeWrapper unzip which ] ; installPhase = '' mkdir -p $out From 6d6f3311093386d1e2e45b4580ac2f0b8838477d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 15 Feb 2016 18:29:44 +0100 Subject: [PATCH 260/308] ragel: 6.9 -> 7.0.0.6 --- pkgs/development/tools/parsing/ragel/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index e55a2015a70..0b3844ef5e9 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,21 +1,26 @@ -{stdenv, fetchurl, transfig, texLiveAggregationFun, texLive, texLiveExtra, ghostscript -, build-manual ? false +{stdenv, fetchurl, transfig, texLiveAggregationFun, texLive, texLiveExtra +, ghostscript, colm, build-manual ? false }: stdenv.mkDerivation rec { name = "ragel-${version}"; - version = "6.9"; + version = "7.0.0.6"; src = fetchurl { url = "http://www.colm.net/files/ragel/${name}.tar.gz"; - sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf"; + sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs"; }; - buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript (texLiveAggregationFun { paths=[ texLive texLiveExtra ]; }) ]; + buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript + (texLiveAggregationFun { paths=[ texLive texLiveExtra ]; }) ]; preConfigure = stdenv.lib.optional build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST ''; + + configureFlags = [ "--with-colm=${colm}" ]; + + doCheck = true; meta = with stdenv.lib; { homepage = http://www.complang.org/ragel; From 72161f6810c9282d1bb3c2a6d8d676cbe80422c8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 15 Feb 2016 18:34:31 +0100 Subject: [PATCH 261/308] ragel: use new texlive infrastructure --- pkgs/development/tools/parsing/ragel/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 0b3844ef5e9..594ec7de53a 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, transfig, texLiveAggregationFun, texLive, texLiveExtra -, ghostscript, colm, build-manual ? false +{stdenv, fetchurl, transfig, tex , ghostscript, colm, build-manual ? false }: stdenv.mkDerivation rec { @@ -11,8 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs"; }; - buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript - (texLiveAggregationFun { paths=[ texLive texLiveExtra ]; }) ]; + buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ]; preConfigure = stdenv.lib.optional build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2b752ab5dc..c4b95ea44c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6062,7 +6062,9 @@ let }; - ragel = callPackage ../development/tools/parsing/ragel { }; + ragel = callPackage ../development/tools/parsing/ragel { + tex = texlive.combined.scheme-small; + }; hammer = callPackage ../development/tools/parsing/hammer { }; From 7c7b08add4965e082a05396217abad035b41129a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Feb 2016 12:03:25 +0100 Subject: [PATCH 262/308] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/94492ca8484ac1cc1962d42050ff6cdc145665f6 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/b3a9ab4a6048a52dbabe68389d8edc10062ee925 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e7c362999942041130d6f66c30289bd6be0430a3 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/b98e7e2d4fc1c47179a362d16d98290990eb8c28 --- .../haskell-modules/configuration-lts-0.0.nix | 22 + .../haskell-modules/configuration-lts-0.1.nix | 22 + .../haskell-modules/configuration-lts-0.2.nix | 22 + .../haskell-modules/configuration-lts-0.3.nix | 22 + .../haskell-modules/configuration-lts-0.4.nix | 22 + .../haskell-modules/configuration-lts-0.5.nix | 22 + .../haskell-modules/configuration-lts-0.6.nix | 22 + .../haskell-modules/configuration-lts-0.7.nix | 22 + .../haskell-modules/configuration-lts-1.0.nix | 22 + .../haskell-modules/configuration-lts-1.1.nix | 22 + .../configuration-lts-1.10.nix | 22 + .../configuration-lts-1.11.nix | 22 + .../configuration-lts-1.12.nix | 22 + .../configuration-lts-1.13.nix | 22 + .../configuration-lts-1.14.nix | 22 + .../configuration-lts-1.15.nix | 22 + .../haskell-modules/configuration-lts-1.2.nix | 22 + .../haskell-modules/configuration-lts-1.4.nix | 22 + .../haskell-modules/configuration-lts-1.5.nix | 22 + .../haskell-modules/configuration-lts-1.7.nix | 22 + .../haskell-modules/configuration-lts-1.8.nix | 22 + .../haskell-modules/configuration-lts-1.9.nix | 22 + .../haskell-modules/configuration-lts-2.0.nix | 24 + .../haskell-modules/configuration-lts-2.1.nix | 24 + .../configuration-lts-2.10.nix | 24 + .../configuration-lts-2.11.nix | 24 + .../configuration-lts-2.12.nix | 24 + .../configuration-lts-2.13.nix | 24 + .../configuration-lts-2.14.nix | 24 + .../configuration-lts-2.15.nix | 24 + .../configuration-lts-2.16.nix | 25 + .../configuration-lts-2.17.nix | 25 + .../configuration-lts-2.18.nix | 25 + .../configuration-lts-2.19.nix | 25 + .../haskell-modules/configuration-lts-2.2.nix | 24 + .../configuration-lts-2.20.nix | 25 + .../configuration-lts-2.21.nix | 25 + .../configuration-lts-2.22.nix | 25 + .../haskell-modules/configuration-lts-2.3.nix | 24 + .../haskell-modules/configuration-lts-2.4.nix | 24 + .../haskell-modules/configuration-lts-2.5.nix | 24 + .../haskell-modules/configuration-lts-2.6.nix | 24 + .../haskell-modules/configuration-lts-2.7.nix | 24 + .../haskell-modules/configuration-lts-2.8.nix | 24 + .../haskell-modules/configuration-lts-2.9.nix | 24 + .../haskell-modules/configuration-lts-3.0.nix | 28 + .../haskell-modules/configuration-lts-3.1.nix | 28 + .../configuration-lts-3.10.nix | 35 + .../configuration-lts-3.11.nix | 36 + .../configuration-lts-3.12.nix | 37 + .../configuration-lts-3.13.nix | 37 + .../configuration-lts-3.14.nix | 37 + .../configuration-lts-3.15.nix | 37 + .../configuration-lts-3.16.nix | 38 + .../configuration-lts-3.17.nix | 38 + .../configuration-lts-3.18.nix | 39 + .../configuration-lts-3.19.nix | 39 + .../haskell-modules/configuration-lts-3.2.nix | 29 + .../configuration-lts-3.20.nix | 40 + .../configuration-lts-3.21.nix | 40 + .../configuration-lts-3.22.nix | 41 + .../haskell-modules/configuration-lts-3.3.nix | 29 + .../haskell-modules/configuration-lts-3.4.nix | 29 + .../haskell-modules/configuration-lts-3.5.nix | 30 + .../haskell-modules/configuration-lts-3.6.nix | 30 + .../haskell-modules/configuration-lts-3.7.nix | 32 + .../haskell-modules/configuration-lts-3.8.nix | 33 + .../haskell-modules/configuration-lts-3.9.nix | 33 + .../haskell-modules/configuration-lts-4.0.nix | 55 + .../haskell-modules/configuration-lts-4.1.nix | 55 + .../haskell-modules/configuration-lts-4.2.nix | 56 + .../haskell-modules/configuration-lts-5.0.nix | 67 + .../haskell-modules/configuration-lts-5.1.nix | 72 + .../haskell-modules/configuration-lts-5.2.nix | 76 +- .../haskell-modules/hackage-packages.nix | 2713 ++++++++++++++--- 75 files changed, 4437 insertions(+), 495 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 4dc205d8973..64ea9e9b6f7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -822,6 +822,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1498,6 +1499,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2129,6 +2131,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2482,6 +2485,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2506,6 +2510,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3175,6 +3180,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3350,6 +3356,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4126,6 +4133,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4458,6 +4466,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5920,6 +5931,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6180,6 +6192,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6255,6 +6268,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6692,6 +6706,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6871,6 +6886,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7026,6 +7042,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7205,6 +7224,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8263,6 +8283,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8579,6 +8600,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 6cc26a6686e..b2bf2ceecbb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -822,6 +822,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1498,6 +1499,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2129,6 +2131,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2482,6 +2485,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2506,6 +2510,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3175,6 +3180,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3350,6 +3356,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4126,6 +4133,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4458,6 +4466,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5920,6 +5931,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6180,6 +6192,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6255,6 +6268,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6692,6 +6706,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6871,6 +6886,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7026,6 +7042,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7205,6 +7224,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8263,6 +8283,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8579,6 +8600,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 063b2a48a5d..67982120f40 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -822,6 +822,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1498,6 +1499,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2129,6 +2131,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2482,6 +2485,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2506,6 +2510,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3175,6 +3180,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3350,6 +3356,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4126,6 +4133,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4458,6 +4466,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5920,6 +5931,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6180,6 +6192,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6255,6 +6268,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6692,6 +6706,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6871,6 +6886,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7026,6 +7042,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7205,6 +7224,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8263,6 +8283,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8579,6 +8600,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 17c987efd93..b8965141bec 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -822,6 +822,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1498,6 +1499,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2129,6 +2131,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2482,6 +2485,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2506,6 +2510,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3175,6 +3180,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3350,6 +3356,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4126,6 +4133,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4458,6 +4466,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5920,6 +5931,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6180,6 +6192,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6255,6 +6268,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6692,6 +6706,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6871,6 +6886,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7026,6 +7042,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7205,6 +7224,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8263,6 +8283,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8579,6 +8600,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index c430217eb7e..03bf57f3aa2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -822,6 +822,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1498,6 +1499,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2129,6 +2131,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2482,6 +2485,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2506,6 +2510,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3174,6 +3179,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3349,6 +3355,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4123,6 +4130,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4455,6 +4463,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5917,6 +5928,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6177,6 +6189,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6252,6 +6265,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6689,6 +6703,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6868,6 +6883,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7023,6 +7039,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7201,6 +7220,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8259,6 +8279,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8575,6 +8596,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 8d76c7cfdd7..9e0026afb0b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -822,6 +822,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1498,6 +1499,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2129,6 +2131,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2482,6 +2485,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2506,6 +2510,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3174,6 +3179,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3349,6 +3355,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4123,6 +4130,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4455,6 +4463,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5917,6 +5928,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6177,6 +6189,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6252,6 +6265,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6689,6 +6703,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6868,6 +6883,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7023,6 +7039,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7201,6 +7220,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8259,6 +8279,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8575,6 +8596,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index c52414a8319..24208bf0d22 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -821,6 +821,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1497,6 +1498,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2128,6 +2130,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2481,6 +2484,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2505,6 +2509,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3173,6 +3178,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3348,6 +3354,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4122,6 +4129,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4453,6 +4461,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5915,6 +5926,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6174,6 +6186,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6249,6 +6262,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6686,6 +6700,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6865,6 +6880,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7019,6 +7035,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7197,6 +7216,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8255,6 +8275,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8571,6 +8592,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 1c609caa978..5ca65df38d5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -821,6 +821,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1497,6 +1498,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2128,6 +2130,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2481,6 +2484,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2505,6 +2509,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3173,6 +3178,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3348,6 +3354,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4122,6 +4129,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4453,6 +4461,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5915,6 +5926,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6174,6 +6186,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6249,6 +6262,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6686,6 +6700,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6865,6 +6880,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7019,6 +7035,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7197,6 +7216,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8255,6 +8275,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8571,6 +8592,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 98cab9aaae0..1cbd61fe493 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -817,6 +817,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1493,6 +1494,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2121,6 +2123,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2473,6 +2476,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2497,6 +2501,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3164,6 +3169,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3339,6 +3345,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4113,6 +4120,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4443,6 +4451,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5904,6 +5915,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6163,6 +6175,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6238,6 +6251,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6675,6 +6689,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6854,6 +6869,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7007,6 +7023,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7185,6 +7204,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8242,6 +8262,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8557,6 +8578,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 45096136b7d..e983e46a408 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -817,6 +817,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1493,6 +1494,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2120,6 +2122,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2471,6 +2474,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2495,6 +2499,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3161,6 +3166,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3336,6 +3342,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4109,6 +4116,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4437,6 +4445,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5897,6 +5908,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6156,6 +6168,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6231,6 +6244,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6668,6 +6682,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6847,6 +6862,7 @@ self: super: { "random-fu" = doDistribute super."random-fu_0_2_6_1"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -7000,6 +7016,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7178,6 +7197,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8230,6 +8250,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8544,6 +8565,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index c569da0fce6..c22d8e43cb7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -816,6 +816,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1492,6 +1493,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2117,6 +2119,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2467,6 +2470,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2491,6 +2495,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3154,6 +3159,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_1"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3328,6 +3334,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4098,6 +4105,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4426,6 +4434,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5879,6 +5890,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6137,6 +6149,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6212,6 +6225,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6648,6 +6662,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6826,6 +6841,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6979,6 +6995,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7157,6 +7176,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8203,6 +8223,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8516,6 +8537,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 3cb13aa1696..0f85aa6e7aa 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -816,6 +816,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1492,6 +1493,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2117,6 +2119,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2467,6 +2470,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2491,6 +2495,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3154,6 +3159,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_1"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3327,6 +3333,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4097,6 +4104,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4425,6 +4433,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5875,6 +5886,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6133,6 +6145,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6208,6 +6221,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6644,6 +6658,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6822,6 +6837,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6975,6 +6991,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7153,6 +7172,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8199,6 +8219,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8512,6 +8533,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 621806b6fb8..ace1963e339 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -816,6 +816,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1492,6 +1493,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2117,6 +2119,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2467,6 +2470,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2491,6 +2495,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3154,6 +3159,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_1"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3327,6 +3333,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4097,6 +4104,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4424,6 +4432,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5874,6 +5885,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6132,6 +6144,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6207,6 +6220,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6643,6 +6657,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6821,6 +6836,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6974,6 +6990,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7152,6 +7171,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8197,6 +8217,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8510,6 +8531,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 652e60c78d8..5f1e148e5e1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -816,6 +816,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1492,6 +1493,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2117,6 +2119,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2467,6 +2470,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2491,6 +2495,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3154,6 +3159,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_1"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3327,6 +3333,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4096,6 +4103,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4423,6 +4431,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5873,6 +5884,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6131,6 +6143,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6206,6 +6219,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6642,6 +6656,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6820,6 +6835,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6973,6 +6989,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7151,6 +7170,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8195,6 +8215,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8508,6 +8529,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index e89537089f3..6829db65772 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -815,6 +815,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1491,6 +1492,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2115,6 +2117,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2464,6 +2467,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2488,6 +2492,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3151,6 +3156,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_1"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3324,6 +3330,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4093,6 +4100,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4419,6 +4427,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5867,6 +5878,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6125,6 +6137,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6200,6 +6213,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6636,6 +6650,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6813,6 +6828,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6966,6 +6982,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7144,6 +7163,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8188,6 +8208,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8501,6 +8522,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 288a2bf2d4e..c69012197af 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -815,6 +815,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1490,6 +1491,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2113,6 +2115,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2461,6 +2464,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2485,6 +2489,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3147,6 +3152,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3320,6 +3326,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4089,6 +4096,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4415,6 +4423,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5863,6 +5874,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6119,6 +6131,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6194,6 +6207,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6630,6 +6644,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6806,6 +6821,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6959,6 +6975,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7137,6 +7156,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8179,6 +8199,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8492,6 +8513,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 75b907a5605..6d1a27525b1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -817,6 +817,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1493,6 +1494,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2119,6 +2121,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2469,6 +2472,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2493,6 +2497,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3159,6 +3164,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3334,6 +3340,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4106,6 +4113,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4434,6 +4442,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5894,6 +5905,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6153,6 +6165,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6228,6 +6241,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6664,6 +6678,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6842,6 +6857,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6995,6 +7011,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7173,6 +7192,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8224,6 +8244,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8538,6 +8559,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 987cbdd2454..1832969011f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -816,6 +816,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1492,6 +1493,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2118,6 +2120,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2468,6 +2471,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2492,6 +2496,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3157,6 +3162,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3332,6 +3338,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4103,6 +4110,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4431,6 +4439,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5890,6 +5901,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6149,6 +6161,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6224,6 +6237,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6660,6 +6674,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6838,6 +6853,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6991,6 +7007,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7169,6 +7188,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8219,6 +8239,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8533,6 +8554,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index c3ea5f923c0..09660ebe963 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -816,6 +816,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1492,6 +1493,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2117,6 +2119,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2467,6 +2470,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2491,6 +2495,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3156,6 +3161,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_0"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3331,6 +3337,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4102,6 +4109,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4430,6 +4438,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5889,6 +5900,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6148,6 +6160,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6223,6 +6236,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6659,6 +6673,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6837,6 +6852,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6990,6 +7006,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7168,6 +7187,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8217,6 +8237,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8530,6 +8551,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index fbd3969eaf9..58ffd1eb7a1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -816,6 +816,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1492,6 +1493,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2117,6 +2119,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2467,6 +2470,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2491,6 +2495,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3156,6 +3161,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_1"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3331,6 +3337,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4102,6 +4109,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4430,6 +4438,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5884,6 +5895,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6143,6 +6155,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6218,6 +6231,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6654,6 +6668,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6832,6 +6847,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6985,6 +7001,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7163,6 +7182,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8212,6 +8232,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8525,6 +8546,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index c7c05da3ec4..ce5855c7aae 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -816,6 +816,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1492,6 +1493,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2117,6 +2119,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2467,6 +2470,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2491,6 +2495,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3154,6 +3159,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_1"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3329,6 +3335,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4099,6 +4106,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4427,6 +4435,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5880,6 +5891,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6139,6 +6151,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6214,6 +6227,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6650,6 +6664,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6828,6 +6843,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6981,6 +6997,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7159,6 +7178,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8207,6 +8227,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8520,6 +8541,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 56a7a77807d..b6eb55cd0a8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -816,6 +816,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1492,6 +1493,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2117,6 +2119,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2467,6 +2470,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2491,6 +2495,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3154,6 +3159,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_1"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3328,6 +3334,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4098,6 +4105,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4426,6 +4434,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -5879,6 +5890,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = dontDistribute super."multiarg"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6138,6 +6150,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6213,6 +6226,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6649,6 +6663,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6827,6 +6842,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6980,6 +6996,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7158,6 +7177,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8206,6 +8226,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8519,6 +8540,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_2"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-buffer" = dontDistribute super."vector-buffer"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 2f8fcbf8bb4..7a6eb2e704b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -809,6 +809,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1481,6 +1482,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2101,6 +2103,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2446,6 +2449,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2470,6 +2474,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3133,6 +3138,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3303,6 +3309,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4070,6 +4077,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4394,6 +4402,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4834,6 +4845,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5704,6 +5716,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5819,6 +5832,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6071,6 +6085,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6146,6 +6161,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6578,6 +6594,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6755,6 +6772,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6908,6 +6926,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7086,6 +7107,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8120,6 +8142,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8432,6 +8455,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 3df16eb2617..01c494fd0df 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -809,6 +809,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1481,6 +1482,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2100,6 +2102,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2445,6 +2448,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2469,6 +2473,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3132,6 +3137,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3302,6 +3308,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4069,6 +4076,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4393,6 +4401,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4833,6 +4844,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5703,6 +5715,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5818,6 +5831,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6070,6 +6084,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6145,6 +6160,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6577,6 +6593,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6754,6 +6771,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6907,6 +6925,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7085,6 +7106,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8119,6 +8141,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8431,6 +8454,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 0d6f60e04f6..231b1da6747 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -807,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1474,6 +1475,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2088,6 +2090,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2431,6 +2434,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2455,6 +2459,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3114,6 +3119,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3283,6 +3289,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4048,6 +4055,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4371,6 +4379,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4808,6 +4819,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5670,6 +5682,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5786,6 +5799,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6036,6 +6050,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6111,6 +6126,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6539,6 +6555,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6715,6 +6732,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6868,6 +6886,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7044,6 +7065,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8068,6 +8090,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8380,6 +8403,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 1882dbd6a08..2662bfe6513 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -807,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1473,6 +1474,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2087,6 +2089,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2430,6 +2433,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2454,6 +2458,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3113,6 +3118,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3282,6 +3288,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4046,6 +4053,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4368,6 +4376,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4805,6 +4816,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5666,6 +5678,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5781,6 +5794,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6031,6 +6045,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6106,6 +6121,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6533,6 +6549,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6709,6 +6726,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6862,6 +6880,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7037,6 +7058,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8059,6 +8081,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8371,6 +8394,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index b731ee68563..87bad704729 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -807,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1473,6 +1474,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2087,6 +2089,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2430,6 +2433,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2454,6 +2458,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3113,6 +3118,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3282,6 +3288,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4046,6 +4053,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4368,6 +4376,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4805,6 +4816,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5666,6 +5678,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5781,6 +5794,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6031,6 +6045,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6106,6 +6121,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6533,6 +6549,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6709,6 +6726,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6862,6 +6880,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7037,6 +7058,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8058,6 +8080,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8370,6 +8393,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index db5547dc9ef..a22d472fb36 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -807,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1473,6 +1474,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2087,6 +2089,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2430,6 +2433,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2454,6 +2458,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3113,6 +3118,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3282,6 +3288,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4045,6 +4052,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4367,6 +4375,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4803,6 +4814,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5664,6 +5676,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5779,6 +5792,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6029,6 +6043,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6104,6 +6119,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6531,6 +6547,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6707,6 +6724,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6860,6 +6878,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7035,6 +7056,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8056,6 +8078,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8368,6 +8391,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 0b500291fcf..0ba5ae883bb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -807,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1472,6 +1473,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2086,6 +2088,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2429,6 +2432,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2453,6 +2457,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3112,6 +3117,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; @@ -3280,6 +3286,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4043,6 +4050,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4365,6 +4373,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4800,6 +4811,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5661,6 +5673,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5776,6 +5789,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6026,6 +6040,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6101,6 +6116,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6528,6 +6544,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6704,6 +6721,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6857,6 +6875,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7032,6 +7053,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8052,6 +8074,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8364,6 +8387,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index f8c70e4bae8..53940a40de8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -807,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1472,6 +1473,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2086,6 +2088,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2429,6 +2432,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2453,6 +2457,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3111,6 +3116,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; @@ -3279,6 +3285,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4042,6 +4049,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4364,6 +4372,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4799,6 +4810,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5660,6 +5672,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5774,6 +5787,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6022,6 +6036,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6097,6 +6112,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6524,6 +6540,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6700,6 +6717,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6853,6 +6871,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7028,6 +7049,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8047,6 +8069,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8359,6 +8382,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index af59ccac512..77cf4fa6807 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -177,6 +177,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -806,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1471,6 +1473,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2084,6 +2087,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2426,6 +2430,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2450,6 +2455,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3106,6 +3112,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; @@ -3274,6 +3281,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4037,6 +4045,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4359,6 +4368,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4794,6 +4806,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5654,6 +5667,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5768,6 +5782,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6016,6 +6031,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6091,6 +6107,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6518,6 +6535,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6694,6 +6712,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6847,6 +6866,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7022,6 +7044,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8041,6 +8064,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8353,6 +8377,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index bdce43f4533..67b1f9a3f57 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -177,6 +177,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -806,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1470,6 +1472,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2082,6 +2085,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2424,6 +2428,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2448,6 +2453,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3102,6 +3108,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; @@ -3270,6 +3277,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4032,6 +4040,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4354,6 +4363,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4789,6 +4801,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5649,6 +5662,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5763,6 +5777,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6010,6 +6025,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6085,6 +6101,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6512,6 +6529,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6688,6 +6706,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6841,6 +6860,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7016,6 +7038,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8035,6 +8058,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8347,6 +8371,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index a8b13abbac8..774b372c451 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -177,6 +177,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -806,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1470,6 +1472,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2081,6 +2084,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2423,6 +2427,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2447,6 +2452,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3100,6 +3106,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; @@ -3268,6 +3275,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4030,6 +4038,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4351,6 +4360,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4786,6 +4798,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5646,6 +5659,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5760,6 +5774,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6006,6 +6021,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6081,6 +6097,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6507,6 +6524,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6683,6 +6701,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6836,6 +6855,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7011,6 +7033,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8029,6 +8052,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8341,6 +8365,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 7f018681924..5cfa6de7a57 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -177,6 +177,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -806,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1470,6 +1472,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2081,6 +2084,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2423,6 +2427,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2447,6 +2452,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3100,6 +3106,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; @@ -3267,6 +3274,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4029,6 +4037,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4350,6 +4359,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4785,6 +4797,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5644,6 +5657,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5758,6 +5772,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6004,6 +6019,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6079,6 +6095,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6505,6 +6522,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6681,6 +6699,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6834,6 +6853,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7009,6 +7031,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8025,6 +8048,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8337,6 +8361,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index c2aa4a3421b..90433b651fc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -809,6 +809,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1480,6 +1481,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2097,6 +2099,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2442,6 +2445,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2466,6 +2470,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3129,6 +3134,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3299,6 +3305,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4066,6 +4073,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4390,6 +4398,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4830,6 +4841,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5700,6 +5712,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5815,6 +5828,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6067,6 +6081,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6142,6 +6157,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6574,6 +6590,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6751,6 +6768,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6904,6 +6922,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7082,6 +7103,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8116,6 +8138,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8428,6 +8451,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index f94aa3dd4a6..a073695f433 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -177,6 +177,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -806,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1470,6 +1472,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2081,6 +2084,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2422,6 +2426,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2446,6 +2451,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3099,6 +3105,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; @@ -3266,6 +3273,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4028,6 +4036,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4349,6 +4358,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4784,6 +4796,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5643,6 +5656,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5757,6 +5771,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6003,6 +6018,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6078,6 +6094,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6503,6 +6520,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6679,6 +6697,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6832,6 +6851,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7007,6 +7029,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8022,6 +8045,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8334,6 +8358,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 404bb06d597..544d71f16bf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -177,6 +177,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -806,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1470,6 +1472,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2081,6 +2084,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2422,6 +2426,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2446,6 +2451,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3099,6 +3105,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; @@ -3266,6 +3273,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4028,6 +4036,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4349,6 +4358,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4784,6 +4796,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5642,6 +5655,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5756,6 +5770,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6002,6 +6017,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6077,6 +6093,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6501,6 +6518,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6677,6 +6695,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6830,6 +6849,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7005,6 +7027,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8020,6 +8043,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8330,6 +8354,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index ae87d1cd488..98e2c96e724 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -177,6 +177,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -806,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1470,6 +1472,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2081,6 +2084,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2422,6 +2426,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2446,6 +2451,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3099,6 +3105,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; "fingertree-tf" = dontDistribute super."fingertree-tf"; @@ -3266,6 +3273,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4028,6 +4036,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_4_0"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4348,6 +4357,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4783,6 +4795,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5640,6 +5653,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5754,6 +5768,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6000,6 +6015,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6075,6 +6091,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6499,6 +6516,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6675,6 +6693,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6828,6 +6847,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7003,6 +7025,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8018,6 +8041,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8328,6 +8352,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 8566604ebe3..d5f060387ce 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -809,6 +809,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1480,6 +1481,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2097,6 +2099,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2442,6 +2445,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2466,6 +2470,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3128,6 +3133,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3298,6 +3304,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4065,6 +4072,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4389,6 +4397,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4828,6 +4839,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5698,6 +5710,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5813,6 +5826,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6065,6 +6079,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6140,6 +6155,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6572,6 +6588,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6749,6 +6766,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6902,6 +6920,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7080,6 +7101,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8114,6 +8136,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8426,6 +8449,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 9f910c81054..e595d238aeb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -809,6 +809,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1480,6 +1481,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2096,6 +2098,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2441,6 +2444,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2465,6 +2469,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3127,6 +3132,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3297,6 +3303,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4064,6 +4071,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4388,6 +4396,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4827,6 +4838,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5696,6 +5708,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5811,6 +5824,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6063,6 +6077,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6138,6 +6153,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6568,6 +6584,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6745,6 +6762,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6898,6 +6916,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7075,6 +7096,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8109,6 +8131,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8421,6 +8444,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 7d5e081463d..35a9871f7cd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -809,6 +809,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1480,6 +1481,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2096,6 +2098,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2440,6 +2443,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2464,6 +2468,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3126,6 +3131,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3296,6 +3302,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4063,6 +4070,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4387,6 +4395,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4826,6 +4837,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5694,6 +5706,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5809,6 +5822,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6061,6 +6075,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6136,6 +6151,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6566,6 +6582,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6743,6 +6760,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6896,6 +6914,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7073,6 +7094,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8107,6 +8129,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8419,6 +8442,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index a1607e9aeae..838a0d81ae3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -809,6 +809,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1478,6 +1479,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2093,6 +2095,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2437,6 +2440,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2461,6 +2465,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3123,6 +3128,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3293,6 +3299,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4058,6 +4065,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4382,6 +4390,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4821,6 +4832,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5689,6 +5701,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5804,6 +5817,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6055,6 +6069,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6130,6 +6145,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6560,6 +6576,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6737,6 +6754,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6890,6 +6908,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7067,6 +7088,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8099,6 +8121,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8411,6 +8434,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 123833c374d..e2658c39b01 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -808,6 +808,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1477,6 +1478,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2092,6 +2094,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2436,6 +2439,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2460,6 +2464,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3122,6 +3127,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3292,6 +3298,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4057,6 +4064,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4381,6 +4389,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4820,6 +4831,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5688,6 +5700,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5804,6 +5817,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6054,6 +6068,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6129,6 +6144,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6559,6 +6575,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6736,6 +6753,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6889,6 +6907,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7066,6 +7087,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8098,6 +8120,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8410,6 +8433,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 6c391312b27..fe475625a7d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -807,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1476,6 +1477,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2091,6 +2093,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2435,6 +2438,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2459,6 +2463,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3121,6 +3126,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3290,6 +3296,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4055,6 +4062,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4379,6 +4387,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4818,6 +4829,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5686,6 +5698,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5802,6 +5815,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6052,6 +6066,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6127,6 +6142,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6557,6 +6573,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6734,6 +6751,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6887,6 +6905,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7063,6 +7084,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8092,6 +8114,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8404,6 +8427,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 7722a893c0f..ff2118946cf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -807,6 +807,7 @@ self: super: { "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1474,6 +1475,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2088,6 +2090,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustering" = dontDistribute super."clustering"; "clustertools" = dontDistribute super."clustertools"; @@ -2432,6 +2435,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2456,6 +2460,7 @@ self: super: { "data-fresh" = dontDistribute super."data-fresh"; "data-hash" = dontDistribute super."data-hash"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3116,6 +3121,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree" = doDistribute super."fingertree_0_1_0_2"; "fingertree-psqueue" = dontDistribute super."fingertree-psqueue"; @@ -3285,6 +3291,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -4050,6 +4057,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4374,6 +4382,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4811,6 +4822,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5677,6 +5689,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-extras" = dontDistribute super."monad-extras"; "monad-fork" = dontDistribute super."monad-fork"; @@ -5793,6 +5806,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -6043,6 +6057,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -6118,6 +6133,7 @@ self: super: { "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-class" = dontDistribute super."operational-class"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6547,6 +6563,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6724,6 +6741,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6877,6 +6895,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -7053,6 +7074,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -8078,6 +8100,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8390,6 +8413,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index de0f4fe5fa1..a6b2efe0c38 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -791,7 +792,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1430,6 +1433,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2020,6 +2024,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2130,6 +2135,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2356,6 +2362,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2379,6 +2386,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3009,6 +3017,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3172,6 +3181,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3926,6 +3936,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4241,6 +4252,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4662,6 +4676,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5484,6 +5499,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5590,6 +5606,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -5833,6 +5850,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5904,6 +5922,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6316,6 +6335,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6490,6 +6510,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6643,6 +6664,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6817,6 +6841,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7791,6 +7816,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7803,6 +7829,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8107,6 +8134,7 @@ self: super: { "vector" = doDistribute super."vector_0_10_12_3"; "vector-algorithms" = doDistribute super."vector-algorithms_0_7"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index d88256166b2..2bed2cd269e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -791,7 +792,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1429,6 +1432,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2019,6 +2023,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2129,6 +2134,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2355,6 +2361,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2378,6 +2385,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3006,6 +3014,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3169,6 +3178,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3923,6 +3933,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4238,6 +4249,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4659,6 +4673,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5480,6 +5495,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5586,6 +5602,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -5828,6 +5845,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5899,6 +5917,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6310,6 +6329,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6484,6 +6504,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6637,6 +6658,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6810,6 +6834,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7784,6 +7809,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7796,6 +7822,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8099,6 +8126,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index c3a43b75622..3550262d4d1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -167,6 +167,7 @@ self: super: { "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -315,6 +316,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -785,7 +787,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1309,6 +1313,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1416,6 +1421,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2002,6 +2008,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2112,6 +2119,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2335,6 +2343,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2358,6 +2367,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2539,6 +2549,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2977,6 +2988,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3137,6 +3149,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3887,6 +3900,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4199,6 +4213,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4617,6 +4634,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5430,6 +5448,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5443,6 +5462,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5534,6 +5554,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5773,6 +5794,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5843,6 +5865,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6092,6 +6115,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6245,6 +6269,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6416,6 +6441,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6567,6 +6593,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6740,6 +6769,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7044,6 +7074,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7125,6 +7156,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7700,6 +7732,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7712,6 +7745,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8011,6 +8045,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index b529c0c648f..b420c055980 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -167,6 +167,7 @@ self: super: { "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -315,6 +316,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -785,7 +787,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1309,6 +1313,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1416,6 +1421,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1546,6 +1552,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -2000,6 +2007,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2110,6 +2118,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2333,6 +2342,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2356,6 +2366,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2537,6 +2548,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2974,6 +2986,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3134,6 +3147,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3884,6 +3898,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4196,6 +4211,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4614,6 +4632,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5427,6 +5446,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5440,6 +5460,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5531,6 +5552,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5770,6 +5792,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5840,6 +5863,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6088,6 +6112,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6241,6 +6266,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6412,6 +6438,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6563,6 +6590,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6736,6 +6766,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7039,6 +7070,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7120,6 +7152,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7695,6 +7728,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7707,6 +7741,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8006,6 +8041,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index b89fa70f8b4..534196a30ac 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -166,6 +166,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -314,6 +315,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -784,7 +786,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1308,6 +1312,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1415,6 +1420,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1545,6 +1551,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1963,6 +1970,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1995,6 +2003,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2105,6 +2114,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2328,6 +2338,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2351,6 +2362,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2532,6 +2544,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2969,6 +2982,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3129,6 +3143,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3878,6 +3893,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4190,6 +4206,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4608,6 +4627,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5421,6 +5441,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5434,6 +5455,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5525,6 +5547,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5764,6 +5787,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5834,6 +5858,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6081,6 +6106,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6234,6 +6260,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6405,6 +6432,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6556,6 +6584,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6729,6 +6760,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7032,6 +7064,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7113,6 +7146,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7686,6 +7720,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7698,6 +7733,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7997,6 +8033,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index f6a631e1153..29a139a9e4d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -166,6 +166,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -314,6 +315,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -784,7 +786,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1308,6 +1312,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1415,6 +1420,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1545,6 +1551,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1963,6 +1970,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1995,6 +2003,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2105,6 +2114,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2328,6 +2338,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2351,6 +2362,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2532,6 +2544,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2969,6 +2982,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3129,6 +3143,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3878,6 +3893,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4189,6 +4205,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4607,6 +4626,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5419,6 +5439,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5432,6 +5453,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5523,6 +5545,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5762,6 +5785,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5832,6 +5856,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6078,6 +6103,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6231,6 +6257,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6402,6 +6429,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6553,6 +6581,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6726,6 +6757,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7029,6 +7061,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7110,6 +7143,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7683,6 +7717,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7695,6 +7730,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7994,6 +8030,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 571045bdc8f..b406a70ae06 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -166,6 +166,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -314,6 +315,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -784,7 +786,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1306,6 +1310,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1413,6 +1418,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1543,6 +1549,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1960,6 +1967,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1992,6 +2000,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2102,6 +2111,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2324,6 +2334,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2347,6 +2358,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2526,6 +2538,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2962,6 +2975,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3122,6 +3136,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3871,6 +3886,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4182,6 +4198,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4599,6 +4618,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5410,6 +5430,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5423,6 +5444,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5513,6 +5535,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5752,6 +5775,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5822,6 +5846,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6068,6 +6093,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6221,6 +6247,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6392,6 +6419,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6543,6 +6571,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6716,6 +6747,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7019,6 +7051,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7100,6 +7133,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7673,6 +7707,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7685,6 +7720,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7984,6 +8020,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index cde1bb303ff..7df0af1bb2a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -166,6 +166,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -314,6 +315,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -784,7 +786,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1306,6 +1310,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1413,6 +1418,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1543,6 +1549,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1960,6 +1967,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1992,6 +2000,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2102,6 +2111,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2324,6 +2334,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2347,6 +2358,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2526,6 +2538,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2962,6 +2975,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3122,6 +3136,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3869,6 +3884,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4179,6 +4195,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4595,6 +4614,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5406,6 +5426,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5419,6 +5440,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5509,6 +5531,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5748,6 +5771,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5818,6 +5842,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6064,6 +6089,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6217,6 +6243,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6388,6 +6415,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6539,6 +6567,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6712,6 +6743,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7014,6 +7046,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7095,6 +7128,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7668,6 +7702,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7680,6 +7715,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7979,6 +8015,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index d3c3eecf1ea..fe271aec27a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -166,6 +166,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -314,6 +315,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -783,7 +785,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1305,6 +1309,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1412,6 +1417,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1542,6 +1548,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1959,6 +1966,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1991,6 +1999,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2101,6 +2110,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2323,6 +2333,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2346,6 +2357,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2525,6 +2537,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2960,6 +2973,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3120,6 +3134,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3866,6 +3881,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4176,6 +4192,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4592,6 +4611,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5401,6 +5421,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5414,6 +5435,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5504,6 +5526,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5743,6 +5766,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5813,6 +5837,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6058,6 +6083,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6210,6 +6236,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6381,6 +6408,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6531,6 +6559,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6704,6 +6735,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7005,6 +7037,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7086,6 +7119,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7252,6 +7286,7 @@ self: super: { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -7655,6 +7690,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7667,6 +7703,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7966,6 +8003,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 2f0d9ece96b..dc618d2f2b5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -166,6 +166,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -314,6 +315,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -783,7 +785,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1304,6 +1308,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1411,6 +1416,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1541,6 +1547,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1957,6 +1964,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1989,6 +1997,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2099,6 +2108,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; @@ -2320,6 +2330,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2343,6 +2354,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2522,6 +2534,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2957,6 +2970,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3117,6 +3131,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3862,6 +3877,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4172,6 +4188,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4588,6 +4607,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -5395,6 +5415,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5408,6 +5429,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5497,6 +5519,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5736,6 +5759,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5806,6 +5830,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6051,6 +6076,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6203,6 +6229,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6374,6 +6401,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6524,6 +6552,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6697,6 +6728,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6998,6 +7030,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7079,6 +7112,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7245,6 +7279,7 @@ self: super: { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -7648,6 +7683,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7660,6 +7696,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7958,6 +7995,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index 208ba6fedff..8f92e45e6ca 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -166,6 +166,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -314,6 +315,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -783,7 +785,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1304,6 +1308,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1411,6 +1416,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1541,6 +1547,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1956,6 +1963,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1988,6 +1996,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2098,6 +2107,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; @@ -2319,6 +2329,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2342,6 +2353,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2521,6 +2533,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2956,6 +2969,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3116,6 +3130,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3857,6 +3872,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4166,6 +4182,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4579,6 +4598,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -5386,6 +5406,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5399,6 +5420,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5488,6 +5510,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5727,6 +5750,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5797,6 +5821,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6041,6 +6066,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6193,6 +6219,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6362,6 +6389,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6512,6 +6540,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6685,6 +6716,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6985,6 +7017,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7066,6 +7099,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7232,6 +7266,7 @@ self: super: { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -7467,6 +7502,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text" = doDistribute super."text_1_2_1_3"; "text-and-plots" = dontDistribute super."text-and-plots"; @@ -7634,6 +7670,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7646,6 +7683,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7943,6 +7981,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index 296a97f41c5..b38924fbbf2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -165,6 +165,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -313,6 +314,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -782,7 +784,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1303,6 +1307,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1408,6 +1413,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1538,6 +1544,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1951,6 +1958,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1983,6 +1991,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2092,6 +2101,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; @@ -2313,6 +2323,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2336,6 +2347,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2515,6 +2527,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2950,6 +2963,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3110,6 +3124,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3851,6 +3866,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4158,6 +4174,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4570,6 +4589,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -5375,6 +5395,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5388,6 +5409,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5477,6 +5499,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5715,6 +5738,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5785,6 +5809,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6027,6 +6052,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6179,6 +6205,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6348,6 +6375,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6498,6 +6526,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6671,6 +6702,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6971,6 +7003,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7051,6 +7084,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7217,6 +7251,7 @@ self: super: { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -7452,6 +7487,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text" = doDistribute super."text_1_2_1_3"; "text-and-plots" = dontDistribute super."text-and-plots"; @@ -7619,6 +7655,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7631,6 +7668,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7928,6 +7966,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index c44009d33c0..ab3660227dc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -317,6 +318,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -789,7 +791,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1426,6 +1430,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2016,6 +2021,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2126,6 +2132,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2352,6 +2359,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2375,6 +2383,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -3002,6 +3011,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3165,6 +3175,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3918,6 +3929,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4233,6 +4245,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4654,6 +4669,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5473,6 +5489,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5579,6 +5596,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -5821,6 +5839,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5892,6 +5911,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6302,6 +6322,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6475,6 +6496,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6628,6 +6650,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6801,6 +6826,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7772,6 +7798,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7784,6 +7811,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8087,6 +8115,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index 32cd18e64e3..bb320bd6d3b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -165,6 +165,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -313,6 +314,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -781,7 +783,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1113,6 +1117,7 @@ self: super: { "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; @@ -1301,6 +1306,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1406,6 +1412,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1536,6 +1543,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1949,6 +1957,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1981,6 +1990,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2090,6 +2100,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; @@ -2311,6 +2322,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2334,6 +2346,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2513,6 +2526,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2948,6 +2962,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3108,6 +3123,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3849,6 +3865,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4156,6 +4173,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4568,6 +4588,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -5372,6 +5393,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5385,6 +5407,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5474,6 +5497,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5712,6 +5736,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5782,6 +5807,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6023,6 +6049,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6175,6 +6202,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6344,6 +6372,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6493,6 +6522,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6666,6 +6698,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6966,6 +6999,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7046,6 +7080,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7211,6 +7246,7 @@ self: super: { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -7446,6 +7482,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7612,6 +7649,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7624,6 +7662,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7921,6 +7960,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index d1ff009a56a..53ba6103f2c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -165,6 +165,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -313,6 +314,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -781,7 +783,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1113,6 +1117,7 @@ self: super: { "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; @@ -1301,6 +1306,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1406,6 +1412,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1535,6 +1542,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1948,6 +1956,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1980,6 +1989,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2087,6 +2097,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; @@ -2308,6 +2319,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2331,6 +2343,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2510,6 +2523,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2943,6 +2957,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3103,6 +3118,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3843,6 +3859,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4150,6 +4167,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4560,6 +4580,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -5364,6 +5385,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5377,6 +5399,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5465,6 +5488,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5703,6 +5727,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5773,6 +5798,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6012,6 +6038,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6164,6 +6191,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6333,6 +6361,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6481,6 +6510,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6653,6 +6685,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6943,6 +6976,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7023,6 +7057,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7188,6 +7223,7 @@ self: super: { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -7423,6 +7459,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7589,6 +7626,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7601,6 +7639,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7897,6 +7936,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index b4f37b347aa..ac439cb6a01 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -165,6 +165,7 @@ self: super: { "ChannelT" = dontDistribute super."ChannelT"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -313,6 +314,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -781,7 +783,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1113,6 +1117,7 @@ self: super: { "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; @@ -1301,6 +1306,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1406,6 +1412,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1535,6 +1542,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binary-typed" = dontDistribute super."binary-typed"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; @@ -1948,6 +1956,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1980,6 +1989,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2087,6 +2097,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; @@ -2308,6 +2319,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2331,6 +2343,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2510,6 +2523,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2941,6 +2955,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3101,6 +3116,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3841,6 +3857,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4147,6 +4164,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4556,6 +4576,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -5358,6 +5379,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5371,6 +5393,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5459,6 +5482,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5697,6 +5721,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5767,6 +5792,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6006,6 +6032,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6158,6 +6185,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6327,6 +6355,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6475,6 +6504,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6647,6 +6679,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6937,6 +6970,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7017,6 +7051,7 @@ self: super: { "sockaddr" = dontDistribute super."sockaddr"; "socket" = dontDistribute super."socket"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -7182,6 +7217,7 @@ self: super: { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -7417,6 +7453,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7583,6 +7620,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7595,6 +7633,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7891,6 +7930,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; @@ -8240,6 +8280,7 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_6"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index e7f095bac2d..42ec1ca8520 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -317,6 +318,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -789,7 +791,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1425,6 +1429,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2015,6 +2020,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2125,6 +2131,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2349,6 +2356,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2372,6 +2380,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2999,6 +3008,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3161,6 +3171,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3914,6 +3925,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4228,6 +4240,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4649,6 +4664,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5468,6 +5484,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5574,6 +5591,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -5816,6 +5834,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5887,6 +5906,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6297,6 +6317,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6470,6 +6491,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6622,6 +6644,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6795,6 +6820,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7764,6 +7790,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7776,6 +7803,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8078,6 +8106,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index be89c0d27b1..a1b98e0c86f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -317,6 +318,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -789,7 +791,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1425,6 +1429,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2015,6 +2020,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2125,6 +2131,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2349,6 +2356,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2372,6 +2380,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2999,6 +3008,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3161,6 +3171,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3914,6 +3925,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4228,6 +4240,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4649,6 +4664,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5468,6 +5484,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5574,6 +5591,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multiarg" = doDistribute super."multiarg_0_30_0_8"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; @@ -5816,6 +5834,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5887,6 +5906,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6297,6 +6317,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6470,6 +6491,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6622,6 +6644,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6795,6 +6820,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7763,6 +7789,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7775,6 +7802,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8077,6 +8105,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 08e7d4607c1..7741253ff12 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -317,6 +318,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -789,7 +791,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1424,6 +1428,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2014,6 +2019,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2124,6 +2130,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2348,6 +2355,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2371,6 +2379,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2997,6 +3006,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3159,6 +3169,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3911,6 +3922,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4224,6 +4236,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4642,6 +4657,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5461,6 +5477,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5567,6 +5584,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5808,6 +5826,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5879,6 +5898,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6129,6 +6149,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6286,6 +6307,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6459,6 +6481,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6611,6 +6634,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6784,6 +6810,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7749,6 +7776,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7761,6 +7789,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8063,6 +8092,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 75234059ec3..52de97dd05a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -317,6 +318,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -789,7 +791,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1424,6 +1428,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2014,6 +2019,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2124,6 +2130,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2348,6 +2355,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2371,6 +2379,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2997,6 +3006,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3158,6 +3168,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3908,6 +3919,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -4221,6 +4233,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4639,6 +4654,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5455,6 +5471,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5560,6 +5577,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5801,6 +5819,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5872,6 +5891,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6121,6 +6141,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6278,6 +6299,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6451,6 +6473,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6603,6 +6626,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6776,6 +6802,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7741,6 +7768,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7753,6 +7781,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8054,6 +8083,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 01f7fab0ca1..a04a9953c14 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -317,6 +318,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -789,7 +791,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1313,6 +1317,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1421,6 +1426,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2011,6 +2017,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2121,6 +2128,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2344,6 +2352,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2367,6 +2376,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2993,6 +3003,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3154,6 +3165,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3904,6 +3916,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4216,6 +4229,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4634,6 +4650,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5449,6 +5466,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5554,6 +5572,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5795,6 +5814,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5866,6 +5886,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6115,6 +6136,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6270,6 +6292,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6442,6 +6465,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6594,6 +6618,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6767,6 +6794,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7072,6 +7100,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7730,6 +7759,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7742,6 +7772,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8042,6 +8073,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 6d7df9e59a9..737c3db5c65 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -317,6 +318,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -789,7 +791,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1313,6 +1317,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1421,6 +1426,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2008,6 +2014,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2118,6 +2125,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2341,6 +2349,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2364,6 +2373,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2545,6 +2555,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2985,6 +2996,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3146,6 +3158,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3896,6 +3909,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4208,6 +4222,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4626,6 +4643,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5439,6 +5457,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5544,6 +5563,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5785,6 +5805,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5856,6 +5877,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6105,6 +6127,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6259,6 +6282,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6430,6 +6454,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6581,6 +6606,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6754,6 +6782,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7059,6 +7088,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7716,6 +7746,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7728,6 +7759,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8028,6 +8060,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index 6286cdf3a42..96dd3a37288 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -169,6 +169,7 @@ self: super: { "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -317,6 +318,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -787,7 +789,9 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1311,6 +1315,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1419,6 +1424,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -2005,6 +2011,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -2115,6 +2122,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-connection" = dontDistribute super."conduit-connection"; "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; @@ -2338,6 +2346,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2361,6 +2370,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2542,6 +2552,7 @@ self: super: { "digest-pure" = dontDistribute super."digest-pure"; "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; @@ -2981,6 +2992,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -3141,6 +3153,7 @@ self: super: { "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; "funcmp" = dontDistribute super."funcmp"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3891,6 +3904,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_4"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hasql-th" = dontDistribute super."hasql-th"; @@ -4203,6 +4217,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4621,6 +4638,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -5434,6 +5452,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5539,6 +5558,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5780,6 +5800,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5850,6 +5871,7 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; "opml-conduit" = dontDistribute super."opml-conduit"; "opn" = dontDistribute super."opn"; @@ -6099,6 +6121,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -6253,6 +6276,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6424,6 +6448,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6575,6 +6600,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6748,6 +6776,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -7053,6 +7082,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -7710,6 +7740,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7722,6 +7753,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -8022,6 +8054,7 @@ self: super: { "vect-opengl" = dontDistribute super."vect-opengl"; "vector" = doDistribute super."vector_0_10_12_3"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index a11e485c3f1..f92b9d4175e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -166,6 +166,7 @@ self: super: { "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -309,6 +310,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -763,8 +765,10 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1085,6 +1089,7 @@ self: super: { "aeson" = doDistribute super."aeson_0_10_0_0"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; @@ -1209,6 +1214,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1311,6 +1317,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1434,6 +1441,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1831,6 +1839,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_6_4"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -1857,6 +1866,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -1961,6 +1971,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2171,6 +2182,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2194,6 +2206,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2364,6 +2377,7 @@ self: super: { "digamma" = dontDistribute super."digamma"; "digest-pure" = dontDistribute super."digest-pure"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; @@ -2546,8 +2560,10 @@ self: super: { "eibd-client-simple" = dontDistribute super."eibd-client-simple"; "eigen" = dontDistribute super."eigen"; "eithers" = dontDistribute super."eithers"; + "ekg" = doDistribute super."ekg_0_4_0_8"; "ekg-bosun" = dontDistribute super."ekg-bosun"; "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = doDistribute super."ekg-json_0_1_0_0"; "ekg-log" = dontDistribute super."ekg-log"; "ekg-push" = dontDistribute super."ekg-push"; "ekg-rrd" = dontDistribute super."ekg-rrd"; @@ -2653,10 +2669,12 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_1"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = doDistribute super."exact-pi_0_4_1_0"; "exception-hierarchy" = dontDistribute super."exception-hierarchy"; "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; @@ -2777,6 +2795,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -2934,6 +2953,7 @@ self: super: { "funbot-client" = dontDistribute super."funbot-client"; "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -3001,6 +3021,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generics-eot" = dontDistribute super."generics-eot"; + "generics-sop" = doDistribute super."generics-sop_0_2_0_0"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; "geni-gui" = dontDistribute super."geni-gui"; @@ -3087,6 +3108,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-annex" = doDistribute super."git-annex_5_20151218"; @@ -3650,6 +3672,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_15_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = dontDistribute super."hasql-postgres"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -3945,6 +3968,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4326,6 +4352,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -4956,6 +4983,7 @@ self: super: { "manatee-terminal" = dontDistribute super."manatee-terminal"; "manatee-welcome" = dontDistribute super."manatee-welcome"; "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_5_0_0"; "mandulia" = dontDistribute super."mandulia"; "manifold-random" = dontDistribute super."manifold-random"; "manifolds" = dontDistribute super."manifolds"; @@ -5107,6 +5135,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5119,6 +5148,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5204,6 +5234,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5245,6 +5276,7 @@ self: super: { "mvc" = dontDistribute super."mvc"; "mvc-updates" = dontDistribute super."mvc-updates"; "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = doDistribute super."mwc-probability_1_0_2"; "mwc-random-monad" = dontDistribute super."mwc-random-monad"; "myTestlll" = dontDistribute super."myTestlll"; "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; @@ -5428,6 +5460,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5494,7 +5527,9 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; + "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0"; "opn" = dontDistribute super."opn"; "optimal-blocks" = dontDistribute super."optimal-blocks"; "optimization" = dontDistribute super."optimization"; @@ -5620,6 +5655,9 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-less" = dontDistribute super."pcre-less"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0"; + "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0"; + "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0"; "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; "pdf2line" = dontDistribute super."pdf2line"; "pdfsplit" = dontDistribute super."pdfsplit"; @@ -5716,6 +5754,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -5859,6 +5898,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6023,6 +6063,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6111,6 +6152,7 @@ self: super: { "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; "reflex-transformers" = dontDistribute super."reflex-transformers"; + "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; @@ -6160,6 +6202,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6206,6 +6251,7 @@ self: super: { "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2"; "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; @@ -6321,6 +6367,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6600,6 +6647,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; @@ -6675,6 +6723,7 @@ self: super: { "sock2stream" = dontDistribute super."sock2stream"; "sockaddr" = dontDistribute super."sockaddr"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -6832,6 +6881,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -7055,6 +7105,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7071,6 +7122,7 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7212,6 +7264,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7224,6 +7277,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7501,6 +7555,7 @@ self: super: { "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; "vect-opengl" = dontDistribute super."vect-opengl"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index 33013dc368a..1a3e3e25530 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -166,6 +166,7 @@ self: super: { "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -309,6 +310,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -763,8 +765,10 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1084,6 +1088,7 @@ self: super: { "aeson" = doDistribute super."aeson_0_10_0_0"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; @@ -1207,6 +1212,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1309,6 +1315,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1432,6 +1439,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1829,6 +1837,7 @@ self: super: { "clash-vhdl" = doDistribute super."clash-vhdl_0_6_4"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -1855,6 +1864,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -1959,6 +1969,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2169,6 +2180,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2192,6 +2204,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2362,6 +2375,7 @@ self: super: { "digamma" = dontDistribute super."digamma"; "digest-pure" = dontDistribute super."digest-pure"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; @@ -2543,8 +2557,10 @@ self: super: { "eibd-client-simple" = dontDistribute super."eibd-client-simple"; "eigen" = dontDistribute super."eigen"; "eithers" = dontDistribute super."eithers"; + "ekg" = doDistribute super."ekg_0_4_0_8"; "ekg-bosun" = dontDistribute super."ekg-bosun"; "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = doDistribute super."ekg-json_0_1_0_0"; "ekg-log" = dontDistribute super."ekg-log"; "ekg-push" = dontDistribute super."ekg-push"; "ekg-rrd" = dontDistribute super."ekg-rrd"; @@ -2649,10 +2665,12 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_1"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = doDistribute super."exact-pi_0_4_1_0"; "exception-hierarchy" = dontDistribute super."exception-hierarchy"; "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; @@ -2771,6 +2789,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -2928,6 +2947,7 @@ self: super: { "funbot-client" = dontDistribute super."funbot-client"; "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -2995,6 +3015,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generics-eot" = dontDistribute super."generics-eot"; + "generics-sop" = doDistribute super."generics-sop_0_2_0_0"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; "geni-gui" = dontDistribute super."geni-gui"; @@ -3081,6 +3102,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-annex" = doDistribute super."git-annex_5_20151218"; @@ -3644,6 +3666,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_15_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = dontDistribute super."hasql-postgres"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -3938,6 +3961,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4316,6 +4342,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -4941,6 +4968,7 @@ self: super: { "manatee-terminal" = dontDistribute super."manatee-terminal"; "manatee-welcome" = dontDistribute super."manatee-welcome"; "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_5_0_0"; "mandulia" = dontDistribute super."mandulia"; "manifold-random" = dontDistribute super."manifold-random"; "manifolds" = dontDistribute super."manifolds"; @@ -5092,6 +5120,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5104,6 +5133,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-products" = doDistribute super."monad-products_4_0_0_1"; @@ -5189,6 +5219,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5230,6 +5261,7 @@ self: super: { "mvc" = dontDistribute super."mvc"; "mvc-updates" = dontDistribute super."mvc-updates"; "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = doDistribute super."mwc-probability_1_0_2"; "mwc-random-monad" = dontDistribute super."mwc-random-monad"; "myTestlll" = dontDistribute super."myTestlll"; "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; @@ -5413,6 +5445,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5479,7 +5512,9 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; + "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0"; "opn" = dontDistribute super."opn"; "optimal-blocks" = dontDistribute super."optimal-blocks"; "optimization" = dontDistribute super."optimization"; @@ -5604,6 +5639,9 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-less" = dontDistribute super."pcre-less"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0"; + "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0"; + "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0"; "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; "pdf2line" = dontDistribute super."pdf2line"; "pdfsplit" = dontDistribute super."pdfsplit"; @@ -5699,6 +5737,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -5842,6 +5881,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -6006,6 +6046,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6093,6 +6134,7 @@ self: super: { "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; "reflex-transformers" = dontDistribute super."reflex-transformers"; + "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; @@ -6142,6 +6184,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6188,6 +6233,7 @@ self: super: { "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2"; "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; @@ -6303,6 +6349,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6582,6 +6629,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; @@ -6657,6 +6705,7 @@ self: super: { "sock2stream" = dontDistribute super."sock2stream"; "sockaddr" = dontDistribute super."sockaddr"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -6814,6 +6863,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -7037,6 +7087,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7053,6 +7104,7 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7194,6 +7246,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7206,6 +7259,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7482,6 +7536,7 @@ self: super: { "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; "vect-opengl" = dontDistribute super."vect-opengl"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix index 05a347b4c96..6d29972d4ea 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix @@ -166,6 +166,7 @@ self: super: { "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -309,6 +310,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -760,8 +762,10 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1080,6 +1084,7 @@ self: super: { "aeson" = doDistribute super."aeson_0_10_0_0"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; @@ -1202,6 +1207,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1304,6 +1310,7 @@ self: super: { "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1427,6 +1434,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1813,12 +1821,14 @@ self: super: { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_6_8"; "clash-lib" = doDistribute super."clash-lib_0_6_8"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_5"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_4"; "clash-verilog" = doDistribute super."clash-verilog_0_6_4"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_5"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -1845,6 +1855,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -1947,6 +1958,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2157,6 +2169,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2180,6 +2193,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2346,6 +2360,7 @@ self: super: { "digamma" = dontDistribute super."digamma"; "digest-pure" = dontDistribute super."digest-pure"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; @@ -2526,8 +2541,10 @@ self: super: { "eibd-client-simple" = dontDistribute super."eibd-client-simple"; "eigen" = dontDistribute super."eigen"; "eithers" = dontDistribute super."eithers"; + "ekg" = doDistribute super."ekg_0_4_0_8"; "ekg-bosun" = dontDistribute super."ekg-bosun"; "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = doDistribute super."ekg-json_0_1_0_0"; "ekg-log" = dontDistribute super."ekg-log"; "ekg-push" = dontDistribute super."ekg-push"; "ekg-rrd" = dontDistribute super."ekg-rrd"; @@ -2631,10 +2648,12 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_1"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = doDistribute super."exact-pi_0_4_1_0"; "exception-hierarchy" = dontDistribute super."exception-hierarchy"; "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; @@ -2750,6 +2769,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -2906,6 +2926,7 @@ self: super: { "funbot-client" = dontDistribute super."funbot-client"; "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -2973,6 +2994,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generics-eot" = dontDistribute super."generics-eot"; + "generics-sop" = doDistribute super."generics-sop_0_2_0_0"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; "geni-gui" = dontDistribute super."geni-gui"; @@ -3058,6 +3080,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-annex" = doDistribute super."git-annex_5_20151218"; @@ -3615,6 +3638,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_15_1_1"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = dontDistribute super."hasql-postgres"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -3905,6 +3929,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4278,6 +4305,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -4897,6 +4925,7 @@ self: super: { "manatee-terminal" = dontDistribute super."manatee-terminal"; "manatee-welcome" = dontDistribute super."manatee-welcome"; "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_5_0_0"; "mandulia" = dontDistribute super."mandulia"; "manifold-random" = dontDistribute super."manifold-random"; "manifolds" = dontDistribute super."manifolds"; @@ -5048,6 +5077,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -5060,6 +5090,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; @@ -5143,6 +5174,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5183,6 +5215,7 @@ self: super: { "mvc" = dontDistribute super."mvc"; "mvc-updates" = dontDistribute super."mvc-updates"; "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = doDistribute super."mwc-probability_1_0_2"; "mwc-random-monad" = dontDistribute super."mwc-random-monad"; "myTestlll" = dontDistribute super."myTestlll"; "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; @@ -5366,6 +5399,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5432,7 +5466,9 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; + "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0"; "opn" = dontDistribute super."opn"; "optimal-blocks" = dontDistribute super."optimal-blocks"; "optimization" = dontDistribute super."optimization"; @@ -5557,6 +5593,9 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-less" = dontDistribute super."pcre-less"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0"; + "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0"; + "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0"; "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; "pdf2line" = dontDistribute super."pdf2line"; "pdfsplit" = dontDistribute super."pdfsplit"; @@ -5652,6 +5691,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; @@ -5792,6 +5832,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -5956,6 +5997,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6042,6 +6084,7 @@ self: super: { "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; "reflex-transformers" = dontDistribute super."reflex-transformers"; + "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; @@ -6091,6 +6134,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6136,6 +6182,7 @@ self: super: { "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retryer" = dontDistribute super."retryer"; @@ -6249,6 +6296,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6523,6 +6571,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; @@ -6598,6 +6647,7 @@ self: super: { "sock2stream" = dontDistribute super."sock2stream"; "sockaddr" = dontDistribute super."sockaddr"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -6753,6 +6803,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -6974,6 +7025,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -6990,6 +7042,7 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7131,6 +7184,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7143,6 +7197,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7419,6 +7474,7 @@ self: super: { "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; "vect-opengl" = dontDistribute super."vect-opengl"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix index 7fd213cdf9f..b7073d46b4d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix @@ -165,6 +165,7 @@ self: super: { "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -306,6 +307,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -447,6 +449,7 @@ self: super: { "HSoundFile" = dontDistribute super."HSoundFile"; "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; "HSvm" = dontDistribute super."HSvm"; + "HTTP" = doDistribute super."HTTP_4000_3_2"; "HTTP-Simple" = dontDistribute super."HTTP-Simple"; "HTab" = dontDistribute super."HTab"; "HTicTacToe" = dontDistribute super."HTicTacToe"; @@ -748,8 +751,10 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1065,6 +1070,7 @@ self: super: { "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; @@ -1187,6 +1193,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1287,6 +1294,7 @@ self: super: { "avers-server" = doDistribute super."avers-server_0_0_1"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1381,6 +1389,7 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; + "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1405,6 +1414,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1782,12 +1792,14 @@ self: super: { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_6_8"; "clash-lib" = doDistribute super."clash-lib_0_6_8"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_5"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_4"; "clash-verilog" = doDistribute super."clash-verilog_0_6_4"; "clash-vhdl" = doDistribute super."clash-vhdl_0_6_5"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -1814,6 +1826,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -1915,6 +1928,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2119,6 +2133,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2142,6 +2157,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2304,6 +2320,7 @@ self: super: { "digamma" = dontDistribute super."digamma"; "digest-pure" = dontDistribute super."digest-pure"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; @@ -2478,8 +2495,10 @@ self: super: { "eibd-client-simple" = dontDistribute super."eibd-client-simple"; "eigen" = dontDistribute super."eigen"; "eithers" = dontDistribute super."eithers"; + "ekg" = doDistribute super."ekg_0_4_0_8"; "ekg-bosun" = dontDistribute super."ekg-bosun"; "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = doDistribute super."ekg-json_0_1_0_0"; "ekg-log" = dontDistribute super."ekg-log"; "ekg-push" = dontDistribute super."ekg-push"; "ekg-rrd" = dontDistribute super."ekg-rrd"; @@ -2515,6 +2534,7 @@ self: super: { "empty" = dontDistribute super."empty"; "encoding" = dontDistribute super."encoding"; "endo" = dontDistribute super."endo"; + "engine-io" = doDistribute super."engine-io_1_2_12"; "engine-io-growler" = dontDistribute super."engine-io-growler"; "engine-io-snap" = dontDistribute super."engine-io-snap"; "engineering-units" = dontDistribute super."engineering-units"; @@ -2579,10 +2599,12 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_1"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = doDistribute super."exact-pi_0_4_1_0"; "exception-hierarchy" = dontDistribute super."exception-hierarchy"; "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; @@ -2694,6 +2716,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -2846,6 +2869,7 @@ self: super: { "funbot-client" = dontDistribute super."funbot-client"; "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -2911,6 +2935,7 @@ self: super: { "generic-storable" = dontDistribute super."generic-storable"; "generic-tree" = dontDistribute super."generic-tree"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-sop" = doDistribute super."generics-sop_0_2_0_0"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; "geni-gui" = dontDistribute super."geni-gui"; @@ -2993,6 +3018,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-annex" = doDistribute super."git-annex_6_20160114"; @@ -3545,6 +3571,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_19_3_3"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = dontDistribute super."hasql-postgres"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -3833,6 +3860,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4079,6 +4109,7 @@ self: super: { "http-shed" = dontDistribute super."http-shed"; "http-test" = dontDistribute super."http-test"; "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_4_4"; "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; "httpspec" = dontDistribute super."httpspec"; @@ -4201,6 +4232,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -4254,6 +4286,7 @@ self: super: { "interpolation" = dontDistribute super."interpolation"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4812,6 +4845,7 @@ self: super: { "manatee-terminal" = dontDistribute super."manatee-terminal"; "manatee-welcome" = dontDistribute super."manatee-welcome"; "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_5_0_0"; "mandulia" = dontDistribute super."mandulia"; "manifold-random" = dontDistribute super."manifold-random"; "manifolds" = dontDistribute super."manifolds"; @@ -4887,6 +4921,7 @@ self: super: { "mi" = dontDistribute super."mi"; "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0"; "microlens-each" = dontDistribute super."microlens-each"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; @@ -4952,6 +4987,7 @@ self: super: { "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; "monad-control" = doDistribute super."monad-control_1_0_0_4"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -4964,6 +5000,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; @@ -5046,6 +5083,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5085,6 +5123,7 @@ self: super: { "mvc" = dontDistribute super."mvc"; "mvc-updates" = dontDistribute super."mvc-updates"; "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = doDistribute super."mwc-probability_1_0_2"; "mwc-random-monad" = dontDistribute super."mwc-random-monad"; "myTestlll" = dontDistribute super."myTestlll"; "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; @@ -5266,6 +5305,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5332,7 +5372,9 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; + "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0"; "opn" = dontDistribute super."opn"; "optimal-blocks" = dontDistribute super."optimal-blocks"; "optimization" = dontDistribute super."optimization"; @@ -5375,6 +5417,7 @@ self: super: { "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = doDistribute super."pagerduty_0_0_4"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; @@ -5387,6 +5430,7 @@ self: super: { "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; + "pandoc-types" = doDistribute super."pandoc-types_1_16_0_1"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5451,6 +5495,9 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-less" = dontDistribute super."pcre-less"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0"; + "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0"; + "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0"; "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; "pdf2line" = dontDistribute super."pdf2line"; "pdfsplit" = dontDistribute super."pdfsplit"; @@ -5543,6 +5590,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -5681,6 +5729,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -5765,6 +5814,7 @@ self: super: { "push-notify-ccs" = dontDistribute super."push-notify-ccs"; "push-notify-general" = dontDistribute super."push-notify-general"; "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = doDistribute super."pusher-http-haskell_0_3_0_1"; "pushme" = dontDistribute super."pushme"; "putlenses" = dontDistribute super."putlenses"; "puzzle-draw" = dontDistribute super."puzzle-draw"; @@ -5841,6 +5891,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -5924,6 +5975,7 @@ self: super: { "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; "reflex-transformers" = dontDistribute super."reflex-transformers"; + "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; "regex-easy" = dontDistribute super."regex-easy"; @@ -5972,6 +6024,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -6017,6 +6072,7 @@ self: super: { "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retryer" = dontDistribute super."retryer"; @@ -6128,6 +6184,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6397,6 +6454,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; @@ -6472,6 +6530,7 @@ self: super: { "sock2stream" = dontDistribute super."sock2stream"; "sockaddr" = dontDistribute super."sockaddr"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -6557,6 +6616,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6622,6 +6682,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -6835,6 +6896,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -6851,6 +6913,7 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -6989,6 +7052,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7001,6 +7065,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7265,6 +7330,7 @@ self: super: { "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; "vect-opengl" = dontDistribute super."vect-opengl"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; @@ -7576,6 +7642,7 @@ self: super: { "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_6"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix index b9e13567f85..c25861c65c8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix @@ -164,6 +164,7 @@ self: super: { "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -305,6 +306,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -445,6 +447,7 @@ self: super: { "HSoundFile" = dontDistribute super."HSoundFile"; "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; "HSvm" = dontDistribute super."HSvm"; + "HTTP" = doDistribute super."HTTP_4000_3_2"; "HTTP-Simple" = dontDistribute super."HTTP-Simple"; "HTab" = dontDistribute super."HTab"; "HTicTacToe" = dontDistribute super."HTicTacToe"; @@ -746,8 +749,10 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1063,6 +1068,7 @@ self: super: { "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-iproute" = dontDistribute super."aeson-iproute"; @@ -1183,6 +1189,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1280,6 +1287,7 @@ self: super: { "average" = dontDistribute super."average"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1374,6 +1382,7 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; + "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1397,6 +1406,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1769,9 +1779,14 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_9"; + "clash-lib" = doDistribute super."clash-lib_0_6_9"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_5"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_6"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -1798,6 +1813,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -1899,6 +1915,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2102,6 +2119,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2125,6 +2143,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2287,6 +2306,7 @@ self: super: { "digamma" = dontDistribute super."digamma"; "digest-pure" = dontDistribute super."digest-pure"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; @@ -2461,8 +2481,10 @@ self: super: { "eibd-client-simple" = dontDistribute super."eibd-client-simple"; "eigen" = dontDistribute super."eigen"; "eithers" = dontDistribute super."eithers"; + "ekg" = doDistribute super."ekg_0_4_0_8"; "ekg-bosun" = dontDistribute super."ekg-bosun"; "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = doDistribute super."ekg-json_0_1_0_0"; "ekg-log" = dontDistribute super."ekg-log"; "ekg-push" = dontDistribute super."ekg-push"; "ekg-rrd" = dontDistribute super."ekg-rrd"; @@ -2498,6 +2520,7 @@ self: super: { "empty" = dontDistribute super."empty"; "encoding" = dontDistribute super."encoding"; "endo" = dontDistribute super."endo"; + "engine-io" = doDistribute super."engine-io_1_2_12"; "engine-io-growler" = dontDistribute super."engine-io-growler"; "engine-io-snap" = dontDistribute super."engine-io-snap"; "engineering-units" = dontDistribute super."engineering-units"; @@ -2562,10 +2585,12 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_1"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = doDistribute super."exact-pi_0_4_1_0"; "exception-hierarchy" = dontDistribute super."exception-hierarchy"; "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; @@ -2677,6 +2702,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -2829,6 +2855,7 @@ self: super: { "funbot-client" = dontDistribute super."funbot-client"; "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -2894,6 +2921,7 @@ self: super: { "generic-storable" = dontDistribute super."generic-storable"; "generic-tree" = dontDistribute super."generic-tree"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-sop" = doDistribute super."generics-sop_0_2_0_0"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; "geni-gui" = dontDistribute super."geni-gui"; @@ -2976,6 +3004,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-annex" = doDistribute super."git-annex_6_20160114"; @@ -3526,6 +3555,8 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_6"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = dontDistribute super."hasql-postgres"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -3814,6 +3845,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4060,6 +4094,7 @@ self: super: { "http-shed" = dontDistribute super."http-shed"; "http-test" = dontDistribute super."http-test"; "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_4_4"; "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; "httpspec" = dontDistribute super."httpspec"; @@ -4181,6 +4216,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -4234,6 +4270,7 @@ self: super: { "interpolation" = dontDistribute super."interpolation"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_3"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4502,6 +4539,7 @@ self: super: { "language-slice" = dontDistribute super."language-slice"; "language-spelling" = dontDistribute super."language-spelling"; "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = doDistribute super."language-thrift_0_7_0_1"; "language-typescript" = dontDistribute super."language-typescript"; "language-vhdl" = dontDistribute super."language-vhdl"; "lat" = dontDistribute super."lat"; @@ -4789,6 +4827,7 @@ self: super: { "manatee-terminal" = dontDistribute super."manatee-terminal"; "manatee-welcome" = dontDistribute super."manatee-welcome"; "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_5_0_0"; "mandulia" = dontDistribute super."mandulia"; "manifold-random" = dontDistribute super."manifold-random"; "manifolds" = dontDistribute super."manifolds"; @@ -4864,6 +4903,7 @@ self: super: { "mi" = dontDistribute super."mi"; "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0"; "microlens-each" = dontDistribute super."microlens-each"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; @@ -4927,6 +4967,7 @@ self: super: { "monad-bool" = dontDistribute super."monad-bool"; "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; + "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -4939,6 +4980,7 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; @@ -5021,6 +5063,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5060,6 +5103,7 @@ self: super: { "mvc" = dontDistribute super."mvc"; "mvc-updates" = dontDistribute super."mvc-updates"; "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = doDistribute super."mwc-probability_1_0_2"; "mwc-random-monad" = dontDistribute super."mwc-random-monad"; "myTestlll" = dontDistribute super."myTestlll"; "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; @@ -5241,6 +5285,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5307,7 +5352,9 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; + "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0"; "opn" = dontDistribute super."opn"; "optimal-blocks" = dontDistribute super."optimal-blocks"; "optimization" = dontDistribute super."optimization"; @@ -5350,6 +5397,7 @@ self: super: { "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = doDistribute super."pagerduty_0_0_4"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; @@ -5362,6 +5410,7 @@ self: super: { "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; + "pandoc-types" = doDistribute super."pandoc-types_1_16_0_1"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5426,6 +5475,9 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-less" = dontDistribute super."pcre-less"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0"; + "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0"; + "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0"; "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; "pdf2line" = dontDistribute super."pdf2line"; "pdfsplit" = dontDistribute super."pdfsplit"; @@ -5518,6 +5570,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-text" = doDistribute super."pipes-text_0_0_1_0"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -5656,6 +5709,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -5740,6 +5794,7 @@ self: super: { "push-notify-ccs" = dontDistribute super."push-notify-ccs"; "push-notify-general" = dontDistribute super."push-notify-general"; "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = doDistribute super."pusher-http-haskell_0_3_0_1"; "pushme" = dontDistribute super."pushme"; "putlenses" = dontDistribute super."putlenses"; "puzzle-draw" = dontDistribute super."puzzle-draw"; @@ -5816,6 +5871,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -5898,6 +5954,7 @@ self: super: { "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; "reflex-transformers" = dontDistribute super."reflex-transformers"; + "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; "regex-easy" = dontDistribute super."regex-easy"; @@ -5946,6 +6003,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -5990,6 +6050,7 @@ self: super: { "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retryer" = dontDistribute super."retryer"; @@ -6101,6 +6162,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6369,6 +6431,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; @@ -6444,6 +6507,7 @@ self: super: { "sock2stream" = dontDistribute super."sock2stream"; "sockaddr" = dontDistribute super."sockaddr"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -6529,6 +6593,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6594,6 +6659,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -6806,6 +6872,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -6822,6 +6889,7 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -6960,6 +7028,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -6972,6 +7041,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7236,6 +7306,7 @@ self: super: { "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; "vect-opengl" = dontDistribute super."vect-opengl"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; @@ -7546,6 +7617,7 @@ self: super: { "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_6"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix index 8a68bd9a273..32256ef75b1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix @@ -164,6 +164,7 @@ self: super: { "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; + "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; "CheatSheet" = dontDistribute super."CheatSheet"; "Checked" = dontDistribute super."Checked"; "Chitra" = dontDistribute super."Chitra"; @@ -305,6 +306,7 @@ self: super: { "Flippi" = dontDistribute super."Flippi"; "Focus" = dontDistribute super."Focus"; "Folly" = dontDistribute super."Folly"; + "FontyFruity" = doDistribute super."FontyFruity_0_5_2"; "ForSyDe" = dontDistribute super."ForSyDe"; "ForkableT" = dontDistribute super."ForkableT"; "FormalGrammars" = dontDistribute super."FormalGrammars"; @@ -445,6 +447,7 @@ self: super: { "HSoundFile" = dontDistribute super."HSoundFile"; "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; "HSvm" = dontDistribute super."HSvm"; + "HTTP" = doDistribute super."HTTP_4000_3_2"; "HTTP-Simple" = dontDistribute super."HTTP-Simple"; "HTab" = dontDistribute super."HTab"; "HTicTacToe" = dontDistribute super."HTicTacToe"; @@ -745,8 +748,10 @@ self: super: { "QuadTree" = dontDistribute super."QuadTree"; "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck" = doDistribute super."QuickCheck_2_8_1"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "QuickPlot" = dontDistribute super."QuickPlot"; "Quickson" = dontDistribute super."Quickson"; "R-pandoc" = dontDistribute super."R-pandoc"; "RANSAC" = dontDistribute super."RANSAC"; @@ -1062,6 +1067,7 @@ self: super: { "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-iproute" = dontDistribute super."aeson-iproute"; @@ -1182,6 +1188,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_7"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1279,6 +1286,7 @@ self: super: { "average" = dontDistribute super."average"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; + "awesome-prelude" = dontDistribute super."awesome-prelude"; "awesomium" = dontDistribute super."awesomium"; "awesomium-glut" = dontDistribute super."awesomium-glut"; "awesomium-raw" = dontDistribute super."awesomium-raw"; @@ -1371,6 +1379,7 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; + "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1394,6 +1403,7 @@ self: super: { "binary-store" = dontDistribute super."binary-store"; "binary-streams" = dontDistribute super."binary-streams"; "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0"; "binarydefer" = dontDistribute super."binarydefer"; "bind-marshal" = dontDistribute super."bind-marshal"; "binding-core" = dontDistribute super."binding-core"; @@ -1765,9 +1775,14 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_9"; + "clash-lib" = doDistribute super."clash-lib_0_6_9"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_5"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_6"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -1794,6 +1809,7 @@ self: super: { "cloudyfs" = dontDistribute super."cloudyfs"; "cltw" = dontDistribute super."cltw"; "clua" = dontDistribute super."clua"; + "clumpiness" = dontDistribute super."clumpiness"; "cluss" = dontDistribute super."cluss"; "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; @@ -1895,6 +1911,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -2098,6 +2115,7 @@ self: super: { "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; "data-construction" = dontDistribute super."data-construction"; "data-cycle" = dontDistribute super."data-cycle"; + "data-default-extra" = dontDistribute super."data-default-extra"; "data-default-generics" = dontDistribute super."data-default-generics"; "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; @@ -2121,6 +2139,7 @@ self: super: { "data-flagset" = dontDistribute super."data-flagset"; "data-fresh" = dontDistribute super."data-fresh"; "data-interval" = dontDistribute super."data-interval"; + "data-inttrie" = doDistribute super."data-inttrie_0_1_0"; "data-ivar" = dontDistribute super."data-ivar"; "data-json-token" = dontDistribute super."data-json-token"; "data-kiln" = dontDistribute super."data-kiln"; @@ -2283,6 +2302,7 @@ self: super: { "digamma" = dontDistribute super."digamma"; "digest-pure" = dontDistribute super."digest-pure"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; @@ -2456,8 +2476,10 @@ self: super: { "eibd-client-simple" = dontDistribute super."eibd-client-simple"; "eigen" = dontDistribute super."eigen"; "eithers" = dontDistribute super."eithers"; + "ekg" = doDistribute super."ekg_0_4_0_8"; "ekg-bosun" = dontDistribute super."ekg-bosun"; "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = doDistribute super."ekg-json_0_1_0_0"; "ekg-log" = dontDistribute super."ekg-log"; "ekg-push" = dontDistribute super."ekg-push"; "ekg-rrd" = dontDistribute super."ekg-rrd"; @@ -2493,6 +2515,7 @@ self: super: { "empty" = dontDistribute super."empty"; "encoding" = dontDistribute super."encoding"; "endo" = dontDistribute super."endo"; + "engine-io" = doDistribute super."engine-io_1_2_12"; "engine-io-growler" = dontDistribute super."engine-io-growler"; "engine-io-snap" = dontDistribute super."engine-io-snap"; "engineering-units" = dontDistribute super."engineering-units"; @@ -2556,11 +2579,11 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_1"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; "exact-combinatorics" = dontDistribute super."exact-combinatorics"; - "exact-pi" = doDistribute super."exact-pi_0_4_1_1"; "exception-hierarchy" = dontDistribute super."exception-hierarchy"; "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; @@ -2671,6 +2694,7 @@ self: super: { "filesystem-trees" = dontDistribute super."filesystem-trees"; "filtrable" = dontDistribute super."filtrable"; "final" = dontDistribute super."final"; + "find-clumpiness" = dontDistribute super."find-clumpiness"; "find-conduit" = dontDistribute super."find-conduit"; "fingertree-tf" = dontDistribute super."fingertree-tf"; "finite-field" = dontDistribute super."finite-field"; @@ -2823,6 +2847,7 @@ self: super: { "funbot-client" = dontDistribute super."funbot-client"; "funbot-ext-events" = dontDistribute super."funbot-ext-events"; "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcons-tools" = dontDistribute super."funcons-tools"; "function-combine" = dontDistribute super."function-combine"; "function-instances-algebra" = dontDistribute super."function-instances-algebra"; "functional-arrow" = dontDistribute super."functional-arrow"; @@ -2888,6 +2913,7 @@ self: super: { "generic-storable" = dontDistribute super."generic-storable"; "generic-tree" = dontDistribute super."generic-tree"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-sop" = doDistribute super."generics-sop_0_2_0_0"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; "geni-gui" = dontDistribute super."geni-gui"; @@ -2969,6 +2995,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-annex" = doDistribute super."git-annex_6_20160114"; @@ -3255,7 +3282,6 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; - "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; @@ -3518,6 +3544,8 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_6"; + "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = dontDistribute super."hasql-postgres"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; @@ -3804,6 +3832,9 @@ self: super: { "hopfield" = dontDistribute super."hopfield"; "hopfield-networks" = dontDistribute super."hopfield-networks"; "hopfli" = dontDistribute super."hopfli"; + "hoppy-generator" = dontDistribute super."hoppy-generator"; + "hoppy-runtime" = dontDistribute super."hoppy-runtime"; + "hoppy-std" = dontDistribute super."hoppy-std"; "hops" = dontDistribute super."hops"; "hoq" = dontDistribute super."hoq"; "horizon" = dontDistribute super."horizon"; @@ -4049,6 +4080,7 @@ self: super: { "http-shed" = dontDistribute super."http-shed"; "http-test" = dontDistribute super."http-test"; "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_4_4"; "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; "httpspec" = dontDistribute super."httpspec"; @@ -4170,6 +4202,7 @@ self: super: { "improve" = dontDistribute super."improve"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "include-file" = doDistribute super."include-file_0_1_0_2"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; @@ -4223,7 +4256,6 @@ self: super: { "interpolation" = dontDistribute super."interpolation"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; - "invariant" = doDistribute super."invariant_0_3_1"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4492,6 +4524,7 @@ self: super: { "language-slice" = dontDistribute super."language-slice"; "language-spelling" = dontDistribute super."language-spelling"; "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = doDistribute super."language-thrift_0_7_0_1"; "language-typescript" = dontDistribute super."language-typescript"; "language-vhdl" = dontDistribute super."language-vhdl"; "lat" = dontDistribute super."lat"; @@ -4779,6 +4812,7 @@ self: super: { "manatee-terminal" = dontDistribute super."manatee-terminal"; "manatee-welcome" = dontDistribute super."manatee-welcome"; "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_5_0_0"; "mandulia" = dontDistribute super."mandulia"; "manifold-random" = dontDistribute super."manifold-random"; "manifolds" = dontDistribute super."manifolds"; @@ -4854,6 +4888,7 @@ self: super: { "mi" = dontDistribute super."mi"; "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0"; "microlens-each" = dontDistribute super."microlens-each"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; @@ -4915,7 +4950,6 @@ self: super: { "monad-bool" = dontDistribute super."monad-bool"; "monad-classes" = dontDistribute super."monad-classes"; "monad-codec" = dontDistribute super."monad-codec"; - "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_2"; "monad-exception" = dontDistribute super."monad-exception"; "monad-fork" = dontDistribute super."monad-fork"; "monad-gen" = dontDistribute super."monad-gen"; @@ -4927,7 +4961,6 @@ self: super: { "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; "monad-open" = dontDistribute super."monad-open"; "monad-ox" = dontDistribute super."monad-ox"; - "monad-parallel" = doDistribute super."monad-parallel_0_7_2_1"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; @@ -5009,6 +5042,7 @@ self: super: { "mulang" = dontDistribute super."mulang"; "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; + "multiaddr" = dontDistribute super."multiaddr"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5048,6 +5082,7 @@ self: super: { "mvc" = dontDistribute super."mvc"; "mvc-updates" = dontDistribute super."mvc-updates"; "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = doDistribute super."mwc-probability_1_0_2"; "mwc-random-monad" = dontDistribute super."mwc-random-monad"; "myTestlll" = dontDistribute super."myTestlll"; "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; @@ -5229,6 +5264,7 @@ self: super: { "nyan" = dontDistribute super."nyan"; "nylas" = dontDistribute super."nylas"; "nymphaea" = dontDistribute super."nymphaea"; + "oanda-rest-api" = dontDistribute super."oanda-rest-api"; "oauthenticated" = dontDistribute super."oauthenticated"; "obdd" = dontDistribute super."obdd"; "oberon0" = dontDistribute super."oberon0"; @@ -5295,7 +5331,9 @@ self: super: { "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; "operational-alacarte" = dontDistribute super."operational-alacarte"; + "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; + "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0"; "opn" = dontDistribute super."opn"; "optimal-blocks" = dontDistribute super."optimal-blocks"; "optimization" = dontDistribute super."optimization"; @@ -5338,6 +5376,7 @@ self: super: { "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = doDistribute super."pagerduty_0_0_4"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; @@ -5350,6 +5389,7 @@ self: super: { "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; + "pandoc-types" = doDistribute super."pandoc-types_1_16_0_1"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5414,9 +5454,6 @@ self: super: { "pcg-random" = dontDistribute super."pcg-random"; "pcre-less" = dontDistribute super."pcre-less"; "pcre-light-extra" = dontDistribute super."pcre-light-extra"; - "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_1"; - "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_1"; - "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_1"; "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; "pdf2line" = dontDistribute super."pdf2line"; "pdfsplit" = dontDistribute super."pdfsplit"; @@ -5509,7 +5546,6 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; - "pipes-text" = doDistribute super."pipes-text_0_0_2_1"; "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -5597,6 +5633,7 @@ self: super: { "posix-waitpid" = dontDistribute super."posix-waitpid"; "possible" = dontDistribute super."possible"; "postcodes" = dontDistribute super."postcodes"; + "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9"; "postgresql-config" = dontDistribute super."postgresql-config"; "postgresql-connector" = dontDistribute super."postgresql-connector"; "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; @@ -5647,6 +5684,7 @@ self: super: { "primitive-simd" = dontDistribute super."primitive-simd"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; + "print-debugger" = dontDistribute super."print-debugger"; "printf-mauke" = dontDistribute super."printf-mauke"; "printxosd" = dontDistribute super."printxosd"; "priority-queue" = dontDistribute super."priority-queue"; @@ -5704,7 +5742,6 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; - "psqueues" = doDistribute super."psqueues_0_2_2_0"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5731,6 +5768,7 @@ self: super: { "push-notify-ccs" = dontDistribute super."push-notify-ccs"; "push-notify-general" = dontDistribute super."push-notify-general"; "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = doDistribute super."pusher-http-haskell_0_3_0_1"; "pushme" = dontDistribute super."pushme"; "putlenses" = dontDistribute super."putlenses"; "puzzle-draw" = dontDistribute super."puzzle-draw"; @@ -5806,6 +5844,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-tree" = dontDistribute super."random-tree"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -5888,6 +5927,7 @@ self: super: { "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; "reflex-transformers" = dontDistribute super."reflex-transformers"; + "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; "regex-easy" = dontDistribute super."regex-easy"; @@ -5936,6 +5976,9 @@ self: super: { "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; + "remote-json" = dontDistribute super."remote-json"; + "remote-json-client" = dontDistribute super."remote-json-client"; + "remote-json-server" = dontDistribute super."remote-json-server"; "remote-monad" = dontDistribute super."remote-monad"; "remotion" = dontDistribute super."remotion"; "renderable" = dontDistribute super."renderable"; @@ -5980,6 +6023,7 @@ self: super: { "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; "retryer" = dontDistribute super."retryer"; @@ -6090,6 +6134,7 @@ self: super: { "salvia-websocket" = dontDistribute super."salvia-websocket"; "sample-frame" = dontDistribute super."sample-frame"; "sample-frame-np" = dontDistribute super."sample-frame-np"; + "sampling" = dontDistribute super."sampling"; "samtools" = dontDistribute super."samtools"; "samtools-conduit" = dontDistribute super."samtools-conduit"; "samtools-enumerator" = dontDistribute super."samtools-enumerator"; @@ -6358,6 +6403,7 @@ self: super: { "smartconstructor" = dontDistribute super."smartconstructor"; "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_2_1"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; @@ -6433,6 +6479,7 @@ self: super: { "sock2stream" = dontDistribute super."sock2stream"; "sockaddr" = dontDistribute super."sockaddr"; "socket-activation" = dontDistribute super."socket-activation"; + "socket-io" = doDistribute super."socket-io_1_3_4"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; "soegtk" = dontDistribute super."soegtk"; @@ -6518,6 +6565,7 @@ self: super: { "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_13_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6583,6 +6631,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streaming-wai" = dontDistribute super."streaming-wai"; @@ -6621,7 +6670,6 @@ self: super: { "subnet" = dontDistribute super."subnet"; "subtitleParser" = dontDistribute super."subtitleParser"; "subtitles" = dontDistribute super."subtitles"; - "success" = doDistribute super."success_0_2_6"; "suffixarray" = dontDistribute super."suffixarray"; "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; @@ -6794,6 +6842,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4_1"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -6810,6 +6859,7 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -6948,6 +6998,7 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -6960,6 +7011,7 @@ self: super: { "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; "trawl" = dontDistribute super."trawl"; "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-fun" = dontDistribute super."tree-fun"; "tree-monad" = dontDistribute super."tree-monad"; "treemap-html" = dontDistribute super."treemap-html"; "treemap-html-tools" = dontDistribute super."treemap-html-tools"; @@ -7224,7 +7276,6 @@ self: super: { "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; "vect-opengl" = dontDistribute super."vect-opengl"; "vector-binary" = dontDistribute super."vector-binary"; - "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_1"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; @@ -7534,6 +7585,7 @@ self: super: { "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_6"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 58ad27a8a92..1dbe2174e50 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3123,7 +3123,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ChasingBottoms" = callPackage + "ChasingBottoms_1_3_0_13" = callPackage ({ mkDerivation, array, base, containers, mtl, QuickCheck, random , syb }: @@ -3141,6 +3141,25 @@ self: { ]; description = "For testing partial and infinite values"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ChasingBottoms" = callPackage + ({ mkDerivation, array, base, containers, mtl, QuickCheck, random + , syb + }: + mkDerivation { + pname = "ChasingBottoms"; + version = "1.3.0.14"; + sha256 = "a4a296b09d8158d25ace6fdaf17a445f30e3af14f753e6bc80282806c309704a"; + libraryHaskellDepends = [ + base containers mtl QuickCheck random syb + ]; + testHaskellDepends = [ + array base containers mtl QuickCheck random syb + ]; + description = "For testing partial and infinite values"; + license = stdenv.lib.licenses.mit; }) {}; "CheatSheet" = callPackage @@ -5001,8 +5020,8 @@ self: { pname = "Earley"; version = "0.10.1.0"; sha256 = "a90c5c1e210a0e37db577ace20b1ca2aa33d22454766ecaeb5dc253cb7d4887e"; - revision = "1"; - editedCabalFile = "2c662e0220aec5059849ac19f5ce4ad63330a4d8475332e59ad28204328cbbce"; + revision = "2"; + editedCabalFile = "310e7216914ee8e8338bc9481f6aa75f7cb2324d35ab03d29973b93bee2a725a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ListLike ]; @@ -5054,7 +5073,6 @@ self: { libraryHaskellDepends = [ array base containers EdisonAPI mtl QuickCheck ]; - jailbreak = true; homepage = "http://rwd.rdockins.name/edison/home/"; description = "A library of efficent, purely-functional data structures (Core Implementations)"; license = "unknown"; @@ -5992,7 +6010,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "FontyFruity" = callPackage + "FontyFruity_0_5_2" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , directory, filepath, text, vector }: @@ -6006,6 +6024,23 @@ self: { ]; description = "A true type file format loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "FontyFruity" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , directory, filepath, text, vector + }: + mkDerivation { + pname = "FontyFruity"; + version = "0.5.3.1"; + sha256 = "24c77ee0ff24e79eeca3d60eb0e8c86e374d49f7b770c127c346ff2fbc782ecd"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq directory filepath text + vector + ]; + description = "A true type file format loader"; + license = stdenv.lib.licenses.bsd3; }) {}; "ForSyDe" = callPackage @@ -7042,15 +7077,15 @@ self: { ({ mkDerivation, base, directory, gtk3, process, temporary }: mkDerivation { pname = "Gifcurry"; - version = "0.1.0.3"; - sha256 = "a54e2bde1b6521997af0bb4983094169eb492e65a8b5d8bc596d57d06b59e399"; + version = "0.1.0.5"; + sha256 = "6a862236c56993145cbcc015739a596c4ee46d5488f28544e0cf7ee8759b362c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory gtk3 process temporary ]; homepage = "https://github.com/lettier/gifcurry"; - description = "Create animated GIFs, overlaid with optional text, from movies"; + description = "Create animated GIFs, overlaid with optional text, from video files"; license = stdenv.lib.licenses.asl20; }) {}; @@ -9242,7 +9277,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HTTP" = callPackage + "HTTP_4000_3_2" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, conduit , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl , network, network-uri, parsec, pureMD5, split, test-framework @@ -9264,6 +9299,31 @@ self: { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "HTTP" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive, conduit + , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl + , network, network-uri, parsec, pureMD5, split, test-framework + , test-framework-hunit, time, wai, warp + }: + mkDerivation { + pname = "HTTP"; + version = "4000.3.3"; + sha256 = "bbada3c2088dc1384234cdbc1bb6089ea588da068a6a38878ea259dd19de9bf2"; + libraryHaskellDepends = [ + array base bytestring mtl network network-uri parsec time + ]; + testHaskellDepends = [ + base bytestring case-insensitive conduit conduit-extra deepseq + http-types httpd-shed HUnit mtl network network-uri pureMD5 split + test-framework test-framework-hunit wai warp + ]; + doCheck = false; + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = stdenv.lib.licenses.bsd3; }) {}; "HTTP-Simple" = callPackage @@ -10593,19 +10653,20 @@ self: { }) {}; "Hoed" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , FPretty, libgraph, mtl, process, RBTree, regex-posix - , template-haskell, threepenny-gui + ({ mkDerivation, array, base, bytestring, cereal, containers + , directory, filepath, FPretty, libgraph, mtl, process, RBTree + , regex-posix, template-haskell, threepenny-gui }: mkDerivation { pname = "Hoed"; - version = "0.3.4"; - sha256 = "c82359deccc4de43e1e5215f2c28f2fc659e701d9e18bad70f9f5c54853e5f90"; + version = "0.3.5"; + sha256 = "b14c654effc7d4926f73966be56de290d9b0d5159371fc184320033aabba1f1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers directory filepath FPretty libgraph mtl - process RBTree regex-posix template-haskell threepenny-gui + array base bytestring cereal containers directory filepath FPretty + libgraph mtl process RBTree regex-posix template-haskell + threepenny-gui ]; homepage = "https://wiki.haskell.org/Hoed"; description = "Lightweight algorithmic debugging"; @@ -11009,8 +11070,8 @@ self: { }: mkDerivation { pname = "HueAPI"; - version = "0.2.6"; - sha256 = "19515ecd8501ae038f060a3b10d391c865d07391d240b1819a55a165340e35c2"; + version = "0.2.7"; + sha256 = "041a08272fadadeac496f04d5fd3f9a4da8a4122fed2c0b9ec3e875d5273b900"; libraryHaskellDepends = [ aeson base containers lens lens-aeson mtl transformers wreq ]; @@ -13485,6 +13546,7 @@ self: { base data-default ghc-prim kan-extensions mmorph monad-products mtl parallel random transformers transformers-compat ]; + jailbreak = true; homepage = "http://alkalisoftware.net"; description = "Methods for composing monads"; license = stdenv.lib.licenses.bsd3; @@ -13545,6 +13607,7 @@ self: { libraryHaskellDepends = [ base mtl random transformers transformers-compat ]; + jailbreak = true; description = "Random-number generation monad"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -13563,6 +13626,7 @@ self: { libraryHaskellDepends = [ base mtl random transformers transformers-compat ]; + jailbreak = true; description = "Random-number generation monad"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -13579,6 +13643,7 @@ self: { libraryHaskellDepends = [ base mtl random transformers transformers-compat ]; + jailbreak = true; description = "Random-number generation monad"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -15571,19 +15636,20 @@ self: { }) {}; "Plot-ho-matic" = callPackage - ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers - , data-default-class, generic-accessors, glib, gtk3, lens, text - , time, transformers, vector + ({ mkDerivation, base, bytestring, cairo, cereal, Chart + , Chart-cairo, containers, data-default-class, generic-accessors + , glib, gtk3, lens, text, time, transformers, vector }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.9.0.1"; - sha256 = "f7cf62c612c0bdf18b7fa4791260ac7f7b1ee7bb58d8f131c358f002a9262ec9"; + version = "0.9.0.2"; + sha256 = "f67856090d2ed0c5869d57cd50da4f32c9eb8c4e654e0c0bf232765f81aea072"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base cairo Chart Chart-cairo containers data-default-class - generic-accessors glib gtk3 lens text time transformers vector + base bytestring cairo cereal Chart Chart-cairo containers + data-default-class generic-accessors glib gtk3 lens text time + transformers vector ]; executableHaskellDepends = [ base containers generic-accessors ]; description = "Real-time line plotter for generic data"; @@ -16009,7 +16075,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "QuickCheck" = callPackage + "QuickCheck_2_8_1" = callPackage ({ mkDerivation, base, containers, random, template-haskell , test-framework, tf-random, transformers }: @@ -16025,12 +16091,14 @@ self: { testHaskellDepends = [ base containers template-haskell test-framework ]; + jailbreak = true; homepage = "https://github.com/nick8325/quickcheck"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "QuickCheck_2_8_2" = callPackage + "QuickCheck" = callPackage ({ mkDerivation, base, containers, random, template-haskell , test-framework, tf-random, transformers }: @@ -16044,11 +16112,9 @@ self: { testHaskellDepends = [ base containers template-haskell test-framework ]; - jailbreak = true; homepage = "https://github.com/nick8325/quickcheck"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-GenT" = callPackage @@ -16078,6 +16144,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "QuickPlot" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, colour + , haskell-src-meta, parsec, scientific, snap, snap-core + , template-haskell, text, vector, websockets, websockets-snap + }: + mkDerivation { + pname = "QuickPlot"; + version = "0.1.0.0"; + sha256 = "f83747c013815d9a0f780a4839f6a7381d0fd867eaf8b92f8ae0333c34afef37"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring colour haskell-src-meta parsec + scientific snap snap-core template-haskell text vector websockets + websockets-snap + ]; + homepage = "http://github.com/tepf/QuickPlot#readme"; + description = "Quick and easy data visualization with Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Quickson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, either, text }: @@ -16162,15 +16249,16 @@ self: { "RFC1751" = callPackage ({ mkDerivation, base, binary, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector }: mkDerivation { pname = "RFC1751"; - version = "0.3.0.1"; - sha256 = "6a6686ca05bcbf4fc24786b2cb7f33003b7b53705e2e631b7187fff20165878c"; - libraryHaskellDepends = [ base binary bytestring ]; + version = "0.3.1.0"; + sha256 = "d19f8c3020e76c45343a746442efbeabc7e60a80d1fdf8a11e5c29723d4937c8"; + libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 + test-framework-hunit test-framework-quickcheck2 vector ]; homepage = "https://github.com/xenog/RFC1751"; description = "RFC-1751 library for Haskell"; @@ -16334,6 +16422,38 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "RNAlien_1_1_0" = callPackage + ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP + , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers + , directory, edit-distance, either-unwrap, EntrezHTTP, filepath + , hierarchical-clustering, HTTP, http-conduit, hxt, matrix, network + , parsec, process, pureMD5, random, split, Taxonomy, text, time + , transformers, vector, ViennaRNAParser + }: + mkDerivation { + pname = "RNAlien"; + version = "1.1.0"; + sha256 = "450d898235dadc7879eef1bb025713b7d55e8a271332760d8d744b4deb9636d8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base biocore biofasta BlastHTTP blastxml bytestring cassava + ClustalParser cmdargs containers directory edit-distance + either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP + http-conduit hxt matrix network parsec process pureMD5 random + Taxonomy text transformers vector ViennaRNAParser + ]; + executableHaskellDepends = [ + base biocore biofasta bytestring cassava cmdargs containers + directory either-unwrap filepath process random split time vector + ViennaRNAParser + ]; + jailbreak = true; + description = "Unsupervized construction of RNA family models"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "RNAwolf" = callPackage ({ mkDerivation, base, BiobaseTrainingData, BiobaseXNA, bytestring , cmdargs, containers, deepseq, directory, parallel, PrimitiveArray @@ -19704,6 +19824,19 @@ self: { license = "GPL"; }) {}; + "ViennaRNAParser_1_2_8" = callPackage + ({ mkDerivation, base, hspec, parsec, process, transformers }: + mkDerivation { + pname = "ViennaRNAParser"; + version = "1.2.8"; + sha256 = "5d298b026f0c40d04cc3da3d148671602bd602c1583c1812153a21f90b40f25e"; + libraryHaskellDepends = [ base parsec process transformers ]; + testHaskellDepends = [ base hspec parsec ]; + description = "Libary for parsing ViennaRNA package output"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Vulkan" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -22346,8 +22479,8 @@ self: { }: mkDerivation { pname = "adblock2privoxy"; - version = "1.4.1"; - sha256 = "6b3242a5ddba181659f9b8eb4786dfa929751aaf48a62b070040043a3e8e0613"; + version = "1.4.2"; + sha256 = "2c42c4a75720d8a988898440d06df15b10a2ff1de88fe793de7b7cfe415a339e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -22645,8 +22778,8 @@ self: { pname = "aeson"; version = "0.9.0.1"; sha256 = "92b97dbc4968a2af6bc13b499629118f85b22efe113a4d60e578fbfb0f6ef8bc"; - revision = "1"; - editedCabalFile = "651b27c1cd2730cd0234cc1fb5860dd74728e5ecc6682b2a5e857fd42d41fe22"; + revision = "2"; + editedCabalFile = "5796e32c015d96fcbce31eaf22eba93580d47a8df798bd2260732ef5eac3cb02"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq dlist ghc-prim hashable mtl scientific syb template-haskell text time transformers @@ -22657,6 +22790,7 @@ self: { template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text time unordered-containers vector ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; @@ -22693,6 +22827,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson_0_11_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq + , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck + , quickcheck-instances, scientific, semigroups, syb + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson"; + version = "0.11.0.0"; + sha256 = "ad3849d5d73824edea0fa3aa552d4c4630e67a8cf1295250e92d34b5e824add5"; + libraryHaskellDepends = [ + attoparsec base bytestring containers deepseq dlist fail ghc-prim + hashable mtl scientific semigroups syb template-haskell text time + transformers unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring containers ghc-prim HUnit QuickCheck + quickcheck-instances template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 text time + unordered-containers vector + ]; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -22758,7 +22921,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "aeson-compat" = callPackage + "aeson-compat_0_3_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , exceptions, hashable, quickcheck-instances, scientific, tasty , tasty-hunit, tasty-quickcheck, text, time, unordered-containers @@ -22780,6 +22943,33 @@ self: { homepage = "https://github.com/phadej/aeson-compat#readme"; description = "Compatibility layer for aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "aeson-compat" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , exceptions, hashable, nats, QuickCheck, quickcheck-instances + , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time + , time-locale-compat, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.1.0"; + sha256 = "9275040d031433eb0006bce8228a0828e058d547c7d07d61ab0b22154286d736"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions hashable + nats scientific text time time-locale-compat unordered-containers + vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions hashable + nats QuickCheck quickcheck-instances scientific tasty tasty-hunit + tasty-quickcheck text time time-locale-compat unordered-containers + vector + ]; + homepage = "https://github.com/phadej/aeson-compat#readme"; + description = "Compatibility layer for aeson"; + license = stdenv.lib.licenses.bsd3; }) {}; "aeson-diff" = callPackage @@ -22995,6 +23185,7 @@ self: { aeson base bytestring lens text unordered-containers vector ]; testHaskellDepends = [ base doctest ]; + doCheck = false; description = "Lens of Aeson"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -23327,8 +23518,8 @@ self: { pname = "aeson-utils"; version = "0.3.0.2"; sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f"; - revision = "1"; - editedCabalFile = "effc944d02b274ca2688671ac16fe1a8c87b6d036b0ba11d06dd404da47a8634"; + revision = "2"; + editedCabalFile = "32116e177571bd140c1d68b2c0502ba2ab58cc327cf83ca15b40521ceab61682"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -23738,8 +23929,8 @@ self: { }: mkDerivation { pname = "aivika-branches"; - version = "0.1.1"; - sha256 = "56bbc2b3e7c9d1db19828b80fd2fc04dcbd1396a32bfd4d5d8e123418428e94a"; + version = "0.1.2"; + sha256 = "6c8a2cd2b840f839881e847af3402f13cb2dc33e6fed19954477c4ae3417a417"; libraryHaskellDepends = [ aivika aivika-transformers base containers mtl random ]; @@ -24535,8 +24726,8 @@ self: { pname = "alternative-io"; version = "0.0.1"; sha256 = "90e98870a6117db09f1ce54c025944a174e643d1149d5ee76782c311d9ba1e06"; - revision = "1"; - editedCabalFile = "982094590ae1e54131d4b1285eaec6d4160717a2864858f90a3511522fc591d6"; + revision = "2"; + editedCabalFile = "08531a3a2f2c8e6c4d44a1b201feb1ec354332f75e39d635318d8f6e31e5f15a"; libraryHaskellDepends = [ base lifted-base monad-control transformers transformers-base ]; @@ -29725,7 +29916,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXScrnSaver;}; - "arbtt" = callPackage + "arbtt_0_9_0_7" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty @@ -29752,6 +29943,36 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libXScrnSaver;}; + + "arbtt" = callPackage + ({ mkDerivation, aeson, array, base, binary, bytestring + , bytestring-progress, containers, deepseq, directory, filepath + , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty + , tasty-golden, tasty-hunit, terminal-progress-bar, time + , transformers, unix, utf8-string, X11 + }: + mkDerivation { + pname = "arbtt"; + version = "0.9.0.8"; + sha256 = "cde0e72d4df6612c04ac7c4061fbd8a86dc5b993c28de82f046d85c2b71602bb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base binary bytestring bytestring-progress containers + deepseq directory filepath parsec pcre-light strict + terminal-progress-bar time transformers unix utf8-string X11 + ]; + executableSystemDepends = [ libXScrnSaver ]; + testHaskellDepends = [ + base binary bytestring containers deepseq directory parsec + pcre-light process-extras tasty tasty-golden tasty-hunit time + transformers unix utf8-string + ]; + homepage = "http://arbtt.nomeata.de/"; + description = "Automatic Rule-Based Time Tracker"; + license = "GPL"; }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage @@ -29899,6 +30120,8 @@ self: { pname = "argon"; version = "0.4.0.0"; sha256 = "49cd357e23dc8aaf1d055bde5030ea12ed4e0b18edc4550a595028e26e582899"; + revision = "1"; + editedCabalFile = "6b1f69222554d70ac99998239cdf836ddbb10d7cc83ec6c1e050c97b894c4060"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29918,6 +30141,34 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "argon_0_4_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , containers, directory, docopt, filepath, ghc, ghc-paths + , ghc-syb-utils, hlint, hspec, lens-simple, pipes, pipes-bytestring + , pipes-files, pipes-group, pipes-safe, QuickCheck, syb + }: + mkDerivation { + pname = "argon"; + version = "0.4.1.0"; + sha256 = "d93c50ae118a4493bdc5ed94e5f3d1eaa434e78422c79e28476329bad4475bea"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal containers directory ghc + ghc-paths ghc-syb-utils lens-simple pipes pipes-bytestring + pipes-files pipes-group pipes-safe syb + ]; + executableHaskellDepends = [ base docopt pipes pipes-safe ]; + testHaskellDepends = [ + aeson ansi-terminal base filepath ghc hlint hspec pipes pipes-safe + QuickCheck + ]; + homepage = "http://github.com/rubik/argon"; + description = "Measure your code's complexity"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "argon2" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty , tasty-quickcheck, text, transformers @@ -32262,6 +32513,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "awesome-prelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "awesome-prelude"; + version = "0.1.0.0"; + sha256 = "cf5edb7500a02aaba7400f3baab984680898dbedc0cf5b09ded2ca40568e6e57"; + libraryHaskellDepends = [ base ]; + homepage = "https://notabug.org/koz.ross/awesome-prelude"; + description = "A prelude which I can be happy with. Based on base-prelude."; + license = stdenv.lib.licenses.gpl3; + }) {}; + "awesomium" = callPackage ({ mkDerivation, aeson, attoparsec, awesomium-raw, base, containers , text, vector @@ -34138,6 +34401,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-prelude_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-prelude"; + version = "1"; + sha256 = "ee443310c2b3a18471f05b3c8c05ce39ea6f7825a0bf78028a06d59b3f28469c"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/base-prelude"; + description = "The most complete prelude formed from only the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-unicode-symbols" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -35158,13 +35434,14 @@ self: { testHaskellDepends = [ base hspec QuickCheck transformers transformers-compat ]; + jailbreak = true; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bifunctors" = callPackage + "bifunctors_5_2" = callPackage ({ mkDerivation, base, comonad, containers, hspec, QuickCheck , semigroups, tagged, template-haskell, transformers , transformers-compat @@ -35180,12 +35457,14 @@ self: { testHaskellDepends = [ base hspec QuickCheck transformers transformers-compat ]; + jailbreak = true; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bifunctors_5_2_1" = callPackage + "bifunctors" = callPackage ({ mkDerivation, base, comonad, containers, hspec, QuickCheck , semigroups, tagged, template-haskell, transformers , transformers-compat @@ -35201,11 +35480,10 @@ self: { testHaskellDepends = [ base hspec QuickCheck transformers transformers-compat ]; - jailbreak = true; + doHaddock = false; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -35438,15 +35716,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary_0_8_2_0" = callPackage + "binary_0_8_2_1" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, filepath, HUnit, QuickCheck, random, test-framework , test-framework-quickcheck2 }: mkDerivation { pname = "binary"; - version = "0.8.2.0"; - sha256 = "f4e51c13800407b31ec11b3d30699c62a2f0480a765c56939fa644cd36a4725d"; + version = "0.8.2.1"; + sha256 = "2452e32eccfe74214f689805745a11de1018f22eb19682772df23cce8816b750"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -35729,8 +36007,8 @@ self: { pname = "binary-orphans"; version = "0.1.4.0"; sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742"; - revision = "1"; - editedCabalFile = "be6bd79c7ab5ca7f7f4f92479064945b4242dc092f512e10497a3aafd9b625fb"; + revision = "3"; + editedCabalFile = "b81b44514f6b9e69bb1cb36484268470dd9268112d974960fb6070a4bb1f307c"; libraryHaskellDepends = [ aeson base binary hashable scientific semigroups tagged text text-binary time unordered-containers vector @@ -35779,6 +36057,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "binary-parser_0_5_2" = callPackage + ({ mkDerivation, base-prelude, bytestring, success, text + , transformers + }: + mkDerivation { + pname = "binary-parser"; + version = "0.5.2"; + sha256 = "712d30f26f8423704437e02bd5cc98cfff48fdbac0499e8cb41998f289245545"; + libraryHaskellDepends = [ + base-prelude bytestring success text transformers + ]; + homepage = "https://github.com/nikita-volkov/binary-parser"; + description = "A highly-efficient but limited parser API specialised for bytestrings"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-protocol" = callPackage ({ mkDerivation, base, binary, bytestring, mtl }: mkDerivation { @@ -35977,7 +36272,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary-tagged" = callPackage + "binary-tagged_0_1_3_0" = callPackage ({ mkDerivation, aeson, array, base, bifunctors, binary , binary-orphans, bytestring, containers, generics-sop, hashable , quickcheck-instances, scientific, SHA, tagged, tasty @@ -36000,6 +36295,32 @@ self: { homepage = "https://github.com/phadej/binary-tagged#readme"; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "binary-tagged" = callPackage + ({ mkDerivation, aeson, array, base, bifunctors, binary + , binary-orphans, bytestring, containers, generics-sop, hashable + , quickcheck-instances, scientific, SHA, tagged, tasty + , tasty-quickcheck, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "binary-tagged"; + version = "0.1.3.1"; + sha256 = "cdd99120148015a56d92ebc38380f9ea9254d6272e5d0952dae4e55eaf52252f"; + libraryHaskellDepends = [ + aeson array base binary bytestring containers generics-sop hashable + scientific SHA tagged text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base bifunctors binary binary-orphans bytestring + containers generics-sop hashable quickcheck-instances scientific + SHA tagged tasty tasty-quickcheck text time unordered-containers + vector + ]; + homepage = "https://github.com/phadej/binary-tagged#readme"; + description = "Tagged binary serialisation"; + license = stdenv.lib.licenses.bsd3; }) {}; "binary-typed" = callPackage @@ -37902,8 +38223,8 @@ self: { pname = "blank-canvas"; version = "0.6"; sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3"; - revision = "2"; - editedCabalFile = "4a18531b67c35f0343333d8281ad3acdbde48f5ff6a4b7e3e687d4eac4c2f570"; + revision = "3"; + editedCabalFile = "3a1b54006324de595823f744e3f2592e85629008eea36f4e5d7b206a91085fdf"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour containers data-default-class http-types kansas-comet mime-types @@ -40924,8 +41245,8 @@ self: { }: mkDerivation { pname = "bytestring-tree-builder"; - version = "0.2.4"; - sha256 = "5c2c3a45e60d1a58b1036139fdc4976554d6539e6333b5e9183cd580b1e10e4f"; + version = "0.2.5"; + sha256 = "05f819da3766b2521e4408497858c8fc538065375749d1dbc4d80de77e7ecf5a"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -43894,6 +44215,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cases_0_1_3" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, HTF, HUnit + , loch-th, placeholders, QuickCheck, text + }: + mkDerivation { + pname = "cases"; + version = "0.1.3"; + sha256 = "67263b179ba8687f04f76de41f8dc69833baa5dd34c7089907ff7c4cef95a928"; + libraryHaskellDepends = [ attoparsec base-prelude loch-th text ]; + testHaskellDepends = [ + base HTF HUnit loch-th placeholders QuickCheck text + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/cases"; + description = "A converter for spinal, snake and camel cases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cash" = callPackage ({ mkDerivation, base, deepseq, haskell98, HaXml, network, parallel , pretty @@ -44218,8 +44558,8 @@ self: { }: mkDerivation { pname = "cassava-streams"; - version = "0.1.1.0"; - sha256 = "87ce8074aae24c510bde7d5d96068903e0056481f5316424e605a05425216121"; + version = "0.2.0.0"; + sha256 = "b4e825309533f9bd33728de92950eea33f362ea5bfd4e04689777b3760f69d6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44229,7 +44569,6 @@ self: { base bytestring cassava io-streams QuickCheck tasty tasty-quickcheck vector ]; - jailbreak = true; homepage = "https://github.com/pjones/cassava-streams"; description = "io-streams interface for the cassava CSV library"; license = stdenv.lib.licenses.bsd3; @@ -46290,6 +46629,7 @@ self: { lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit tasty-th transformers-compat ]; + jailbreak = true; homepage = "http://clafer.org"; description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -46323,6 +46663,7 @@ self: { array base clafer cmdargs directory filepath HUnit tasty tasty-hunit tasty-th transformers transformers-compat ]; + jailbreak = true; homepage = "http://clafer.org"; description = "claferIG is an interactive tool that generates instances of Clafer models"; license = stdenv.lib.licenses.mit; @@ -46343,6 +46684,7 @@ self: { network-uri process SHA split time transformers transformers-compat utf8-string ]; + jailbreak = true; homepage = "http://github.com/gsdlab/claferwiki"; description = "A wiki-based IDE for literate modeling with Clafer"; license = stdenv.lib.licenses.mit; @@ -46590,7 +46932,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc" = callPackage + "clash-ghc_0_6_9" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl , containers, directory, filepath, ghc, ghc-typelits-extra @@ -46614,6 +46956,33 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-ghc" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib + , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl + , containers, directory, filepath, ghc, ghc-typelits-extra + , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl + , process, text, transformers, unbound-generics, unix + , unordered-containers + }: + mkDerivation { + pname = "clash-ghc"; + version = "0.6.10"; + sha256 = "5f8280cd4e71313c0b54942d34bcb698c1792e10d87da56f673b23ef7792ebcb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-verilog clash-vhdl containers directory + filepath ghc ghc-typelits-extra ghc-typelits-natnormalise hashable + haskeline lens mtl process text transformers unbound-generics unix + unordered-containers + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-lib_0_5_10" = callPackage @@ -46758,7 +47127,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib" = callPackage + "clash-lib_0_6_9" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl , filepath, hashable, lens, mtl, pretty, process, template-haskell @@ -46778,6 +47147,29 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-lib" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, hashable, lens, mtl, pretty, process, template-haskell + , text, time, transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text + }: + mkDerivation { + pname = "clash-lib"; + version = "0.6.10"; + sha256 = "93cb93dac0201f23a9821b02f4e908ef0b47f71f7da7f83f71c0a8bfa125a8e2"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clash-prelude concurrent-supply + containers deepseq directory errors fgl filepath hashable lens mtl + pretty process template-haskell text time transformers + unbound-generics unordered-containers uu-parsinglib wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude_0_9_2" = callPackage @@ -46845,7 +47237,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-prelude" = callPackage + "clash-prelude_0_10_5" = callPackage ({ mkDerivation, array, base, data-default, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens , QuickCheck, reflection, singletons, template-haskell, th-lift @@ -46863,6 +47255,27 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-prelude" = callPackage + ({ mkDerivation, array, base, data-default, doctest, ghc-prim + , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens + , QuickCheck, reflection, singletons, template-haskell, th-lift + }: + mkDerivation { + pname = "clash-prelude"; + version = "0.10.6"; + sha256 = "7056c0ac7b2fecbb9cabb3e8ac029e0a269265fa40b361089d4a3af53e6e9237"; + libraryHaskellDepends = [ + array base data-default ghc-prim ghc-typelits-extra + ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection + singletons template-haskell th-lift + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude-quickcheck" = callPackage @@ -47236,7 +47649,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-vhdl" = callPackage + "clash-vhdl_0_6_6" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -47251,6 +47664,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-vhdl" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.6.7"; + sha256 = "bbf5d4f3261dcf2f0ff570cce475045cf7f32001f6ef62980f522c64eafc5a51"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - VHDL backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "classify" = callPackage @@ -47544,7 +47975,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude" = callPackage + "classy-prelude_0_12_5" = callPackage ({ mkDerivation, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl @@ -47569,6 +48000,34 @@ self: { homepage = "https://github.com/snoyberg/classy-prelude"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude" = callPackage + ({ mkDerivation, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, dlist, enclosed-exceptions, exceptions + , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl + , mutable-containers, primitive, QuickCheck, semigroups, stm, text + , time, time-locale-compat, transformers, unordered-containers + , vector, vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "0.12.5.1"; + sha256 = "30da07b4577005fbd41f807fddef5aee34aee7593a5d1b1eab23c7f059ef18b4"; + libraryHaskellDepends = [ + base basic-prelude bifunctors bytestring chunked-data containers + dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base + mono-traversable mtl mutable-containers primitive semigroups stm + text time time-locale-compat transformers unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "A typeclass-based Prelude"; + license = stdenv.lib.licenses.mit; }) {}; "classy-prelude-conduit_0_10_2" = callPackage @@ -48289,16 +48748,19 @@ self: { }) {}; "cli" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, directory, mtl, QuickCheck, tasty + , tasty-quickcheck, terminfo, transformers + }: mkDerivation { pname = "cli"; - version = "0.0.5"; - sha256 = "2d514d8c7b17566c4cd5b9ae8f50dfad4af81fa5a81f547becb5b20faed714b2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers ]; - homepage = "https://github.com/NicolasDP/hs-cli"; - description = "Simple Command Line Interface Library"; + version = "0.1.1"; + sha256 = "a348c51e5ad1c134a39145cd3e2de5aa2ca5fca1f88262d26012df07aaf68edd"; + libraryHaskellDepends = [ base mtl terminfo transformers ]; + testHaskellDepends = [ + base directory QuickCheck tasty tasty-quickcheck transformers + ]; + homepage = "https://github.com/vincenthz/hs-cli"; + description = "Command Line Interface"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -48680,6 +49142,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clumpiness" = callPackage + ({ mkDerivation, base, containers, tree-fun }: + mkDerivation { + pname = "clumpiness"; + version = "0.17.0.0"; + sha256 = "fd4b303d206eaf242c779bb65c42256e42220c8497a6bcf3bc59589b9396c495"; + libraryHaskellDepends = [ base containers tree-fun ]; + description = "Calculate the clumpiness of leaf properties in a tree"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "cluss" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -51410,7 +51883,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit-combinators" = callPackage + "conduit-combinators_1_0_3" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers , directory, filepath, hspec, monad-control, mono-traversable, mtl @@ -51436,6 +51909,35 @@ self: { homepage = "https://github.com/fpco/conduit-combinators"; description = "Commonly used conduit functions, for both chunked and unchunked data"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit-combinators" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, chunked-data, conduit, conduit-extra, containers + , directory, filepath, hspec, monad-control, mono-traversable, mtl + , mwc-random, primitive, QuickCheck, resourcet, safe, silently + , text, transformers, transformers-base, unix, unix-compat, vector + , void + }: + mkDerivation { + pname = "conduit-combinators"; + version = "1.0.3.1"; + sha256 = "66a40be2cc964c36b06cf9b096c1a99b107dba06b62baa4b13b9c485dc4f8b48"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring chunked-data + conduit conduit-extra filepath monad-control mono-traversable + mwc-random primitive resourcet text transformers transformers-base + unix unix-compat vector void + ]; + testHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring chunked-data + conduit containers directory filepath hspec mono-traversable mtl + mwc-random QuickCheck safe silently text transformers vector + ]; + homepage = "https://github.com/fpco/conduit-combinators"; + description = "Commonly used conduit functions, for both chunked and unchunked data"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-connection" = callPackage @@ -52879,6 +53381,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "contravariant-extras_0_3_1" = callPackage + ({ mkDerivation, base, base-prelude, contravariant + , template-haskell, tuple-th + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.1"; + sha256 = "5bbdc3f535163677825b95f520f0d2f9c63cafff39aabc0f23aecd6b27f99de3"; + libraryHaskellDepends = [ + base base-prelude contravariant template-haskell tuple-th + ]; + homepage = "https://github.com/nikita-volkov/contravariant-extras"; + description = "Extras for the \"contravariant\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "control-bool" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -55691,6 +56210,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_11" = callPackage + ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim + , integer-gmp, memory, tasty, tasty-hunit, tasty-kat + , tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.11"; + sha256 = "4dedc69d6aae086fe9edd7ac3b3bdb0eef5842985eece9189e578c4c1f71676c"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base byteable bytestring memory tasty tasty-hunit tasty-kat + tasty-quickcheck + ]; + homepage = "https://github.com/haskell-crypto/cryptonite"; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -56665,12 +57206,12 @@ self: { ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist , directory, filepath, FindBin, hashable, haskeline, html, HTTP - , HUnit, mmap, mtl, network, network-uri, old-time, parsec, process - , QuickCheck, random, regex-applicative, regex-compat-tdfa, sandi - , shelly, split, tar, terminfo, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, transformers-compat, unix, unix-compat, utf8-string - , vector, zip-archive, zlib + , HUnit, mmap, mtl, network, network-uri, old-locale, old-time + , parsec, process, QuickCheck, random, regex-applicative + , regex-compat-tdfa, sandi, shelly, split, tar, terminfo + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers, transformers-compat, unix, unix-compat + , utf8-string, vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; @@ -56684,9 +57225,9 @@ self: { libraryHaskellDepends = [ array attoparsec base base16-bytestring binary bytestring containers cryptohash data-ordlist directory filepath hashable - haskeline html HTTP mmap mtl network network-uri old-time parsec - process random regex-applicative regex-compat-tdfa sandi tar - terminfo text time transformers transformers-compat unix + haskeline html HTTP mmap mtl network network-uri old-locale + old-time parsec process random regex-applicative regex-compat-tdfa + sandi tar terminfo text time transformers transformers-compat unix unix-compat utf8-string vector zip-archive zlib ]; librarySystemDepends = [ curl ]; @@ -56698,6 +57239,7 @@ self: { test-framework-hunit test-framework-quickcheck2 text unix-compat zip-archive zlib ]; + jailbreak = true; postInstall = '' mkdir -p $out/etc/bash_completion.d mv contrib/darcs_completion $out/etc/bash_completion.d/darcs @@ -57395,6 +57937,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-default-extra" = callPackage + ({ mkDerivation, base, data-default-class + , data-default-instances-base, data-default-instances-bytestring + , data-default-instances-case-insensitive + , data-default-instances-containers + , data-default-instances-new-base + , data-default-instances-old-locale, data-default-instances-text + , data-default-instances-unordered-containers + , data-default-instances-vector + }: + mkDerivation { + pname = "data-default-extra"; + version = "0.0.1"; + sha256 = "ddd73777101f49566654bae02203424bc7f4dd55ba5b839b5d2d8d4fa6d0812e"; + libraryHaskellDepends = [ + base data-default-class data-default-instances-base + data-default-instances-bytestring + data-default-instances-case-insensitive + data-default-instances-containers data-default-instances-new-base + data-default-instances-old-locale data-default-instances-text + data-default-instances-unordered-containers + data-default-instances-vector + ]; + homepage = "https://github.com/trskop/data-default-extra"; + description = "A class for types with a default value"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-default-generics" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, ghc-prim , hspec, HUnit, old-locale, text, time, unordered-containers @@ -57803,7 +58373,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-inttrie" = callPackage + "data-inttrie_0_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-inttrie"; @@ -57813,6 +58383,19 @@ self: { homepage = "http://github.com/luqui/data-inttrie"; description = "A lazy, infinite trie of integers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "data-inttrie" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "data-inttrie"; + version = "0.1.2"; + sha256 = "8ddae7ad7d3cafdf349d93c0eed5767ab1213d854980bc28d7d935163c5f1df9"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/luqui/data-inttrie"; + description = "A lazy, infinite trie of integers"; + license = stdenv.lib.licenses.bsd3; }) {}; "data-ivar" = callPackage @@ -58808,6 +59391,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dbmigrations_1_1" = callPackage + ({ mkDerivation, base, bytestring, configurator, containers + , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3 + , HUnit, MissingH, mtl, mysql, mysql-simple, process, random, split + , template-haskell, text, time, yaml-light + }: + mkDerivation { + pname = "dbmigrations"; + version = "1.1"; + sha256 = "fe8075f25f1b55a55e792e654b8708e7f093c78b2cd75c1f1867efbf1a3cc2bc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring configurator containers directory fgl filepath HDBC + HDBC-postgresql HDBC-sqlite3 mtl mysql mysql-simple random split + template-haskell text time yaml-light + ]; + executableHaskellDepends = [ base configurator ]; + testHaskellDepends = [ + base bytestring configurator containers directory fgl filepath HDBC + HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl mysql mysql-simple + process split template-haskell text time yaml-light + ]; + description = "An implementation of relational database \"migrations\""; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus_0_10_10" = callPackage ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck , containers, directory, filepath, libxml-sax, network, parsec @@ -62975,7 +63586,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "digestive-functors-aeson" = callPackage + "digestive-functors-aeson_1_1_18" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, HUnit, lens, lens-aeson, mtl, safe , scientific, tasty, tasty-hunit, text, vector @@ -62995,6 +63606,29 @@ self: { homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "digestive-functors-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , digestive-functors, HUnit, lens, lens-aeson, mtl, safe + , scientific, tasty, tasty-hunit, text, vector + }: + mkDerivation { + pname = "digestive-functors-aeson"; + version = "1.1.19"; + sha256 = "eb58a68fee918486e6ef884e946898427a75ddc6c3d1d509dd9a475341b6daa7"; + libraryHaskellDepends = [ + aeson base containers digestive-functors lens lens-aeson safe text + vector + ]; + testHaskellDepends = [ + aeson base bytestring digestive-functors HUnit mtl scientific tasty + tasty-hunit text + ]; + homepage = "http://github.com/ocharles/digestive-functors-aeson"; + description = "Run digestive-functors forms against JSON"; + license = stdenv.lib.licenses.gpl3; }) {}; "digestive-functors-blaze" = callPackage @@ -63653,8 +64287,8 @@ self: { }: mkDerivation { pname = "discrete-space-map"; - version = "0.0.4"; - sha256 = "98d53b95733cf40e4a59461c41cdec7f45f3b5810deacef8d7cdde1ea60f91b5"; + version = "0.0.5"; + sha256 = "18c12b0b2bc2796e60f5b4e8d8e10ce3c788f4723161ab0f348e53eb72cd8268"; libraryHaskellDepends = [ adjunctions base comonad distributive keys semigroupoids ]; @@ -63748,13 +64382,12 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.1.0.0"; - sha256 = "7c49a85015f428e55af318214de93ce8ab9257e627ad6ef8592b781324aac52e"; + version = "0.2.1.0"; + sha256 = "345140293e28e6feaae46e2e3e275e892d72029dbd57617ba8fc1b7251ae902f"; libraryHaskellDepends = [ base binary bytestring constraints template-haskell ]; testHaskellDepends = [ base binary hspec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/tweag/distributed-closure"; description = "Serializable closures for distributed programming"; license = stdenv.lib.licenses.bsd3; @@ -65127,8 +65760,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.2.0.3"; - sha256 = "d6c2430d273d817947cfc87bdd120e5837a32f564b174f4ba13e53879454c227"; + version = "0.2.0.4"; + sha256 = "66821e0315b1016fa3c70c6760763134b5ddbde23f644410ed12975d67b94096"; libraryHaskellDepends = [ aeson base bytestring containers data-default HsOpenSSL http-client-openssl lens lens-aeson network-uri pipes @@ -65329,8 +65962,8 @@ self: { }: mkDerivation { pname = "doctest-discover"; - version = "0.1.0.6"; - sha256 = "a39510efe8256937ab06284be91c810d429205636b8150c9aaea11e7c340f3e5"; + version = "0.1.0.7"; + sha256 = "ac6a65da517db7f264e65607a50b080b54f008ba592746ac11b7bb40107fbd70"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65341,7 +65974,6 @@ self: { ]; testHaskellDepends = [ base doctest ]; doHaddock = false; - jailbreak = true; homepage = "http://github.com/karun012/doctest-discover"; description = "Easy way to run doctests via cabal"; license = stdenv.lib.licenses.publicDomain; @@ -67052,10 +67684,9 @@ self: { ({ mkDerivation, base, bytestring, crypto-api }: mkDerivation { pname = "ed25519-donna"; - version = "0.1"; - sha256 = "260b064cf097cbea4a3c83deef975aade9ef6a3a037b9e8119324938caaeedf4"; + version = "0.1.1"; + sha256 = "6ddb25e72cb18b18e70ab9727a028c26acb0ffaa9dafafb42821c9f81d81f84e"; libraryHaskellDepends = [ base bytestring crypto-api ]; - jailbreak = true; homepage = "github.com/tommd/hs-ed25519-donna"; description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)"; license = stdenv.lib.licenses.bsd3; @@ -67455,7 +68086,10 @@ self: { pname = "effect-monad"; version = "0.6.1"; sha256 = "884b7f1b26767329051ca846ad20cef871decd992f63c2d7d50475b163d3724d"; + revision = "2"; + editedCabalFile = "5cb34f683ee8c60c89647fd5a283cbe4b640a596cf2608a937a0819503e3b3ea"; libraryHaskellDepends = [ base ghc-prim type-level-sets ]; + jailbreak = true; description = "Embeds effect systems into Haskell using parameteric effect monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -67853,7 +68487,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ekg" = callPackage + "ekg_0_4_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json , filepath, network, snap-core, snap-server, text, time , transformers, unordered-containers @@ -67869,6 +68503,25 @@ self: { homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ekg" = callPackage + ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json + , filepath, network, snap-core, snap-server, text, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "ekg"; + version = "0.4.0.9"; + sha256 = "71028dd82b19c82d8aeb3182d1b678d4deef78cfbc1bd8a23d1da45c2bb2bdb4"; + libraryHaskellDepends = [ + aeson base bytestring ekg-core ekg-json filepath network snap-core + snap-server text time transformers unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg"; + description = "Remote monitoring of processes"; + license = stdenv.lib.licenses.bsd3; }) {}; "ekg-bosun" = callPackage @@ -67923,7 +68576,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ekg-json" = callPackage + "ekg-json_0_1_0_0" = callPackage ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers }: mkDerivation { @@ -67936,6 +68589,22 @@ self: { homepage = "https://github.com/tibbe/ekg-json"; description = "JSON encoding of ekg metrics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ekg-json" = callPackage + ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers + }: + mkDerivation { + pname = "ekg-json"; + version = "0.1.0.1"; + sha256 = "ab401e93dd9238eda389a09121bae049d3ed82a031d0fa52384494c2f8f61b3f"; + libraryHaskellDepends = [ + aeson base ekg-core text unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg-json"; + description = "JSON encoding of ekg metrics"; + license = stdenv.lib.licenses.bsd3; }) {}; "ekg-log" = callPackage @@ -68329,8 +68998,8 @@ self: { }: mkDerivation { pname = "elm-init"; - version = "1.0.2"; - sha256 = "a0a3559b0e3abcc2cf11deaf97144fa5fc6b19dda84896cb0fdc90d90c061079"; + version = "1.0.3"; + sha256 = "cf185ec4ce23944dcd33ac7f364cb549182f53acfa79fc843789ca0bd7b38f8b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68907,7 +69576,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "engine-io" = callPackage + "engine-io_1_2_12" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay , text, transformers, unordered-containers, vector, websockets @@ -68924,6 +69593,26 @@ self: { homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "engine-io" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring + , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay + , text, transformers, unordered-containers, vector, websockets + }: + mkDerivation { + pname = "engine-io"; + version = "1.2.13"; + sha256 = "5fc53f8a4a0ba563b9592e7bf3d9475a4a7ce165c66cd63a303567f6a941cf45"; + libraryHaskellDepends = [ + aeson async attoparsec base base64-bytestring bytestring either + free monad-loops mwc-random stm stm-delay text transformers + unordered-containers vector websockets + ]; + homepage = "http://github.com/ocharles/engine.io"; + description = "A Haskell implementation of Engine.IO"; + license = stdenv.lib.licenses.bsd3; }) {}; "engine-io-growler" = callPackage @@ -69831,6 +70520,7 @@ self: { libraryHaskellDepends = [ base safe transformers transformers-compat ]; + jailbreak = true; description = "Simplified error-handling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -70155,6 +70845,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "esqueleto_2_4_3" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, conduit, containers + , hspec, HUnit, monad-control, monad-logger, persistent + , persistent-sqlite, persistent-template, QuickCheck, resourcet + , tagged, text, transformers, unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "2.4.3"; + sha256 = "bf555cfb40519ed1573f7bb90c65f693b9639dfa93fc2222230d3ded6e897434"; + libraryHaskellDepends = [ + base blaze-html bytestring conduit monad-logger persistent + resourcet tagged text transformers unordered-containers + ]; + testHaskellDepends = [ + base conduit containers hspec HUnit monad-control monad-logger + persistent persistent-sqlite persistent-template QuickCheck + resourcet text transformers + ]; + homepage = "https://github.com/prowdsponsor/esqueleto"; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -70610,7 +71325,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore" = callPackage + "eventstore_0_10_0_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cereal, containers , network, protobuf, random, stm, tasty, tasty-hunit, text, time , unordered-containers, uuid @@ -70631,6 +71346,30 @@ self: { description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "eventstore" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, cereal, containers + , network, protobuf, random, stm, tasty, tasty-hunit, text, time + , unordered-containers, uuid + }: + mkDerivation { + pname = "eventstore"; + version = "0.10.0.2"; + sha256 = "dab85bb0b250c01b36665a2e4945ad6b249cfa2d4d0cd2cbcd564f1b9ad575c8"; + libraryHaskellDepends = [ + aeson async base bytestring cereal containers network protobuf + random stm text time unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base stm tasty tasty-hunit text time + ]; + doCheck = false; + homepage = "http://github.com/YoEight/eventstore"; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "every-bit-counts" = callPackage @@ -70695,7 +71434,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "exact-pi" = callPackage + "exact-pi_0_4_1_0" = callPackage ({ mkDerivation, base, numtype-dk }: mkDerivation { pname = "exact-pi"; @@ -70705,9 +71444,10 @@ self: { homepage = "https://github.com/dmcclean/exact-pi"; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "exact-pi_0_4_1_1" = callPackage + "exact-pi" = callPackage ({ mkDerivation, base, numtype-dk }: mkDerivation { pname = "exact-pi"; @@ -70717,7 +71457,6 @@ self: { homepage = "https://github.com/dmcclean/exact-pi/"; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-real" = callPackage @@ -70879,6 +71618,7 @@ self: { base HUnit test-framework test-framework-hunit transformers transformers-compat ]; + jailbreak = true; description = "Type classes and monads for unchecked extensible exceptions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -72552,8 +73292,8 @@ self: { pname = "fay"; version = "0.23.1.12"; sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727"; - revision = "1"; - editedCabalFile = "4a5a1a7b9f3854292ddbc73ba9d6cdaf5ffbce062bdc015f3d4765b41ea6df1d"; + revision = "2"; + editedCabalFile = "8b1d2491a1f85893a14f5212460ec030b22e47e2da680f275f7ff619ad15b4b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73529,8 +74269,8 @@ self: { }: mkDerivation { pname = "feed-collect"; - version = "0.2.0.0"; - sha256 = "107701b470b86ef66be17fc76393995ad59e2912aa399bb4212bf63023152559"; + version = "0.2.0.1"; + sha256 = "8a3c57faec9f0e3df17fe9ad7ebf64e09973f1e485906378365b4f6c5395b81b"; libraryHaskellDepends = [ base data-default-class feed http-client http-client-tls time time-interval time-units timerep transformers utf8-string @@ -73869,6 +74609,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; + "fft_0_1_8_3" = callPackage + ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable + , QuickCheck, storable-complex, syb, transformers + }: + mkDerivation { + pname = "fft"; + version = "0.1.8.3"; + sha256 = "73f450978f2b1f2d6d549aa5a81aaeeadfe153bd8f3ce935690b149a036a3896"; + libraryHaskellDepends = [ + array base carray ix-shapable storable-complex syb transformers + ]; + libraryPkgconfigDepends = [ fftw fftwFloat ]; + testHaskellDepends = [ base carray QuickCheck storable-complex ]; + description = "Bindings to the FFTW library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; + "fftwRaw" = callPackage ({ mkDerivation, base, fftw }: mkDerivation { @@ -74565,6 +75323,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "find-clumpiness" = callPackage + ({ mkDerivation, aeson, base, bytestring, clumpiness, containers + , optparse-applicative, text, text-show, tree-fun + , unordered-containers, vector + }: + mkDerivation { + pname = "find-clumpiness"; + version = "0.2.0.1"; + sha256 = "87db2a011a2662481f59ac03f64e95ef6692519386aee51417c3894c2174da22"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base clumpiness containers text text-show tree-fun + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring clumpiness containers optparse-applicative + text tree-fun unordered-containers + ]; + homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; + description = "Find the clumpiness of labels in a tree"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "find-conduit" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -76193,8 +76975,8 @@ self: { }: mkDerivation { pname = "foldl-transduce"; - version = "0.4.7.0"; - sha256 = "8836b026467a5940be86015d34f2dfca7f0b1787fd608d1bad81a8bd25cbc8e9"; + version = "0.5.1.0"; + sha256 = "05dd7d6cc6fd8bd925346d631a287fbef24e04dd25be0228ad7a723666d33160"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers foldl free monoid-subclasses profunctors semigroupoids semigroups split text @@ -76216,8 +76998,8 @@ self: { }: mkDerivation { pname = "foldl-transduce-attoparsec"; - version = "0.1.0.1"; - sha256 = "380616c9d8ef4997ad6793ae3ac9ddd699091cefabcfcff4c981279543bdb677"; + version = "0.2.0.0"; + sha256 = "0bd4c213bd949f1aa1f6f849b9c5caee6d20a6756712efcae2e383b24fe62f73"; libraryHaskellDepends = [ attoparsec base bytestring foldl-transduce monoid-subclasses text transformers @@ -77479,16 +78261,18 @@ self: { }) {}; "free-vl" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { pname = "free-vl"; - version = "0.1.3"; - sha256 = "866cb0695f3dca802dbef507246f7833cd5167c46da42abfba88000a1a8d8837"; + version = "0.1.4"; + sha256 = "57f63ed35b42fc54fefb3cc183d0655e0d6c4a28d5371dba00fc9c9d3fa602bf"; + revision = "1"; + editedCabalFile = "150ba489128fe05a830fe3aad3771e134222a9b7327dc43676ef70b3cc99219c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base containers mtl tasty tasty-hunit ]; homepage = "http://github.com/aaronlevin/free-vl"; description = "van Laarhoven encoded Free Monad with Extensible Effects"; license = stdenv.lib.licenses.bsd3; @@ -78239,6 +79023,29 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; + "funcons-tools" = callPackage + ({ mkDerivation, base, bv, containers, directory, mtl, multiset + , parsec, split, text, vector + }: + mkDerivation { + pname = "funcons-tools"; + version = "0.1.0.0"; + sha256 = "99f2652af578a482d6f9253f9fffa057ab8fcb4272d32e6a78a23291a4fd96ef"; + revision = "2"; + editedCabalFile = "fee9ad9bc35f0d9b37f5a219ca853dd55ff6baaa761e587b27ab4e6f00716014"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bv containers directory mtl multiset parsec split text vector + ]; + executableHaskellDepends = [ + base bv containers directory mtl multiset parsec split text vector + ]; + homepage = "http://plancomps.org"; + description = "A modular interpreter for executing funcons"; + license = stdenv.lib.licenses.mit; + }) {}; + "function-combine" = callPackage ({ mkDerivation, base, data-type }: mkDerivation { @@ -79224,8 +80031,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.7"; sha256 = "1ff3c270634ba8393ff019d2b2dd47a86d98cc2ec83495324fed6fe3b2fa0c1b"; - revision = "4"; - editedCabalFile = "3d30e4aa0f8c020eb282ff899dee145caa151bebac2894a376cd9bc577dd211a"; + revision = "5"; + editedCabalFile = "010bcf68960f2c1eebdde39a33d7159b5b34554163875deddfcca84c25e3e145"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -79602,7 +80409,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "generics-sop" = callPackage + "generics-sop_0_2_0_0" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; @@ -79612,6 +80419,19 @@ self: { testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "generics-sop" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell }: + mkDerivation { + pname = "generics-sop"; + version = "0.2.1.0"; + sha256 = "f5fcdd0e6c509d35971e851d29356f718e907ff4c1bdabe17c25308a69ea9f31"; + libraryHaskellDepends = [ base ghc-prim template-haskell ]; + testHaskellDepends = [ base ]; + description = "Generic Programming using True Sums of Products"; + license = stdenv.lib.licenses.bsd3; }) {}; "genericserialize" = callPackage @@ -79928,8 +80748,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.1.0.4"; - sha256 = "9167b8822b2aa59f24d12f3baa9c5c4f16e04e1c85f3d35af388922a17f51ec0"; + version = "0.2.0.0"; + sha256 = "942f7fbb0a5a433d2211a3ffb80911cb1fcef8acd7a5d73f0a25d524cdb0c6e5"; libraryHaskellDepends = [ base bytestring cereal containers iproute mmap reinterpret-cast text @@ -81834,7 +82654,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gipeda" = callPackage + "gipeda_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, containers , directory, extra, filepath, gitlib, gitlib-libgit2, scientific , shake, split, tagged, text, unordered-containers, vector, yaml @@ -81853,6 +82673,28 @@ self: { homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gipeda" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , directory, extra, filepath, gitlib, gitlib-libgit2, scientific + , shake, split, tagged, text, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "gipeda"; + version = "0.2.0.1"; + sha256 = "8b2e6d06a7392b5ce4956a97aa6102213b790e575516c74feeaed371e0f7e12e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cassava containers directory extra filepath + gitlib gitlib-libgit2 scientific shake split tagged text + unordered-containers vector yaml + ]; + homepage = "https://github.com/nomeata/gipeda"; + description = "Git Performance Dashboard"; + license = stdenv.lib.licenses.mit; }) {}; "gist" = callPackage @@ -82160,6 +83002,72 @@ self: { inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; + "git-annex_6_20160211" = callPackage + ({ mkDerivation, aeson, async, aws, base, blaze-builder + , bloomfilter, bup, byteable, bytestring, case-insensitive + , clientsession, concurrent-output, conduit, conduit-extra + , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus + , directory, dlist, dns, edit-distance, esqueleto, exceptions + , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify + , hslogger, http-client, http-conduit, http-types, IfElse, json + , lsof, magic, MissingH, monad-control, monad-logger, mtl, network + , network-info, network-multicast, network-protocol-xmpp + , network-uri, old-locale, openssh, optparse-applicative + , path-pieces, perl, persistent, persistent-sqlite + , persistent-template, process, QuickCheck, random, regex-tdfa + , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare + , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun + , template-haskell, text, time, torrent, transformers, unix + , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls + , wget, which, xml-types, yesod, yesod-core, yesod-default + , yesod-form, yesod-static + }: + mkDerivation { + pname = "git-annex"; + version = "6.20160211"; + sha256 = "0a7d2dab17df27c06a935c469ced47a68d3c018cbb9254c9a735b584d413fb42"; + configureFlags = [ + "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" + "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" + "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" + "-fwebapp-secure" "-fwebdav" "-fxmpp" + ]; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async aws base blaze-builder bloomfilter byteable bytestring + case-insensitive clientsession concurrent-output conduit + conduit-extra containers crypto-api cryptonite data-default DAV + dbus directory dlist dns edit-distance esqueleto exceptions + fdo-notify feed filepath gnutls hinotify hslogger http-client + http-conduit http-types IfElse json magic MissingH monad-control + monad-logger mtl network network-info network-multicast + network-protocol-xmpp network-uri old-locale optparse-applicative + path-pieces persistent persistent-sqlite persistent-template + process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi + securemem shakespeare stm tasty tasty-hunit tasty-quickcheck + tasty-rerun template-haskell text time torrent transformers unix + unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types + yesod yesod-core yesod-default yesod-form yesod-static + ]; + executableSystemDepends = [ + bup curl git gnupg lsof openssh perl rsync wget which + ]; + preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; + postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; + installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; + checkPhase = "./git-annex test"; + enableSharedExecutables = false; + homepage = "http://git-annex.branchable.com/"; + description = "manage files with git, without checking their contents into git"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; + inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; + inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; + inherit (pkgs) which;}; + "git-checklist" = callPackage ({ mkDerivation, base, directory, filepath, optparse-applicative , parsec, pretty, process @@ -82513,6 +83421,8 @@ self: { pname = "github"; version = "0.14.1"; sha256 = "fcd5f8957855e4a110db2dc411916309fd7afb7105534ebe378a5698f409fa7d"; + revision = "1"; + editedCabalFile = "a03fc2c579eb4451933e82486f705a81480c030eb17c47c4bccd07fb1e302584"; libraryHaskellDepends = [ aeson aeson-compat attoparsec base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash @@ -84062,15 +84972,16 @@ self: { "gnss-converters" = callPackage ({ mkDerivation, base, basic-prelude, binary-conduit, conduit , conduit-extra, lens, resourcet, rtcm, sbp, tasty, tasty-hunit + , time }: mkDerivation { pname = "gnss-converters"; - version = "0.1.2"; - sha256 = "8e43f583e7562c086bb8de1a88ef5b5e6bdca72a3ea4645e6d9f486861d07f0c"; + version = "0.1.4"; + sha256 = "82aaaade8f41cbe7d2093db80186c7919f1786187739c8cc307864d1f2717987"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base basic-prelude conduit-extra lens rtcm sbp + base basic-prelude conduit-extra lens rtcm sbp time ]; executableHaskellDepends = [ base basic-prelude binary-conduit conduit conduit-extra resourcet @@ -84128,8 +85039,8 @@ self: { }: mkDerivation { pname = "gnuplot"; - version = "0.5.4"; - sha256 = "b05ac987c0abcac76edee80144090ae018b246f78155da2c6a5ecef8ee7da6e7"; + version = "0.5.4.1"; + sha256 = "fa54c95f5dad96e3af6a13429cf6852bffe97bd52bdd99bdce60ca9e78bee8f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85621,8 +86532,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-actor"; - version = "1.1.0.0"; - sha256 = "d7d5d9799295f5811f01be4441da968e80ad1da3e00735726235fac8581729aa"; + version = "1.1.1.0"; + sha256 = "2f2f9a7bd5b485e1b55e7aa89537c458fbeab66bbd259d8599f19cbf7b94bbd2"; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash hashable mtl unordered-containers @@ -85639,8 +86550,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-async"; - version = "1.0.0.0"; - sha256 = "3e9ed4259af38831eebfd1f2084567c9bac9c9cb5b45636b82914faec0e1e1fc"; + version = "1.0.1.0"; + sha256 = "5e9ca4486c074d3bd9de0cb03cb830e6bb6edaba3809ef4ddb8f00b95e628abc"; libraryHaskellDepends = [ async base containers deepseq exceptions gore-and-ash hashable mtl transformers unordered-containers @@ -85664,8 +86575,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-demo"; - version = "1.0.0.0"; - sha256 = "a9199fc3ad293bff3269494b1a7b96a8f175dd8defd03797ee0b7746f97a595a"; + version = "1.1.0.0"; + sha256 = "08d6fa2861a03281dee03e0baa5c23a54e7366f1d5cb1390e921b90fe8c7ab3b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85686,8 +86597,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-logging"; - version = "1.1.0.0"; - sha256 = "b23ca7f32dc44894519cf62c1107876da448db703c1254e573f394c31bc7d678"; + version = "1.1.1.0"; + sha256 = "c35b4523e7eaaf601684b8c4054b33a787732524d8437c0c6d18abb2ff012fdd"; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash mtl text text-show transformers @@ -85699,24 +86610,23 @@ self: { "gore-and-ash-network" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, exceptions - , extra, ghc-prim, gmp, gore-and-ash, gore-and-ash-logging - , hashable, integer-gmp, mtl, network, text, text-show - , typesafe-endian, unordered-containers + , extra, ghc-prim, gore-and-ash, gore-and-ash-logging, hashable + , integer-gmp, mtl, network, text, text-show, typesafe-endian + , unordered-containers }: mkDerivation { pname = "gore-and-ash-network"; - version = "1.1.0.1"; - sha256 = "ef61dd238dde6ba45fb437db60c3d93d5626351d27dbe299d712b9f241e80d69"; + version = "1.2.2.0"; + sha256 = "29e057aa8fefad346800af73419310024cf363641012a538d3e4f9bd68eec9c7"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions extra ghc-prim gore-and-ash gore-and-ash-logging hashable integer-gmp mtl network text text-show typesafe-endian unordered-containers ]; - librarySystemDepends = [ gmp ]; homepage = "https://github.com/Teaspot-Studio/gore-and-ash-network"; description = "Core module for Gore&Ash engine with low level network API"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) gmp;}; + }) {}; "gore-and-ash-sdl" = callPackage ({ mkDerivation, base, containers, deepseq, exceptions @@ -85725,8 +86635,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-sdl"; - version = "1.1.0.1"; - sha256 = "44ab31fc793e2ca7416b920f94c54a08dcf9304e1cc84779c123b3a773674940"; + version = "2.0.0.0"; + sha256 = "0a351f7be59a61ea6f9b1c535c259c94ef4420a45d09fd6b79515948cd7636ec"; libraryHaskellDepends = [ base containers deepseq exceptions gore-and-ash lens linear mtl sdl2 text transformers unordered-containers @@ -85744,8 +86654,8 @@ self: { }: mkDerivation { pname = "gore-and-ash-sync"; - version = "1.1.0.0"; - sha256 = "41aea8a5d021c55c130364f0726be9e4fda7a99c5e777c8b2cdca33c1b901ea2"; + version = "1.1.1.0"; + sha256 = "2b83fd24a3c4d671f513a3e229289fc548f2ad6c5cee8a0f08fde6383ff33411"; libraryHaskellDepends = [ base bytestring cereal containers deepseq exceptions gore-and-ash gore-and-ash-actor gore-and-ash-logging gore-and-ash-network @@ -86026,6 +86936,7 @@ self: { base containers deepseq hashable HTF mtl QuickCheck safe unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/factisresearch/graph-core"; description = "Fast, memory efficient and persistent graph implementation"; license = stdenv.lib.licenses.mit; @@ -88665,47 +89576,6 @@ self: { }) {}; "hOpenPGP" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib - , conduit, conduit-extra, containers, crypto-cipher-types - , cryptonite, data-default-class, errors, hashable - , incremental-parser, ixset-typed, lens, memory, monad-loops - , nettle, network, network-uri, newtype, openpgp-asciiarmor - , QuickCheck, quickcheck-instances, resourcet, securemem - , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text - , time, time-locale-compat, transformers, unordered-containers - , wl-pprint-extras, zlib - }: - mkDerivation { - pname = "hOpenPGP"; - version = "2.4.2"; - sha256 = "dc8472877d202c65f206f937801499cd904d65110414ba5522c5ac1a168aadb8"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bifunctors binary - binary-conduit byteable bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite data-default-class errors - hashable incremental-parser ixset-typed lens memory monad-loops - nettle network network-uri newtype openpgp-asciiarmor resourcet - securemem semigroups split text time time-locale-compat - transformers unordered-containers wl-pprint-extras zlib - ]; - testHaskellDepends = [ - aeson attoparsec base bifunctors binary binary-conduit byteable - bytestring bzlib conduit conduit-extra containers - crypto-cipher-types cryptonite data-default-class errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype QuickCheck quickcheck-instances - resourcet securemem semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers - unordered-containers wl-pprint-extras zlib - ]; - homepage = "http://floss.scru.org/hOpenPGP/"; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hOpenPGP_2_4_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib , conduit, conduit-extra, containers, crypto-cipher-types @@ -92239,6 +93109,7 @@ self: { testHaskellDepends = [ base bytestring containers HUnit parsec zlib ]; + jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -92269,6 +93140,7 @@ self: { testHaskellDepends = [ base bytestring containers HUnit parsec zlib ]; + jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -93068,6 +93940,8 @@ self: { pname = "hashable-time"; version = "0.2"; sha256 = "97b722ab467fae0d499de91bfaf3d6e346c7c1cac126796f0031aee5dbfe2b0a"; + revision = "1"; + editedCabalFile = "b925aba56f1b9a5a1952fae307eaf8ee653293b68651d3807c3852dc4c771d35"; libraryHaskellDepends = [ base hashable time ]; description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; @@ -95110,8 +95984,8 @@ self: { }: mkDerivation { pname = "haskellscrabble"; - version = "1.4.3"; - sha256 = "73b49427676a19a55bc8c86deee8b1864cdbd39f15b74d811d7b8cc8ac1f3d9b"; + version = "2.0.1"; + sha256 = "514e4af38a6e889532437fcfad09479c247e0097c01f5f01295b01beda4596e4"; libraryHaskellDepends = [ array arrows base containers errors listsafe mtl parsec QuickCheck random safe semigroups split transformers unordered-containers @@ -96039,6 +96913,7 @@ self: { quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time transformers uuid vector ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/hasql"; description = "A very efficient PostgreSQL driver and a flexible mapping API"; @@ -96071,6 +96946,7 @@ self: { quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time transformers uuid vector ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/hasql"; description = "A very efficient PostgreSQL driver and a flexible mapping API"; @@ -96104,6 +96980,7 @@ self: { quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time transformers uuid vector ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/hasql"; description = "A very efficient PostgreSQL driver and a flexible mapping API"; @@ -96111,7 +96988,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hasql" = callPackage + "hasql_0_19_6" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , contravariant, contravariant-extras, data-default-class, dlist , either, hashable, hashtables, loch-th, mtl, placeholders @@ -96137,10 +97014,76 @@ self: { quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time transformers uuid vector ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/hasql"; description = "A very efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hasql" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , contravariant, contravariant-extras, data-default-class, dlist + , either, hashable, hashtables, loch-th, mtl, placeholders + , postgresql-binary, postgresql-libpq, profunctors, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.7"; + sha256 = "d7fd13c5b31de9e0df8531915de9e50087dd97560b1e9d8a82b8279e1763c239"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring contravariant + contravariant-extras data-default-class dlist either hashable + hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors scientific text time transformers uuid + vector + ]; + testHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + data-default-class dlist either hashable profunctors QuickCheck + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text time transformers uuid vector + ]; + doCheck = false; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "A very efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hasql_0_19_8" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , contravariant, contravariant-extras, data-default-class, dlist + , either, hashable, hashtables, loch-th, mtl, placeholders + , postgresql-binary, postgresql-libpq, profunctors, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.8"; + sha256 = "34eaaa18216ba49621f7cf4ae5202299c8e2b57b460ac45a8dc161a159a564d1"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring contravariant + contravariant-extras data-default-class dlist either hashable + hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors scientific text time transformers uuid + vector + ]; + testHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + data-default-class dlist either hashable profunctors QuickCheck + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text time transformers uuid vector + ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "A very efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-backend_0_2_1" = callPackage @@ -96258,6 +97201,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-optparse-applicative" = callPackage + ({ mkDerivation, base-prelude, hasql, hasql-pool + , optparse-applicative + }: + mkDerivation { + pname = "hasql-optparse-applicative"; + version = "0.1"; + sha256 = "42f0b2acdfd1e213f8c30f65abeb063cb62534cb8d8a2f7950201409b00b7ac5"; + libraryHaskellDepends = [ + base-prelude hasql hasql-pool optparse-applicative + ]; + homepage = "https://github.com/sannsyn/hasql-optparse-applicative"; + description = "\"optparse-applicative\" parsers for \"hasql\""; + license = stdenv.lib.licenses.mit; + }) {}; + "hasql-pool" = callPackage ({ mkDerivation, base-prelude, hasql, resource-pool, time }: mkDerivation { @@ -97567,8 +98526,8 @@ self: { }: mkDerivation { pname = "hcoap"; - version = "0.1.0.2"; - sha256 = "71a2ecfde4fc2a17d116d5cfacd6868b6abe7ae851b834710173dc6e449952a2"; + version = "0.1.1.0"; + sha256 = "95cbfdd22d8e41da208f5bc8aafcc252e215b56df5db4163401f0f8c71504d8d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97576,7 +98535,7 @@ self: { ]; executableHaskellDepends = [ base bytestring network ]; testHaskellDepends = [ - base bytestring HUnit network QuickCheck random + async base bytestring HUnit network QuickCheck random ]; homepage = "https://github.com/lulf/hcoap"; description = "CoAP implementation for Haskell"; @@ -99583,13 +100542,13 @@ self: { }: mkDerivation { pname = "hfmt"; - version = "0.0.2.1"; - sha256 = "1bf5c1e5b686af47739f8589134889812fd7313049777001acf74bae38011373"; + version = "0.0.2.2"; + sha256 = "36610511a051f13e8b604f090eff467ff88bf40d2edc809d99d7246b9ac22d5f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal Diff directory filepath haskell-src-exts hindent hlint - HUnit pipes pretty stylish-haskell text + base Cabal directory filepath haskell-src-exts hindent hlint HUnit + pipes stylish-haskell text ]; executableHaskellDepends = [ ansi-wl-pprint base Diff optparse-applicative pipes pretty @@ -104962,6 +105921,48 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "hoppy-generator" = callPackage + ({ mkDerivation, base, containers, directory, filepath, haskell-src + , mtl + }: + mkDerivation { + pname = "hoppy-generator"; + version = "0.1.0"; + sha256 = "b21263c50e730e903873c59dcbb9e88ce35db066713c22938e2b87e12e7d0fad"; + libraryHaskellDepends = [ + base containers directory filepath haskell-src mtl + ]; + homepage = "http://khumba.net/projects/hoppy"; + description = "C++ FFI generator - Code generator"; + license = stdenv.lib.licenses.agpl3; + }) {}; + + "hoppy-runtime" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hoppy-runtime"; + version = "0.1.0"; + sha256 = "b0f7721ef01bb4f1b4b7e9debbb6c18d0ec06eae058ef3c7160f64a026e05ddb"; + libraryHaskellDepends = [ base ]; + homepage = "http://khumba.net/projects/hoppy"; + description = "C++ FFI generator - Runtime support"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "hoppy-std" = callPackage + ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: + mkDerivation { + pname = "hoppy-std"; + version = "0.1.0"; + sha256 = "adde5ad934f9e52d69e9c7f246d208d2a9ded339434c4bde8633d5193ba03d78"; + libraryHaskellDepends = [ + base filepath haskell-src hoppy-generator + ]; + homepage = "http://khumba.net/projects/hoppy"; + description = "C++ FFI generator - Standard library bindings"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hops" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring , conduit, conduit-extra, containers, deepseq, directory, filepath @@ -107558,6 +108559,8 @@ self: { aeson aeson-lens async base containers data-default deepseq hformat hspec lens mtl text ]; + doHaddock = false; + doCheck = false; homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc"; license = stdenv.lib.licenses.bsd3; @@ -110033,14 +111036,13 @@ self: { }: mkDerivation { pname = "hsqml-demo-morris"; - version = "0.3.1.0"; - sha256 = "ada2125507c42987735cfdb7bd13dd205958527788b44ca20c5b3f482865727e"; + version = "0.3.1.1"; + sha256 = "15d6fd3a62ccd3988eafafb0707775b6a0c7c749073644da30e0550bbd01d998"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers deepseq directory hsqml OddWord text ]; - jailbreak = true; homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "HsQML-based implementation of Nine Men's Morris"; license = stdenv.lib.licenses.bsd3; @@ -112895,7 +113897,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http2" = callPackage + "http2_1_4_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, containers, directory, doctest, filepath , Glob, hex, hspec, psqueues, stm, text, unordered-containers @@ -112923,6 +113925,37 @@ self: { ]; description = "HTTP/2.0 library including frames and HPACK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , bytestring-builder, containers, directory, doctest, filepath + , Glob, hex, hspec, psqueues, stm, text, unordered-containers + , vector, word8 + }: + mkDerivation { + pname = "http2"; + version = "1.4.5"; + sha256 = "34c6e481b2ce00180ce86370af3d06b01afe762360289fa945abbf8a55c5dba5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring bytestring-builder containers psqueues stm + unordered-containers + ]; + executableHaskellDepends = [ + aeson aeson-pretty array base bytestring bytestring-builder + containers directory filepath hex text unordered-containers vector + word8 + ]; + testHaskellDepends = [ + aeson aeson-pretty array base bytestring bytestring-builder + containers directory doctest filepath Glob hex hspec psqueues stm + text unordered-containers vector word8 + ]; + description = "HTTP/2.0 library including frames and HPACK"; + license = stdenv.lib.licenses.bsd3; }) {}; "httpd-shed" = callPackage @@ -115442,6 +116475,8 @@ self: { pname = "ide-backend"; version = "0.10.0.1"; sha256 = "07186ec1d8135e94fac39c16fc10145c3a6cee957b96fa739f240afd0ae5faf0"; + revision = "1"; + editedCabalFile = "cf76e099362742622e03b1463e55eb77e4488755afbc768fe2aca9e8c163662d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115647,6 +116682,8 @@ self: { pname = "ide-backend-common"; version = "0.10.1.2"; sha256 = "031028f38e1a6174a58665cecd882356c6ca7579c6c21a9e2461f13d81a5915b"; + revision = "1"; + editedCabalFile = "c4caa9457f4890700a79c91a9c71d11785bc43bb4bb7564e01e6b787736b9dd9"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring binary bytestring bytestring-trie containers crypto-api data-accessor directory @@ -116940,7 +117977,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "include-file" = callPackage + "include-file_0_1_0_2" = callPackage ({ mkDerivation, base, bytestring, random, template-haskell }: mkDerivation { pname = "include-file"; @@ -116952,9 +117989,10 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Inclusion of files in executables at compile-time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "include-file_0_1_0_3" = callPackage + "include-file" = callPackage ({ mkDerivation, base, bytestring, random, template-haskell }: mkDerivation { pname = "include-file"; @@ -116966,7 +118004,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Inclusion of files in executables at compile-time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-computing" = callPackage @@ -118306,7 +119343,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "invariant" = callPackage + "invariant_0_3" = callPackage ({ mkDerivation, array, base, bifunctors, containers, contravariant , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar , stm, tagged, template-haskell, transformers, transformers-compat @@ -118327,9 +119364,10 @@ self: { homepage = "https://github.com/nfrisby/invariant-functors"; description = "Haskell 98 invariant functors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "invariant_0_3_1" = callPackage + "invariant" = callPackage ({ mkDerivation, array, base, bifunctors, containers, contravariant , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar , stm, tagged, template-haskell, transformers, transformers-compat @@ -118348,7 +119386,6 @@ self: { homepage = "https://github.com/nfrisby/invariant-functors"; description = "Haskell 98 invariant functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-syntax" = callPackage @@ -119617,9 +120654,12 @@ self: { pname = "ivor"; version = "0.1.14.1"; sha256 = "90f91a08095f7bd37615bec3108a3f2a1d7783193924b3b78659f3dba79b3e65"; + revision = "1"; + editedCabalFile = "32900700e14c90c9c9aad7d7790c36540bad4c7a4af16cfdc1c16c6289902635"; libraryHaskellDepends = [ base binary containers directory haskell98 mtl parsec ]; + jailbreak = true; homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/"; description = "Theorem proving library based on dependent type theory"; license = stdenv.lib.licenses.bsd3; @@ -121303,8 +122343,8 @@ self: { }: mkDerivation { pname = "json-rpc"; - version = "0.7.0.2"; - sha256 = "e8187d8946735a2e6845ddcc4097181c99d750aea2b9c4563bf9765e86c3be82"; + version = "0.7.1.1"; + sha256 = "e7587e2a4bdbfcee27aaf28718f9ff9199a4f5f6d742a93b9b077e4df49ff247"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra deepseq hashable lifted-async monad-control monad-logger mtl QuickCheck stm @@ -121315,7 +122355,6 @@ self: { QuickCheck stm stm-conduit test-framework test-framework-quickcheck2 text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/xenog/json-rpc"; description = "Fully-featured JSON-RPC 2.0 library"; license = stdenv.lib.licenses.publicDomain; @@ -121330,8 +122369,8 @@ self: { }: mkDerivation { pname = "json-rpc-client"; - version = "0.2.2.0"; - sha256 = "370fb8122243ada541060a4ea201d54f19d3031b7a524ec5176545a31be72740"; + version = "0.2.3.0"; + sha256 = "6c4325ad6d9fc8552d496f6bf680444dd90454c44c3a4265ed7e9a5b473f6a3a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121355,8 +122394,8 @@ self: { }: mkDerivation { pname = "json-rpc-server"; - version = "0.2.2.0"; - sha256 = "49eefc830aa7164662ea2a6263e9ea5d2379ebe21de6c6eaa463847e4c4ce33c"; + version = "0.2.3.0"; + sha256 = "73d633f3bfeea0ad785916c53afb1f4e3d481bef55977dc20d51297180148337"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121611,8 +122650,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96"; - revision = "2"; - editedCabalFile = "34b4f2ea278bbcb6cd0e6ed8e6d5f0e97f71c6885bc72914d3f47a372cf07d3b"; + revision = "3"; + editedCabalFile = "a919f70860dd9f379002ed0db301bbee85803dbf2661ae4c0d1f3045987f5233"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -121658,20 +122697,20 @@ self: { }) {}; "json-stream" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, hspec + ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec , QuickCheck, quickcheck-unicode, scientific, text , unordered-containers, vector }: mkDerivation { pname = "json-stream"; - version = "0.4.0.0"; - sha256 = "10efbff41ba46c62b0f78f650275b3dcc1c5665edca7291143ddc9a7bbc8880a"; + version = "0.4.1.0"; + sha256 = "eaaec9b5f640203e2aa4d78988966440e24e8c76a97e25292db630cc51d3f497"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring directory hspec QuickCheck quickcheck-unicode - scientific text unordered-containers vector + aeson base bytestring directory doctest hspec QuickCheck + quickcheck-unicode scientific text unordered-containers vector ]; homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; @@ -121930,8 +122969,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.2"; - sha256 = "efbaefbbe3a6b66aea18885faf8ddfc3c84ce58ebbd507aebefd36336f278a4f"; + version = "0.2.3"; + sha256 = "e57562e66b77b22f9297f5bc9e8c0e0fb00d6073f3ab0a04839284db5c6f67f9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122209,8 +123248,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1"; - revision = "2"; - editedCabalFile = "7130c2d96d36883b648d583fda40b74b7880f217213dd11827eef86caf7bc927"; + revision = "3"; + editedCabalFile = "94126550ee61faf694feaf83218fb9ff4a15dbe08d66403f2833167378842115"; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time transformers unordered-containers @@ -124200,6 +125239,8 @@ self: { pname = "lambdabot-haskell-plugins"; version = "5.0.3"; sha256 = "a11f264918af611b4dd48e698302b73b70952f196307051acd584979e327ca47"; + revision = "1"; + editedCabalFile = "32242e812c3d3dff424a6672d6678878132aefa8e195b438da45124dbdca0e9a"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts hoogle HTTP IOSpec @@ -124208,6 +125249,7 @@ self: { parsec pretty process QuickCheck regex-tdfa show split syb transformers utf8-string vector-space ]; + jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; @@ -125920,7 +126962,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-thrift" = callPackage + "language-thrift_0_7_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens , parsers, QuickCheck, text, transformers, trifecta, wl-pprint }: @@ -125942,6 +126984,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-thrift" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover + , megaparsec, QuickCheck, text, transformers + }: + mkDerivation { + pname = "language-thrift"; + version = "0.8.0.0"; + sha256 = "1bfb07ecaa49d8cffa2b985f1d820607ca6369692a98ea7f9f3ec3133959452a"; + libraryHaskellDepends = [ + ansi-wl-pprint base megaparsec text transformers + ]; + testHaskellDepends = [ + ansi-wl-pprint base hspec hspec-discover megaparsec QuickCheck text + ]; + homepage = "https://github.com/abhinav/language-thrift"; + description = "Parser and pretty printer for the Thrift IDL format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-typescript" = callPackage ({ mkDerivation, base, containers, parsec, pretty }: mkDerivation { @@ -126229,6 +127291,8 @@ self: { pname = "lattices"; version = "1.5.0"; sha256 = "c6e3fb4334503b9087209195f40c96f56819497f999959358a2ff5d843a45d1f"; + revision = "1"; + editedCabalFile = "566d0c60f273b1d938dd9db805546fbcd4b53c132f1dfa259d6d23e212e88512"; libraryHaskellDepends = [ base containers deepseq hashable semigroups tagged universe-base universe-reverse-instances unordered-containers void @@ -126933,7 +127997,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens_4_13_1" = callPackage + "lens_4_13_2" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring , comonad, containers, contravariant, deepseq, directory , distributive, doctest, exceptions, filepath, free @@ -126946,10 +128010,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.13.1"; - sha256 = "987137d11f189e08ceeb0e2e5c047c1456ad666642974067d2d8e11309ef6b7b"; - revision = "1"; - editedCabalFile = "35b2594d3e37b4294c2a9dd3e7620af7a27ce10044631a2f91611cdaf66a55f9"; + version = "4.13.2"; + sha256 = "814b7b35949cc8a3ad1a35fc39b88fc3b78bbfb339097f3f3438627048155b78"; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -127094,8 +128156,8 @@ self: { pname = "lens-aeson"; version = "1.0.0.5"; sha256 = "65faad5b75852209b4c6df43ae1f7460c2b94bf3bbc10b5cd529f43c743a5d9f"; - revision = "1"; - editedCabalFile = "806f94330f5b813192f1cfe62a0c07ecb43ecdb1f83b94e4aa704e7d2be017da"; + revision = "2"; + editedCabalFile = "fb2b4c4dc5b44f95da81837394ea09416dd0211dd98e23c30c2473e2b39e844c"; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -127841,8 +128903,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.9"; - sha256 = "621f0dbd1bfc57d7fbd593698ed31af9b1943ba65fc9ece31514d6caab58748a"; + version = "1.10"; + sha256 = "d5d6152c80ae8be8c43ff02f1e74ac114b734254426a289f2b89e5815f9f232f"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -128338,25 +129400,6 @@ self: { }) {}; "lift-generics" = callPackage - ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim - , hspec, template-haskell - }: - mkDerivation { - pname = "lift-generics"; - version = "0.1"; - sha256 = "77db9dacd191547300bd303555492f81cfbb00827d6364495f98fce053a627e1"; - libraryHaskellDepends = [ - base generic-deriving ghc-prim template-haskell - ]; - testHaskellDepends = [ - base base-compat generic-deriving hspec template-haskell - ]; - homepage = "https://github.com/RyanGlScott/lift-generics"; - description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lift-generics_0_1_1" = callPackage ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim , hspec, template-haskell }: @@ -128370,11 +129413,9 @@ self: { testHaskellDepends = [ base base-compat generic-deriving hspec template-haskell ]; - jailbreak = true; homepage = "https://github.com/RyanGlScott/lift-generics"; description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-async_0_2_0_2" = callPackage @@ -129931,6 +130972,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "list-t_0_4_6" = callPackage + ({ mkDerivation, base-prelude, HTF, mmorph, monad-control, mtl + , mtl-prelude, transformers, transformers-base + }: + mkDerivation { + pname = "list-t"; + version = "0.4.6"; + sha256 = "fe49a4fee6f166c677758e26bb26dadd8fa57c5a8fa288c64bbcaeeb420467b2"; + libraryHaskellDepends = [ + base-prelude mmorph monad-control mtl transformers + transformers-base + ]; + testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; + homepage = "https://github.com/nikita-volkov/list-t"; + description = "ListT done right"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "list-t-attoparsec" = callPackage ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t , list-t-text, text, transformers @@ -130101,8 +131161,8 @@ self: { }: mkDerivation { pname = "lit"; - version = "0.1.0.9"; - sha256 = "6e84201625f8924da5f63eee8fe66b89bbf70bd5631509c9fd3eaef0f05c240f"; + version = "0.1.10.0"; + sha256 = "549f3ad1a97c14c4bae4d74e49322efa5a10f5ad9056ab82b7d9529ae04f3636"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130361,8 +131421,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.5.1.1"; - sha256 = "e1f636b445b5a161750273d11a4a70ac1263c237dd47b1b347c6150fdfd29733"; + version = "3.5.1.2"; + sha256 = "2075b44cc1475a8623e7164add94d7b9f31ca9a157e099b23389b892886bd297"; libraryHaskellDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -130386,10 +131446,8 @@ self: { }: mkDerivation { pname = "llvm-general-pure"; - version = "3.5.0.0"; - sha256 = "612d2e40ea69da99940357d88098ef30f1eaf8eda18a2f084fc300f097a3d2f8"; - revision = "1"; - editedCabalFile = "64ab5cdad51aaff9fcb168afee8ef6602287e8ee24c156564adc1adfd7ad1119"; + version = "3.5.1.0"; + sha256 = "e5349189b1c203793dd4f0e2a582b633f09fa311340189b3ade004f4794b8097"; libraryHaskellDepends = [ base containers mtl parsec setenv template-haskell transformers ]; @@ -130397,6 +131455,7 @@ self: { base containers HUnit mtl QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + homepage = "http://github.com/bscarlet/llvm-general/"; description = "Pure Haskell LLVM functionality (no FFI)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -133683,7 +134742,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mandrill" = callPackage + "mandrill_0_5_0_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, containers, email-validate, http-client , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck @@ -133705,6 +134764,31 @@ self: { ]; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mandrill" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , bytestring, containers, email-validate, http-client + , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck + , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time + , unordered-containers + }: + mkDerivation { + pname = "mandrill"; + version = "0.5.1.0"; + sha256 = "107ca6fe552fe86585fff7b31452073140be1df039a7baadd7e1efb880a063d1"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-html bytestring containers + email-validate http-client http-client-tls http-types lens mtl + old-locale QuickCheck text time unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Library for interfacing with the Mandrill JSON API"; + license = stdenv.lib.licenses.mit; }) {}; "mandulia" = callPackage @@ -133905,8 +134989,8 @@ self: { }: mkDerivation { pname = "mappy"; - version = "0.1.2.1"; - sha256 = "54f6af643b2aeb6245ec92717a27dfca4e8b0b65442fef39cf09cd09b83268d8"; + version = "0.1.3.0"; + sha256 = "6446e847c2663f752184b81c9e4f541bc7ada3fc0a8bcde9435a20363a3b72cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135886,7 +136970,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-aeson" = callPackage + "microlens-aeson_2_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , doctest, filepath, generic-deriving, microlens, scientific , semigroups, simple-reflect, text, unordered-containers, vector @@ -135906,6 +136990,29 @@ self: { homepage = "http://github.com/fosskers/microlens-aeson/"; description = "Law-abiding lenses for Aeson, using microlens"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-aeson" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, directory + , doctest, filepath, generic-deriving, microlens, scientific + , semigroups, simple-reflect, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-aeson"; + version = "2.1.1"; + sha256 = "5b43bcdc52d4b86b8c74040f754209efa95f5983d5d114d2af6709949614acda"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring microlens scientific text + unordered-containers vector + ]; + testHaskellDepends = [ + base directory doctest filepath generic-deriving semigroups + simple-reflect + ]; + homepage = "http://github.com/fosskers/microlens-aeson/"; + description = "Law-abiding lenses for Aeson, using microlens"; + license = stdenv.lib.licenses.mit; }) {}; "microlens-contra" = callPackage @@ -136126,6 +137233,8 @@ self: { pname = "microlens-th"; version = "0.2.2.0"; sha256 = "bf52318c0898294ab356ba75f72b880b9453cbc9df809b71aeac8081105596f9"; + revision = "1"; + editedCabalFile = "838249b8311e60d02769f4d6f106be52451179d3656842d43e11d866c46b2a8e"; libraryHaskellDepends = [ base containers microlens template-haskell ]; @@ -136142,6 +137251,8 @@ self: { pname = "microlens-th"; version = "0.3.0.0"; sha256 = "951eaf33daf3b648082f754a6c091a8401bad39f5d5f659bad22252fe214d866"; + revision = "1"; + editedCabalFile = "9c75b584e225de81b1114a1bf81fad5f7b7c44d5d9271b09235b24ed6d17d02b"; libraryHaskellDepends = [ base containers microlens template-haskell ]; @@ -136150,6 +137261,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-th_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell }: + mkDerivation { + pname = "microlens-th"; + version = "0.3.0.1"; + sha256 = "05576f60d3cafc2f4554164330e864d965f2de8912cd29c802c2c11d719eba52"; + libraryHaskellDepends = [ + base containers microlens template-haskell + ]; + homepage = "http://github.com/aelve/microlens"; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microtimer" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -137743,6 +138869,7 @@ self: { libraryHaskellDepends = [ base transformers transformers-base transformers-compat ]; + jailbreak = true; homepage = "https://github.com/basvandijk/monad-control"; description = "Lift control operations, like exception catching, through monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -137816,7 +138943,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-coroutine" = callPackage + "monad-coroutine_0_9_0_1" = callPackage ({ mkDerivation, base, monad-parallel, transformers , transformers-compat }: @@ -137827,12 +138954,14 @@ self: { libraryHaskellDepends = [ base monad-parallel transformers transformers-compat ]; + jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine"; description = "Coroutine monad transformer for suspending and resuming monadic computations"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-coroutine_0_9_0_2" = callPackage + "monad-coroutine" = callPackage ({ mkDerivation, base, monad-parallel, transformers , transformers-compat }: @@ -137846,7 +138975,6 @@ self: { homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine"; description = "Coroutine monad transformer for suspending and resuming monadic computations"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-exception" = callPackage @@ -138496,13 +139624,14 @@ self: { libraryHaskellDepends = [ base parallel transformers transformers-compat ]; + jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-parallel" = callPackage + "monad-parallel_0_7_2_0" = callPackage ({ mkDerivation, base, parallel, transformers, transformers-compat }: mkDerivation { @@ -138512,12 +139641,14 @@ self: { libraryHaskellDepends = [ base parallel transformers transformers-compat ]; + jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-parallel_0_7_2_1" = callPackage + "monad-parallel" = callPackage ({ mkDerivation, base, parallel, transformers, transformers-compat }: mkDerivation { @@ -138530,7 +139661,6 @@ self: { homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-parallel-progressbar" = callPackage @@ -140821,6 +141951,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multiaddr" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, cereal, errors + , hashable, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "multiaddr"; + version = "0.1.0"; + sha256 = "704a76498f4b0e7078151771124ddb1f4facc6e6f3d2d068c2d2f4cc9ac96b8e"; + libraryHaskellDepends = [ + attoparsec base bytestring cereal errors hashable text + ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "http://github.com/micxjo/hs-multiaddr"; + description = "A network address format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multiarg_0_30_0_8" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck , tasty-th @@ -141724,7 +142873,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mwc-probability" = callPackage + "mwc-probability_1_0_2" = callPackage ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; @@ -141734,6 +142883,32 @@ self: { homepage = "http://github.com/jtobin/mwc-probability"; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mwc-probability" = callPackage + ({ mkDerivation, base, mwc-random, primitive, transformers }: + mkDerivation { + pname = "mwc-probability"; + version = "1.0.3"; + sha256 = "38386c522e96768ffe4f71c4eedbe0e3418472eb8d78c8c509183fb19175c47f"; + libraryHaskellDepends = [ base mwc-random primitive transformers ]; + homepage = "http://github.com/jtobin/mwc-probability"; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + }) {}; + + "mwc-probability_1_1_3" = callPackage + ({ mkDerivation, base, mwc-random, primitive, transformers }: + mkDerivation { + pname = "mwc-probability"; + version = "1.1.3"; + sha256 = "a7190d8f2b12d5aff0344a1bdc5a85386cb12960fe31e346b14806e615773363"; + libraryHaskellDepends = [ base mwc-random primitive transformers ]; + homepage = "http://github.com/jtobin/mwc-probability"; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random_0_13_2_2" = callPackage @@ -142592,8 +143767,8 @@ self: { }: mkDerivation { pname = "natural-transformation"; - version = "0.3"; - sha256 = "dce066be311d19aa14aab9431aacf99117df101db8d68f2d0dddb3ffe1796ed0"; + version = "0.3.1"; + sha256 = "9b5a39f18790f33807298d47dc7098e2863ca874e8b3d2b419bf696f2ad09702"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -142817,6 +143992,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "neat-interpolation_0_3_1" = callPackage + ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell + , text + }: + mkDerivation { + pname = "neat-interpolation"; + version = "0.3.1"; + sha256 = "dd5ac81fb44ab9dff1ae1e0a1a67bc59358e4ad1a6fdf17529b1c7d3582a221f"; + libraryHaskellDepends = [ + base base-prelude parsec template-haskell text + ]; + testHaskellDepends = [ base-prelude HTF ]; + homepage = "https://github.com/nikita-volkov/neat-interpolation"; + description = "A quasiquoter for neat and simple multiline text interpolation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "needle" = callPackage ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec , parsec-extra, template-haskell, text, vector @@ -142842,8 +144035,8 @@ self: { }: mkDerivation { pname = "neet"; - version = "0.4.0.0"; - sha256 = "65070ee005098819c3521be167182f5d22b5ab5687c066658ef226262f3314f4"; + version = "0.4.0.1"; + sha256 = "f27956192a15ec9dc4d869c980562ced7abe3b4fda584b9ed89ac9036684cf9c"; libraryHaskellDepends = [ base cereal containers graphviz MonadRandom multimap parallel random transformers @@ -145787,8 +146980,8 @@ self: { }: mkDerivation { pname = "number-length"; - version = "0.1.0.0"; - sha256 = "96b5a43ab1832891bacaf81d5642f6e0686ccd93e79330b46ab0f802e68877c3"; + version = "0.1.0.1"; + sha256 = "6c024aad9a8a751a621b0804b58ea2dd3e67703db1b75c71776996f67268e9c5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -146192,6 +147385,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "oanda-rest-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, Decimal + , hlint, hspec, HUnit, lens, old-locale, scientific, text, time + , vector, wreq + }: + mkDerivation { + pname = "oanda-rest-api"; + version = "0.1.0.0"; + sha256 = "7a22fbe550d0bd7d80d9a07e4e563557ff81f294eef423026542bc2bd8a18b0f"; + libraryHaskellDepends = [ + aeson base bytestring containers Decimal lens old-locale scientific + text time vector wreq + ]; + testHaskellDepends = [ + aeson base bytestring containers Decimal hlint hspec HUnit lens + old-locale scientific text time vector wreq + ]; + homepage = "http://github.com/jdreaver/oanda-rest-api"; + description = "Client to the OANDA REST API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "oauthenticated" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, case-insensitive, crypto-random, cryptohash, either @@ -147760,6 +148975,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "operational-extra" = callPackage + ({ mkDerivation, base, operational, time }: + mkDerivation { + pname = "operational-extra"; + version = "0.1.0.0"; + sha256 = "d0ab3fa58e55ff94f2e12d563410dfcc11c6ce6c1ab863602afd6b5522549c9b"; + libraryHaskellDepends = [ base operational time ]; + homepage = "http://github.com/andrewthad/vinyl-operational#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "opml" = callPackage ({ mkDerivation, base, directory, xml }: mkDerivation { @@ -147771,6 +148998,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opml-conduit_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, conduit + , conduit-combinators, conduit-parse, containers, data-default + , exceptions, foldl, hlint, lens-simple, mono-traversable + , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances + , resourcet, semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , time, timerep, uri-bytestring, xml-conduit, xml-conduit-parse + , xml-types + }: + mkDerivation { + pname = "opml-conduit"; + version = "0.4.0.0"; + sha256 = "7a684983ad76067cce5d6b9358cfb581a2222a6495928eca9d61aa04bd0e9e1d"; + libraryHaskellDepends = [ + base case-insensitive conduit conduit-parse containers exceptions + foldl lens-simple mono-traversable monoid-subclasses parsers + semigroups text time timerep uri-bytestring xml-conduit + xml-conduit-parse xml-types + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators conduit-parse + containers data-default exceptions hlint lens-simple + mono-traversable mtl parsers QuickCheck quickcheck-instances + resourcet semigroups tasty tasty-hunit tasty-quickcheck text time + uri-bytestring xml-conduit-parse + ]; + homepage = "https://github.com/k0ral/opml-conduit"; + description = "Streaming parser/renderer for the OPML 2.0 format."; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opml-conduit" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit , conduit-combinators, conduit-parse, containers, data-default @@ -147782,8 +149041,8 @@ self: { }: mkDerivation { pname = "opml-conduit"; - version = "0.4.0.0"; - sha256 = "7a684983ad76067cce5d6b9358cfb581a2222a6495928eca9d61aa04bd0e9e1d"; + version = "0.4.0.1"; + sha256 = "6b1ed378cdf1d8b6cc1aeb8038eac5ed770e572946bf8ff98b474fc315d2a93c"; libraryHaskellDepends = [ base case-insensitive conduit conduit-parse containers exceptions foldl lens-simple mono-traversable monoid-subclasses parsers @@ -148027,6 +149286,7 @@ self: { libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; + jailbreak = true; homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; @@ -148044,6 +149304,7 @@ self: { libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; + jailbreak = true; homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; @@ -148879,7 +150140,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pagerduty" = callPackage + "pagerduty_0_0_4" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions , generics-sop, http-client, http-types, lens, lens-aeson, mmorph @@ -148901,6 +150162,31 @@ self: { homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pagerduty" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring + , bytestring-conversion, conduit, data-default-class, exceptions + , generics-sop, http-client, http-types, lens, lens-aeson, mmorph + , monad-control, mtl, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "pagerduty"; + version = "0.0.6"; + sha256 = "4e00ab7235af51640a1599e523fe388b98d9dffa04130d7d6f7fedfe05d342ef"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring bytestring-conversion conduit + data-default-class exceptions generics-sop http-client http-types + lens lens-aeson mmorph monad-control mtl template-haskell text time + time-locale-compat transformers transformers-base + transformers-compat unordered-containers + ]; + homepage = "http://github.com/brendanhay/pagerduty"; + description = "Client library for PagerDuty Integration and REST APIs"; + license = "unknown"; }) {}; "pagure-hook-receiver" = callPackage @@ -149913,7 +151199,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-types" = callPackage + "pandoc-types_1_16_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , ghc-prim, syb }: @@ -149927,6 +151213,23 @@ self: { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pandoc-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , ghc-prim, syb + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.16.1"; + sha256 = "846054157d7072ca3f7260b988a6752536b42bbd32c051400e55f46229b8179e"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim syb + ]; + homepage = "http://johnmacfarlane.net/pandoc"; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; }) {}; "pandoc-unlit" = callPackage @@ -151613,7 +152916,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pdf-toolbox-content" = callPackage + "pdf-toolbox-content_0_0_5_0" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring , containers, io-streams, pdf-toolbox-core, text }: @@ -151628,9 +152931,10 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pdf-toolbox-content_0_0_5_1" = callPackage + "pdf-toolbox-content" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring , containers, io-streams, pdf-toolbox-core, text }: @@ -151645,10 +152949,9 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pdf-toolbox-core" = callPackage + "pdf-toolbox-core_0_0_4_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , io-streams, scientific, transformers, zlib-bindings }: @@ -151663,9 +152966,10 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pdf-toolbox-core_0_0_4_1" = callPackage + "pdf-toolbox-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , io-streams, scientific, transformers, zlib-bindings }: @@ -151680,10 +152984,9 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pdf-toolbox-document" = callPackage + "pdf-toolbox-document_0_0_7_0" = callPackage ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4 , containers, crypto-api, cryptohash, io-streams , pdf-toolbox-content, pdf-toolbox-core, text, transformers @@ -151700,9 +153003,10 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pdf-toolbox-document_0_0_7_1" = callPackage + "pdf-toolbox-document" = callPackage ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4 , containers, crypto-api, cryptohash, io-streams , pdf-toolbox-content, pdf-toolbox-core, text, transformers @@ -151719,7 +153023,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-viewer" = callPackage @@ -152223,8 +153526,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.3.0.0"; - sha256 = "9b9383f1dfa6d3c8b700fa4417a27538175143259a3410dfd72a39e5ac299b4f"; + version = "0.4.0.0"; + sha256 = "b0227677da0c54514e8f98adef99ee5f2fdad5c6d251c5cfb36357e68abaeaa5"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell transformers ]; @@ -152239,14 +153542,14 @@ self: { }: mkDerivation { pname = "persistable-types-HDBC-pg"; - version = "0.0.1.1"; - sha256 = "4af95781aef9366894c7c7fde4700cac7d954c617ffe16374bd90bd5833bd887"; + version = "0.0.1.3"; + sha256 = "586cbb0b471c957c0e3979a019ef7e5bfdf4db50092a196cac72aa4f8b82cca0"; libraryHaskellDepends = [ base bytestring convertible HDBC persistable-record relational-query-HDBC text-postgresql ]; homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "HDBC Convertible instances and HRR persistable instances of PostgreSQL extended types"; + description = "HDBC and Relational-Record instances of PostgreSQL extended types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -155761,7 +157064,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-text" = callPackage + "pipes-text_0_0_1_0" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-bytestring , pipes-group, pipes-parse, pipes-safe, streaming-commons, text , transformers @@ -155777,9 +157080,10 @@ self: { homepage = "https://github.com/michaelt/text-pipes"; description = "Text pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-text_0_0_2_1" = callPackage + "pipes-text" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-bytestring , pipes-group, pipes-parse, pipes-safe, streaming-commons, text , transformers @@ -155795,7 +157099,6 @@ self: { homepage = "https://github.com/michaelt/text-pipes"; description = "properly streaming text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-transduce" = callPackage @@ -156406,6 +157709,8 @@ self: { pname = "plugins"; version = "1.5.5.0"; sha256 = "57012217c22dce398b3574f45af22404be38de96145e5862d1453c599816f6a2"; + revision = "1"; + editedCabalFile = "84dab5882c330bdc39bcecdbc9d8834c4c964241cd4a1ce87d4987947add924a"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random @@ -157190,8 +158495,8 @@ self: { ({ mkDerivation, base, hspec, network, QuickCheck }: mkDerivation { pname = "pong-server"; - version = "0.0.1.0"; - sha256 = "649ea24e1412408d55e4e82f4c0d0e87bdbeb100bb70ea2167627f304ee2730e"; + version = "0.0.2.0"; + sha256 = "2964703036c52a24afc15522f3ad0a5eee5ee14f3153dd35a9e3ddd7501761ad"; libraryHaskellDepends = [ base network ]; testHaskellDepends = [ base hspec network QuickCheck ]; homepage = "http://github.com/RobertFischer/pong-server#readme"; @@ -157334,15 +158639,15 @@ self: { }: mkDerivation { pname = "pooled-io"; - version = "0.0.2"; - sha256 = "b43f5d60c7549bc22130219b34f4385265b9f8a386db1816d5982931b704f46c"; + version = "0.0.2.1"; + sha256 = "7d405a8876d55a9c077a304dd378854bc9e6e20f643c357c82bd3f38297ff9d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base concurrent-split containers deepseq transformers unsafe utility-ht ]; - homepage = "http://code.haskell.org/~thielema/pooled-io/"; + homepage = "http://hub.darcs.net/thielema/pooled-io/"; description = "Run jobs on a limited number of threads and support data dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -157855,7 +159160,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "postgresql-binary" = callPackage + "postgresql-binary_0_7_9" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq @@ -157883,6 +159188,65 @@ self: { homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "postgresql-binary" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, conversion, conversion-bytestring, conversion-text + , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq + , QuickCheck, quickcheck-instances, rebase, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time + , transformers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.8"; + sha256 = "401fe41d1bbf31ec0c5cf61ef6370cc56c61ae5f49a92a5f464981bc535c09c2"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring foldl loch-th + placeholders scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring conversion conversion-bytestring + conversion-text either json-ast loch-th placeholders + postgresql-libpq QuickCheck quickcheck-instances rebase scientific + tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time + transformers uuid vector + ]; + doCheck = false; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + }) {}; + + "postgresql-binary_0_8_1" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, conversion, conversion-bytestring, conversion-text + , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq + , QuickCheck, quickcheck-instances, rebase, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time + , transformers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.8.1"; + sha256 = "e5745c009806fb10705f1f5f23c2af4028b47a7178e1ea09e102cf697cc2581b"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring foldl loch-th + placeholders scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring conversion conversion-bytestring + conversion-text either json-ast loch-th placeholders + postgresql-libpq QuickCheck quickcheck-instances rebase scientific + tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time + transformers uuid vector + ]; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-config" = callPackage @@ -159372,6 +160736,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "print-debugger" = callPackage + ({ mkDerivation, base, split }: + mkDerivation { + pname = "print-debugger"; + version = "1.1.7"; + sha256 = "3e0333a2ded92a164a8c6e33f84ee8014efb0474b8a55011c16194fabf8d6d6c"; + libraryHaskellDepends = [ base split ]; + homepage = "https://github.com/JohnReedLOL/HaskellPrintDebugger"; + description = "Debug print formatting library"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "printf-mauke" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , template-haskell, utf8-string @@ -159747,8 +161123,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.9.0.1"; - sha256 = "114bf31ba101447858cf6db6f127e6fcc09e154cc6f49fda27c60e6e0db2e1dc"; + version = "0.9.1.0"; + sha256 = "cd1efb0a5a24a9b3c13fc24bba2054ae0be494b645a5091f733b06854a275a9c"; libraryHaskellDepends = [ base bifunctors bytestring conceit free kan-extensions pipes pipes-bytestring pipes-concurrency pipes-parse pipes-safe @@ -160418,8 +161794,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.15.3"; - sha256 = "8d83603d915fcce9ce109b70bd19499a94a70de6abc2a31ac2ebd892f76af683"; + version = "2.15.4"; + sha256 = "1113810f1cd23c8d84b61bdd783359ec51000d030b6c25892548447f1e0edeb5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161054,24 +162430,6 @@ self: { }) {}; "psqueues" = callPackage - ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit - , QuickCheck, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "psqueues"; - version = "0.2.1.0"; - sha256 = "54999bb6f718533771a35e3e333b41ac1ab355eb034281c8607217b53fb6891d"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "psqueues_0_2_2_0" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -161087,7 +162445,6 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pub" = callPackage @@ -161130,8 +162487,8 @@ self: { ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20160201"; - sha256 = "86aed1a05038b9f95038682bd8621d0bcad1cc745d0bb761636a9639ac6247e1"; + version = "0.20160209"; + sha256 = "60d856fc6d6d82ff96d742e253ecf638f625c4693b7d8be250501e9f334a2246"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -161913,7 +163270,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell" = callPackage + "pusher-http-haskell_0_3_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , containers, cryptohash, hashable, hspec, http-client, http-types , mtl, QuickCheck, snap-core, snap-server, text, time, transformers @@ -161941,6 +163298,37 @@ self: { homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pusher-http-haskell" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , containers, cryptohash, hashable, hspec, http-client, http-types + , mtl, QuickCheck, snap-core, snap-server, text, time, transformers + , unordered-containers, yaml + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "0.3.0.2"; + sha256 = "72ce2a76a802d6c866ea0630fde7711b0298929113609998e0ec1dd733fb8098"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash hashable + http-client http-types mtl QuickCheck text time transformers + unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring containers mtl snap-core snap-server text + transformers unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring hspec http-client http-types mtl QuickCheck + text transformers unordered-containers + ]; + homepage = "https://github.com/pusher-community/pusher-http-haskell"; + description = "Haskell client library for the Pusher HTTP API"; + license = stdenv.lib.licenses.mit; }) {}; "pushme" = callPackage @@ -162612,6 +164000,7 @@ self: { array base bytestring containers hashable old-time QuickCheck text time unordered-containers ]; + jailbreak = true; homepage = "https://github.com/aslatter/qc-instances"; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; @@ -163339,11 +164728,33 @@ self: { base bytestring containers lens QuickCheck rainbow tasty tasty-quickcheck text ]; + doCheck = false; homepage = "http://www.github.com/massysett/rainbox"; description = "Two-dimensional box pretty printing, with colors"; license = stdenv.lib.licenses.bsd3; }) {}; + "rainbox_0_18_0_6" = callPackage + ({ mkDerivation, base, bytestring, containers, lens, QuickCheck + , rainbow, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "rainbox"; + version = "0.18.0.6"; + sha256 = "8197c0b75410c760777a7e9e46632de792b5539d2ac1e4fdd9259dbb7cb3ac9b"; + libraryHaskellDepends = [ + base bytestring containers lens rainbow text + ]; + testHaskellDepends = [ + base bytestring containers lens QuickCheck rainbow tasty + tasty-quickcheck text + ]; + homepage = "http://www.github.com/massysett/rainbox"; + description = "Two-dimensional box pretty printing, with colors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rake" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { @@ -163635,6 +165046,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "random-tree" = callPackage + ({ mkDerivation, base, containers, lens, MonadRandom, mtl, random + , random-shuffle, transformers, tree-fun + }: + mkDerivation { + pname = "random-tree"; + version = "0.6.0.5"; + sha256 = "2b604e7ce184e2c877fac63dbac1df3060cdc023427b8eb5844106a826591cc2"; + libraryHaskellDepends = [ + base containers lens MonadRandom mtl random random-shuffle + transformers tree-fun + ]; + description = "Create random trees"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "random-variates" = callPackage ({ mkDerivation, base, containers, directory, erf, HUnit, lens, mtl , random, reinterpret-cast @@ -164364,10 +165791,8 @@ self: { ({ mkDerivation, base, reactive-banana, sdl2 }: mkDerivation { pname = "reactive-banana-sdl2"; - version = "0.1.0.0"; - sha256 = "605dd7df6814f82b69d2ba0aa51029417659c6ab560c869c7598a06615905942"; - revision = "1"; - editedCabalFile = "3c82ab987be2ab12330aa5863b3c80f5022525a5fb7d65cff6b5de47288b9ae7"; + version = "0.1.1.0"; + sha256 = "87981c16e9ec48e898b62a121b7e60fa4ed1b977391770d21a2ad506b68e1e95"; libraryHaskellDepends = [ base reactive-banana sdl2 ]; testHaskellDepends = [ base ]; homepage = "http://github.com/cies/reactive-banana-sdl2#readme"; @@ -164645,8 +166070,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "0.4.1"; - sha256 = "7c5bbc55a5653b9f456f1369616e22d135f667441d8ea160a8b11e02549e5abe"; + version = "0.4.2"; + sha256 = "185cb219a41c323be3b850efae9b8a95f9b5b4abe3934cad85238c5f0023c8c7"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either hashable mtl profunctors @@ -165319,8 +166744,8 @@ self: { ({ mkDerivation, base, base-prelude, template-haskell }: mkDerivation { pname = "refined"; - version = "0.1.1.0"; - sha256 = "0390684ce0d977c49b921ed477bcba5cb7c74e09130de843c53c93f4d4cee0ae"; + version = "0.1.2"; + sha256 = "3e43f8a0e4f141eef379920c37a04e351d6bcf8ed57f8143c48f2cc91e5c18f8"; libraryHaskellDepends = [ base base-prelude template-haskell ]; homepage = "https://github.com/nikita-volkov/refined"; description = "Refinement types with static and runtime checking"; @@ -165421,6 +166846,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflection_2_1_2" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "reflection"; + version = "2.1.2"; + sha256 = "a909882c04b24016bedb85587c09f23cf06bad71a2b1f7e781e89abaa6023c39"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/ekmett/reflection"; + description = "Reifies arbitrary terms into types that can be reflected back into terms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflection-extras" = callPackage ({ mkDerivation, aeson, base, constraints, lens, reflection, tagged }: @@ -165540,16 +166978,16 @@ self: { }) {}; "reflex-gloss" = callPackage - ({ mkDerivation, base, dependent-sum, gloss, reflex, transformers + ({ mkDerivation, base, dependent-sum, gloss, mtl, reflex + , transformers }: mkDerivation { pname = "reflex-gloss"; - version = "0.1.0.2"; - sha256 = "cfd9f09e0ff736d60fe00202295dc2ee24748003d09abcd76baa4fe37cc64ba3"; + version = "0.2"; + sha256 = "e8bcebe49b351de22a6cbf6caec64465b449bc4212074de1a867876151837ab6"; libraryHaskellDepends = [ - base dependent-sum gloss reflex transformers + base dependent-sum gloss mtl reflex transformers ]; - jailbreak = true; homepage = "https://github.com/reflex-frp/reflex-gloss"; description = "An reflex interface for gloss"; license = stdenv.lib.licenses.bsd3; @@ -165749,7 +167187,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "regex-applicative-text" = callPackage + "regex-applicative-text_0_1_0_0" = callPackage ({ mkDerivation, base, regex-applicative, text }: mkDerivation { pname = "regex-applicative-text"; @@ -165761,6 +167199,19 @@ self: { homepage = "https://github.com/phadej/regex-applicative-text#readme"; description = "regex-applicative on text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "regex-applicative-text" = callPackage + ({ mkDerivation, base, regex-applicative, text }: + mkDerivation { + pname = "regex-applicative-text"; + version = "0.1.0.1"; + sha256 = "b093051f80865d257da2ded8ad1b566927b01b3d2f86d41da2ffee4a26c4e2d9"; + libraryHaskellDepends = [ base regex-applicative text ]; + homepage = "https://github.com/phadej/regex-applicative-text#readme"; + description = "regex-applicative on text"; + license = stdenv.lib.licenses.bsd3; }) {}; "regex-base" = callPackage @@ -166521,8 +167972,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.8.0.4"; - sha256 = "0a2b8f3739cfeaf19c2b0dca4f321c2d1fbbedc007f241cfbf85142e25f03eb5"; + version = "0.8.0.5"; + sha256 = "1dae8b11ade66c4be1f1755fdef7483ba569f1eb900176cd96bc48d1f904cbd7"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text time time-locale-compat @@ -166543,8 +167994,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.5.0.0"; - sha256 = "b6d3fb55175eab8d816b15628a24fcf401a768122a8d3db02141605f054ff789"; + version = "0.6.0.0"; + sha256 = "629eb2f798603e5890ac3156fc0396276017e9eb94ce3c5a2f5f2dc1c1352541"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record relational-query relational-schemas @@ -166690,6 +168141,64 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "remote-json" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , exceptions, fail, natural-transformation, QuickCheck + , quickcheck-instances, random, remote-monad, scientific, tasty + , tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "remote-json"; + version = "0.2"; + sha256 = "626c1a9dc5287f538d47eba6d727a2c0f4d99ec9d07e0d1679c307b028025a8a"; + libraryHaskellDepends = [ + aeson base exceptions fail natural-transformation remote-monad text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers natural-transformation + QuickCheck quickcheck-instances random scientific tasty + tasty-quickcheck text + ]; + description = "Remote Monad implementation of the JSON RPC protocol"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "remote-json-client" = callPackage + ({ mkDerivation, aeson, base, lens, natural-transformation + , remote-json, wreq + }: + mkDerivation { + pname = "remote-json-client"; + version = "0.2"; + sha256 = "7d8fe9df424dae251b602073d618506f22a4f8e6bde5e0a39cdb6fdb7d065953"; + revision = "1"; + editedCabalFile = "dcaba53dfe4c923ab531dbcd8ea45bb89bbe57a06f23b431477c505a7101085f"; + libraryHaskellDepends = [ + aeson base lens natural-transformation remote-json wreq + ]; + description = "Web client wrapper for remote-json"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "remote-json-server" = callPackage + ({ mkDerivation, aeson, base, data-default-class + , natural-transformation, remote-json, scotty, text, transformers + , warp + }: + mkDerivation { + pname = "remote-json-server"; + version = "0.2.0.1"; + sha256 = "69d73e270668433a9526948bf24ca7cc3e2076d8e323310c830c1326232c2553"; + libraryHaskellDepends = [ + aeson base data-default-class natural-transformation remote-json + scotty text transformers warp + ]; + description = "Web server wrapper for remote-json"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "remote-monad" = callPackage ({ mkDerivation, base, containers, natural-transformation , QuickCheck, quickcheck-instances, tasty, tasty-quickcheck @@ -166697,14 +168206,16 @@ self: { }: mkDerivation { pname = "remote-monad"; - version = "0.1.0.1"; - sha256 = "e52a1a304d507169be144abbff8c7e28b08a36e7c05f296dbcd4be8a5fcd53e1"; + version = "0.2"; + sha256 = "94c8fcb1c9c4088931cc960c39070778e571f195ad7ce45a12341e6f314a3f63"; + revision = "1"; + editedCabalFile = "a2439b1ff68620c1004e36420104d96bb8942395190607f98372f2afec20b31f"; libraryHaskellDepends = [ base natural-transformation transformers ]; testHaskellDepends = [ - base containers QuickCheck quickcheck-instances tasty - tasty-quickcheck + base containers natural-transformation QuickCheck + quickcheck-instances tasty tasty-quickcheck ]; description = "An parametrizable Remote Monad, and parametrizable Applicative Functor"; license = stdenv.lib.licenses.bsd3; @@ -167719,6 +169230,7 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; + jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -167739,6 +169251,7 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; + jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -167759,6 +169272,7 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; + jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -167779,6 +169293,7 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; + jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -167965,6 +169480,7 @@ self: { monad-control mtl resourcet rest-types tostring transformers transformers-base transformers-compat uri-encode utf8-string ]; + jailbreak = true; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -167987,6 +169503,7 @@ self: { monad-control mtl resourcet rest-types tostring transformers transformers-base transformers-compat uri-encode utf8-string ]; + jailbreak = true; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -168176,6 +169693,8 @@ self: { pname = "rest-core"; version = "0.38"; sha256 = "b491b734c2d74729f427ca02370f12b839dd92347fea44b5fb66c66a39b11cec"; + revision = "1"; + editedCabalFile = "edcbe69d770149b6e3aeb47cc7ae2a9f4e589fa3cd1c928f1538504ac24b8b2c"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -168597,6 +170116,8 @@ self: { pname = "rest-gen"; version = "0.19.0.2"; sha256 = "12caa70e7b29b073cb0e066cf7d5c590b13e0fb5b2f924944cd1ae5217c79330"; + revision = "1"; + editedCabalFile = "afca13957f1b186ba5922659d6275cdf5c8d49ec2bca6f2319d89c213afa5c4d"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -168838,8 +170359,8 @@ self: { pname = "rest-stringmap"; version = "0.2.0.6"; sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a"; - revision = "1"; - editedCabalFile = "a814dde006adf0a6f3b0c98956060b4e9759b47da046ca6faaa8eb0e3272e246"; + revision = "2"; + editedCabalFile = "286ce136699cc8dffad47ead93fdaf0538e465edafde510ff7697f96e470ea1d"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -168894,8 +170415,8 @@ self: { pname = "rest-types"; version = "1.14.0.1"; sha256 = "645516a501f3f6d928c04b6022b111bd5411f301572f4de6b96ef7b15e480b32"; - revision = "1"; - editedCabalFile = "d3f5642df902f6d3a393839b8e365481fb1b16f4ed945290f85e2c9cda253794"; + revision = "2"; + editedCabalFile = "ff6c3027d4c2f87d78868a23bfbda807237c2d31b6caae9399f1de159a6e0ac1"; libraryHaskellDepends = [ aeson base case-insensitive generic-aeson generic-xmlpickler hxt json-schema rest-stringmap text uuid @@ -169053,7 +170574,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rethinkdb" = callPackage + "rethinkdb_2_2_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , bytestring, containers, data-default, doctest, mtl, network , scientific, text, time, unordered-containers, utf8-string, vector @@ -169075,6 +170596,31 @@ self: { homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.1"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rethinkdb" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, containers, data-default, doctest, mtl, network + , scientific, text, time, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "rethinkdb"; + version = "2.2.0.3"; + sha256 = "c5499076552d6fa07972e7597b6c8c04c0f2a0dcdb9b9e630c2fb48cc06f1183"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring containers + data-default mtl network scientific text time unordered-containers + utf8-string vector + ]; + executableHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ base doctest ]; + doCheck = false; + homepage = "http://github.com/atnnn/haskell-rethinkdb"; + description = "A driver for RethinkDB 2.2"; + license = stdenv.lib.licenses.asl20; }) {}; "rethinkdb-client-driver_0_0_13" = callPackage @@ -171517,6 +173063,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sampling" = callPackage + ({ mkDerivation, base, foldl, mwc-random, primitive, vector }: + mkDerivation { + pname = "sampling"; + version = "0.1.1"; + sha256 = "a1282010e483959c81cf9c018aac5560f2429cc9826e0e79452bc19ea484f19d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base foldl mwc-random primitive vector ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/jtobin/sampling"; + description = "Sample values from collections"; + license = stdenv.lib.licenses.mit; + }) {}; + "samtools" = callPackage ({ mkDerivation, base, bytestring, c2hs, filepath, process, seqloc , vector, zlib @@ -172852,6 +174413,7 @@ self: { async base data-default-class directory hspec hspec-wai http-types lifted-base network text wai ]; + jailbreak = true; homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; @@ -172869,6 +174431,8 @@ self: { pname = "scotty"; version = "0.11.0"; sha256 = "892203c937ccf1279f5005ddb78ebea84629b80687a1e38fc118b38011a386ed"; + revision = "1"; + editedCabalFile = "2e46f8dbc3078a329ac2d6662f80aa48a7c0517d02978812b0d1293c8bc050dc"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -173600,8 +175164,8 @@ self: { }: mkDerivation { pname = "secp256k1"; - version = "0.4.2"; - sha256 = "8033fcd488494994f79bb129ffd70a6d2233d647e010a352a7e7dca8ce6072e6"; + version = "0.4.3"; + sha256 = "fb4d0187d3e6189a933b95b5f884c9545b06c26c637af239ca9ceff98b2335a5"; libraryHaskellDepends = [ base base16-bytestring binary bytestring entropy largeword mtl QuickCheck string-conversions @@ -173612,8 +175176,8 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; homepage = "http://github.com/haskoin/secp256k1#readme"; - description = "secp256k1 bindings for Haskell"; - license = stdenv.lib.licenses.mit; + description = "Bindings for secp256k1 library from Bitcoin Core"; + license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -174001,6 +175565,7 @@ self: { distributive semigroups tagged transformers transformers-compat ]; testHaskellDepends = [ base directory doctest filepath ]; + jailbreak = true; doCheck = false; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; @@ -175865,28 +177430,6 @@ self: { }) {}; "servant-swagger" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob - , hspec, http-media, lens, QuickCheck, servant, swagger2, text - , time, unordered-containers - }: - mkDerivation { - pname = "servant-swagger"; - version = "1.0"; - sha256 = "cc9bc89bd83c373d1a31ce7ba603104f302db90b96cd93f45029b125f59e668e"; - libraryHaskellDepends = [ - aeson base bytestring hspec http-media lens QuickCheck servant - swagger2 text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-qq base doctest Glob hspec lens QuickCheck servant - swagger2 text time - ]; - homepage = "https://github.com/haskell-servant/servant-swagger"; - description = "Generate Swagger specification for your servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger_1_0_3" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob , hspec, http-media, lens, QuickCheck, servant, swagger2, text , time, unordered-containers @@ -175903,11 +177446,9 @@ self: { aeson aeson-qq base doctest Glob hspec lens QuickCheck servant swagger2 text time ]; - jailbreak = true; homepage = "https://github.com/haskell-servant/servant-swagger"; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-yaml" = callPackage @@ -179901,6 +181442,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "slave-thread_1_0_1" = callPackage + ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph + , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore + , stm-containers, transformers + }: + mkDerivation { + pname = "slave-thread"; + version = "1.0.1"; + sha256 = "c1396bd77b21997e5d1e86b212a08b7d453030374b8baddef51593922337d755"; + libraryHaskellDepends = [ + base base-prelude list-t mmorph partial-handler stm-containers + transformers + ]; + testHaskellDepends = [ + base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore + ]; + homepage = "https://github.com/nikita-volkov/slave-thread"; + description = "A principal solution to ghost threads and silent exceptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "slice-cpp-gen" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, directory , filepath, language-slice, MissingH @@ -180296,7 +181859,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "smoothie" = callPackage + "smoothie_0_4_2_1" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; @@ -180306,6 +181869,19 @@ self: { homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "smoothie" = callPackage + ({ mkDerivation, aeson, base, linear, text, vector }: + mkDerivation { + pname = "smoothie"; + version = "0.4.2.2"; + sha256 = "be4f9b24ca5a1dc99165b2a1f5484b48b6baf16e5700514689875dbb2a0e4133"; + libraryHaskellDepends = [ aeson base linear text vector ]; + homepage = "https://github.com/phaazon/smoothie"; + description = "Smooth curves via several interpolation modes"; + license = stdenv.lib.licenses.bsd3; }) {}; "smsaero" = callPackage @@ -181484,8 +183060,8 @@ self: { pname = "snaplet-fay"; version = "0.3.3.13"; sha256 = "39810748b7177b45a0fab785e48ac497d81587e48dde9dc8ad75e8d704bdda3f"; - revision = "1"; - editedCabalFile = "7e46253eccd3c819ebf3700a5398e9405ce21069bc5b8f92a29550cf8119e47a"; + revision = "2"; + editedCabalFile = "43c3a484e0e34f13bf2f372850d33b98de9d8057fd33e9d79be0fcc0a5013559"; libraryHaskellDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -182499,7 +184075,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "socket-io" = callPackage + "socket-io_1_3_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, engine-io , mtl, stm, text, transformers, unordered-containers, vector }: @@ -182513,6 +184089,23 @@ self: { ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "socket-io" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, engine-io + , mtl, stm, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "socket-io"; + version = "1.3.5"; + sha256 = "1604797a7095ef26b733cdff8922bf373fac551ab157c9756b031d191f90903f"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring engine-io mtl stm text + transformers unordered-containers vector + ]; + homepage = "http://github.com/ocharles/engine.io"; + license = stdenv.lib.licenses.bsd3; }) {}; "socket-sctp" = callPackage @@ -182846,8 +184439,8 @@ self: { }: mkDerivation { pname = "sox"; - version = "0.2.2.5"; - sha256 = "36250918961d51c7b4a3721cee264c8a8c678da07244100b8a0be2c954ff4ca6"; + version = "0.2.2.6"; + sha256 = "d4f486e14d67bc7f714d14ac7a1605166962a8af1405bc978a4eb59385f9fb12"; libraryHaskellDepends = [ base containers explicit-exception extensible-exceptions process sample-frame transformers unix utility-ht @@ -184938,8 +186531,8 @@ self: { pname = "stack"; version = "1.0.2"; sha256 = "4227f4c4016e5008755a974cbf04a9772319d87d1764da32228e74f13153c5c4"; - revision = "1"; - editedCabalFile = "d789ed4dceed4c226571d0f5f5e6d2d5602a6b36b7f4579b78352d330934e3ab"; + revision = "3"; + editedCabalFile = "6843a554b3987bb6a0277f59a70e6ed49ff515da73623f97949520877736ef04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185424,7 +187017,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stackage-curator" = callPackage + "stackage-curator_0_13_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, base16-bytestring, binary, binary-tagged, blaze-html , byteable, bytestring, Cabal, classy-prelude-conduit, conduit @@ -185471,7 +187064,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stackage-curator_0_13_1" = callPackage + "stackage-curator" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, base16-bytestring, binary, binary-tagged, blaze-html , byteable, bytestring, Cabal, classy-prelude-conduit, conduit @@ -186019,6 +187612,7 @@ self: { libraryHaskellDepends = [ base mtl transformers transformers-compat ]; + jailbreak = true; description = "Simple State-like monad transformer with saveable and restorable state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -186838,6 +188432,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stm-containers_0_2_10" = callPackage + ({ mkDerivation, base-prelude, focus, free, hashable, HTF, list-t + , loch-th, mtl, mtl-prelude, placeholders, primitive, QuickCheck + , transformers, unordered-containers + }: + mkDerivation { + pname = "stm-containers"; + version = "0.2.10"; + sha256 = "1dd724fda2456279d2bf70b8666eb1f87604776932b452f3b097236ad1533e6d"; + libraryHaskellDepends = [ + base-prelude focus hashable list-t loch-th placeholders primitive + transformers + ]; + testHaskellDepends = [ + base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude + placeholders primitive QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/nikita-volkov/stm-containers"; + description = "Containers for STM"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stm-delay" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -187615,7 +189232,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streaming-commons" = callPackage + "streaming-commons_0_1_15" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, hspec, network, process, QuickCheck, random , stm, text, transformers, unix, zlib @@ -187635,6 +189252,29 @@ self: { homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "streaming-commons" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , deepseq, directory, hspec, network, process, QuickCheck, random + , stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.1.15.1"; + sha256 = "af3b07d1022f263b1e0f95ba15697d87d55afc1cf0933c9b16fd37a687b8cacb"; + libraryHaskellDepends = [ + array async base blaze-builder bytestring directory network process + random stm text transformers unix zlib + ]; + testHaskellDepends = [ + array async base blaze-builder bytestring deepseq hspec network + QuickCheck text unix zlib + ]; + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; }) {}; "streaming-histogram" = callPackage @@ -187666,6 +189306,7 @@ self: { json-stream mtl pipes resourcet streaming streaming-bytestring transformers ]; + jailbreak = true; homepage = "https://github.com/michaelt/streaming-utils"; description = "http, attoparsec, pipes and conduit utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; @@ -188833,22 +190474,6 @@ self: { }) {}; "success" = callPackage - ({ mkDerivation, base, monad-control, mtl, transformers - , transformers-base - }: - mkDerivation { - pname = "success"; - version = "0.2.5.1"; - sha256 = "7efbd9b238a6741ab70f5b021c5ebc95369bf4de00ab88220eecb30b3df86bec"; - libraryHaskellDepends = [ - base monad-control mtl transformers transformers-base - ]; - homepage = "https://github.com/nikita-volkov/success"; - description = "A version of Either specialised for encoding of success or failure"; - license = stdenv.lib.licenses.mit; - }) {}; - - "success_0_2_6" = callPackage ({ mkDerivation, base, monad-control, mtl, transformers , transformers-base }: @@ -188862,7 +190487,6 @@ self: { homepage = "https://github.com/nikita-volkov/success"; description = "A version of Either specialised for encoding of success or failure"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "suffixarray" = callPackage @@ -189243,6 +190867,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "svg-tree_0_3_2_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , JuicyPixels, lens, linear, mtl, scientific, text, transformers + , vector, xml + }: + mkDerivation { + pname = "svg-tree"; + version = "0.3.2.2"; + sha256 = "f1dfee9879672dc9ad3a4de3850ce9d120e45f33ca02642da5cc15bd5d9dc85a"; + libraryHaskellDepends = [ + attoparsec base bytestring containers JuicyPixels lens linear mtl + scientific text transformers vector xml + ]; + description = "SVG file loader and serializer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "svg2q" = callPackage ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb , xml @@ -189425,31 +191067,6 @@ self: { }) {}; "swagger2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers - , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl - , network, QuickCheck, scientific, template-haskell, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.0"; - sha256 = "bbd6d2f3287e619ec9caa6e1c1628a5fd0f71ac311e451d87456d00c41a8f2d0"; - libraryHaskellDepends = [ - aeson base base-compat containers hashable http-media lens mtl - network scientific template-haskell text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat containers doctest Glob hashable - hspec HUnit lens mtl QuickCheck text time unordered-containers - vector - ]; - homepage = "https://github.com/GetShopTV/swagger2"; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "swagger2_2_0_1" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl , network, QuickCheck, scientific, template-haskell, text, time @@ -189472,7 +191089,6 @@ self: { homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -191036,14 +192652,16 @@ self: { }: mkDerivation { pname = "tagchup"; - version = "0.4.0.4"; - sha256 = "7700c1ded7d11945b9de3d6e5651fcef3ef5d39317dc332ad7c87b37ceb76b90"; + version = "0.4.0.5"; + sha256 = "c0c12eeec562a7769deb165c7edae8a8dbc0087d5788655b72864df122a0fa35"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-accessor explicit-exception transformers utility-ht xml-basic ]; + executableHaskellDepends = [ base xml-basic ]; + testHaskellDepends = [ base xml-basic ]; homepage = "http://code.haskell.org/~thielema/tagchup/"; description = "alternative package for processing of tag soups"; license = "GPL"; @@ -193590,6 +195208,7 @@ self: { hspec-expectations-lifted mtl process QuickCheck regex-posix template-haskell text transformers transformers-compat unix ]; + jailbreak = true; homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "Sandbox for system tests"; license = stdenv.lib.licenses.bsd3; @@ -194031,7 +195650,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "texmath" = callPackage + "texmath_0_8_4_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, network-uri, pandoc-types, parsec, process, split, syb , temporary, text, utf8-string, xml @@ -194053,9 +195672,10 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "texmath_0_8_4_2" = callPackage + "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, network-uri, pandoc-types, parsec, process, split, syb , temporary, text, utf8-string, xml @@ -194077,7 +195697,6 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -194654,7 +196273,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-show" = callPackage + "text-show_2_1_2" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, generic-deriving , ghc-prim, hspec, integer-gmp, nats, QuickCheck @@ -194678,12 +196297,14 @@ self: { quickcheck-instances tagged text transformers transformers-compat void ]; + jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-show_3" = callPackage + "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, generic-deriving , ghc-prim, hspec, integer-gmp, nats, QuickCheck @@ -194706,11 +196327,10 @@ self: { integer-gmp nats QuickCheck quickcheck-instances semigroups tagged template-haskell text transformers transformers-compat void ]; - jailbreak = true; + doHaddock = false; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage @@ -194740,7 +196360,6 @@ self: { transformers transformers-compat unix unordered-containers vector xhtml ]; - jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; @@ -195240,6 +196859,8 @@ self: { pname = "th-extras"; version = "0.0.0.2"; sha256 = "94212defd4d76bf27eddfb85c1a49c1ef3a73d980ea00b11d69a612ba5705897"; + revision = "1"; + editedCabalFile = "d9dfbdaeda88312758fd97e43f54d2d83d49039ee1bcfa94e38d87b215dedf67"; libraryHaskellDepends = [ base syb template-haskell ]; homepage = "https://github.com/mokus0/th-extras"; description = "A grab bag of functions for use with Template Haskell"; @@ -195994,8 +197615,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.6.0.5"; - sha256 = "d64c7cd00248efda561642cf8f815b486a9dcbabc6bc17d4108423eb8cb10aa0"; + version = "0.6.0.6"; + sha256 = "f275e22d52d419f97feacbc0dbd4a99b32992910bf6427a0a1798b6146a2f94d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197697,6 +199318,8 @@ self: { pname = "token-bucket"; version = "0.1.0.1"; sha256 = "312609c0037271b1091f23c2edf467e9449edca5bbed0cfb45c2c93c1bee6ad0"; + revision = "1"; + editedCabalFile = "41232cfabd4ba8e217d2b78f0f897d5a245756cf525c9a84c5ba2c695b533576"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; homepage = "https://github.com/hvr/token-bucket"; @@ -198273,7 +199896,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers-compat" = callPackage + "transformers-compat_0_4_0_4" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "transformers-compat"; @@ -198284,9 +199907,10 @@ self: { homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers-compat_0_5_1_4" = callPackage + "transformers-compat" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; @@ -198296,7 +199920,6 @@ self: { homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-compose" = callPackage @@ -198521,6 +200144,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tree-fun" = callPackage + ({ mkDerivation, base, containers, mtl }: + mkDerivation { + pname = "tree-fun"; + version = "0.8.1.0"; + sha256 = "2ae925f198e9700dedbf809c2b77086fef32f58b4a4adb6c398dca49f4d56f1f"; + libraryHaskellDepends = [ base containers mtl ]; + description = "Library for functions pertaining to tree exploration and manipulation"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tree-monad" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -199146,8 +200780,8 @@ self: { }: mkDerivation { pname = "tttool"; - version = "1.6"; - sha256 = "a2e6a9ad43ec7a0b6758d9fcd639d9c2e57d39c6c25427a888876d850985efd0"; + version = "1.6.0.1"; + sha256 = "52d9d4e28ce1e1a81e81ff2b8fe9a2a21d0b1b74ba172777c654d0c1e608a23f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203538,8 +205172,8 @@ self: { ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "uu-cco"; - version = "0.1.0.4"; - sha256 = "a2913c4802337ae57d5a4ede73e2664795fe823035da00b65f52d015c42632a0"; + version = "0.1.0.5"; + sha256 = "cd64659a673dbea93892d8e418ababdbe41e1b9abb1a6a662a091896a99e0c01"; libraryHaskellDepends = [ ansi-terminal base ]; homepage = "https://github.com/UU-ComputerScience/uu-cco"; description = "Utilities for compiler construction: core functionality"; @@ -204423,15 +206057,16 @@ self: { }) {}; "varying" = callPackage - ({ mkDerivation, base, time, transformers }: + ({ mkDerivation, base, hspec, QuickCheck, time, transformers }: mkDerivation { pname = "varying"; - version = "0.3.0.1"; - sha256 = "1678e5e71eb18228acba06d7b62220edd3102af620ca19107896ef65855c2aec"; + version = "0.4.0.0"; + sha256 = "9a9c6b0e6f89deb748f72c1b1cf58a291235a0989305be190ebf4ec50d566092"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base time transformers ]; executableHaskellDepends = [ base time transformers ]; + testHaskellDepends = [ base hspec QuickCheck time transformers ]; homepage = "https://github.com/schell/varying"; description = "FRP through value streams and monadic splines"; license = stdenv.lib.licenses.mit; @@ -204485,6 +206120,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vault_0_3_0_6" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "vault"; + version = "0.3.0.6"; + sha256 = "0b433de60fa3d20e93dce6013293e18089fb3233c34211ffa3f860408866ef48"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vaultaire-common" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , cereal, containers, hashable, hslogger, hspec, locators, mtl @@ -204871,7 +206522,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-binary-instances" = callPackage + "vector-binary-instances_0_2_1_0" = callPackage ({ mkDerivation, base, binary, cereal, vector }: mkDerivation { pname = "vector-binary-instances"; @@ -204881,9 +206532,10 @@ self: { homepage = "https://github.com/bos/vector-binary-instances"; description = "Instances of Data.Binary and Data.Serialize for vector"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "vector-binary-instances_0_2_1_1" = callPackage + "vector-binary-instances" = callPackage ({ mkDerivation, base, binary, vector }: mkDerivation { pname = "vector-binary-instances"; @@ -204893,7 +206545,6 @@ self: { homepage = "https://github.com/bos/vector-binary-instances"; description = "Instances of Data.Binary and Data.Serialize for vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-buffer" = callPackage @@ -208452,6 +210103,30 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "wai-predicates_0_8_6" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , bytestring-conversion, case-insensitive, cookie, http-types + , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers + , vault, vector, wai + }: + mkDerivation { + pname = "wai-predicates"; + version = "0.8.6"; + sha256 = "7aba73c37a27975b37077b6f06d6c34488750ff022210e29a0966c68fafde918"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-conversion case-insensitive + cookie http-types singletons transformers vault vector wai + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive http-types tasty + tasty-hunit tasty-quickcheck wai + ]; + homepage = "https://gitlab.com/twittner/wai-predicates/"; + description = "WAI request predicates"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-request-spec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-types, text, wai @@ -208631,6 +210306,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-routes_0_9_7" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, data-default-class + , filepath, hspec, hspec-wai, hspec-wai-json, http-types + , mime-types, monad-loops, mtl, path-pieces, random + , template-haskell, text, vault, wai, wai-app-static, wai-extra + }: + mkDerivation { + pname = "wai-routes"; + version = "0.9.7"; + sha256 = "326fb3f6da6c87f625b75479dc4881a82129d46053a3e2b42eae37d51ca27166"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive containers + cookie data-default-class filepath http-types mime-types + monad-loops mtl path-pieces random template-haskell text vault wai + wai-app-static wai-extra + ]; + testHaskellDepends = [ + aeson base hspec hspec-wai hspec-wai-json text wai + ]; + homepage = "https://ajnsit.github.io/wai-routes/"; + description = "Typesafe URLs for Wai applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-routing_0_12_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, containers, cookie @@ -211721,8 +213422,8 @@ self: { }: mkDerivation { pname = "werewolf"; - version = "0.4.3.1"; - sha256 = "daf3e180e534b2dd36667f8855c5d1699afab5512b3d38009f64bc9d8a24a19c"; + version = "0.4.4.0"; + sha256 = "247a99b23a409c11344a70f4fbfc3b939eda436e0e52bd7363c376615644dad8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212291,7 +213992,7 @@ self: { description = "Haskell bindings for the wlc library"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; - }) {wlc = null;}; + }) {inherit (pkgs) wlc;}; "wobsurv" = callPackage ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring @@ -213701,8 +215402,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.4.0"; - sha256 = "6cfa37a5d13d326fadd838939df457412eb752e81877e6f128b75b8e101b50db"; + version = "0.4.1"; + sha256 = "c5449a61a2415f0be39ca4b1be2b186e2eb0f1563391d819b555a348f35f5248"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215572,8 +217273,10 @@ self: { }: mkDerivation { pname = "xournal-types"; - version = "0.5.1"; - sha256 = "57c9f55cc7ec3450b6ae1ee4d7e8411e9ce1da147ff104fc8cc66f0e4c6924c6"; + version = "0.5.1.0"; + sha256 = "b0e8d4194af0397bdd76352e1174b61947343dfcced21bef062598fb058e69cb"; + revision = "1"; + editedCabalFile = "d6fdc2ac2b741597d72cc1a5ef1fad122858a96212df461e3a97540eeceb78fb"; libraryHaskellDepends = [ base bytestring cereal containers lens strict TypeCompose ]; @@ -217855,7 +219558,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth-oauth2" = callPackage + "yesod-auth-oauth2_0_1_6" = callPackage ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 , hspec, http-client, http-conduit, http-types, lifted-base , network-uri, random, text, transformers, vector, yesod-auth @@ -217874,6 +219577,33 @@ self: { homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-auth-oauth2" = callPackage + ({ mkDerivation, aeson, authenticate, base, bytestring, containers + , hoauth2, hspec, http-client, http-conduit, http-types + , lifted-base, load-env, network-uri, random, text, transformers + , vector, warp, yesod, yesod-auth, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.1.7"; + sha256 = "272ebc701f55b955f2eae69acca68a2344f8ec99988a5eff94853b3b0382b7d4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson authenticate base bytestring hoauth2 http-client http-conduit + http-types lifted-base network-uri random text transformers vector + yesod-auth yesod-core yesod-form + ]; + executableHaskellDepends = [ + base containers http-conduit load-env text warp yesod yesod-auth + ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; + description = "OAuth 2.0 authentication plugins"; + license = stdenv.lib.licenses.bsd3; }) {}; "yesod-auth-pam" = callPackage @@ -223120,6 +224850,8 @@ self: { pname = "zlib-lens"; version = "0.1.1.1"; sha256 = "3fb8a31d5ff081fa22d3fd628b49e61eb5be8a0bc43d52b5e73c60b2098b67c8"; + revision = "1"; + editedCabalFile = "fe783bc66f56cb660f1b06012c28f12ae025c97e24f0254ed938eb5e132f9cc2"; libraryHaskellDepends = [ base bytestring profunctors zlib ]; jailbreak = true; homepage = "http://lens.github.io/"; @@ -223134,6 +224866,8 @@ self: { pname = "zlib-lens"; version = "0.1.1.2"; sha256 = "c1e47feb44ca0aa70b152db60db7bc29b2b1820ba0d015bbb301a1340c80ee8f"; + revision = "1"; + editedCabalFile = "2cd596d95a3665d374fb519a9698017abd1c2c0bc0b27669708500af24c7b7ed"; libraryHaskellDepends = [ base bytestring profunctors zlib ]; jailbreak = true; homepage = "http://lens.github.io/"; @@ -223148,14 +224882,27 @@ self: { pname = "zlib-lens"; version = "0.1.2"; sha256 = "1649c2d05f8a720804b0d380f51b854fdeea4ce9bcfe682d2e335e9faa16a1ee"; - revision = "1"; - editedCabalFile = "353e3ef6e0281894cd494b95563bb93a30ec0ff96e309a173c36bddfc4069e66"; + revision = "2"; + editedCabalFile = "167ebeb448d8097a8a7d1375006d1f791139b71ac6ec5f4b66d80d5b2c7eec42"; libraryHaskellDepends = [ base bytestring profunctors zlib ]; homepage = "http://lens.github.io/"; description = "Lenses for zlib"; license = stdenv.lib.licenses.bsd3; }) {}; + "zlib-lens_0_1_2_1" = callPackage + ({ mkDerivation, base, bytestring, profunctors, zlib }: + mkDerivation { + pname = "zlib-lens"; + version = "0.1.2.1"; + sha256 = "e5a563453899e0896cfa3aed22a2fbfc67012990ace6d14631f31b704ff766eb"; + libraryHaskellDepends = [ base bytestring profunctors zlib ]; + homepage = "http://lens.github.io/"; + description = "Lenses for zlib"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zmcat" = callPackage ({ mkDerivation, base, bytestring, zeromq3-haskell }: mkDerivation { From 8d0219c6ef3d28fe00bfb29fdf5dab862c3325a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Feb 2016 22:27:49 +0100 Subject: [PATCH 263/308] haskell-transformers-compat: drop obsolete override for ghc-8.0.x --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index d9a5702a094..f6e00bad49a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -43,9 +43,6 @@ self: super: { # Older versions of QuickCheck don't support our version of Template Haskell. QuickCheck = self.QuickCheck_2_8_2; - # Older versions don't support our version of transformers. - transformers-compat = self.transformers-compat_0_5_1_4; - # https://github.com/hspec/HUnit/issues/7 HUnit = dontCheck super.HUnit; From 3906a32bda60d0313297a5d172bdff07adceb843 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Feb 2016 21:28:20 +0100 Subject: [PATCH 264/308] haskell-QuickCheck: drop obsolete override for ghc-8.0.x --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index f6e00bad49a..2c1c825af53 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -40,9 +40,6 @@ self: super: { # jailbreak-cabal can use the native Cabal library. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; - # Older versions of QuickCheck don't support our version of Template Haskell. - QuickCheck = self.QuickCheck_2_8_2; - # https://github.com/hspec/HUnit/issues/7 HUnit = dontCheck super.HUnit; From 2029027d8883ab22e3044a71a4a33cc7a0beaf2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Feb 2016 20:42:49 +0100 Subject: [PATCH 265/308] haskell-binary: update older compilers to the latest version --- pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 2c495a80e2e..1bdd454d408 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -41,7 +41,7 @@ self: super: { unix = null; # These packages are core libraries in GHC 7.10.x, but not here. - binary = self.binary_0_8_2_0; + binary = self.binary_0_8_2_1; deepseq = self.deepseq_1_3_0_1; haskeline = self.haskeline_0_7_2_1; hoopl = self.hoopl_3_10_2_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 8b9d962e832..d354ea1305d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -42,7 +42,7 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_0; process = self.process_1_2_3_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_1; process = self.process_1_2_3_0; }; # Newer versions don't compile. Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 6d47ccc866c..0103eb3c598 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -41,10 +41,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_1; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 60be40a79af..e10136a42ee 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -40,10 +40,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_1; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; From 0b72e7e2472e381b0168345f2158dfe76afc2ab0 Mon Sep 17 00:00:00 2001 From: lukasepple Date: Sun, 14 Feb 2016 16:34:30 +0100 Subject: [PATCH 266/308] intel2200BGFirmware: init at 3.1 This commit adds the firmware for the Intel 2200BG wireless cards for the ipw2200 kernel module. Also it changes the networking.enableIntel2200BGFirmware option to set it as hardware.firmware since firmware-linux-nonfree does not contain the appropiate firmware anymore. Also hardware.enableAllFirmware does enable the intel2200BGFirmware now. --- lib/maintainers.nix | 1 + nixos/modules/hardware/all-firmware.nix | 2 +- .../modules/hardware/network/intel-2200bg.nix | 2 +- .../firmware/intel2200BGFirmware/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 808d78d499d..094eaea56e6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -184,6 +184,7 @@ lowfatcomputing = "Andreas Wagner "; lsix = "Lancelot SIX "; ludo = "Ludovic Courtès "; + lukasepple = "Lukas Epple "; lukego = "Luke Gorrie "; luispedro = "Luis Pedro Coelho "; lw = "Sergey Sofeychuk "; diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 1a04baef193..d0d481f72a4 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -22,7 +22,7 @@ with lib; ###### implementation config = mkIf config.hardware.enableAllFirmware { - hardware.firmware = [ pkgs.firmwareLinuxNonfree ]; + hardware.firmware = [ pkgs.firmwareLinuxNonfree pkgs.intel2200BGFirmware ]; }; } diff --git a/nixos/modules/hardware/network/intel-2200bg.nix b/nixos/modules/hardware/network/intel-2200bg.nix index 1b70057d135..17b973474c9 100644 --- a/nixos/modules/hardware/network/intel-2200bg.nix +++ b/nixos/modules/hardware/network/intel-2200bg.nix @@ -23,7 +23,7 @@ config = lib.mkIf config.networking.enableIntel2200BGFirmware { - hardware.enableAllFirmware = true; + hardware.firmware = [ pkgs.intel2200BGFirmware ]; }; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix new file mode 100644 index 00000000000..f5b6abdd9c7 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl }: + +let version = "3.1"; in + +stdenv.mkDerivation { + name = "intel2200BGFirmware-${version}"; + + src = fetchurl { + url = "http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; + sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/lib/firmware + for fw in \ + ipw2200-bss.fw \ + ipw2200-ibss.fw \ + ipw2200-sniffer.fw + do + cp -f $fw $out/lib/firmware/$fw + done + mkdir -p $out/share/doc/intel2200BGFirmware + cp -f LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE + ''; + + meta = with stdenv.lib; { + description = "Firmware for Intel 2200BG cards"; + homepage = http://ipw2200.sourceforge.net/firmware.php; + license = stdenv.lib.licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ lukasepple ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 635f0125f2f..0f4534bbdc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10073,6 +10073,8 @@ let ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { }; + intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; + iomelt = callPackage ../os-specific/linux/iomelt { }; iotop = callPackage ../os-specific/linux/iotop { }; From f3909c9943c64a85acd4c9e551745b5910fbe529 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 15 Feb 2016 19:58:46 +0000 Subject: [PATCH 267/308] atom: 1.4.3 -> 1.5.3 --- pkgs/applications/editors/atom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 87a36a36f90..d7b91de80d8 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.4.3"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "15ix5ww3ny5ylgmmxpkc32li6af2vc4a2p6aymx9c472fra0c41x"; + sha256 = "101fz4c5pj7yp7fg7kg7vcpqjzpwfrbxdyb6va5liip1llg1i2z3"; name = "${name}.deb"; }; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { description = "A hackable text editor for the 21st Century"; homepage = https://atom.io/; license = licenses.mit; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline maintainers.nequissimus ]; platforms = [ "x86_64-linux" ]; }; } From d213089a2515c38c98f4427700f9a10b62527f36 Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Sat, 26 Dec 2015 18:29:08 +0100 Subject: [PATCH 268/308] spark: 1.4.0 -> 1.5.2 --- pkgs/applications/networking/cluster/spark/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 1147c4b64a1..727d0b0e917 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, pythonPackages +{ stdenv, fetchzip, makeWrapper, jre, pythonPackages , mesosSupport ? true, mesos }: @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "spark-${version}"; - version = "1.4.0"; + version = "1.5.2"; - src = fetchurl { + src = fetchzip { url = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz"; - sha256 = "1w60xzzg9mcymin1pmqwx1mvcqmdpfyxhd2dmw5alhnrzi21ycxi"; + sha256 = "0bgpz3bqj24flrbajzhbkz38fjsd53qmji1kls9izji8vprcjr5v"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] From 704e923ad5bc2b33f3f6eb9a02e19ff202cd3d45 Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Sat, 26 Dec 2015 18:29:49 +0100 Subject: [PATCH 269/308] spark: reduce default shell log verbosity --- pkgs/applications/networking/cluster/spark/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 727d0b0e917..278fc6305c7 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { mkdir -p $out/{lib/${untarDir}/conf,bin} mv * $out/lib/${untarDir} + sed -e 's/INFO, console/WARN, console/' < \ + $out/lib/${untarDir}/conf/log4j.properties.template > \ + $out/lib/${untarDir}/conf/log4j.properties + cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF export JAVA_HOME="${jre}" export SPARK_HOME="$out/lib/${untarDir}" From d72fad9ee4b968eb77aa79acf6b9e0a7db4d3728 Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Sat, 26 Dec 2015 18:30:28 +0100 Subject: [PATCH 270/308] spark: export the assembly to /share/java, fixes #11961 So that we can compile applications that depend on spark --- pkgs/applications/networking/cluster/spark/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 278fc6305c7..5e284d4387f 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { untarDir = "${name}-bin-cdh4"; installPhase = '' - mkdir -p $out/{lib/${untarDir}/conf,bin} + mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} mv * $out/lib/${untarDir} sed -e 's/INFO, console/WARN, console/' < \ @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do makeWrapper "$n" "$out/bin/$(basename $n)" done + ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java ''; meta = { From c7571611dc5f69737d27449cfa8a9ef4af3de64d Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 17 Jan 2016 04:11:09 -0800 Subject: [PATCH 271/308] cfdyndns: init at 0.0.1 --- lib/maintainers.nix | 1 + nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/cfdyndns.nix | 70 +++++++++++++++++++ .../networking/dyndns/cfdyndns/default.nix | 30 ++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 106 insertions(+) create mode 100644 nixos/modules/services/misc/cfdyndns.nix create mode 100644 pkgs/applications/networking/dyndns/cfdyndns/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 808d78d499d..bf6cd29996d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -69,6 +69,7 @@ coconnor = "Corey O'Connor "; codsl = "codsl "; codyopel = "Cody Opel "; + colemickens = "Cole Mickens "; copumpkin = "Dan Peebles "; coroa = "Jonas Hörsch "; couchemar = "Andrey Pavlov "; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 064b4cbc4b3..82ba9018c7c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -248,6 +248,7 @@ matrix-synapse = 224; rspamd = 225; rmilter = 226; + cfdyndns = 227; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -473,6 +474,7 @@ matrix-synapse = 224; rspamd = 225; rmilter = 226; + cfdyndns = 227; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0011544988d..f6f674c253d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -201,6 +201,7 @@ ./services/misc/bepasty.nix ./services/misc/canto-daemon.nix ./services/misc/calibre-server.nix + ./services/misc/cfdyndns.nix ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/confd.nix diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixos/modules/services/misc/cfdyndns.nix new file mode 100644 index 00000000000..69a33d0b8c1 --- /dev/null +++ b/nixos/modules/services/misc/cfdyndns.nix @@ -0,0 +1,70 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.cfdyndns; +in +{ + options = { + services.cfdyndns = { + enable = mkEnableOption "Cloudflare Dynamic DNS Client"; + + email = mkOption { + type = types.str; + description = '' + The email address to use to authenticate to CloudFlare. + ''; + }; + + apikey = mkOption { + type = types.str; + description = '' + The API Key to use to authenticate to CloudFlare. + ''; + }; + + records = mkOption { + default = []; + example = [ "host.tld" ]; + type = types.listOf types.str; + description = '' + The records to update in CloudFlare. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.cfdyndns = { + description = "CloudFlare Dynamic DNS Client"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + startAt = "5 minutes"; + serviceConfig = { + Type = "simple"; + User = config.ids.uids.cfdyndns; + Group = config.ids.gids.cfdyndns; + ExecStart = "/bin/sh -c '${pkgs.cfdyndns}/bin/cfdyndns'"; + }; + environment = { + CLOUDFLARE_EMAIL="${cfg.email}"; + CLOUDFLARE_APIKEY="${cfg.apikey}"; + CLOUDFLARE_RECORDS="${concatStringsSep "," cfg.records}"; + }; + }; + + users.extraUsers = { + cfdyndns = { + group = "cfdyndns"; + uid = config.ids.uids.cfdyndns; + }; + }; + + users.extraGroups = { + cfdyndns = { + gid = config.ids.gids.cfdyndns; + }; + }; + }; +} diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix new file mode 100644 index 00000000000..43d257d7b0e --- /dev/null +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, openssl }: + +with rustPlatform; + +buildRustPackage rec { + name = "cfdyndns-${version}"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "colemickens"; + repo = "cfdyndns"; + rev = "v${version}"; + sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b"; + }; + + depsSha256 = "0whs3fgmpb6g1mjajs3qs9g613x5dal4x6ghzzkpl73a9pgydkpn"; + + buildInputs = [ makeWrapper openssl ]; + + installPhase = '' + mkdir -p $out/bin + cp -p target/release/cfdyndns $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "CloudFlare Dynamic DNS Client"; + homepage = https://github.com/colemickens/cfdyndns; + license = stdenv.lib.licenses.mit; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d91d975689f..6aaa7e07f09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -786,6 +786,8 @@ let ccnet = callPackage ../tools/networking/ccnet { }; + cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; + ckbcomp = callPackage ../tools/X11/ckbcomp { }; cli53 = callPackage ../tools/admin/cli53 { }; From 69c843f392f895286ae751f91126d53f37728488 Mon Sep 17 00:00:00 2001 From: Arda Xi Date: Mon, 28 Dec 2015 21:20:19 +0100 Subject: [PATCH 272/308] pythonPackages.twisted: 11.1.0 -> 13.2.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5694d65a016..6b7ac315e37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20792,10 +20792,10 @@ in modules // { # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) disabled = isPy3k; - name = "Twisted-11.1.0"; + name = "Twisted-13.2.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2"; - sha256 = "05agfp17cndhv2w0p559lvknl7nv0xqkg10apc47fm53m8llbfvz"; + sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89"; }; propagatedBuildInputs = with self; [ zope_interface ]; From 10a40c62447b78ac3f2df8692535ac4dfe3c7000 Mon Sep 17 00:00:00 2001 From: Arda Xi Date: Mon, 28 Dec 2015 21:24:15 +0100 Subject: [PATCH 273/308] pythonPackages.nevow: 0.10.0 -> 0.11.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b7ac315e37..0c9e16a3577 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12145,11 +12145,11 @@ in modules // { nevow = buildPythonPackage (rec { name = "nevow-${version}"; - version = "0.10.0"; + version = "0.11.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/N/Nevow/Nevow-${version}.tar.gz"; - sha256 = "90631f68f626c8934984908d3df15e7c198939d36be7ead1305479dfc67ff6d0"; + sha256 = "1z0y8a5q4fa2nmh0dap7cs9pp5xs3jm6q0g4vpwcw77q7jagdmw9"; name = "${name}.tar.gz"; }; From a3a9a56f8fc615c4c2d596a2d656c9f344fe71de Mon Sep 17 00:00:00 2001 From: Arda Xi Date: Mon, 28 Dec 2015 21:36:47 +0100 Subject: [PATCH 274/308] pythonPackages.foolscap: 0.6.4 -> 0.10.1 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c9e16a3577..4a38a060dff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8914,14 +8914,14 @@ in modules // { }); foolscap = buildPythonPackage (rec { - name = "foolscap-0.6.4"; + name = "foolscap-0.10.1"; src = pkgs.fetchurl { url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; - sha256 = "16cddyk5is0gjfn0ia5n2l4lhdzvbjzlx6sfpy7ddjd3d3fq7ckl"; + sha256 = "1wrnbdq3y3lfxnhx30yj9xbr3iy9512jb60k8qi1da1phalnwz5x"; }; - propagatedBuildInputs = [ self.twisted self.pyopenssl ]; + propagatedBuildInputs = [ self.twisted self.pyopenssl self.service-identity ]; meta = { homepage = http://foolscap.lothar.com/; From 443072799dc228ef1ebb8573c4ed55cf569c2b2a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 15 Feb 2016 21:56:14 +0100 Subject: [PATCH 275/308] tahoelafs: 1.10.0 -> 1.10.2 and refractor expression, fixes #12004 --- .../networking/p2p/tahoe-lafs/default.nix | 26 +++++++++---------- pkgs/top-level/all-packages.nix | 6 +---- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 1f935c2f83b..dae985febbb 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,19 +1,18 @@ -{ fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow -, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial, python -, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock, zope_interface }: +{ fetchurl, lib, unzip, nettools, pythonPackages }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) # store path. The problem appears to be non-fatal, but there's probably # some loss of functionality because of it. -buildPythonPackage rec { - name = "tahoe-lafs-1.10.0"; +pythonPackages.buildPythonPackage rec { + version = "1.10.2"; + name = "tahoe-lafs-${version}"; namePrefix = ""; src = fetchurl { - url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.0.tar.bz2"; - sha256 = "1qng7j1vykk8zl5da9yklkljvgxfnjky58gcay6dypz91xq1cmcw"; + url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-${version}.tar.bz2"; + sha256 = "1rvv0ik5biy7ji8pg56v0qycnggzr3k6dbg88n555nb6r4cxgmgy"; }; patchPhase = '' @@ -32,13 +31,14 @@ buildPythonPackage rec { ''; # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2 - buildInputs = [ unzip numpy ]; + buildInputs = with pythonPackages; [ unzip numpy mock ]; # The `backup' command requires `sqlite3'. - propagatedBuildInputs = - [ twisted foolscap nevow simplejson zfec pycryptopp sqlite3 - darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface mock - ]; + propagatedBuildInputs = with pythonPackages; [ + twisted foolscap nevow simplejson zfec pycryptopp sqlite3 darcsver + setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface + service-identity + ]; postInstall = '' # Install the documentation. @@ -49,7 +49,7 @@ buildPythonPackage rec { checkPhase = '' # TODO: broken with wheels - #${python.interpreter} setup.py trial + #${pythonPackages.python.interpreter} setup.py trial ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93558c8401f..be1251595ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13496,11 +13496,7 @@ let tagainijisho = callPackage ../applications/office/tagainijisho {}; - tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs { - inherit (pythonPackages) twisted foolscap simplejson nevow zfec - pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs - numpy pyasn1 mock zope_interface; - }; + tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; tailor = callPackage ../applications/version-management/tailor {}; From 198f9e3b54ad576cd85d8815d98282ecd75b03cd Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Mon, 15 Feb 2016 21:01:42 +0000 Subject: [PATCH 276/308] rainbowstream: 1.3.1 -> 1.3.3 Built and tested locally. Unfortunately no changelog seems to be available. --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a38a060dff..5d053c5f314 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11260,11 +11260,11 @@ in modules // { rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; - version = "1.3.1"; + version = "1.3.3"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz"; - sha256 = "0dhhgr0ww4x85pgl6mzp327sy4v6mv6hz3wvnsrwl0knkxknbadv"; + sha256 = "08598slbn8sm2hjs0q1041fv7m56k2ky4q66rsihacjw0mg7blai"; }; doCheck = false; From d0dcad3b91212179a27987ad17b1cbbfceb71a9a Mon Sep 17 00:00:00 2001 From: Balletie Date: Mon, 15 Feb 2016 22:10:32 +0100 Subject: [PATCH 277/308] hfsprogs: init at 332.25 --- pkgs/tools/filesystems/hfsprogs/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/filesystems/hfsprogs/default.nix diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix new file mode 100644 index 00000000000..25ec31ea698 --- /dev/null +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, openssl, libbsd }: + +let version = "332.25"; + package_name = "hfsprogs"; in +stdenv.mkDerivation rec { + name = "${package_name}-${version}"; + srcs = [ + (fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz"; + sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; + }) + (fetchurl { + url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz"; + sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6"; + }) + ]; + + sourceRoot = "diskdev_cmds-" + version; + patches = [ "../debian/patches/*.patch" ]; + + buildInputs = [ openssl libbsd ]; + makefile = "Makefile.lnx"; + + # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/ + installPhase = '' + # Create required package directories + install -m 755 -d "$out/bin" + install -m 755 -d "$out/share/${package_name}" + install -m 755 -d "$out/share/man/man8/" + # Copy executables + install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus" + install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus" + # Copy shared data + install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata" + # Copy man pages + install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" + install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" + ''; + + meta = { + description = "HFS/HFS+ user space utils"; + license = stdenv.lib.licenses.apsl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be1251595ab..f7b7104508a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1912,6 +1912,8 @@ let hevea = callPackage ../tools/typesetting/hevea { }; + hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; + highlight = callPackage ../tools/text/highlight { lua = lua5; }; From d2ed83ac391393628f6a64093176c41f0dec0898 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 17 Jan 2016 04:11:09 -0800 Subject: [PATCH 278/308] mxt-app: init at v1.26 --- lib/maintainers.nix | 1 + pkgs/misc/mxt-app/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/misc/mxt-app/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 808d78d499d..bf6cd29996d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -69,6 +69,7 @@ coconnor = "Corey O'Connor "; codsl = "codsl "; codyopel = "Cody Opel "; + colemickens = "Cole Mickens "; copumpkin = "Dan Peebles "; coroa = "Jonas Hörsch "; couchemar = "Andrey Pavlov "; diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix new file mode 100644 index 00000000000..cfcba8a3a8b --- /dev/null +++ b/pkgs/misc/mxt-app/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool }: + +stdenv.mkDerivation rec{ + version="1.26"; + name = "mxt-app-${version}"; + + src = fetchFromGitHub { + owner = "atmel-maxtouch"; + repo = "mxt-app"; + rev = "v${version}"; + sha256 = "07afdgh8pnhgh2372cf5pqy6p7l6w3ing2hwnvz6db8wxw59n48h"; + }; + + buildInputs = [ autoconf automake libtool ]; + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "Command line utility for Atmel maXTouch devices"; + homepage = http://github.com/atmel-maxtouch/mxt-app; + license = licenses.bsd2; + maintainers = [ maintainers.colemickens ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d91d975689f..6aedc5a3c6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2128,6 +2128,8 @@ let multitail = callPackage ../tools/misc/multitail { }; + mxt-app = callPackage ../misc/mxt-app { }; + netperf = callPackage ../applications/networking/netperf { }; netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; From d58ae071fd81a623f6a7c028db3940755faec1e2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 16 Feb 2016 01:34:57 +0100 Subject: [PATCH 279/308] neovim: 0.1.1 -> 0.1.2 also updated neovim's forked libvterm to latest revision --- pkgs/applications/editors/neovim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 1b984c0ff9c..e291cfcdc2b 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -21,8 +21,8 @@ let version = "2015-11-06"; src = fetchFromGitHub { - sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9"; - rev = "04781d37ce5af3f580376dc721bd3b89c434966b"; + sha256 = "090pyf1n5asaw1m2l9bsbdv3zd753aq1plb0w0drbc2k43ds7k3g"; + rev = "a9c7c6fd20fa35e0ad3e0e98901ca12dfca9c25c"; repo = "libvterm"; owner = "neovim"; }; @@ -60,10 +60,10 @@ let neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { - sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60"; + sha256 = "128aznp2gj08bdz05ri8mqday7wcsy9yz7dw7vdgzk0pk23vjz89"; rev = "v${version}"; repo = "neovim"; owner = "neovim"; From 5e2fd638ccd9e321eb2c8a7033b9efb6c88e0a4c Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 17 Jan 2016 04:11:27 -0800 Subject: [PATCH 280/308] plex: add enablePlexPass (init at 0.9.15.3.1674) enables plex pass subscribers to opt-in to the pre-release downloads --- pkgs/servers/plex/default.nix | 25 +++++++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 29cd45714d7..03f6fb63c72 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -1,15 +1,28 @@ { stdenv, fetchurl, rpmextract, glibc , dataDir ? "/var/lib/plex" # Plex's data directory must be baked into the package due to symlinks. +, enablePlexPass ? false }: -stdenv.mkDerivation rec { +let + plexpkg = if enablePlexPass then { + version = "0.9.15.3.1674"; + vsnHash = "f46e7e6"; + sha256 = "086njnjcmknmbn90mmvf60ls7q73g2m955yk621jjdngs4ybvm19"; + } else { + version = "0.9.15.2.1663"; + vsnHash = "7efd046"; + sha256 = "1kzr826khn0n69mr2kbr5hxcb56mj12fryhwr95r3132gj02aqph"; + }; + +in stdenv.mkDerivation rec { name = "plex-${version}"; - version = "0.9.15.2.1663"; - vsnHash = "7efd046"; + version = plexpkg.version; + vsnHash = plexpkg.vsnHash; + sha256 = plexpkg.sha256; src = fetchurl { - url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; - sha256 = "f06225807c6284914bca1cfaec4490d594c53a2c794d916b321658388d40f9cf"; + url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; + inherit sha256; }; buildInputs = [ rpmextract glibc ]; @@ -57,7 +70,7 @@ stdenv.mkDerivation rec { homepage = http://plex.tv/; license = licenses.unfree; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ forkk thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice ]; description = "Media / DLNA server"; longDescription = '' Plex is a media server which allows you to store your media and play it diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c07ef352e01..396c2b535ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2824,7 +2824,7 @@ let platformioPackages = callPackage ../development/arduino/platformio { }; platformio = platformioPackages.platformio-chrootenv.override {}; - plex = callPackage ../servers/plex { }; + plex = callPackage ../servers/plex { enablePlexPass = config.plex.enablePlexPass or false; }; ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; From a5a5c1d9cd6e0feed40fa34f3d89a7573d324436 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Mon, 15 Feb 2016 17:58:33 -0800 Subject: [PATCH 281/308] chromium/plugins: Fix widevine substitution Fixes: #12840 Related to: 61042a5 61042a5 changes the replaced token from $something to @something@. This commit repeats that change in one additional location used by the WideVine plugin --- pkgs/applications/networking/browsers/chromium/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 78d9086dd96..157ddf379c2 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -80,7 +80,7 @@ let wvName = "Widevine Content Decryption Module"; wvDescription = "Playback of encrypted HTML audio/video content"; wvMimeTypes = "application/x-ppapi-widevine-cdm"; - wvModule = "$widevine/lib/libwidevinecdmadapter.so"; + wvModule = "@widevine@/lib/libwidevinecdmadapter.so"; wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; in '' flashVersion="$( From ab19061df8a097f7a70dbd205c13740032e922fc Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Tue, 16 Feb 2016 03:25:12 +0000 Subject: [PATCH 282/308] rethinkdb: 2.1.3 -> 2.2.4 --- pkgs/servers/nosql/rethinkdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 57b0e0abb76..4566a670206 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "rethinkdb-${version}"; - version = "2.1.3"; + version = "2.2.4"; src = fetchurl { url = "http://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "03w9fq3wcvwy04b3x6zb3hvwar7b9jfbpq77rmxdlgh5w64vvgwd"; + sha256 = "0zs07g7arrrvm85mqbkffyzgd255qawn64r6iqdws25lj1kq2qim"; }; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' From 32eeb8658f32036b262d3a2ac9275d0a7f866bb1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 16 Feb 2016 05:12:56 +0100 Subject: [PATCH 283/308] babeld: 1.6.1 -> 1.7.1 --- pkgs/tools/networking/babeld/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 7af9aa901a8..7a54887e9d8 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.6.1"; + name = "babeld-1.7.1"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "1d45f12mhlxsf8jlpgb1gig5bjg5izdkfk173rd9a1wi7s82pisl"; + sha256 = "1dl7s2lb40kiysrqhr7zd0s90yfxy6xfsp0fhqgdlwfr99ymx59c"; }; preBuild = '' @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu fpletz ]; }; } From 139708a10d1882ed2eee484b5408808515c7b2c9 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 15 Feb 2016 22:48:17 -0800 Subject: [PATCH 284/308] git-lfs: 1.0.0 -> 1.1.1 --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df56303c774..364ccec6f5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1654,6 +1654,8 @@ let git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; + git-lfs = goPackages.git-lfs.bin // { outputs = [ "bin" ]; }; + gitfs = callPackage ../tools/filesystems/gitfs { }; gitinspector = callPackage ../applications/version-management/gitinspector { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 97fafe7c752..8a8bc381748 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -878,10 +878,11 @@ let }; git-lfs = buildFromGitHub { - rev = "v1.0.0"; + date = "1.1.1"; # "date" is effectively "version" + rev = "v1.1.1"; owner = "github"; repo = "git-lfs"; - sha256 = "1zlg3rm5yxak6d88brffv1wpj0iq4qgzn6sgg8xn0pbnzxjd1284"; + sha256 = "1m7kii57jrsb22m5x9v8xa3s1qmipfkpk6cscgxrbrj7g0a75fnc"; # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' excludedPackages = [ "test" ]; From ed6adf3f44058e162d102bf9407ceacb3ed6fd26 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Tue, 16 Feb 2016 08:42:15 +0100 Subject: [PATCH 285/308] re-enable grsec_testing, it has been updated since --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c07ef352e01..0201fefad8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10304,10 +10304,10 @@ let linux_grsec_stable_server_xen = throw "No longer supporteddue to https://grsecurity.net/announce.php. " + "Please use linux_grsec_testing_server_xen."; - # Testing kernels: outdated ATM - #linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; - #linux_grsec_testing_server = grKernel grFlavors.linux_grsec_testing_server; - #linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen; + # Testing kernels + linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; + linux_grsec_testing_server = grKernel grFlavors.linux_grsec_testing_server; + linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -10454,7 +10454,7 @@ let linuxPackages_grsec_stable_server = grPackage grFlavors.linux_grsec_stable_server; linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen; - # Testing kernels: outdated ATM + # Testing kernels linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop; linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server; linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen; From f59baafee2eea1489efc5fcdb9909849ccd226ab Mon Sep 17 00:00:00 2001 From: = Date: Mon, 15 Feb 2016 21:34:59 +0100 Subject: [PATCH 286/308] glabels: init at 3.2.1 (git) --- .../applications/graphics/glabels/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/graphics/glabels/default.nix diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix new file mode 100644 index 00000000000..cf1ab1942e5 --- /dev/null +++ b/pkgs/applications/graphics/glabels/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3 +, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book +, intltool, itstool, makeWrapper, pkgconfig, which +}: + +stdenv.mkDerivation rec { + name = "glabels-${version}"; + version = "3.2.1"; + src = fetchFromGitHub { + owner = "jimevins"; + repo = "glabels"; + rev = "glabels-3_2_1"; + sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg"; + }; + + buildInputs = [ + autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools + gnome3.gnome_common gnome3.gsettings_desktop_schemas + intltool itstool libxml2 librsvg libe-book libtool + makeWrapper pkgconfig + ]; + + preFixup = '' + rm "$out/share/icons/hicolor/icon-theme.cache" + wrapProgram "$out/bin/glabels-3" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + preConfigure = "./autogen.sh"; + + meta = { + description = "Create labels and business cards"; + homepage = http://glabels.org/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93558c8401f..fa1ccd5c327 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9400,6 +9400,8 @@ let gatling = callPackage ../servers/http/gatling { }; + glabels = callPackage ../applications/graphics/glabels { }; + grafana = (callPackage ../servers/monitoring/grafana { }).bin // { outputs = ["bin"]; }; groovebasin = callPackage ../applications/audio/groovebasin { }; From 0f7665ae37376fb7a98f86001c47f87e68b6f786 Mon Sep 17 00:00:00 2001 From: desiderius Date: Tue, 16 Feb 2016 12:52:23 +0100 Subject: [PATCH 287/308] pythonPackages.python3pika: disable unit test The tests adds dependencies to pyev, tornado and twisted (and twisted is disabled for Python 3). --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d053c5f314..1422ae09cc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14944,6 +14944,10 @@ in modules // { python3pika = buildPythonPackage { name = "python3-pika-0.9.14"; disabled = !isPy3k; + + # Unit tests adds dependencies on pyev, tornado and twisted (and twisted is disabled for Python 3) + doCheck = false; + src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/p/python3-pika/python3-pika-0.9.14.tar.gz; md5 = "f3a3ee58afe0ae06f1fa553710e1aa28"; From 5bb3ac70c624bc593b05be454ab521590fc8d0da Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 16 Feb 2016 10:57:33 +0100 Subject: [PATCH 288/308] backintime: 1.1.6 -> 1.1.12 --- .../networking/sync/backintime/common.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 14fa69974e8..c3f8e0f02c6 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -1,13 +1,15 @@ -{stdenv, fetchurl, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }: +{stdenv, fetchFromGitHub, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }: stdenv.mkDerivation rec { - version = "1.1.6"; + version = "1.1.12"; name = "backintime-common-${version}"; - src = fetchurl { - url = "https://launchpad.net/backintime/1.1/${version}/+download/backintime-${version}.tar.gz"; - sha256 = "04yw1v6h959mmvc67mhh0km7vkxjzb7j1mniv5xfjdy27ryii1ig"; + src = fetchFromGitHub { + owner = "bit-team"; + repo = "backintime"; + rev = "v${version}"; + sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a"; }; buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ]; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://launchpad.net/backintime; + homepage = https://github.com/bit-team/backintime; description = "Simple backup tool for Linux"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.DamienCassou ]; From 108a0ae88185ebe530d90682118f067d85ebeaf6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Feb 2016 13:41:19 +0100 Subject: [PATCH 289/308] aws-sdk-cpp: Init at 0.9.6 --- .../libraries/aws-sdk-cpp/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/libraries/aws-sdk-cpp/default.nix diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix new file mode 100644 index 00000000000..22fb9facfea --- /dev/null +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl }: + +stdenv.mkDerivation rec { + name = "aws-sdk-cpp-${version}"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-sdk-cpp"; + rev = version; + sha256 = "022v7naa5vjvq3wfn4mcp99li61ffsk2fnc8qqi52cb1pyxz9sk1"; + }; + + buildInputs = [ cmake curl ]; + + # FIXME: provide flags to build only part of the SDK, or put them in + # different outputs. + # cmakeFlags = "-DBUILD_ONLY=aws-cpp-sdk-s3"; + + enableParallelBuilding = true; + + preBuild = + '' + # Ensure that the unit tests can find the *.so files. + for i in testing-resources aws-cpp-sdk-*; do + export LD_LIBRARY_PATH=$(pwd)/$i:$LD_LIBRARY_PATH + done + ''; + + postInstall = + '' + # Move the .so files to a more reasonable location. + mv $out/lib/linux/*/Release/*.so $out/lib + rm -rf $out/lib/linux + ''; + + meta = { + description = "A C++ interface for Amazon Web Services"; + homepage = https://github.com/awslabs/aws-sdk-cpp; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c227320bf3..df1daa75acb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6288,6 +6288,8 @@ let inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { }; + babl = callPackage ../development/libraries/babl { }; beecrypt = callPackage ../development/libraries/beecrypt { }; From 1bd0d41e0f4b62d3de5c6dea0398fd90f6d1e955 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 16 Feb 2016 10:42:13 +0100 Subject: [PATCH 290/308] pharo-vm: 2016.01.14 -> 2016.02.15 --- pkgs/development/pharo/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 9af1b5ad5ba..0628e8545e7 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -16,12 +16,12 @@ rec { }; pharo-spur = pharo-vm-build rec { - version = "2016.01.14"; + version = "2016.02.15"; name = "pharo-vm-spur-i386-${version}"; binary-basename = "pharo-spur-vm"; src = fetchurl { url = "${base-url}/pharo-vm-spur-${version}.tar.bz2"; - sha256 = "1746kisa3wkhg1kwgjs544s3f17r8h99kr728qc4nk035dxkjfbx"; + sha256 = "1lyz6wkxg9cmhgbg32a27kyj1syvk3p3015ga83z98353xlz91rx"; }; }; } From acd75605a23717e5a591c04b68eb52c70ebf538a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 16 Feb 2016 14:13:53 +0100 Subject: [PATCH 291/308] vdirsyncer: 0.8.1 -> 0.9.0 --- pkgs/tools/misc/vdirsyncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 89018699263..4d3c43db3bd 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.8.1"; + version = "0.9.0"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz"; - sha256 = "1abflqw6x30xd2dlj58cr5n62x98kc0ia9f9vr8l64k2z1fjlq78"; + sha256 = "0s9awjr9v60rr80xcpwmdhkf4v1yqnydahjmxwvxmh64565is465"; }; propagatedBuildInputs = with pythonPackages; [ From 27709b6050e0eca26927aad5a91d8b6e502b7f9b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 16 Feb 2016 14:17:28 +0100 Subject: [PATCH 292/308] mdp: 1.0.4 -> 1.0.5 --- pkgs/applications/misc/mdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 1a89bda888e..45b0271f693 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.5"; name = "mdp-${version}"; src = fetchurl { url = "https://github.com/visit1985/mdp/archive/${version}.tar.gz"; - sha256 = "1wvys3sb0ki7zz5b0y4bl9x6jdj7h88lxsf8vap95k1sj2ymanlm"; + sha256 = "0ckd9k5571zc7pzxdx84gv8k103d5qp49f2i477a395fy2pnq4m8"; }; makeFlags = "PREFIX=$(out)"; From 2ce37d089f97daefdec7a9f4a369d855064188c0 Mon Sep 17 00:00:00 2001 From: desiderius Date: Tue, 16 Feb 2016 14:22:19 +0100 Subject: [PATCH 293/308] pythonPackages.consul: 0.4.7 -> 0.6.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1422ae09cc8..6ca2baeb35c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3275,11 +3275,11 @@ in modules // { consul = buildPythonPackage (rec { - name = "python-consul-0.4.7"; + name = "python-consul-0.6.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-consul/${name}.tar.gz"; - sha256 = "1vb0hgl11n8krpk5n22bk90agm31004ipv4xnbcadzczj5xackg7"; + sha256 = "0vfyr499sbc4nnhhijp2lznyj507nnak95bvv9w8y78ngxggskbh"; }; buildInputs = with self; [ requests2 six pytest ]; From 97bbc37b6fac4b0205b3da239619df5fafdbd7cf Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 16 Feb 2016 14:11:01 +0000 Subject: [PATCH 294/308] rekonq: fix homepage url --- pkgs/applications/networking/browsers/rekonq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index df8ad1eb350..70aa648ccc5 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.urkud ]; description = "KDE Webkit browser"; - homepage = http://rekonq.sourceforge.net; + homepage = https://rekonq.kde.org/; }; } From b5aa8a4e641e2b5ec0e39f7438f9febc5b09f5e6 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Tue, 16 Feb 2016 16:10:12 +0100 Subject: [PATCH 295/308] glibc: patch CVE-2015-7547 The glibc DNS client side resolver is vulnerable to a stack-based buffer overflow when the getaddrinfo() library function is used. Software using this function may be exploited with attacker-controlled domain names, attacker-controlled DNS servers, or through a man-in-the-middle attack. https://googleonlinesecurity.blogspot.co.uk/2016/02/cve-2015-7547-glibc-getaddrinfo-stack.html --- pkgs/development/libraries/glibc/common.nix | 1 + .../libraries/glibc/cve-2015-7547.patch | 569 ++++++++++++++++++ 2 files changed, 570 insertions(+) create mode 100644 pkgs/development/libraries/glibc/cve-2015-7547.patch diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 26d2f2454b4..45f5c24e959 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation ({ ./security-bdf1ff05.patch ./cve-2014-8121.patch ./cve-2015-1781.patch + ./cve-2015-7547.patch ./glibc-locale-incompatibility.patch ]; diff --git a/pkgs/development/libraries/glibc/cve-2015-7547.patch b/pkgs/development/libraries/glibc/cve-2015-7547.patch new file mode 100644 index 00000000000..1f10aafe0c0 --- /dev/null +++ b/pkgs/development/libraries/glibc/cve-2015-7547.patch @@ -0,0 +1,569 @@ + +CVE-2015-7547 + +2016-02-15 Carlos O'Donell + + [BZ #18665] + * resolv/nss_dns/dns-host.c (gaih_getanswer_slice): Always set + *herrno_p. + (gaih_getanswer): Document functional behviour. Return tryagain + if any result is tryagain. + * resolv/res_query.c (__libc_res_nsearch): Set buffer size to zero + when freed. + * resolv/res_send.c: Add copyright text. + (__libc_res_nsend): Document that MAXPACKET is expected. + (send_vc): Document. Remove buffer reuse. + (send_dg): Document. Remove buffer reuse. Set *thisanssizp to set the + size of the buffer. Add Dprint for truncated UDP buffer. + +diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c +index a255d5e..47cfe27 100644 +--- a/resolv/nss_dns/dns-host.c ++++ b/resolv/nss_dns/dns-host.c +@@ -1031,7 +1031,10 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname, + int h_namelen = 0; + + if (ancount == 0) +- return NSS_STATUS_NOTFOUND; ++ { ++ *h_errnop = HOST_NOT_FOUND; ++ return NSS_STATUS_NOTFOUND; ++ } + + while (ancount-- > 0 && cp < end_of_message && had_error == 0) + { +@@ -1208,7 +1211,14 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname, + /* Special case here: if the resolver sent a result but it only + contains a CNAME while we are looking for a T_A or T_AAAA record, + we fail with NOTFOUND instead of TRYAGAIN. */ +- return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; ++ if (canon != NULL) ++ { ++ *h_errnop = HOST_NOT_FOUND; ++ return NSS_STATUS_NOTFOUND; ++ } ++ ++ *h_errnop = NETDB_INTERNAL; ++ return NSS_STATUS_TRYAGAIN; + } + + +@@ -1222,11 +1232,101 @@ gaih_getanswer (const querybuf *answer1, int anslen1, const querybuf *answer2, + + enum nss_status status = NSS_STATUS_NOTFOUND; + ++ /* Combining the NSS status of two distinct queries requires some ++ compromise and attention to symmetry (A or AAAA queries can be ++ returned in any order). What follows is a breakdown of how this ++ code is expected to work and why. We discuss only SUCCESS, ++ TRYAGAIN, NOTFOUND and UNAVAIL, since they are the only returns ++ that apply (though RETURN and MERGE exist). We make a distinction ++ between TRYAGAIN (recoverable) and TRYAGAIN' (not-recoverable). ++ A recoverable TRYAGAIN is almost always due to buffer size issues ++ and returns ERANGE in errno and the caller is expected to retry ++ with a larger buffer. ++ ++ Lastly, you may be tempted to make significant changes to the ++ conditions in this code to bring about symmetry between responses. ++ Please don't change anything without due consideration for ++ expected application behaviour. Some of the synthesized responses ++ aren't very well thought out and sometimes appear to imply that ++ IPv4 responses are always answer 1, and IPv6 responses are always ++ answer 2, but that's not true (see the implemetnation of send_dg ++ and send_vc to see response can arrive in any order, particlarly ++ for UDP). However, we expect it holds roughly enough of the time ++ that this code works, but certainly needs to be fixed to make this ++ a more robust implementation. ++ ++ ---------------------------------------------- ++ | Answer 1 Status / | Synthesized | Reason | ++ | Answer 2 Status | Status | | ++ |--------------------------------------------| ++ | SUCCESS/SUCCESS | SUCCESS | [1] | ++ | SUCCESS/TRYAGAIN | TRYAGAIN | [5] | ++ | SUCCESS/TRYAGAIN' | SUCCESS | [1] | ++ | SUCCESS/NOTFOUND | SUCCESS | [1] | ++ | SUCCESS/UNAVAIL | SUCCESS | [1] | ++ | TRYAGAIN/SUCCESS | TRYAGAIN | [2] | ++ | TRYAGAIN/TRYAGAIN | TRYAGAIN | [2] | ++ | TRYAGAIN/TRYAGAIN' | TRYAGAIN | [2] | ++ | TRYAGAIN/NOTFOUND | TRYAGAIN | [2] | ++ | TRYAGAIN/UNAVAIL | TRYAGAIN | [2] | ++ | TRYAGAIN'/SUCCESS | SUCCESS | [3] | ++ | TRYAGAIN'/TRYAGAIN | TRYAGAIN | [3] | ++ | TRYAGAIN'/TRYAGAIN' | TRYAGAIN' | [3] | ++ | TRYAGAIN'/NOTFOUND | TRYAGAIN' | [3] | ++ | TRYAGAIN'/UNAVAIL | UNAVAIL | [3] | ++ | NOTFOUND/SUCCESS | SUCCESS | [3] | ++ | NOTFOUND/TRYAGAIN | TRYAGAIN | [3] | ++ | NOTFOUND/TRYAGAIN' | TRYAGAIN' | [3] | ++ | NOTFOUND/NOTFOUND | NOTFOUND | [3] | ++ | NOTFOUND/UNAVAIL | UNAVAIL | [3] | ++ | UNAVAIL/SUCCESS | UNAVAIL | [4] | ++ | UNAVAIL/TRYAGAIN | UNAVAIL | [4] | ++ | UNAVAIL/TRYAGAIN' | UNAVAIL | [4] | ++ | UNAVAIL/NOTFOUND | UNAVAIL | [4] | ++ | UNAVAIL/UNAVAIL | UNAVAIL | [4] | ++ ---------------------------------------------- ++ ++ [1] If the first response is a success we return success. ++ This ignores the state of the second answer and in fact ++ incorrectly sets errno and h_errno to that of the second ++ answer. However because the response is a success we ignore ++ *errnop and *h_errnop (though that means you touched errno on ++ success). We are being conservative here and returning the ++ likely IPv4 response in the first answer as a success. ++ ++ [2] If the first response is a recoverable TRYAGAIN we return ++ that instead of looking at the second response. The ++ expectation here is that we have failed to get an IPv4 response ++ and should retry both queries. ++ ++ [3] If the first response was not a SUCCESS and the second ++ response is not NOTFOUND (had a SUCCESS, need to TRYAGAIN, ++ or failed entirely e.g. TRYAGAIN' and UNAVAIL) then use the ++ result from the second response, otherwise the first responses ++ status is used. Again we have some odd side-effects when the ++ second response is NOTFOUND because we overwrite *errnop and ++ *h_errnop that means that a first answer of NOTFOUND might see ++ its *errnop and *h_errnop values altered. Whether it matters ++ in practice that a first response NOTFOUND has the wrong ++ *errnop and *h_errnop is undecided. ++ ++ [4] If the first response is UNAVAIL we return that instead of ++ looking at the second response. The expectation here is that ++ it will have failed similarly e.g. configuration failure. ++ ++ [5] Testing this code is complicated by the fact that truncated ++ second response buffers might be returned as SUCCESS if the ++ first answer is a SUCCESS. To fix this we add symmetry to ++ TRYAGAIN with the second response. If the second response ++ is a recoverable error we now return TRYAGIN even if the first ++ response was SUCCESS. */ ++ + if (anslen1 > 0) + status = gaih_getanswer_slice(answer1, anslen1, qname, + &pat, &buffer, &buflen, + errnop, h_errnop, ttlp, + &first); ++ + if ((status == NSS_STATUS_SUCCESS || status == NSS_STATUS_NOTFOUND + || (status == NSS_STATUS_TRYAGAIN + /* We want to look at the second answer in case of an +@@ -1242,8 +1342,15 @@ gaih_getanswer (const querybuf *answer1, int anslen1, const querybuf *answer2, + &pat, &buffer, &buflen, + errnop, h_errnop, ttlp, + &first); ++ /* Use the second response status in some cases. */ + if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND) + status = status2; ++ /* Do not return a truncated second response (unless it was ++ unavoidable e.g. unrecoverable TRYAGAIN). */ ++ if (status == NSS_STATUS_SUCCESS ++ && (status2 == NSS_STATUS_TRYAGAIN ++ && *errnop == ERANGE && *h_errnop != NO_RECOVERY)) ++ status = NSS_STATUS_TRYAGAIN; + } + + return status; +diff --git a/resolv/res_query.c b/resolv/res_query.c +index 4a9b3b3..95470a9 100644 +--- a/resolv/res_query.c ++++ b/resolv/res_query.c +@@ -396,6 +396,7 @@ __libc_res_nsearch(res_state statp, + { + free (*answerp2); + *answerp2 = NULL; ++ *nanswerp2 = 0; + *answerp2_malloced = 0; + } + } +@@ -447,6 +448,7 @@ __libc_res_nsearch(res_state statp, + { + free (*answerp2); + *answerp2 = NULL; ++ *nanswerp2 = 0; + *answerp2_malloced = 0; + } + +@@ -521,6 +523,7 @@ __libc_res_nsearch(res_state statp, + { + free (*answerp2); + *answerp2 = NULL; ++ *nanswerp2 = 0; + *answerp2_malloced = 0; + } + if (saved_herrno != -1) +diff --git a/resolv/res_send.c b/resolv/res_send.c +index a968b95..21843f1 100644 +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -1,3 +1,20 @@ ++/* Copyright (C) 2016 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ + /* + * Copyright (c) 1985, 1989, 1993 + * The Regents of the University of California. All rights reserved. +@@ -355,6 +372,8 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, + #ifdef USE_HOOKS + if (__glibc_unlikely (statp->qhook || statp->rhook)) { + if (anssiz < MAXPACKET && ansp) { ++ /* Always allocate MAXPACKET, callers expect ++ this specific size. */ + u_char *buf = malloc (MAXPACKET); + if (buf == NULL) + return (-1); +@@ -630,6 +649,77 @@ get_nsaddr (res_state statp, int n) + return (struct sockaddr *) (void *) &statp->nsaddr_list[n]; + } + ++/* The send_vc function is responsible for sending a DNS query over TCP ++ to the nameserver numbered NS from the res_state STATP i.e. ++ EXT(statp).nssocks[ns]. The function supports sending both IPv4 and ++ IPv6 queries at the same serially on the same socket. ++ ++ Please note that for TCP there is no way to disable sending both ++ queries, unlike UDP, which honours RES_SNGLKUP and RES_SNGLKUPREOP ++ and sends the queries serially and waits for the result after each ++ sent query. This implemetnation should be corrected to honour these ++ options. ++ ++ Please also note that for TCP we send both queries over the same ++ socket one after another. This technically violates best practice ++ since the server is allowed to read the first query, respond, and ++ then close the socket (to service another client). If the server ++ does this, then the remaining second query in the socket data buffer ++ will cause the server to send the client an RST which will arrive ++ asynchronously and the client's OS will likely tear down the socket ++ receive buffer resulting in a potentially short read and lost ++ response data. This will force the client to retry the query again, ++ and this process may repeat until all servers and connection resets ++ are exhausted and then the query will fail. It's not known if this ++ happens with any frequency in real DNS server implementations. This ++ implementation should be corrected to use two sockets by default for ++ parallel queries. ++ ++ The query stored in BUF of BUFLEN length is sent first followed by ++ the query stored in BUF2 of BUFLEN2 length. Queries are sent ++ serially on the same socket. ++ ++ Answers to the query are stored firstly in *ANSP up to a max of ++ *ANSSIZP bytes. If more than *ANSSIZP bytes are needed and ANSCP ++ is non-NULL (to indicate that modifying the answer buffer is allowed) ++ then malloc is used to allocate a new response buffer and ANSCP and ++ ANSP will both point to the new buffer. If more than *ANSSIZP bytes ++ are needed but ANSCP is NULL, then as much of the response as ++ possible is read into the buffer, but the results will be truncated. ++ When truncation happens because of a small answer buffer the DNS ++ packets header feild TC will bet set to 1, indicating a truncated ++ message and the rest of the socket data will be read and discarded. ++ ++ Answers to the query are stored secondly in *ANSP2 up to a max of ++ *ANSSIZP2 bytes, with the actual response length stored in ++ *RESPLEN2. If more than *ANSSIZP bytes are needed and ANSP2 ++ is non-NULL (required for a second query) then malloc is used to ++ allocate a new response buffer, *ANSSIZP2 is set to the new buffer ++ size and *ANSP2_MALLOCED is set to 1. ++ ++ The ANSP2_MALLOCED argument will eventually be removed as the ++ change in buffer pointer can be used to detect the buffer has ++ changed and that the caller should use free on the new buffer. ++ ++ Note that the answers may arrive in any order from the server and ++ therefore the first and second answer buffers may not correspond to ++ the first and second queries. ++ ++ It is not supported to call this function with a non-NULL ANSP2 ++ but a NULL ANSCP. Put another way, you can call send_vc with a ++ single unmodifiable buffer or two modifiable buffers, but no other ++ combination is supported. ++ ++ It is the caller's responsibility to free the malloc allocated ++ buffers by detecting that the pointers have changed from their ++ original values i.e. *ANSCP or *ANSP2 has changed. ++ ++ If errors are encountered then *TERRNO is set to an appropriate ++ errno value and a zero result is returned for a recoverable error, ++ and a less-than zero result is returned for a non-recoverable error. ++ ++ If no errors are encountered then *TERRNO is left unmodified and ++ a the length of the first response in bytes is returned. */ + static int + send_vc(res_state statp, + const u_char *buf, int buflen, const u_char *buf2, int buflen2, +@@ -639,11 +729,7 @@ send_vc(res_state statp, + { + const HEADER *hp = (HEADER *) buf; + const HEADER *hp2 = (HEADER *) buf2; +- u_char *ans = *ansp; +- int orig_anssizp = *anssizp; +- // XXX REMOVE +- // int anssiz = *anssizp; +- HEADER *anhp = (HEADER *) ans; ++ HEADER *anhp = (HEADER *) *ansp; + struct sockaddr *nsap = get_nsaddr (statp, ns); + int truncating, connreset, n; + /* On some architectures compiler might emit a warning indicating +@@ -731,6 +817,8 @@ send_vc(res_state statp, + * Receive length & response + */ + int recvresp1 = 0; ++ /* Skip the second response if there is no second query. ++ To do that we mark the second response as received. */ + int recvresp2 = buf2 == NULL; + uint16_t rlen16; + read_len: +@@ -767,36 +855,14 @@ send_vc(res_state statp, + u_char **thisansp; + int *thisresplenp; + if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) { ++ /* We have not received any responses ++ yet or we only have one response to ++ receive. */ + thisanssizp = anssizp; + thisansp = anscp ?: ansp; + assert (anscp != NULL || ansp2 == NULL); + thisresplenp = &resplen; + } else { +- if (*anssizp != MAXPACKET) { +- /* No buffer allocated for the first +- reply. We can try to use the rest +- of the user-provided buffer. */ +- DIAG_PUSH_NEEDS_COMMENT; +- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); +-#if _STRING_ARCH_unaligned +- *anssizp2 = orig_anssizp - resplen; +- *ansp2 = *ansp + resplen; +-#else +- int aligned_resplen +- = ((resplen + __alignof__ (HEADER) - 1) +- & ~(__alignof__ (HEADER) - 1)); +- *anssizp2 = orig_anssizp - aligned_resplen; +- *ansp2 = *ansp + aligned_resplen; +-#endif +- DIAG_POP_NEEDS_COMMENT; +- } else { +- /* The first reply did not fit into the +- user-provided buffer. Maybe the second +- answer will. */ +- *anssizp2 = orig_anssizp; +- *ansp2 = *ansp; +- } +- + thisanssizp = anssizp2; + thisansp = ansp2; + thisresplenp = resplen2; +@@ -804,10 +870,14 @@ send_vc(res_state statp, + anhp = (HEADER *) *thisansp; + + *thisresplenp = rlen; +- if (rlen > *thisanssizp) { +- /* Yes, we test ANSCP here. If we have two buffers +- both will be allocatable. */ +- if (__glibc_likely (anscp != NULL)) { ++ /* Is the answer buffer too small? */ ++ if (*thisanssizp < rlen) { ++ /* If the current buffer is not the the static ++ user-supplied buffer then we can reallocate ++ it. */ ++ if (thisansp != NULL && thisansp != ansp) { ++ /* Always allocate MAXPACKET, callers expect ++ this specific size. */ + u_char *newp = malloc (MAXPACKET); + if (newp == NULL) { + *terrno = ENOMEM; +@@ -819,6 +889,9 @@ send_vc(res_state statp, + if (thisansp == ansp2) + *ansp2_malloced = 1; + anhp = (HEADER *) newp; ++ /* A uint16_t can't be larger than MAXPACKET ++ thus it's safe to allocate MAXPACKET but ++ read RLEN bytes instead. */ + len = rlen; + } else { + Dprint(statp->options & RES_DEBUG, +@@ -948,6 +1021,66 @@ reopen (res_state statp, int *terrno, int ns) + return 1; + } + ++/* The send_dg function is responsible for sending a DNS query over UDP ++ to the nameserver numbered NS from the res_state STATP i.e. ++ EXT(statp).nssocks[ns]. The function supports IPv4 and IPv6 queries ++ along with the ability to send the query in parallel for both stacks ++ (default) or serially (RES_SINGLKUP). It also supports serial lookup ++ with a close and reopen of the socket used to talk to the server ++ (RES_SNGLKUPREOP) to work around broken name servers. ++ ++ The query stored in BUF of BUFLEN length is sent first followed by ++ the query stored in BUF2 of BUFLEN2 length. Queries are sent ++ in parallel (default) or serially (RES_SINGLKUP or RES_SNGLKUPREOP). ++ ++ Answers to the query are stored firstly in *ANSP up to a max of ++ *ANSSIZP bytes. If more than *ANSSIZP bytes are needed and ANSCP ++ is non-NULL (to indicate that modifying the answer buffer is allowed) ++ then malloc is used to allocate a new response buffer and ANSCP and ++ ANSP will both point to the new buffer. If more than *ANSSIZP bytes ++ are needed but ANSCP is NULL, then as much of the response as ++ possible is read into the buffer, but the results will be truncated. ++ When truncation happens because of a small answer buffer the DNS ++ packets header feild TC will bet set to 1, indicating a truncated ++ message, while the rest of the UDP packet is discarded. ++ ++ Answers to the query are stored secondly in *ANSP2 up to a max of ++ *ANSSIZP2 bytes, with the actual response length stored in ++ *RESPLEN2. If more than *ANSSIZP bytes are needed and ANSP2 ++ is non-NULL (required for a second query) then malloc is used to ++ allocate a new response buffer, *ANSSIZP2 is set to the new buffer ++ size and *ANSP2_MALLOCED is set to 1. ++ ++ The ANSP2_MALLOCED argument will eventually be removed as the ++ change in buffer pointer can be used to detect the buffer has ++ changed and that the caller should use free on the new buffer. ++ ++ Note that the answers may arrive in any order from the server and ++ therefore the first and second answer buffers may not correspond to ++ the first and second queries. ++ ++ It is not supported to call this function with a non-NULL ANSP2 ++ but a NULL ANSCP. Put another way, you can call send_vc with a ++ single unmodifiable buffer or two modifiable buffers, but no other ++ combination is supported. ++ ++ It is the caller's responsibility to free the malloc allocated ++ buffers by detecting that the pointers have changed from their ++ original values i.e. *ANSCP or *ANSP2 has changed. ++ ++ If an answer is truncated because of UDP datagram DNS limits then ++ *V_CIRCUIT is set to 1 and the return value non-zero to indicate to ++ the caller to retry with TCP. The value *GOTSOMEWHERE is set to 1 ++ if any progress was made reading a response from the nameserver and ++ is used by the caller to distinguish between ECONNREFUSED and ++ ETIMEDOUT (the latter if *GOTSOMEWHERE is 1). ++ ++ If errors are encountered then *TERRNO is set to an appropriate ++ errno value and a zero result is returned for a recoverable error, ++ and a less-than zero result is returned for a non-recoverable error. ++ ++ If no errors are encountered then *TERRNO is left unmodified and ++ a the length of the first response in bytes is returned. */ + static int + send_dg(res_state statp, + const u_char *buf, int buflen, const u_char *buf2, int buflen2, +@@ -957,8 +1090,6 @@ send_dg(res_state statp, + { + const HEADER *hp = (HEADER *) buf; + const HEADER *hp2 = (HEADER *) buf2; +- u_char *ans = *ansp; +- int orig_anssizp = *anssizp; + struct timespec now, timeout, finish; + struct pollfd pfd[1]; + int ptimeout; +@@ -991,6 +1122,8 @@ send_dg(res_state statp, + int need_recompute = 0; + int nwritten = 0; + int recvresp1 = 0; ++ /* Skip the second response if there is no second query. ++ To do that we mark the second response as received. */ + int recvresp2 = buf2 == NULL; + pfd[0].fd = EXT(statp).nssocks[ns]; + pfd[0].events = POLLOUT; +@@ -1154,55 +1287,56 @@ send_dg(res_state statp, + int *thisresplenp; + + if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) { ++ /* We have not received any responses ++ yet or we only have one response to ++ receive. */ + thisanssizp = anssizp; + thisansp = anscp ?: ansp; + assert (anscp != NULL || ansp2 == NULL); + thisresplenp = &resplen; + } else { +- if (*anssizp != MAXPACKET) { +- /* No buffer allocated for the first +- reply. We can try to use the rest +- of the user-provided buffer. */ +-#if _STRING_ARCH_unaligned +- *anssizp2 = orig_anssizp - resplen; +- *ansp2 = *ansp + resplen; +-#else +- int aligned_resplen +- = ((resplen + __alignof__ (HEADER) - 1) +- & ~(__alignof__ (HEADER) - 1)); +- *anssizp2 = orig_anssizp - aligned_resplen; +- *ansp2 = *ansp + aligned_resplen; +-#endif +- } else { +- /* The first reply did not fit into the +- user-provided buffer. Maybe the second +- answer will. */ +- *anssizp2 = orig_anssizp; +- *ansp2 = *ansp; +- } +- + thisanssizp = anssizp2; + thisansp = ansp2; + thisresplenp = resplen2; + } + + if (*thisanssizp < MAXPACKET +- /* Yes, we test ANSCP here. If we have two buffers +- both will be allocatable. */ +- && anscp ++ /* If the current buffer is not the the static ++ user-supplied buffer then we can reallocate ++ it. */ ++ && (thisansp != NULL && thisansp != ansp) + #ifdef FIONREAD ++ /* Is the size too small? */ + && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0 + || *thisanssizp < *thisresplenp) + #endif + ) { ++ /* Always allocate MAXPACKET, callers expect ++ this specific size. */ + u_char *newp = malloc (MAXPACKET); + if (newp != NULL) { +- *anssizp = MAXPACKET; +- *thisansp = ans = newp; ++ *thisanssizp = MAXPACKET; ++ *thisansp = newp; + if (thisansp == ansp2) + *ansp2_malloced = 1; + } + } ++ /* We could end up with truncation if anscp was NULL ++ (not allowed to change caller's buffer) and the ++ response buffer size is too small. This isn't a ++ reliable way to detect truncation because the ioctl ++ may be an inaccurate report of the UDP message size. ++ Therefore we use this only to issue debug output. ++ To do truncation accurately with UDP we need ++ MSG_TRUNC which is only available on Linux. We ++ can abstract out the Linux-specific feature in the ++ future to detect truncation. */ ++ if (__glibc_unlikely (*thisanssizp < *thisresplenp)) { ++ Dprint(statp->options & RES_DEBUG, ++ (stdout, ";; response may be truncated (UDP)\n") ++ ); ++ } ++ + HEADER *anhp = (HEADER *) *thisansp; + socklen_t fromlen = sizeof(struct sockaddr_in6); + assert (sizeof(from) <= fromlen); + From 2678f3688416a5ace7302bd8f18d3cd71ffa4c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Tue, 16 Feb 2016 10:34:21 -0500 Subject: [PATCH 296/308] Fix OMake source URL Current source is 404, moving to pkgs.fedoraproject.org mirror. Should fix current aborted jobs on Hydra: http://hydra.nixos.org/eval/1237311#tabs-aborted --- pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 986bd4609d5..40188734a99 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "${webpage}/downloads/${pname}-${version}.tar.gz"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; }; patchFlags = "-p0"; From a6cf5ddc982f0f72336b16708ceb58be944cc5f7 Mon Sep 17 00:00:00 2001 From: Eric Hegnes Date: Mon, 15 Feb 2016 12:39:36 -0500 Subject: [PATCH 297/308] Update Cargo crates index --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index cc16f450227..fc3e8fcb98c 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-02-02"; - rev = "9312acc30def6bb16739ab6c4560fb9880b25c5a"; + version = "2016-02-15"; + rev = "af2c6a768083a66a898a07f5f3b7ec62871dbc3c"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0mrfcipc7sv0kzryjs649x3j4djr8jgbl58jd21hrcihc61qa38n"; + sha256 = "f2da91b1a11146eed04c4b4ad7599f1bd3dc2bca4e011b3377ba16365b3124aa"; }; in From 23ab6bf6b274a0605a8099d98623e8b9af6b24f7 Mon Sep 17 00:00:00 2001 From: Eric Hegnes Date: Mon, 15 Feb 2016 15:43:31 -0500 Subject: [PATCH 298/308] exa: init at git 2016-02-15 --- lib/maintainers.nix | 1 + pkgs/tools/misc/exa/default.nix | 38 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/tools/misc/exa/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f8c7c2e21e5..24ae4c9fc40 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -95,6 +95,7 @@ eduarrrd = "Eduard Bachmakov "; edwtjo = "Edward Tjörnhammar "; eelco = "Eelco Dolstra "; + ehegnes = "Eric Hegnes "; ehmry = "Emery Hemingway "; eikek = "Eike Kettner "; elasticdog = "Aaron Bull Schaefer "; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix new file mode 100644 index 00000000000..8518a7331b9 --- /dev/null +++ b/pkgs/tools/misc/exa/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "exa-${version}"; + version = "2016-02-15"; + + depsSha256 = "1925nhpfph82wn755zf2nmad24f1hzbxq60gpva9sic6rnap4c1x"; + + src = fetchFromGitHub { + owner = "ogham"; + repo = "exa"; + rev = "252eba484476369bb966fb1af7f739732b968fc0"; + sha256 = "1smyy32z44zgmhyhlbjaxcgfnlbcwz7am9225yppqfdsiqqgdybf"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; + + # Some tests fail, but Travis ensures a proper build + doCheck = false; + + meta = with stdenv.lib; { + description = "Replacement for 'ls' written in Rust"; + longDescription = '' + exa is a modern replacement for ls. It uses colours for information by + default, helping you distinguish between many types of files, such as + whether you are the owner, or in the owning group. It also has extra + features not present in the original ls, such as viewing the Git status + for a directory, or recursing into directories with a tree view. exa is + written in Rust, so it’s small, fast, and portable. + ''; + homepage = http://bsago.me/exa; + license = licenses.mit; + maintainer = [ maintainers.ehegnes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93558c8401f..ad9efd6105e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1472,6 +1472,8 @@ let evtest = callPackage ../applications/misc/evtest { }; + exa = callPackage ../tools/misc/exa { }; + exempi = callPackage ../development/libraries/exempi { }; execline = callPackage ../tools/misc/execline { }; From b60ceea90371f27578ea6ab2f892e8a46c41ded9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 16 Feb 2016 17:01:15 +0100 Subject: [PATCH 299/308] svtplay-dl: 0.30.2016.01.10 -> 0.30.2016.02.08 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 97737bce783..270e1c0cb62 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "0.30.2016.01.10"; + version = "0.30.2016.02.08"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1npgjgbri7g27f9ayx39d3pbv7pa22860c0aipwwvayggs27g1sr"; + sha256 = "0nkgc43lf06h0w8k4zm5pdzp6r6jjc6j94ciljcm8333n0ykfzpr"; }; pythonPaths = [ pycrypto requests2 ]; From fc48bf5a2ceb908b73dc035374e2ec5a31086aa2 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Tue, 16 Feb 2016 17:22:51 +0100 Subject: [PATCH 300/308] glibc: fix cve-2015-7547.patch so it applies cleanly --- pkgs/development/libraries/glibc/cve-2015-7547.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/cve-2015-7547.patch b/pkgs/development/libraries/glibc/cve-2015-7547.patch index 1f10aafe0c0..9bf0bcc388c 100644 --- a/pkgs/development/libraries/glibc/cve-2015-7547.patch +++ b/pkgs/development/libraries/glibc/cve-2015-7547.patch @@ -316,7 +316,7 @@ index a968b95..21843f1 100644 - // int anssiz = *anssizp; - HEADER *anhp = (HEADER *) ans; + HEADER *anhp = (HEADER *) *ansp; - struct sockaddr *nsap = get_nsaddr (statp, ns); + struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns]; int truncating, connreset, n; /* On some architectures compiler might emit a warning indicating @@ -731,6 +817,8 @@ send_vc(res_state statp, @@ -328,7 +328,7 @@ index a968b95..21843f1 100644 int recvresp2 = buf2 == NULL; uint16_t rlen16; read_len: -@@ -767,36 +855,14 @@ send_vc(res_state statp, +@@ -767,40 +855,14 @@ send_vc(res_state statp, u_char **thisansp; int *thisresplenp; if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) { @@ -344,8 +344,10 @@ index a968b95..21843f1 100644 - /* No buffer allocated for the first - reply. We can try to use the rest - of the user-provided buffer. */ +-#if __GNUC_PREREQ (4, 7) - DIAG_PUSH_NEEDS_COMMENT; - DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); +-#endif -#if _STRING_ARCH_unaligned - *anssizp2 = orig_anssizp - resplen; - *ansp2 = *ansp + resplen; @@ -356,7 +358,9 @@ index a968b95..21843f1 100644 - *anssizp2 = orig_anssizp - aligned_resplen; - *ansp2 = *ansp + aligned_resplen; -#endif +-#if __GNUC_PREREQ (4, 7) - DIAG_POP_NEEDS_COMMENT; +-#endif - } else { - /* The first reply did not fit into the - user-provided buffer. Maybe the second From 7fd2cc1ea8687568901e7f8efec940ccb9e06657 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 16 Feb 2016 19:35:35 +0300 Subject: [PATCH 301/308] liferea: update upstream tarball --- .../networking/newsreaders/liferea/default.nix | 4 +--- .../liferea-fix-notification-header-location.patch | 12 ------------ 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 442240c2718..ff2b16b8a58 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0wpinar2cxyzq2j7ff7lznc08f0n6qjdm9aavsarbgdpaf2s1xvq"; + sha256 = "0xyy0qm3h22b69if2hmg36jzvvljxb1w0zy2m2a28kdqfzpa6m8g"; }; buildInputs = with gst_all_1; [ @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { makeWrapper ]; - patches = [ ./liferea-fix-notification-header-location.patch ]; - preFixup = '' for f in "$out"/bin/*; do wrapProgram "$f" \ diff --git a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch deleted file mode 100644 index 3cd322460b0..00000000000 --- a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/src/notification/libnotify.c b/src/notification/libnotify.c ---- a/src/notification/libnotify.c 2016-01-28 19:33:19.000000000 +0100 -+++ b/src/notification/libnotify.c 2016-02-01 19:20:39.167580131 +0100 -@@ -40,7 +40,7 @@ - #include "ui/feed_list_view.h" - #include "ui/ui_tray.h" - --#include "notification/notification.h" -+#include "../notification.h" - - static gboolean supports_actions = FALSE; - static gboolean supports_append = FALSE; From 7fcce2a9f09f45de51be85da7c62b109af95d753 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 16 Feb 2016 21:20:15 +0100 Subject: [PATCH 302/308] perl-strictures: 2.000001 -> 2.000002 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b58a6b834e0..55fd008d96c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10484,10 +10484,10 @@ let self = _self // overrides; _self = with self; { }; strictures = buildPerlPackage rec { - name = "strictures-2.000001"; + name = "strictures-2.000002"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "1lr0br982xb49wxra5ywq9vk4jhjmq28670i8yscks1wss58lwqy"; + sha256 = "0021m9k1f6dfqn88znlp24g7xsqxwwjbj91w474c7n5gngf5a0qk"; }; meta = { homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; From c38eb526d59e2fcc985a0459e94a6ad30b1d3706 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 16 Feb 2016 21:01:21 +0000 Subject: [PATCH 303/308] git: fix references to gettext in bash scripts See #13047 --- .../version-management/git-and-tools/git/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 49ecce0456b..2c07f540ece 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -85,6 +85,10 @@ stdenv.mkDerivation { -e 's| perl -e| ${perl}/bin/perl -e|g' \ $out/libexec/git-core/{git-am,git-submodule} + # Fix references to gettext. + substituteInPlace $out/libexec/git-core/git-sh-i18n \ + --replace 'gettext.sh' '${gettext}/bin/gettext.sh' + # gzip (and optionally bzip2, xz, zip) are runtime dependencies for # gitweb.cgi, need to patch so that it's found sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ From b7b696e534bb3c4ae70ec2a80338c3a62186b2ec Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 10 Feb 2016 00:58:53 +0100 Subject: [PATCH 304/308] leiningen: 2.5.3 -> 2.6.1 --- pkgs/development/tools/build-managers/leiningen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index f4f18dac487..8a8ab9ba91f 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.5.3"; + version = "2.6.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0xbfg6v6f3qyi99dbqragh3za2a0agrcq9c0qbkshvp5yd0fx4h1"; + sha256 = "1ndirl36gbba12cs5vw22k2zrbpqdmnpi1gciwqb1zbib2s1akg8"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; - sha256 = "1p93j03v02mf1cnli6lv9qqnx7gwxr571g8z7y06p0d4nq31c32b"; + sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p"; }; patches = [ ./lein-fix-jar-path.patch ]; From 4cb9f662ce8eae9477febdb70ba5f217496a731f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Feb 2016 22:39:33 +0100 Subject: [PATCH 305/308] hwloc: 1.6 -> 1.11.2 and disable tests This package was failing to build on wendy: lt-linux-libnuma: linux-libnuma.c:70: main: Assertion `numa_bitmask_equal(bitmask, numa_all_nodes_ptr)' failed. Since we shouldn't run tests that depend on the hardware characteristics of the build machine, I've disabled these. --- pkgs/development/libraries/hwloc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index c357d808cac..5d07cfe3a2b 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -2,11 +2,11 @@ , pciutils, numactl }: stdenv.mkDerivation rec { - name = "hwloc-1.6"; + name = "hwloc-1.11.2"; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v1.6/downloads/${name}.tar.bz2"; - sha256 = "0y561bryiqp1f5af5lm432dcw93xwp1jw55si7wa6skxnd6ch25w"; + url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; + sha1 = "3d68de060808f04349538be4e63cde501cd53b0a"; }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { -e "s|-lnuma|-L$numalibdir -lnuma|g" ''; - # XXX: A test hangs on Cygwin, see - # . - doCheck = !stdenv.isCygwin; + # Checks disabled because they're impure (hardware dependent) and + # fail on some build machines. + doCheck = false; meta = with stdenv.lib; { description = "Portable abstraction of hierarchical architectures for high-performance computing"; From b58f84f236538113eaec27e17c3218e6e039b4ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Feb 2016 22:52:33 +0100 Subject: [PATCH 306/308] pyxml: move to pythonPackages --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 662905129e5..62f13dd5531 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9187,7 +9187,7 @@ let pysideShiboken = pythonPackages.pysideShiboken; - pyxml = callPackage ../development/python-modules/pyxml { }; + pyxml = pythonPackages.pyxml; rbtools = pythonPackages.rbtools; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42eac4716b2..f400d13bdf1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -177,6 +177,8 @@ in modules // { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}"; + sip = callPackage ../development/python-modules/sip { }; sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { }; From fc85f1beedffe55925484747944873fab59f9a06 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 28 Aug 2015 20:28:32 -0700 Subject: [PATCH 307/308] nix-prefetch-hg: Various bash style improvements, fixes #9511 --- pkgs/build-support/fetchhg/nix-prefetch-hg | 70 +++++++++++----------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg index 7143eecfe5c..94c6b1ec694 100755 --- a/pkgs/build-support/fetchhg/nix-prefetch-hg +++ b/pkgs/build-support/fetchhg/nix-prefetch-hg @@ -5,79 +5,79 @@ url=$1 rev=$2 expHash=$3 -hashType=$NIX_HASH_ALGO -if test -z "$hashType"; then - hashType=sha256 -fi -if test -z "$hashFormat"; then - hashFormat=--base32 +hashType="${NIX_HASH_ALGO:-sha256}" +hashFormat=${hashFormat:-"--base32"} +rev="${rev:-tip}" + +LOG() { + echo "$@" >&2 +} + +die() { + LOG "$@" + exit 1 +} + +if [[ -z "$url" || "$url" == "--help" ]]; then + die "Usage: nix-prefetch-hg URL [rev [EXPECTED-HASH]]" fi -if test -z "$url"; then - echo "syntax: nix-prefetch-hg URL [rev [EXPECTED-HASH]]" >&2 - exit 1 -fi - -if test "$fetchSubrepos" == 1; then +if [[ "${fetchSubrepos:-0}" == 1 ]]; then subrepoClause=S else subrepoClause= fi -test -n "$rev" || rev="tip" - - # If the hash was given, a file with that hash may already be in the # store. -if test -n "$expHash"; then +if [[ -n "$expHash" ]]; then finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" hg-archive) if ! nix-store --check-validity "$finalPath" 2> /dev/null; then finalPath= fi - hash=$expHash + hash="$expHash" fi # If we don't know the hash or a path with that hash doesn't exist, # download the file and add it to the store. -if test -z "$finalPath"; then +if [[ -z "$finalPath" ]]; then tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")" - trap "rm -rf \"$tmpPath\"" EXIT + cleanup() { x=$?; rm -rf "$tmpPath"; exit $x; }; trap cleanup EXIT tmpArchive="$tmpPath/hg-archive" # Perform the checkout. - if [[ $url != /* ]]; then - tmpClone=$tmpPath/hg-clone - hg clone -q -y -U "$url" $tmpClone >&2 + if [[ "$url" != /* ]]; then + tmpClone="$tmpPath/hg-clone" + hg clone -q -y -U "$url" "$tmpClone" >&2 else tmpClone=$url fi - hg archive -q$subrepoClause -y -r "$rev" --cwd $tmpClone $tmpArchive - rm -f $tmpArchive/.hg_archival.txt + hg archive -q$subrepoClause -y -r "$rev" --cwd "$tmpClone" "$tmpArchive" + rm -f "$tmpArchive/.hg_archival.txt" - echo "hg revision is $(cd $tmpClone; hg id -r "$rev" -i)" + LOG "hg revision is $(cd "$tmpClone"; hg id -r "$rev" -i)" # Compute the hash. - hash=$(nix-hash --type $hashType $hashFormat $tmpArchive) - if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi + hash=$(nix-hash --type "$hashType" "$hashFormat" "$tmpArchive") + if [[ -z "$QUIET" ]]; then LOG "hash is $hash"; fi # Add the downloaded file to the Nix store. - finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpArchive) + finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpArchive") - if test -n "$expHash" -a "$expHash" != "$hash"; then - echo "hash mismatch for URL \`$url'" - exit 1 + if [[ -n "$expHash" && "$expHash" != "$hash" ]]; then + die "ERROR: hash mismatch for URL \`$url'" fi fi -if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi +if [[ -z "$QUIET" ]]; then LOG "path is $finalPath"; fi -echo $hash +echo "$hash" -if test -n "$PRINT_PATH"; then - echo $finalPath +if [[ -n "$PRINT_PATH" ]]; then + echo "$finalPath" fi From 2f3eae3a87eb4f9e330ac2c31611061c1ae8699f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 17 Feb 2016 08:47:47 +0100 Subject: [PATCH 308/308] pkgconfig: add a http-only mirror It seems we don't really need `fetchurlBoot` here ATM, but let's keep it. https://github.com/NixOS/nixpkgs/issues/12816#issuecomment-185083205 --- pkgs/development/tools/misc/pkgconfig/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index c82a626336f..d7246d22ca7 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation (rec { name = "pkg-config-0.29"; - + setupHook = ./setup-hook.sh; - + src = fetchurl { - url = "http://pkgconfig.freedesktop.org/releases/${name}.tar.gz"; + urls = [ + "https://pkgconfig.freedesktop.org/releases/${name}.tar.gz" + "http://fossies.org/linux/misc/${name}.tar.gz" + ]; sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68"; };