From de88ff99124dcc15ddef7743b1c6bc1ffd7d36f6 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Fri, 18 Sep 2015 02:26:45 -0700 Subject: [PATCH 001/191] 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/191] 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 fdb5563bcc668b96591fa2649853c4dba771aa24 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Wed, 30 Dec 2015 01:49:56 +0800 Subject: [PATCH 003/191] 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 004/191] 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 005/191] 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 006/191] 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 007/191] 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 008/191] 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 009/191] 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 010/191] 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 011/191] 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 46ecb25d68ba94248945ba9dfebe8fafcf70ed15 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Thu, 4 Feb 2016 11:31:28 +0800 Subject: [PATCH 012/191] 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 92dc00d0fdbfafa58bb82e9ed8657de5dfed53a6 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 9 Dec 2015 22:07:23 -0500 Subject: [PATCH 013/191] 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 20bb296be60feda7741ed680e53761a954f21423 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 7 Feb 2016 18:51:28 +0900 Subject: [PATCH 014/191] 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 a708bce08b9ecdc25c53d1bde22be66aba80b772 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 7 Feb 2016 22:55:32 +0100 Subject: [PATCH 015/191] 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 55b7f03e3bf5986241655894288b7980000fb6c1 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Wed, 3 Feb 2016 11:05:58 +0100 Subject: [PATCH 016/191] 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 8477e5788c32734af2fc210b2a7521d669f41e42 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 9 Feb 2016 14:26:11 +0000 Subject: [PATCH 017/191] 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 018/191] 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 74270469dbdf12895827929753c92ce13737d709 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 10 Feb 2016 00:03:00 +0900 Subject: [PATCH 019/191] 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 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 020/191] 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 021/191] 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 022/191] 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 023/191] 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 024/191] 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 025/191] 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 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 026/191] 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 027/191] 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 028/191] 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 029/191] 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 030/191] 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 031/191] 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 032/191] 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 033/191] 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 034/191] 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 035/191] 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 036/191] 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 037/191] 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 038/191] 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 039/191] 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 040/191] 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 041/191] 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 042/191] 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 043/191] 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 044/191] 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 045/191] 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 046/191] 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 047/191] 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 048/191] 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 049/191] 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 050/191] 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 051/191] 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 052/191] 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 053/191] 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 054/191] 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 055/191] 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 056/191] 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 057/191] 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 058/191] 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 059/191] 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 060/191] 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 061/191] 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 062/191] 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 063/191] 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 064/191] 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 065/191] 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 066/191] 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 067/191] 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 068/191] 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 069/191] 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 070/191] 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 071/191] 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 072/191] 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 073/191] 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 074/191] 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 075/191] 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 076/191] 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 077/191] 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 078/191] 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 079/191] 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 080/191] 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 081/191] 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 082/191] 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 083/191] 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 084/191] 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 085/191] 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 086/191] 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 087/191] 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 088/191] 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 089/191] 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 090/191] 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 091/191] 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 092/191] 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 093/191] 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 094/191] 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 095/191] 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 a1fa485378f3c17946c138935fd46be2178da389 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Feb 2016 13:14:34 +0100 Subject: [PATCH 096/191] 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 097/191] 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 098/191] 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 099/191] 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 100/191] 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 101/191] 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 102/191] 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 103/191] 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 104/191] 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 105/191] 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 106/191] 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 107/191] 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 108/191] 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 109/191] 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 110/191] 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 111/191] 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 112/191] 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 113/191] 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 114/191] 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 115/191] 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 116/191] 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 117/191] 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 118/191] 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 119/191] 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 120/191] 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 121/191] 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 122/191] 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 123/191] 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 124/191] 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 125/191] {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 126/191] 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 127/191] 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 128/191] 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 129/191] 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 130/191] 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 131/191] 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 132/191] 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 133/191] 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 134/191] 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 135/191] 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 136/191] 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 137/191] 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 138/191] 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 e7565363921eb4a8041fecaeb5a2d717ab3232b0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 13 Feb 2016 17:13:33 -0800 Subject: [PATCH 139/191] 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 140/191] 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 141/191] 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 142/191] 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 143/191] 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 144/191] 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 145/191] 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 146/191] 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 147/191] 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 148/191] 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 149/191] 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 150/191] 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 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 151/191] 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 152/191] 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 153/191] 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 154/191] 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 155/191] 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 156/191] 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 157/191] 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 158/191] 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 159/191] 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 160/191] 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 161/191] 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 162/191] 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 163/191] 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 164/191] 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 af64bedaca73c660d6a3d0424981f9fe58ee9a52 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Tue, 9 Feb 2016 22:34:31 +0100 Subject: [PATCH 165/191] 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 166/191] 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 167/191] 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 168/191] 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 169/191] 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 170/191] 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 171/191] 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 172/191] 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 745a11fad56964b0ce6e9a7bf5a8baab745f9184 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 8 Feb 2016 10:53:02 +0200 Subject: [PATCH 173/191] 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 174/191] 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 175/191] 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 314e4edf59880c138468f5a7c271fdee9a37843f Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Mon, 15 Feb 2016 13:15:48 +0100 Subject: [PATCH 176/191] 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 177/191] 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 178/191] 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 179/191] 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 180/191] 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 181/191] 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 50bd1a0e8f388ba64b5f8fca39ed332c051ff7b2 Mon Sep 17 00:00:00 2001 From: Christoph-Simon Senjak Date: Fri, 12 Feb 2016 14:40:49 +0100 Subject: [PATCH 182/191] 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 183/191] 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 184/191] 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 185/191] 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 6d6f3311093386d1e2e45b4580ac2f0b8838477d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 15 Feb 2016 18:29:44 +0100 Subject: [PATCH 186/191] 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 187/191] 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 188/191] 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 189/191] 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 190/191] 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 191/191] 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;