diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 4148e87e018..f0015a7f9ac 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -366,4 +366,20 @@ it. Place the resulting package.nix file into
+
+
+Autojump
+
+
+ autojump needs the shell integration to be useful but unlike other systems,
+ nix doesn't have a standard share directory location. This is why a
+ autojump-share script is shipped that prints the location
+ of the shared folder. This can then be used in the .bashrc like this:
+
+ source "$(autojump-share)/autojump.bash"
+
+
+
+
+
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 8129dda5a37..d5f37aee15e 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1171,12 +1171,14 @@ echo @foo@
That is, no substitution is performed for undefined variables.
- Environment variables that start with an uppercase letter are filtered out,
- to prevent global variables (like HOME) from accidentally
+ Environment variables that start with an uppercase letter or an
+ underscore are filtered out,
+ to prevent global variables (like HOME) or private
+ variables (like __ETC_PROFILE_DONE) from accidentally
getting substituted.
The variables also have to be valid bash “names”, as
- defined in the bash manpage (alphanumeric or _, must not
- start with a number).
+ defined in the bash manpage (alphanumeric or _,
+ must not start with a number).
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 157ccc08f62..e9ca22117aa 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -26,6 +26,9 @@ elif [[ $1 == build ]]; then
echo "=== Checking tarball creation"
nix-build pkgs/top-level/release.nix -A tarball
+ echo "=== Checking NixOS options"
+ nix-build --show-trace nixos/release.nix -A options
+
if [[ $TRAVIS_PULL_REQUEST == false ]]; then
echo "=== Not a pull request"
else
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 1bf2a9c5830..192f608e138 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -102,6 +102,11 @@ for type in hvm pv; do
mv $vhdFile.tmp $vhdFile
fi
+ vhdFileLogicalBytes="$(qemu-img info "$vhdFile" | grep ^virtual\ size: | cut -f 2 -d \( | cut -f 1 -d \ )"
+ vhdFileLogicalGigaBytes=$(((vhdFileLogicalBytes-1)/1024/1024/1024+1)) # Round to the next GB
+
+ echo "Disk size is $vhdFileLogicalBytes bytes. Will be registered as $vhdFileLogicalGigaBytes GB."
+
taskId=$(cat $stateDir/$region.$type.task-id 2> /dev/null || true)
volId=$(cat $stateDir/$region.$type.vol-id 2> /dev/null || true)
snapId=$(cat $stateDir/$region.$type.snap-id 2> /dev/null || true)
@@ -165,7 +170,7 @@ for type in hvm pv; do
rm -f $stateDir/$region.$type.vol-id
fi
- extraFlags="-b /dev/sda1=$snapId:20:true:gp2"
+ extraFlags="-b /dev/sda1=$snapId:$vhdFileLogicalGigaBytes:true:gp2"
if [ $type = pv ]; then
extraFlags+=" --root-device-name=/dev/sda1"
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 6b02446d53b..2f37f180c7e 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -123,6 +123,8 @@ with lib;
(mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ])
(mkRemovedOptionModule [ "services" "printing" "cupsdConf" ])
(mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ])
+ (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ])
+ (mkRemovedOptionModule [ "services" "dovecot2" "package" ])
];
}
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index d766f6badfc..4a6d61d2676 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -29,7 +29,7 @@ with lib;
network inet raw,
${pkgs.glibc.out}/lib/*.so mr,
- ${pkgs.libcap.out}/lib/libcap.so* mr,
+ ${pkgs.libcap.lib}/lib/libcap.so* mr,
${pkgs.attr.out}/lib/libattr.so* mr,
${pkgs.iputils}/bin/ping mixr,
diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index fff0d091c7a..10f3daea69e 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -75,9 +75,10 @@ in
after = [ "network.target" ];
preStart = ''
- test -e ${stateDir}/saves/${cfg.saveName}.zip || ${pkgs.factorio-headless}/bin/factorio \
- --config=${cfg.configFile} \
- --create=${cfg.saveName}
+ test -e ${stateDir}/saves/${cfg.saveName}.zip || \
+ ${pkgs.factorio-headless}/bin/factorio \
+ --config=${cfg.configFile} \
+ --create=${cfg.saveName}
'';
serviceConfig = {
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 47e374d8edc..f239dda564a 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.dovecot2;
- dovecotPkg = cfg.package;
+ dovecotPkg = pkgs.dovecot;
baseDir = "/run/dovecot2";
stateDir = "/var/lib/dovecot";
@@ -98,13 +98,6 @@ in
description = "Additional listeners to start when Dovecot is enabled.";
};
- package = mkOption {
- type = types.package;
- default = pkgs.dovecot;
- defaultText = "pkgs.dovecot";
- description = "Dovecot package to use.";
- };
-
user = mkOption {
type = types.str;
default = "dovecot2";
@@ -159,8 +152,7 @@ in
description = ''
Symlinks the contents of lib/dovecot of every given package into
/etc/dovecot/modules. This will make the given modules available
- if a dovecot package with the module_dir patch applied (like
- pkgs.dovecot22, the default) is being used.
+ if a dovecot package with the module_dir patch applied is being used.
'';
};
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index 118d299042d..ef744439c3d 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -11,6 +11,7 @@ with lib;
services.dictd = {
enable = mkOption {
+ type = types.bool;
default = false;
description = ''
Whether to enable the DICT.org dictionary server.
@@ -18,8 +19,9 @@ with lib;
};
DBs = mkOption {
+ type = types.listOf types.package;
default = [];
- # example = [ pkgs.dictDBs.nld2eng ];
+ example = [ pkgs.dictdDBs.nld2eng ];
description = ''List of databases to make available.'';
};
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index f1838224098..ddc7258ce0b 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -126,7 +126,7 @@ in
{ description = "NFSv3 Mount Daemon";
requires = [ "rpcbind.service" ];
- after = [ "rpcbind.service" ];
+ after = [ "rpcbind.service" "local-fs.target" ];
path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ];
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 9e2b044821d..3961088c4b0 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -165,7 +165,7 @@ in
${pkgs.xz.out}/lib/liblzma.so.* mr,
${pkgs.libgcrypt.out}/lib/libgcrypt.so.* mr,
${pkgs.libgpgerror.out}/lib/libgpg-error.so.* mr,
- ${pkgs.libcap.out}/lib/libcap.so.* mr,
+ ${pkgs.libcap.lib}/lib/libcap.so.* mr,
${pkgs.lz4}/lib/liblz4.so.* mr,
${pkgs.attr.out}/lib/libattr.so.* mr,
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index 8ffce23a4b1..9868f303ab2 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -78,6 +78,12 @@ in {
description = "Configuration dumps that should be loaded on the first startup";
example = literalExample "[ ./myejabberd.dump ]";
};
+
+ imagemagick = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Add ImageMagick to server's path; allows for image thumbnailing";
+ };
};
};
@@ -105,7 +111,7 @@ in {
description = "ejabberd server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- path = [ pkgs.findutils pkgs.coreutils ];
+ path = [ pkgs.findutils pkgs.coreutils ] ++ lib.optional cfg.imagemagick pkgs.imagemagick;
serviceConfig = {
Type = "forking";
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 26182dc93cd..32203a522b0 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -126,7 +126,7 @@ in
${pkgs.libgpgerror.out}/lib/libgpg-error*.so* mr,
${pkgs.nghttp2.lib}/lib/libnghttp2*.so* mr,
${pkgs.c-ares.out}/lib/libcares*.so* mr,
- ${pkgs.libcap.out}/lib/libcap*.so* mr,
+ ${pkgs.libcap.lib}/lib/libcap*.so* mr,
${pkgs.attr.out}/lib/libattr*.so* mr,
${pkgs.lz4}/lib/liblz4*.so* mr,
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 7953729c00c..c23897192b4 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -406,7 +406,7 @@ let
([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices));
}
''
- cat ${php}/etc/php-recommended.ini > $out
+ cat ${php}/etc/php.ini > $out
echo "$options" >> $out
'';
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 6a60000ce19..2658d7117e3 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -19,6 +19,12 @@ let
${concatStringsSep "\n" (mapAttrsToList (n: v: "[${n}]\n${v}") cfg.poolConfigs)}
'';
+ phpIni = pkgs.writeText "php.ini" ''
+ ${readFile "${cfg.phpPackage}/etc/php.ini"}
+
+ ${cfg.phpOptions}
+ '';
+
in {
options = {
@@ -44,10 +50,15 @@ in {
'';
};
- phpIni = mkOption {
- type = types.path;
- default = "${cfg.phpPackage}/etc/php-recommended.ini";
- description = "php.ini file to use.";
+ phpOptions = mkOption {
+ type = types.lines;
+ default = "";
+ example =
+ ''
+ date.timezone = "CET"
+ '';
+ description =
+ "Options appended to the PHP configuration file php.ini.";
};
poolConfigs = mkOption {
@@ -84,7 +95,7 @@ in {
mkdir -p "${stateDir}"
'';
serviceConfig = {
- ExecStart = "${cfg.phpPackage}/sbin/php-fpm -y ${cfgFile} -c ${cfg.phpIni}";
+ ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";
PIDFile = pidFile;
};
};
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index 6e8719e1053..65532c7a32b 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -1,32 +1,78 @@
{ config, lib, pkgs, ... }:
+
with lib;
+
let cfg = config.services.unclutter;
+
in {
- options = {
- services.unclutter.enable = mkOption {
+ options.services.unclutter = {
+
+ enable = mkOption {
+ description = "Enable unclutter to hide your mouse cursor when inactive";
type = types.bool;
default = false;
example = true;
- description = "Enable unclutter to hide your mouse cursor when inactive";
};
- services.unclutter.arguments = mkOption {
- description = "Arguments to pass to unclutter command";
- default = "-idle 1";
+ package = mkOption {
+ type = types.package;
+ default = pkgs.unclutter;
+ defaultText = "pkgs.unclutter";
+ description = "unclutter derivation to use.";
+ };
+
+ keystroke = mkOption {
+ description = "Wait for a keystroke before hiding the cursor";
+ type = types.bool;
+ default = false;
+ };
+
+ timeout = mkOption {
+ description = "Number of seconds before the cursor is marked inactive";
+ type = types.int;
+ default = 1;
+ };
+
+ threeshold = mkOption {
+ description = "Minimum number of pixels considered cursor movement";
+ type = types.int;
+ default = 1;
+ };
+
+ displayName = mkOption {
+ description = "Name of the X11 display";
type = types.str;
+ default = ":0";
+ };
+
+ excluded = mkOption {
+ description = "Names of windows where unclutter should not apply";
+ type = types.listOf types.str;
+ default = [];
+ example = [ "" ];
+ };
+
+ extraOptions = mkOption {
+ description = "More arguments to pass to the unclutter command";
+ type = types.listOf types.str;
+ default = [];
+ example = [ "noevent" "grab" ];
};
};
config = mkIf cfg.enable {
- systemd.services.unclutter = {
+ systemd.user.services.unclutter = {
description = "unclutter";
- requires = [ "display-manager.service" ];
- after = [ "display-manager.service" ];
- wantedBy = [ "graphical.target" ];
+ wantedBy = [ "default.target" ];
serviceConfig.ExecStart = ''
- ${pkgs.unclutter}/bin/unclutter ${cfg.arguments}
+ ${cfg.package}/bin/unclutter \
+ -idle ${toString cfg.timeout} \
+ -display ${cfg.displayName} \
+ -jitter ${toString (cfg.threeshold - 1)} \
+ ${optionalString cfg.keystroke "-keystroke"} \
+ ${concatMapStrings (x: " -"+x) cfg.extraOptions} \
+ -not ${concatStringsSep " " cfg.excluded} \
'';
- environment = { DISPLAY = ":0"; };
serviceConfig.Restart = "always";
};
};
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index 4cdc8154195..a881459bed1 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -88,7 +88,7 @@ in
boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
- cp -pv ${pkgs.glibc}/lib/libnss_files.so.* $out/lib
+ cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
'';
boot.initrd.extraUtilsCommandsTest = ''
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 1f8779abf0c..9bffcd31b9b 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -439,8 +439,18 @@ eval "exec $logOutFd>&- $logErrFd>&-"
# Kill any remaining processes, just to be sure we're not taking any
# with us into stage 2. But keep storage daemons like unionfs-fuse.
-pkill -9 -v -f '@'
-
+#
+# Storage daemons are distinguished by an @ in front of their command line:
+# https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
+local pidsToKill="$(pgrep -v -f '^@')"
+for pid in $pidsToKill; do
+ # Make sure we don't kill kernel processes, see #15226 and:
+ # http://stackoverflow.com/questions/12213445/identifying-kernel-threads
+ readlink "/proc/$pid/exe" &> /dev/null || continue
+ # Try to avoid killing ourselves.
+ [ $pid -eq $$ ] && continue
+ kill -9 "$pid"
+done
if test -n "$debug1mounts"; then fail; fi
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index ac2415a22b5..b9a4f3b11dc 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -25,6 +25,8 @@ in
serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";
};
+ environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*";
+
services.xserver = {
videoDrivers = mkOverride 50 [ "vmware" ];
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 5fc0bf9c945..c8c4df5c913 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -48,7 +48,7 @@ in rec {
nixos.ova.x86_64-linux
#(all nixos.tests.containers)
- (all nixos.tests.chromium)
+ nixos.tests.chromium
(all nixos.tests.firefox)
(all nixos.tests.firewall)
nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
@@ -67,6 +67,7 @@ in rec {
(all nixos.tests.boot.biosUsb)
(all nixos.tests.boot.uefiCdrom)
(all nixos.tests.boot.uefiUsb)
+ (all nixos.tests.boot-stage1)
(all nixos.tests.ipv6)
(all nixos.tests.kde4)
#(all nixos.tests.lightdm)
diff --git a/nixos/release.nix b/nixos/release.nix
index 97f6df16dc9..c8547784bbc 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -209,6 +209,7 @@ in rec {
tests.bittorrent = callTest tests/bittorrent.nix {};
tests.blivet = callTest tests/blivet.nix {};
tests.boot = callSubTests tests/boot.nix {};
+ tests.boot-stage1 = callTest tests/boot-stage1.nix {};
tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
tests.cjdns = callTest tests/cjdns.nix {};
diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix
new file mode 100644
index 00000000000..ad253d23c54
--- /dev/null
+++ b/nixos/tests/boot-stage1.nix
@@ -0,0 +1,155 @@
+import ./make-test.nix ({ pkgs, ... }: {
+ name = "boot-stage1";
+
+ machine = { config, pkgs, lib, ... }: {
+ boot.extraModulePackages = let
+ compileKernelModule = name: source: pkgs.runCommand name rec {
+ inherit source;
+ kdev = config.boot.kernelPackages.kernel.dev;
+ kver = config.boot.kernelPackages.kernel.modDirVersion;
+ ksrc = "${kdev}/lib/modules/${kver}/build";
+ } ''
+ echo "obj-m += $name.o" > Makefile
+ echo "$source" > "$name.c"
+ make -C "$ksrc" M=$(pwd) modules
+ install -vD "$name.ko" "$out/lib/modules/$kver/$name.ko"
+ '';
+
+ # This spawns a kthread which just waits until it gets a signal and
+ # terminates if that is the case. We want to make sure that nothing during
+ # the boot process kills any kthread by accident, like what happened in
+ # issue #15226.
+ kcanary = compileKernelModule "kcanary" ''
+ #include
+ #include
+ #include
+ #include
+ #include
+
+ struct task_struct *canaryTask;
+
+ static int kcanary(void *nothing)
+ {
+ allow_signal(SIGINT);
+ allow_signal(SIGTERM);
+ allow_signal(SIGKILL);
+ while (!kthread_should_stop()) {
+ set_current_state(TASK_INTERRUPTIBLE);
+ schedule_timeout_interruptible(msecs_to_jiffies(100));
+ if (signal_pending(current)) break;
+ }
+ return 0;
+ }
+
+ static int kcanaryInit(void)
+ {
+ kthread_run(&kcanary, NULL, "kcanary");
+ return 0;
+ }
+
+ static void kcanaryExit(void)
+ {
+ kthread_stop(canaryTask);
+ }
+
+ module_init(kcanaryInit);
+ module_exit(kcanaryExit);
+ '';
+
+ in lib.singleton kcanary;
+
+ boot.initrd.kernelModules = [ "kcanary" ];
+
+ boot.initrd.extraUtilsCommands = let
+ compile = name: source: pkgs.runCommand name { inherit source; } ''
+ mkdir -p "$out/bin"
+ echo "$source" | gcc -Wall -o "$out/bin/$name" -xc -
+ '';
+
+ daemonize = name: source: compile name ''
+ #include
+ #include
+
+ void runSource(void) {
+ ${source}
+ }
+
+ int main(void) {
+ if (fork() > 0) return 0;
+ setsid();
+ runSource();
+ return 1;
+ }
+ '';
+
+ mkCmdlineCanary = { name, cmdline ? "", source ? "" }: (daemonize name ''
+ char *argv[] = {"${cmdline}", NULL};
+ execvp("${name}-child", argv);
+ '') // {
+ child = compile "${name}-child" ''
+ #include
+ #include
+
+ int main(void) {
+ ${source}
+ while (1) sleep(1);
+ return 1;
+ }
+ '';
+ };
+
+ copyCanaries = with lib; concatMapStrings (canary: ''
+ ${optionalString (canary ? child) ''
+ copy_bin_and_libs "${canary.child}/bin/${canary.child.name}"
+ ''}
+ copy_bin_and_libs "${canary}/bin/${canary.name}"
+ '');
+
+ in copyCanaries [
+ # Simple canary process which just sleeps forever and should be killed by
+ # stage 2.
+ (daemonize "canary1" "while (1) sleep(1);")
+
+ # We want this canary process to try mimicking a kthread using a cmdline
+ # with a zero length so we can make sure that the process is properly
+ # killed in stage 1.
+ (mkCmdlineCanary {
+ name = "canary2";
+ source = ''
+ FILE *f;
+ f = fopen("/run/canary2.pid", "w");
+ fprintf(f, "%d\n", getpid());
+ fclose(f);
+ '';
+ })
+
+ # This canary process mimicks a storage daemon, which we do NOT want to be
+ # killed before going into stage 2. For more on root storage daemons, see:
+ # https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
+ (mkCmdlineCanary {
+ name = "canary3";
+ cmdline = "@canary3";
+ })
+ ];
+
+ boot.initrd.postMountCommands = ''
+ canary1
+ canary2
+ canary3
+ # Make sure the pidfile of canary 2 is created so that we still can get
+ # its former pid after the killing spree starts next within stage 1.
+ while [ ! -s /run/canary2.pid ]; do sleep 0.1; done
+ '';
+ };
+
+ testScript = ''
+ $machine->waitForUnit("multi-user.target");
+ $machine->succeed('test -s /run/canary2.pid');
+ $machine->fail('pgrep -a canary1');
+ $machine->fail('kill -0 $(< /run/canary2.pid)');
+ $machine->succeed('pgrep -a -f \'^@canary3$\''');
+ $machine->succeed('pgrep -a -f \'^kcanary$\''');
+ '';
+
+ meta.maintainers = with pkgs.stdenv.lib.maintainers; [ aszlig ];
+})
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 48d5fecad92..0b0e53ee732 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
let
# The configuration to install.
- makeConfig = { grubVersion, grubDevice, grubIdentifier
+ makeConfig = { bootLoader, grubVersion, grubDevice, grubIdentifier
, extraConfig, forceGrubReinstallCount ? 0
}:
pkgs.writeText "configuration.nix" ''
@@ -18,15 +18,21 @@ let
];
- boot.loader.grub.version = ${toString grubVersion};
- ${optionalString (grubVersion == 1) ''
- boot.loader.grub.splashImage = null;
- ''}
- boot.loader.grub.device = "${grubDevice}";
- boot.loader.grub.extraConfig = "serial; terminal_output.serial";
- boot.loader.grub.fsIdentifier = "${grubIdentifier}";
+ ${optionalString (bootLoader == "grub") ''
+ boot.loader.grub.version = ${toString grubVersion};
+ ${optionalString (grubVersion == 1) ''
+ boot.loader.grub.splashImage = null;
+ ''}
+ boot.loader.grub.device = "${grubDevice}";
+ boot.loader.grub.extraConfig = "serial; terminal_output.serial";
+ boot.loader.grub.fsIdentifier = "${grubIdentifier}";
- boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount};
+ boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount};
+ ''}
+
+ ${optionalString (bootLoader == "gummiboot") ''
+ boot.loader.gummiboot.enable = true;
+ ''}
hardware.enableAllFirmware = lib.mkForce false;
@@ -42,7 +48,7 @@ let
# disk, and then reboot from the hard disk. It's parameterized with
# a test script fragment `createPartitions', which must create
# partitions and filesystems.
- testScriptFun = { createPartitions, grubVersion, grubDevice
+ testScriptFun = { bootLoader, createPartitions, grubVersion, grubDevice
, grubIdentifier, preBootCommands, extraConfig
}:
let
@@ -50,7 +56,8 @@ let
qemuFlags =
(if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
(optionalString (system == "x86_64-linux") "-cpu kvm64 ");
- hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", '';
+ hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", ''
+ + optionalString (bootLoader == "gummiboot") ''bios => "${pkgs.OVMF}/FV/OVMF.fd", '';
in
''
$machine->start;
@@ -73,7 +80,7 @@ let
$machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
$machine->copyFileFromHost(
- "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; } }",
+ "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier extraConfig; } }",
"/mnt/etc/nixos/configuration.nix");
# Perform the installation.
@@ -97,7 +104,11 @@ let
# Did /boot get mounted?
$machine->waitForUnit("local-fs.target");
- $machine->succeed("test -e /boot/grub");
+ ${if bootLoader == "grub" then
+ ''$machine->succeed("test -e /boot/grub");''
+ else
+ ''$machine->succeed("test -e /boot/loader/loader.conf");''
+ }
# Check whether /root has correct permissions.
$machine->succeed("stat -c '%a' /root") =~ /700/ or die;
@@ -114,7 +125,7 @@ let
# We need to a writable nix-store on next boot.
$machine->copyFileFromHost(
- "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }",
+ "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }",
"/etc/nixos/configuration.nix");
# Check whether nixos-rebuild works.
@@ -132,7 +143,7 @@ let
${preBootCommands}
$machine->waitForUnit("multi-user.target");
$machine->copyFileFromHost(
- "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 2; } }",
+ "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 2; } }",
"/etc/nixos/configuration.nix");
$machine->succeed("nixos-rebuild boot >&2");
$machine->shutdown;
@@ -148,8 +159,9 @@ let
makeInstallerTest = name:
{ createPartitions, preBootCommands ? "", extraConfig ? ""
- , grubVersion ? 2, grubDevice ? "/dev/vda"
- , grubIdentifier ? "uuid", enableOCR ? false, meta ? {}
+ , bootLoader ? "grub" # either "grub" or "gummiboot"
+ , grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid"
+ , enableOCR ? false, meta ? {}
}:
makeTest {
inherit enableOCR;
@@ -183,6 +195,8 @@ let
virtualisation.qemu.diskInterface =
if grubVersion == 1 then "scsi" else "virtio";
+ boot.loader.gummiboot.enable = mkIf (bootLoader == "gummiboot") true;
+
hardware.enableAllFirmware = mkForce false;
# The test cannot access the network, so any packages we
@@ -198,8 +212,8 @@ let
pkgs.perlPackages.XMLLibXML
pkgs.perlPackages.ListCompare
]
- ++ optional (grubVersion == 1) pkgs.grub
- ++ optionals (grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
+ ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
+ ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
nix.binaryCaches = mkForce [ ];
};
@@ -207,8 +221,8 @@ let
};
testScript = testScriptFun {
- inherit createPartitions preBootCommands grubVersion
- grubDevice grubIdentifier extraConfig;
+ inherit bootLoader createPartitions preBootCommands
+ grubVersion grubDevice grubIdentifier extraConfig;
};
};
@@ -236,6 +250,29 @@ in {
'';
};
+ # Simple GPT/UEFI configuration using Gummiboot with 3 partitions: ESP, swap & root filesystem
+ simpleUefiGummiboot = makeInstallerTest "simpleUefiGummiboot"
+ { createPartitions =
+ ''
+ $machine->succeed(
+ "parted /dev/vda mklabel gpt",
+ "parted -s /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
+ "parted -s /dev/vda -- set 1 boot on",
+ "parted -s /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
+ "parted -s /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
+ "udevadm settle",
+ "mkswap /dev/vda2 -L swap",
+ "swapon -L swap",
+ "mkfs.ext3 -L nixos /dev/vda3",
+ "mount LABEL=nixos /mnt",
+ "mkfs.vfat -n BOOT /dev/vda1",
+ "mkdir -p /mnt/boot",
+ "mount LABEL=BOOT /mnt/boot",
+ );
+ '';
+ bootLoader = "gummiboot";
+ };
+
# Same as the previous, but now with a separate /boot partition.
separateBoot = makeInstallerTest "separateBoot"
{ createPartitions =
@@ -370,6 +407,10 @@ in {
"mdadm --verbose -W /dev/md1",
);
'';
+ preBootCommands = ''
+ $machine->start;
+ $machine->fail("dmesg | grep 'immediate safe mode'");
+ '';
};
# Test a basic install using GRUB 1.
diff --git a/pkgs/applications/audio/CharacterCompressor/default.nix b/pkgs/applications/audio/CharacterCompressor/default.nix
index 3501e04aa97..5c28de3c60a 100644
--- a/pkgs/applications/audio/CharacterCompressor/default.nix
+++ b/pkgs/applications/audio/CharacterCompressor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
stdenv.mkDerivation rec {
name = "CharacterCompressor-${version}";
version = "0.2";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "0fvi8m4nshcxypn4jgxhnh7pxp68wshhav3k8wn3il7qpw71pdxi";
};
- buildInputs = [ faust2jack faust2lv2 ];
+ buildInputs = [ faust2jaqt faust2lv2gui ];
buildPhase = ''
- faust2jack -t 99999 CharacterCompressor.dsp
- faust2lv2 -t 99999 CharacterCompressor.dsp
+ faust2jaqt -t 99999 CharacterCompressor.dsp
+ faust2lv2 -gui -t 99999 CharacterCompressor.dsp
'';
installPhase = ''
diff --git a/pkgs/applications/audio/CompBus/default.nix b/pkgs/applications/audio/CompBus/default.nix
index 497d1ef5243..25175f27162 100644
--- a/pkgs/applications/audio/CompBus/default.nix
+++ b/pkgs/applications/audio/CompBus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
stdenv.mkDerivation rec {
name = "CompBus-${version}";
version = "1.1.02";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "025vi60caxk3j2vxxrgbc59xlyr88vgn7k3127s271zvpyy7apwh";
};
- buildInputs = [ faust2jack faust2lv2 ];
+ buildInputs = [ faust2jaqt faust2lv2gui ];
buildPhase = ''
for f in *.dsp;
do
- faust2jack -t 99999 $f
- faust2lv2 -t 99999 $f
+ faust2jaqt -t 99999 $f
+ faust2lv2 -gui -t 99999 $f
done
'';
diff --git a/pkgs/applications/audio/LazyLimiter/default.nix b/pkgs/applications/audio/LazyLimiter/default.nix
index d400bea3379..16aca9c3d32 100644
--- a/pkgs/applications/audio/LazyLimiter/default.nix
+++ b/pkgs/applications/audio/LazyLimiter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
stdenv.mkDerivation rec {
name = "LazyLimiter-${version}";
version = "0.3.01";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1yx9d5cakmqbiwb1j9v2af9h5lqzahl3kaamnyk71cf4i8g7zp3l";
};
- buildInputs = [ faust2jack faust2lv2 ];
+ buildInputs = [ faust2jaqt faust2lv2gui ];
buildPhase = ''
- faust2jack -t 99999 LazyLimiter.dsp
- faust2lv2 -t 99999 LazyLimiter.dsp
+ faust2jaqt -t 99999 LazyLimiter.dsp
+ faust2lv2 -gui -t 99999 LazyLimiter.dsp
'';
installPhase = ''
diff --git a/pkgs/applications/audio/MBdistortion/default.nix b/pkgs/applications/audio/MBdistortion/default.nix
index c70ab578259..aa71fff41c5 100644
--- a/pkgs/applications/audio/MBdistortion/default.nix
+++ b/pkgs/applications/audio/MBdistortion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
stdenv.mkDerivation rec {
name = "MBdistortion-${version}";
version = "1.1";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1rmvfi48hg8ybfw517zgj3fjj2xzckrmv8x131i26vj0fv7svjsp";
};
- buildInputs = [ faust2jack faust2lv2 ];
+ buildInputs = [ faust2jaqt faust2lv2gui ];
buildPhase = ''
- faust2jack -t 99999 MBdistortion.dsp
- faust2lv2 -t 99999 MBdistortion.dsp
+ faust2jaqt -t 99999 MBdistortion.dsp
+ faust2lv2 -gui -t 99999 MBdistortion.dsp
'';
installPhase = ''
diff --git a/pkgs/applications/audio/RhythmDelay/default.nix b/pkgs/applications/audio/RhythmDelay/default.nix
index e0cfff7c906..05d3b4f193e 100644
--- a/pkgs/applications/audio/RhythmDelay/default.nix
+++ b/pkgs/applications/audio/RhythmDelay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
stdenv.mkDerivation rec {
name = "RhythmDelay-${version}";
version = "2.0";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "0n938nm08mf3lz92k6v07k1469xxzmfkgclw40jgdssfcfa16bn7";
};
- buildInputs = [ faust2jack faust2lv2 ];
+ buildInputs = [ faust2jaqt faust2lv2gui ];
buildPhase = ''
- faust2jack -t 99999 RhythmDelay.dsp
- faust2lv2 -t 99999 RhythmDelay.dsp
+ faust2jaqt -t 99999 RhythmDelay.dsp
+ faust2lv2 -gui -t 99999 RhythmDelay.dsp
'';
installPhase = ''
diff --git a/pkgs/applications/audio/constant-detune-chorus/default.nix b/pkgs/applications/audio/constant-detune-chorus/default.nix
index 54fe4c866d5..0f53d125911 100644
--- a/pkgs/applications/audio/constant-detune-chorus/default.nix
+++ b/pkgs/applications/audio/constant-detune-chorus/default.nix
@@ -1,27 +1,27 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
stdenv.mkDerivation rec {
name = "constant-detune-chorus-${version}";
- version = "0.1.01";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "magnetophon";
repo = "constant-detune-chorus";
rev = "v${version}";
- sha256 = "1z8aj1a36ix9jizk9wl06b3i98hrkg47qxqp8vx930r624pc5z86";
+ sha256 = "1ks2k6pflqyi2cs26bnbypphyrrgn0xf31l31kgx1qlilyc57vln";
};
- buildInputs = [ faust2jack faust2lv2 ];
+ buildInputs = [ faust2jaqt faust2lv2gui ];
buildPhase = ''
- faust2jack -t 99999 constant-detune-chorus.dsp
- faust2lv2 -t 99999 constant-detune-chorus.dsp
+ faust2jaqt -t 99999 ConstantDetuneChorus.dsp
+ faust2lv2 -gui -t 99999 ConstantDetuneChorus.dsp
'';
installPhase = ''
mkdir -p $out/bin
- cp constant-detune-chorus $out/bin/
+ cp ConstantDetuneChorus $out/bin/
mkdir -p $out/lib/lv2
- cp -r constant-detune-chorus.lv2/ $out/lib/lv2
+ cp -r ConstantDetuneChorus.lv2/ $out/lib/lv2
'';
meta = {
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 43aba89213f..07f9e565c2a 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
# deadbeef can use either gtk2 or gtk3
, gtk2Support ? false, gtk2 ? null
-, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
+, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
# input plugins
, vorbisSupport ? true, libvorbis ? null
, mp123Support ? true, libmad ? null
@@ -30,7 +30,7 @@
assert gtk2Support || gtk3Support;
assert gtk2Support -> gtk2 != null;
-assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && makeWrapper != null;
+assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null;
assert vorbisSupport -> libvorbis != null;
assert mp123Support -> libmad != null;
assert flacSupport -> flac != null;
@@ -85,15 +85,10 @@ stdenv.mkDerivation rec {
;
nativeBuildInputs = with stdenv.lib; [ intltool pkgconfig ]
- ++ optional gtk3Support makeWrapper;
+ ++ optional gtk3Support wrapGAppsHook;
enableParallelBuilding = true;
- postInstall = if !gtk3Support then "" else ''
- wrapProgram "$out/bin/deadbeef" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- '';
-
meta = with stdenv.lib; {
description = "Ultimate Music Player for GNU/Linux";
homepage = "http://deadbeef.sourceforge.net/";
diff --git a/pkgs/applications/audio/faust/faust1git.nix b/pkgs/applications/audio/faust/faust1git.nix
new file mode 100644
index 00000000000..5b769aa621e
--- /dev/null
+++ b/pkgs/applications/audio/faust/faust1git.nix
@@ -0,0 +1,210 @@
+{ stdenv
+, coreutils
+, fetchgit
+, makeWrapper
+, pkgconfig
+}:
+
+with stdenv.lib.strings;
+
+let
+
+ version = "2016-04-27";
+
+ src = fetchgit {
+ url = "git://git.code.sf.net/p/faudiostream/code";
+ rev = "931fca3e649f99ef09025d37bd6a7dc70a03e6f6";
+ sha256 = "05yam8jfdnziysvpxa5w118k5bbl103vamyqgka6vyhjjizp1nx7";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = http://faust.grame.fr/;
+ downloadPage = http://sourceforge.net/projects/faudiostream/files/;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ magnetophon pmahoney ];
+ };
+
+ faust = stdenv.mkDerivation {
+
+ name = "faust-${version}";
+
+ inherit src;
+
+ buildInputs = [ makeWrapper ];
+
+ passthru = {
+ inherit wrap wrapWithBuildEnv;
+ };
+
+ preConfigure = ''
+ makeFlags="$makeFlags prefix=$out"
+
+ # The faust makefiles use 'system ?= $(shell uname -s)' but nix
+ # defines 'system' env var, so undefine that so faust detects the
+ # correct system.
+ unset system
+ '';
+
+ # Remove most faust2appl scripts since they won't run properly
+ # without additional paths setup. See faust.wrap,
+ # faust.wrapWithBuildEnv.
+ postInstall = ''
+ # syntax error when eval'd directly
+ pattern="faust2!(svg)"
+ (shopt -s extglob; rm "$out"/bin/$pattern)
+ '';
+
+ postFixup = ''
+ # Set faustpath explicitly.
+ substituteInPlace "$out"/bin/faustpath \
+ --replace "/usr/local /usr /opt /opt/local" "$out"
+
+ # The 'faustoptflags' is 'source'd into other faust scripts and
+ # not used as an executable, so patch 'uname' usage directly
+ # rather than use makeWrapper.
+ substituteInPlace "$out"/bin/faustoptflags \
+ --replace uname "${coreutils}/bin/uname"
+
+ # wrapper for scripts that don't need faust.wrap*
+ for script in "$out"/bin/faust2*; do
+ wrapProgram "$script" \
+ --prefix PATH : "$out"/bin
+ done
+ '';
+
+ meta = meta // {
+ description = "A functional programming language for realtime audio signal processing";
+ longDescription = ''
+ FAUST (Functional Audio Stream) is a functional programming
+ language specifically designed for real-time signal processing
+ and synthesis. FAUST targets high-performance signal processing
+ applications and audio plug-ins for a variety of platforms and
+ standards.
+ The Faust compiler translates DSP specifications into very
+ efficient C++ code. Thanks to the notion of architecture,
+ FAUST programs can be easily deployed on a large variety of
+ audio platforms and plugin formats (jack, alsa, ladspa, maxmsp,
+ puredata, csound, supercollider, pure, vst, coreaudio) without
+ any change to the FAUST code.
+
+ This package has just the compiler, libraries, and headers.
+ Install faust2* for specific faust2appl scripts.
+ '';
+ };
+
+ };
+
+ # Default values for faust2appl.
+ faust2ApplBase =
+ { baseName
+ , dir ? "tools/faust2appls"
+ , scripts ? [ baseName ]
+ , ...
+ }@args:
+
+ args // {
+ name = "${baseName}-${version}";
+
+ inherit src;
+
+ configurePhase = ":";
+
+ buildPhase = ":";
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p "$out/bin"
+ for script in ${concatStringsSep " " scripts}; do
+ cp "${dir}/$script" "$out/bin/"
+ done
+
+ runHook postInstall
+ '';
+
+ postInstall = ''
+ # For the faust2appl script, change 'faustpath' and
+ # 'faustoptflags' to absolute paths.
+ for script in "$out"/bin/*; do
+ substituteInPlace "$script" \
+ --replace ". faustpath" ". '${faust}/bin/faustpath'" \
+ --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'"
+ done
+ '';
+
+ meta = meta // {
+ description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing";
+ };
+ };
+
+ # Some 'faust2appl' scripts, such as faust2alsa, run faust to
+ # generate cpp code, then invoke the c++ compiler to build the code.
+ # This builder wraps these scripts in parts of the stdenv such that
+ # when the scripts are called outside any nix build, they behave as
+ # if they were running inside a nix build in terms of compilers and
+ # paths being configured (e.g. rpath is set so that compiled
+ # binaries link to the libs inside the nix store)
+ #
+ # The function takes two main args: the appl name (e.g.
+ # 'faust2alsa') and an optional list of propagatedBuildInputs. It
+ # returns a derivation that contains only the bin/${appl} script,
+ # wrapped up so that it will run as if it was inside a nix build
+ # with those build inputs.
+ #
+ # The build input 'faust' is automatically added to the
+ # propagatedBuildInputs.
+ wrapWithBuildEnv =
+ { baseName
+ , propagatedBuildInputs ? [ ]
+ , ...
+ }@args:
+
+ stdenv.mkDerivation ((faust2ApplBase args) // {
+
+ buildInputs = [ makeWrapper pkgconfig ];
+
+ propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
+
+ postFixup = ''
+
+ # export parts of the build environment
+ for script in "$out"/bin/*; do
+ wrapProgram "$script" \
+ --set FAUSTLIB "${faust}/lib/faust" \
+ --set FAUSTINC "${faust}/include/faust" \
+ --prefix PATH : "$PATH" \
+ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
+ --set NIX_CFLAGS_COMPILE "\"$NIX_CFLAGS_COMPILE\"" \
+ --set NIX_LDFLAGS "\"$NIX_LDFLAGS\""
+ done
+ '';
+ });
+
+ # Builder for 'faust2appl' scripts, such as faust2firefox that
+ # simply need to be wrapped with some dependencies on PATH.
+ #
+ # The build input 'faust' is automatically added to the PATH.
+ wrap =
+ { baseName
+ , runtimeInputs ? [ ]
+ , ...
+ }@args:
+
+ let
+
+ runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs));
+
+ in stdenv.mkDerivation ((faust2ApplBase args) // {
+
+ buildInputs = [ makeWrapper ];
+
+ postFixup = ''
+ for script in "$out"/bin/*; do
+ wrapProgram "$script" --prefix PATH : "${runtimePath}"
+ done
+ '';
+
+ });
+
+in faust
diff --git a/pkgs/applications/audio/faust/faust2lv2gui.nix b/pkgs/applications/audio/faust/faust2lv2gui.nix
new file mode 100644
index 00000000000..af20bb1d745
--- /dev/null
+++ b/pkgs/applications/audio/faust/faust2lv2gui.nix
@@ -0,0 +1,14 @@
+{ boost
+, faust1git
+, lv2
+, qt4
+
+}:
+
+faust1git.wrapWithBuildEnv {
+
+ baseName = "faust2lv2";
+
+ propagatedBuildInputs = [ boost lv2 qt4 ];
+
+}
diff --git a/pkgs/applications/audio/faustCompressors/default.nix b/pkgs/applications/audio/faustCompressors/default.nix
new file mode 100644
index 00000000000..ea0680568db
--- /dev/null
+++ b/pkgs/applications/audio/faustCompressors/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }:
+stdenv.mkDerivation rec {
+ name = "faustCompressors-${version}";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "magnetophon";
+ repo = "faustCompressors";
+ rev = "v${version}";
+ sha256 = "0x5nd2cjhknb4aclhkkjaywx75bi2wj22prgv8n47czi09jcj0jb";
+ };
+
+ buildInputs = [ faust2jaqt faust2lv2gui ];
+
+ buildPhase = ''
+ for f in *.dsp;
+ do
+ faust2jaqt -double -t 99999 $f
+ faust2lv2 -double -gui -t 99999 $f
+ done
+ '';
+
+ installPhase = ''
+ mkdir -p $out/lib/lv2
+ mv *.lv2/ $out/lib/lv2
+ mkdir -p $out/bin
+ for f in $(find . -executable -type f);
+ do
+ cp $f $out/bin/
+ done
+ '';
+
+ meta = {
+ description = "A collection of bread and butter compressors";
+ homepage = https://github.com/magnetophon/faustCompressors;
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ };
+}
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index d99e2e577eb..db17ca8553c 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -7,33 +7,39 @@ assert alsaSupport -> alsaLib != null;
assert jackSupport -> libjack2 != null;
assert portaudioSupport -> portaudio != null;
+with stdenv.lib;
+
stdenv.mkDerivation rec {
name = "fmit-${version}";
- version = "1.0.13";
+ version = "1.0.15";
src = fetchFromGitHub {
- sha256 = "04cj70q60sqns68nvw4zfy6078x4cc2q1y2y13z3rs5n80jw27by";
+ sha256 = "0bakqwgl7xx6khs8993w10a8kvlbr7sbqdaljbsmy8y8mjd6inqb";
rev = "v${version}";
repo = "fmit";
owner = "gillesdegottex";
};
- buildInputs = [ fftw freeglut mesa_glu qtbase qtmultimedia qmakeHook ]
- ++ stdenv.lib.optionals alsaSupport [ alsaLib ]
- ++ stdenv.lib.optionals jackSupport [ libjack2 ]
- ++ stdenv.lib.optionals portaudioSupport [ portaudio ];
+ buildInputs = [ fftw qtbase qtmultimedia qmakeHook ]
+ ++ optionals alsaSupport [ alsaLib ]
+ ++ optionals jackSupport [ libjack2 ]
+ ++ optionals portaudioSupport [ portaudio ];
+
+ postPatch = ''
+ substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
+ '';
preConfigure = ''
qmakeFlags="$qmakeFlags \
- CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \
- CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \
- CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \
+ CONFIG+=${optionalString alsaSupport "acs_alsa"} \
+ CONFIG+=${optionalString jackSupport "acs_jack"} \
+ CONFIG+=${optionalString portaudioSupport "acs_portaudio"} \
PREFIXSHORTCUT=$out"
'';
enableParallelBuilding = true;
- meta = with stdenv.lib; {
+ meta = {
description = "Free Musical Instrument Tuner";
longDescription = ''
FMIT is a graphical utility for tuning musical instruments, with error
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
new file mode 100644
index 00000000000..8bf85ac24b0
--- /dev/null
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -0,0 +1,85 @@
+{
+ boost,
+ cln,
+ cmake,
+ fetchgit,
+ gcc5,
+ ginac,
+ jamomacore,
+ kde5,
+ libsndfile,
+ ninja,
+ portaudio,
+ qtbase,
+ qtdeclarative,
+ qtimageformats,
+ qtsvg,
+ qttools,
+ qtwebsockets,
+ rtaudio,
+ stdenv
+}:
+
+stdenv.mkDerivation rec {
+ version = "1.0.0-a67";
+ name = "i-score-${version}";
+
+ src = fetchgit {
+ url = "https://github.com/OSSIA/i-score.git";
+ rev = "ede2453b139346ae46702b5e2643c5488f8c89fb";
+ sha256 = "04li771nj0k8gym7vg6rnawjkp2f6d5m5mby26h0k6ksf7hg7h70";
+ leaveDotGit = true;
+ deepClone = true;
+ };
+
+ buildInputs = [
+ boost
+ cln
+ cmake
+ ginac
+ gcc5
+ jamomacore
+ kde5.kdnssd
+ libsndfile
+ ninja
+ portaudio
+ qtbase
+ qtdeclarative
+ qtimageformats
+ qtsvg
+ qttools
+ qtwebsockets
+ rtaudio
+ ];
+
+ cmakeFlags = [
+ "-GNinja"
+ "-DISCORE_CONFIGURATION=static-release"
+ "-DISCORE_ENABLE_LTO=OFF"
+ "-DISCORE_BUILD_FOR_PACKAGE_MANAGER=True"
+ ];
+
+ patchPhase = ''
+ sed -e '77d' -i CMake/modules/GetGitRevisionDescription.cmake
+ '';
+
+ preConfigure = ''
+ export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
+ '';
+
+ preBuild = ''
+ ninja
+ '';
+
+ installPhase = ''
+ cmake --build . --target install
+ '';
+
+ meta = {
+ description = "An interactive sequencer for the intermedia arts";
+ homepage = http://i-score.org/;
+ license = stdenv.lib.licenses.cecill20;
+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 13c2795ea55..10586341784 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -360,11 +360,11 @@ rec {
scala = buildEclipseUpdateSite rec {
name = "scala-${version}";
- version = "4.4.0.201604010956";
+ version = "4.4.1.201605041056";
src = fetchzip {
url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
- sha256 = "1yypzcf2iwlcj43vd6h9n4y2ka1gxjf5vm3yx87bgfbzbchzckz7";
+ sha256 = "13xgx2rwlll0l4bs0g6gyvrx5gcc0125vzn501fdj0wv2fqxn5lw";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 6513e78ef86..5ac7a69aeda 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -141,7 +141,7 @@ let
# those contributions were copied from Vim (identified in the commit logs
# by the vim-patch token). See LICENSE for details."
license = with licenses; [ asl20 vim ];
- maintainers = with maintainers; [ manveru nckx garbas ];
+ maintainers = with maintainers; [ manveru garbas ];
platforms = platforms.unix;
};
};
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 201db054743..a128899d24e 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -5,12 +5,12 @@ let
# qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
in stdenv.mkDerivation rec {
name = "tiled-${version}";
- version = "0.16.0";
+ version = "0.16.1";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
- sha256 = "1vlhfkgl126irp53xw94jw1xnj96l1hwnbxmm1s5az60460gfbf0";
+ sha256 = "0s1i6yhm1z9ayzjh8cprcc9jvj5m87l9snyqg6w7zlj3q9zn4rn6";
};
nativeBuildInputs = [ pkgconfig qmakeHook ];
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 6f43a2f9a89..a688170b8ad 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, ncurses, gettext
, pkgconfig, cscope, python, ruby, tcl, perl, luajit
+, darwin
}:
stdenv.mkDerivation rec {
@@ -72,6 +73,10 @@ stdenv.mkDerivation rec {
)
'';
+ postConfigure = ''
+ substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include"
+ '';
+
postInstall = ''
mkdir -p $out/Applications
cp -r src/MacVim/build/Release/MacVim.app $out/Applications
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index d0a1f7b78d3..52a123a7fb9 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
- version = "2.0.2";
+ version = "2.0.4";
name = "darktable-${version}";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
- sha256 = "0014j73sy956xqdhd4jrxvbamildqqadx8hmagrbiah8xda67skm";
+ sha256 = "0qhyjsjjcd8yirqdnzbbzsldwd6y4wf1bxjbsshvqq7h5xi4ir40";
};
buildInputs =
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 338b3cf0f97..572d346760c 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -1,34 +1,32 @@
-{ stdenv, cmake, fetchurl, gnumake, pkgconfig, makeWrapper
-, boost, gettext, tclap, wxGTK
-, freeglut, glew, libX11, libXi, libXmu, mesa, cairo
-, autopanosiftc, enblend-enfuse, exiv2, fftw, ilmbase, lensfun, libpng, libtiff
-, openexr, panotools, perlPackages, sqlite, vigra
+{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig
+, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
+, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
+, libXmu, mesa, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
}:
stdenv.mkDerivation rec {
- name = "hugin-2015.0.0";
+ name = "hugin-2016.0.0";
src = fetchurl {
url = "mirror://sourceforge/hugin/${name}.tar.bz2";
- sha256 = "1gfblax9rxay8xskz5r8bips4nfh70vkyrb8ksgl6pg91c8krn9c";
+ sha256 = "1rk5bgsvszv9bza46jxwr3i3qgiha2rza5v8lbwkqn4b4idv0c5h";
};
- NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+ buildInputs = [
+ boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg
+ libpng libtiff libX11 libXi libXmu mesa openexr panotools sqlite vigra
+ wxGTK zlib
+ ];
- buildInputs = [ boost gettext tclap wxGTK
- freeglut glew libX11 libXi libXmu mesa cairo
- exiv2 fftw ilmbase lensfun libtiff libpng openexr panotools
- sqlite vigra
- perlPackages.ImageExifTool makeWrapper
- ];
+ nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
# disable installation of the python scripting interface
cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
- nativeBuildInputs = [ cmake pkgconfig ];
-
enableParallelBuilding = true;
+ NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
postInstall = ''
for p in $out/bin/*; do
wrapProgram "$p" \
@@ -39,11 +37,11 @@ stdenv.mkDerivation rec {
done
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://hugin.sourceforge.net/;
description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end";
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ viric hrdinka ];
- platforms = with stdenv.lib.platforms; linux;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ viric hrdinka ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index 182c99dc2d0..16553d6e013 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // {
- version = "2016-04-23";
+ version = "2016-05-07";
src = fetchgit {
- sha256 = "11bf60cd5a6b314e855a69a6f57a5ca0db3254527def55662bce25810a2314df";
- rev = "c8169b1e656f7f95c67946298da5a0e1c143f8e8";
+ sha256 = "5f8974bc56d5eb1d33fbe53b30e80395b690151a1ea418d8aa44c7e092656896";
+ rev = "926bfade544de4a4fd5f1a8082b85a97e2443770";
url = "git://alioth.debian.org/git/sane/sane-backends.git";
};
})
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix
new file mode 100644
index 00000000000..23d0d682176
--- /dev/null
+++ b/pkgs/applications/misc/flamerobin/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, wxGTK30, boost, firebird }:
+
+stdenv.mkDerivation rec {
+ version = "0.9.3.1";
+ name = "flamerobin-${version}";
+
+ src = fetchFromGitHub {
+ owner = "mariuz";
+ repo = "flamerobin";
+ rev = version;
+ sha256 = "1wwcsca01hpgi9z5flvbdhs9zv7jvahnbn97j6ymy0hdyb8lv6si";
+ };
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ wxGTK30 boost firebird ];
+
+ preBuild = ''
+ sed -i 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -nostartfiles/' Makefile
+ '';
+
+ configureFlags = [
+ "--disable-debug"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Database administration tool for Firebird RDBMS";
+ homepage = "https://github.com/mariuz/flamerobin";
+ license = licenses.bsdOriginal;
+ maintainers = with maintainers; [ uralbash ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index d6835388d89..29d434c53af 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, plugins ? [] }:
+{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, gtk2, plugins ? [] }:
# KeePass looks for plugins in under directory in which KeePass.exe is
# located. It follows symlinks where looking for that directory, so
@@ -72,6 +72,8 @@ with builtins; buildDotnetPackage rec {
# is found and does not pollute output path.
binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins));
+ dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ];
+
postInstall =
let
extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh;
@@ -79,7 +81,9 @@ with builtins; buildDotnetPackage rec {
''
mkdir -p "$out/share/applications"
cp ${desktopItem}/share/applications/* $out/share/applications
- wrapProgram $out/bin/keepass --prefix PATH : "$binPaths"
+ wrapProgram $out/bin/keepass \
+ --prefix PATH : "$binPaths" \
+ --prefix LD_LIBRARY_PATH : "$dynlibPath"
${extractFDeskIcons} \
"./Translation/TrlUtil/Resources/KeePass.ico" \
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index c21c0d32b73..533d2d95366 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, pango, cairo, glib
, pcre , imlib2, libXinerama , libXrender, libXcomposite, libXdamage, libX11
, libXrandr, gtk, libpthreadstubs , libXdmcp, librsvg
-, libstartup_notification, wrapGAppsHook
+, libstartup_notification, hicolor_icon_theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "tint2-${version}";
- version = "0.12.9";
+ version = "0.12.10";
src = fetchFromGitLab {
owner = "o9000";
repo = "tint2";
rev = version;
- sha256 = "17n3yssqiwxqrwsxypzw8skwzxm2540ikbyx7kfxv2gqlbjx5y6q";
+ sha256 = "0da28ykid84i4pw0cvgaxw0wq2yn03i68g54dzmajgsl1wvkqb0z";
};
enableParallelBuilding = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pango cairo glib pcre imlib2 libXinerama libXrender
libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs libXdmcp
- librsvg libstartup_notification ];
+ librsvg libstartup_notification hicolor_icon_theme ];
preConfigure = ''
substituteInPlace CMakeLists.txt --replace /etc $out/etc
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://gitlab.com/o9000/tint2;
license = stdenv.lib.licenses.gpl2;
- description = "A simple panel/taskbar unintrusive and light (memory / cpu / aestetic)";
+ description = "Simple panel/taskbar unintrusive and light (memory / cpu / aestetic)";
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/networking/bittorrentsync/1.4.x.nix b/pkgs/applications/networking/bittorrentsync/1.4.x.nix
index 1b439daa853..9d57cdaaf20 100644
--- a/pkgs/applications/networking/bittorrentsync/1.4.x.nix
+++ b/pkgs/applications/networking/bittorrentsync/1.4.x.nix
@@ -1,42 +1,9 @@
-{ stdenv, fetchurl, patchelf }:
+{ stdenv, fetchurl, ... } @ args:
-let
- arch = if stdenv.system == "x86_64-linux" then "x64"
- else if stdenv.system == "i686-linux" then "i386"
- else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
-
- sha256 = if stdenv.system == "x86_64-linux" then "1b9f6qxpvyrzf23l71hw42qyg4i27by3hs91sm34drm24z7m7fpd"
- else if stdenv.system == "i686-linux" then "0caqwaxd6i8cap35kpzkwy5dknk7iaxf5fbfjy46cbwylgcpsc2x"
- else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
-
- libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
-in
-stdenv.mkDerivation rec {
- name = "btsync-${version}";
- version = "1.4.110";
-
- src = fetchurl {
- url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";
- inherit sha256;
+import ./generic.nix (args // {
+ version = "1.4.111";
+ sha256s = {
+ "x86_64-linux" = "0bw3ds3ndcnkry5mpv645z2bfi5z387bh0f7b35blxq1yv93r83f";
+ "i686-linux" = "1qwaj7l7nsd4afx7ksb4b1c22mki9qa40803v9x1a8bhbdfhkczk";
};
-
- dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
- sourceRoot = ".";
- buildInputs = [ patchelf ];
-
- installPhase = ''
- mkdir -p "$out/bin/"
- cp -r "btsync" "$out/bin/"
-
- patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath ${libPath} "$out/bin/btsync"
- '';
-
- meta = {
- description = "Automatically sync files via secure, distributed technology";
- homepage = "http://www.bittorrent.com/sync";
- license = stdenv.lib.licenses.unfreeRedistributable;
- platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ iElectric thoughtpolice ];
- };
-}
+})
diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
index ee4d3a436a5..f8ba6a5c5f6 100644
--- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix
+++ b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
@@ -1,41 +1,9 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, ... } @ args:
-let
- arch = if stdenv.system == "x86_64-linux" then "x64"
- else if stdenv.system == "i686-linux" then "i386"
- else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
-
- sha256 = if stdenv.system == "x86_64-linux" then "01yrligi61gxcixh7z6gi427ga0sx97wnmkv08p9ykd4b90hvj7s"
- else if stdenv.system == "i686-linux" then "119dll7f4w7h8nrrafmrj1d0lddjzwg5l8hnf74xdjg6g7rhrmd7"
- else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
-
- libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
-in
-stdenv.mkDerivation rec {
- name = "btsync-${version}";
- version = "2.3.6";
-
- src = fetchurl {
- url = "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";
- inherit sha256;
+import ./generic.nix (args // {
+ version = "2.3.7";
+ sha256s = {
+ "x86_64-linux" = "1hnw6bv60xrnc733gm1ilywc0y93k2g6bmwgnww9qk7ivbvi6pd1";
+ "i686-linux" = "0hj8nbq6mava15m1hxaqq371fqk0whdx5iqsbnppyci0jjnr4qv1";
};
-
- dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
- sourceRoot = ".";
-
- installPhase = ''
- mkdir -p "$out/bin/"
- cp -r "btsync" "$out/bin/"
-
- patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath ${libPath} "$out/bin/btsync"
- '';
-
- meta = {
- description = "Automatically sync files via secure, distributed technology";
- homepage = https://www.getsync.com/;
- license = stdenv.lib.licenses.unfreeRedistributable;
- platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ iElectric thoughtpolice cwoac ];
- };
-}
+})
diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix
new file mode 100644
index 00000000000..6d8735609ea
--- /dev/null
+++ b/pkgs/applications/networking/bittorrentsync/generic.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, version, sha256s, ... } @ args:
+
+let
+ arch = {
+ "x86_64-linux" = "x64";
+ "i686-linux" = "i386";
+ }.${stdenv.system};
+ libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
+in
+
+stdenv.mkDerivation rec {
+ name = "btsync-${version}";
+ inherit version;
+
+ src = fetchurl {
+ # annoyingly, downloads for 1.4 and 2.3 do not follow the same URL layout; this is
+ # a simple work-around, in place of overriding the url in the caller.
+ urls = [
+ "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz"
+ "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"
+ ];
+ sha256 = sha256s.${stdenv.system};
+ };
+
+ dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
+ sourceRoot = ".";
+
+ installPhase = ''
+ install -D btsync "$out/bin/btsync"
+ patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync"
+ '';
+
+ meta = {
+ description = "Automatically sync files via secure, distributed technology";
+ homepage = https://www.getsync.com/;
+ license = stdenv.lib.licenses.unfreeRedistributable;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ iElectric thoughtpolice cwoac ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 3b653d9d871..d284296d3d9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -138,6 +138,9 @@ stdenv.mkDerivation {
patchelf --set-rpath "$libPath" \
"$out/usr/lib/firefox-bin-${version}/{}" \;
+ # wrapFirefox expects "$out/lib" instead of "$out/usr/lib"
+ ln -s "$out/usr/lib" "$out/lib"
+
# Create a desktop item.
mkdir -p $out/share/applications
cat > $out/share/applications/firefox.desktop < Popcorn-Time
- chmod 555 Popcorn-Time
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp -r * $out/
- makeWrapper $out/Popcorn-Time $out/bin/popcorntime
- '';
-
- meta = with stdenv.lib; {
- homepage = https://popcorntime.sh/;
- description = "An application that streams movies and TV shows from torrents";
- license = stdenv.lib.licenses.gpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ bobvanderlinden rnhmjoj ];
- broken = true;
- };
-}
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 1cd33e8b97a..f5e0441ea6c 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, lib, fetchurl, makeWrapper, autoreconfHook,
+{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
libmspack, openssl, pam, xercesc, icu, libdnet, procps,
xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,
- pkgconfig, glib, gtk, gtkmm }:
+ pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd }:
let
- majorVersion = "9.10";
- minorVersion = "0";
- patchSet = "2476743";
- version = "${majorVersion}.${minorVersion}-${patchSet}";
+ majorVersion = "10.0";
+ minorVersion = "7";
+ version = "${majorVersion}.${minorVersion}";
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
name = "open-vm-tools-${version}";
- src = fetchurl {
- url = "mirror://sourceforge/project/open-vm-tools/open-vm-tools/stable-${majorVersion}.x/open-vm-tools-${version}.tar.gz";
- sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1";
+ src = fetchFromGitHub {
+ owner = "vmware";
+ repo = "open-vm-tools";
+ rev = "stable-${version}";
+ sha256 = "0xxgppxjisg3jly21r7mjk06rc4n7ssyvapasxhbi2d1bw0xkvrj";
};
+ sourceRoot = "${src.name}/open-vm-tools";
+
buildInputs =
[ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps
pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
- patchPhase = ''
+ postPatch = ''
sed -i s,-Werror,,g configure.ac
sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
@@ -30,6 +33,14 @@ in stdenv.mkDerivation {
configureFlags = "--without-kernel-modules --without-xmlsecurity";
+ postInstall = ''
+ sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network"
+ wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
+ --prefix PATH ':' "${iproute}/bin" \
+ --prefix PATH ':' "${dbus}/bin" \
+ --prefix PATH ':' "${systemd}/bin"
+ '';
+
meta = with stdenv.lib; {
homepage = "https://github.com/vmware/open-vm-tools";
description = "Set of tools for VMWare guests to improve host-guest interaction";
diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
index b69731179c1..64991a152bc 100644
--- a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
+++ b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
@@ -1,18 +1,7 @@
-From d1b753212ee5151db941de0e2b826dcf9722f2f3 Mon Sep 17 00:00:00 2001
-From: Arseniy Seroka
-Date: Fri, 21 Aug 2015 20:20:16 +0300
-Subject: [PATCH] [PATCH]: recognize NixOS Linux
-
----
- open-vm-tools/lib/include/guest_os.h | 1 +
- open-vm-tools/lib/misc/hostinfoPosix.c | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
-index 4fc9ea7..f5104fd 100644
---- a/open-vm-tools/lib/include/guest_os.h
-+++ b/open-vm-tools/lib/include/guest_os.h
-@@ -215,6 +215,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
+diff -ruN open-vm-tools.orig/lib/include/guest_os.h open-vm-tools/lib/include/guest_os.h
+--- open-vm-tools.orig/lib/include/guest_os.h 2016-02-12 00:50:33.000000000 +0000
++++ open-vm-tools/lib/include/guest_os.h 2016-04-18 20:07:41.677251511 +0000
+@@ -222,6 +222,7 @@
#define STR_OS_MANDRAKE_FULL "Mandrake Linux"
#define STR_OS_MANDRIVA "mandriva"
#define STR_OS_MKLINUX "MkLinux"
@@ -20,19 +9,30 @@ index 4fc9ea7..f5104fd 100644
#define STR_OS_NOVELL "nld9"
#define STR_OS_NOVELL_FULL "Novell Linux Desktop 9"
#define STR_OS_ORACLE "oraclelinux"
-diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
-index 6c13fe3..5b82983 100644
---- a/open-vm-tools/lib/misc/hostinfoPosix.c
-+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -184,6 +184,7 @@ static const DistroInfo distroArray[] = {
+diff -ruN open-vm-tools.orig/lib/include/vmblock.h open-vm-tools/lib/include/vmblock.h
+--- open-vm-tools.orig/lib/include/vmblock.h 2016-02-12 00:50:33.000000000 +0000
++++ open-vm-tools/lib/include/vmblock.h 2016-04-18 21:51:15.651235848 +0000
+@@ -145,7 +145,7 @@
+ # define VMBLOCK_DEVICE_MODE VMBLOCK_FUSE_DEVICE_MODE
+ # define VMBLOCK_MOUNT_POINT VMBLOCK_FUSE_MOUNT_POINT
+
+-#elif defined(linux)
++#elif defined(__linux__)
+ # define VMBLOCK_ADD_FILEBLOCK 98
+ # define VMBLOCK_DEL_FILEBLOCK 99
+ # ifdef VMX86_DEVEL
+diff -ruN open-vm-tools.orig/lib/misc/hostinfoPosix.c open-vm-tools/lib/misc/hostinfoPosix.c
+--- open-vm-tools.orig/lib/misc/hostinfoPosix.c 2016-02-12 00:50:33.000000000 +0000
++++ open-vm-tools/lib/misc/hostinfoPosix.c 2016-04-18 20:09:45.841668252 +0000
+@@ -195,6 +195,7 @@
{"Mandrake", "/etc/mandrake-release"},
{"Mandriva", "/etc/mandriva-release"},
- {"Mandrake", "/etc/mandrakelinux-release"},
+ {"MkLinux", "/etc/mklinux-release"},
+ {"NixOS", "/etc/os-release"},
- {"TurboLinux", "/etc/turbolinux-release"},
- {"Fedora Core", "/etc/fedora-release"},
- {"Gentoo", "/etc/gentoo-release"},
-@@ -613,6 +614,8 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name
+ {"Novell", "/etc/nld-release"},
+ {"OracleLinux", "/etc/oracle-release"},
+ {"Photon", "/etc/lsb-release"},
+@@ -619,6 +620,8 @@
Str_Strcpy(distroShort, STR_OS_MANDRIVA, distroShortSize);
} else if (strstr(distroLower, "mklinux")) {
Str_Strcpy(distroShort, STR_OS_MKLINUX, distroShortSize);
@@ -41,6 +41,3 @@ index 6c13fe3..5b82983 100644
} else if (strstr(distroLower, "pld")) {
Str_Strcpy(distroShort, STR_OS_PLD, distroShortSize);
} else if (strstr(distroLower, "slackware")) {
---
-2.5.0
-
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 892deadfe38..1f6e5637fa0 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -9,7 +9,7 @@ let
stage1Flavours = [ "coreos" "fly" "host" ];
in stdenv.mkDerivation rec {
- version = "1.4.0";
+ version = "1.5.1";
name = "rkt-${version}";
BUILDDIR="build-${name}";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
rev = "v${version}";
owner = "coreos";
repo = "rkt";
- sha256 = "0lnvqhg88aa6zx4wnkz17v3f529i9hi0y2aihfsq09pvsn56hwjl";
+ sha256 = "1y99m0ay9qj5a0rb657abdjmwjvqi9dh3k6xr0npmx6vnvwpxs58";
};
stage1BaseImage = fetchurl {
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index a7d492a05dc..33dcfe8adf4 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python
+{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python, which
, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
stdenv.mkDerivation rec {
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
# for dlopen-ing
patchPhase = ''
substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so"
+ substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which"
'';
configurePhase = ''
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
EOF
'';
- buildInputs = [ pkgconfig libixp_hg txt2tags dash python
+ buildInputs = [ pkgconfig libixp_hg txt2tags dash python which
libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index f874354b15e..5ead82dee8b 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -286,17 +286,20 @@ EOF
cp ${layer}/* temp/
chmod ug+w temp/*
- # FIXME: might not be /nix/store
- echo '/nix' >> layerFiles
- echo '/nix/store' >> layerFiles
for dep in $(cat $layerClosure); do
- find $dep >> layerFiles
+ find $dep -path "${layer}" -prune -o -print >> layerFiles
done
+ if [ -s layerFiles ]; then
+ # FIXME: might not be /nix/store
+ echo '/nix' >> layerFiles
+ echo '/nix/store' >> layerFiles
+ fi
+
echo Adding layer
tar -tf temp/layer.tar >> baseFiles
sed 's/^\.//' -i baseFiles
- comm <(sort -n baseFiles|uniq) <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
+ comm <(sort -u baseFiles) <(sort -u layerFiles) -1 -3 > newFiles
tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true
echo Adding meta
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index d8042d65273..e06c02a294f 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -15,6 +15,7 @@ let
unrestrictProcGid = 121; # Ugh, an awful hack. See grsecurity NixOS gid
disableRBAC = false;
disableSimultConnect = false;
+ redistKernel = true;
verboseVersion = false;
kernelExtraConfig = "";
} // grsecOptions.config;
@@ -91,6 +92,12 @@ let
GRKERNSEC y
${grsecMainConfig}
+ # Disable features rendered useless by redistributing the kernel
+ ${optionalString cfg.config.redistKernel ''
+ GRKERNSEC_RANDSTRUCT n
+ GRKERNSEC_HIDESYM n
+ ''}
+
# The paxmarks mechanism relies on ELF header markings, but the default
# grsecurity configuration only enables xattr markings
PAX_PT_PAX_FLAGS y
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index d38cb89c928..c8f7717103b 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pecita-${version}";
- version = "5.2";
+ version = "5.3";
src = fetchurl {
url = "http://archive.rycee.net/pecita/${name}.tar.xz";
- sha256 = "0ryfvxdla5iinwwin4dc1k89hk1bjq2mfdrrv67q6fdgz41l0qf0";
+ sha256 = "1glr21gi1b9db17ln8qn4zk9gwpxs0frm76i4hp3anlpivbwiis8";
};
phases = ["unpackPhase" "installPhase"];
diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix
new file mode 100644
index 00000000000..d82ff652bd0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/impatience.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+ name = "gnome-shell-impatience-${version}";
+ version = "6564c21e4caf4a6bc5fe2bf21116d7c15408d494";
+
+ src = fetchFromGitHub {
+ owner = "timbertson";
+ repo = "gnome-shell-impatience";
+ rev = version;
+ sha256 = "10zyj42i07dcvaciv47qgkcs5g5n2bpc8a0m6fsimfi0442iwlcn";
+ };
+
+ buildInputs = [
+ glib
+ ];
+
+ buildPhase = ''
+ make schemas
+ '';
+
+ installPhase = ''
+ cp -r impatience $out
+ '';
+
+ uuid = "impatience@gfxmonk.net";
+
+ meta = with stdenv.lib; {
+ description = "Speed up builtin gnome-shell animations";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ aneeshusa timbertson ];
+ homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor.nix b/pkgs/desktops/gnome-3/extensions/system-monitor.nix
new file mode 100644
index 00000000000..f9b13df7f76
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+ name = "gnome-shell-system-monitor-${version}";
+ version = "8b31f070e9e59109d729661ced313d6a63e31787";
+
+ src = fetchFromGitHub {
+ owner = "paradoxxxzero";
+ repo = "gnome-shell-system-monitor-applet";
+ rev = version;
+ sha256 = "0fm5zb6qp53jjy2mnkb8ybxygzjwpb314giiq0ywq87hhrpch8m3";
+ };
+
+ buildInputs = [
+ glib
+ ];
+
+ buildPhase = ''
+ ${glib}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
+ '';
+
+ installPhase = ''
+ cp -r ${uuid} $out
+ '';
+
+ uuid = "system-monitor@paradoxxx.zero.gmail.com";
+
+ meta = with stdenv.lib; {
+ description = "Display system informations in gnome shell status bar";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ aneeshusa ];
+ homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
new file mode 100644
index 00000000000..845d21f5219
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+ name = "gnome-shell-volume-mixer-${version}";
+ version = "844ed80ad448855d8f6218847183a80474b523c7";
+
+ src = fetchFromGitHub {
+ owner = "aleho";
+ repo = "gnome-shell-volume-mixer";
+ rev = version;
+ sha256 = "1vcj2spbymhdi1nazvhldvcfgad23r3h7f0ihh4nianbxn7hjs9w";
+ };
+
+ buildInputs = [
+ glib
+ ];
+
+ buildPhase = ''
+ ${glib}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
+ '';
+
+ installPhase = ''
+ cp -r ${uuid} $out
+ '';
+
+ uuid = "shell-volume-mixer@derhofbauer.at";
+
+ meta = with stdenv.lib; {
+ description = "GNOME Shell Extension allowing separate configuration of PulseAudio devices";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ aneeshusa ];
+ homepage = https://github.com/aleho/gnome-shell-volume-mixer;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
new file mode 100644
index 00000000000..10aee5cafe6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, glib }:
+
+stdenv.mkDerivation rec {
+ name = "gnome-shell-workspace-grid-${version}";
+ version = "0f3a430e7d04bb5465a17c1225aab0f574426d6b";
+
+ src = fetchFromGitHub {
+ owner = "zakkak";
+ repo = "workspace-grid-gnome-shell-extension";
+ rev = version;
+ sha256 = "0503b7lmydrbblfvf9b56pv5hpmykzgyc6v8y99rckg58h2jhs69";
+ };
+
+ buildInputs = [
+ glib
+ ];
+
+ installPhase = ''
+ cp -r ${uuid} $out
+ '';
+
+ uuid = "workspace-grid@mathematical.coffee.gmail.com";
+
+ meta = with stdenv.lib; {
+ description = "Arranges workspaces in a configurable grid";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ aneeshusa ];
+ homepage = https://github.com/zakkak/workspace-grid-gnome-shell-extension;
+ };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
index 454e3977c3a..08901010de8 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
@@ -1,12 +1,11 @@
{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcrash
, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
-, libcap_progs
}:
kdeFramework {
name = "kinit";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
- nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools libcap.out ];
propagatedBuildInputs = [
kconfig kcrash ki18n kio kservice kwindowsystem libcap
];
diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/development/compilers/bupc/default.nix
new file mode 100644
index 00000000000..f22549d06e6
--- /dev/null
+++ b/pkgs/development/compilers/bupc/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, perl, coreutils }:
+
+stdenv.mkDerivation rec {
+ name = "berkeley_upc-2.22.0";
+
+ src = fetchurl {
+ url = "http://upc.lbl.gov/download/release/${name}.tar.gz";
+ sha256 = "041l215x8z1cvjcx7kwjdgiaf9rl2d778k6kiv8q09bc68nwd44m";
+ };
+
+ postPatch = ''
+ patchShebangs .
+ '';
+
+ # Used during the configure phase
+ ENVCMD = "${coreutils}/bin/env";
+
+ nativeBuildInputs = [ coreutils ];
+ buildInputs = [ perl ];
+
+ meta = with stdenv.lib; {
+ description = "A compiler for the Berkely Unified Parallel C language";
+ longDescription = ''
+ Unified Parallel C (UPC) is an extension of the C programming language
+ designed for high performance computing on large-scale parallel
+ machines.The language provides a uniform programming model for both
+ shared and distributed memory hardware. The programmer is presented with
+ a single shared, partitioned address space, where variables may be
+ directly read and written by any processor, but each variable is
+ physically associated with a single processor. UPC uses a Single Program
+ Multiple Data (SPMD) model of computation in which the amount of
+ parallelism is fixed at program startup time, typically with a single
+ thread of execution per processor.
+ '';
+ homepage = http://upc.lbl.gov/;
+ license = licenses.mit;
+ platforms = with platforms; [ linux ];
+ maintainers = with maintainers; [ zimbatm ];
+ };
+}
diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index d9e7cc50730..65200dce71e 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -3,39 +3,32 @@
stdenv.mkDerivation rec {
name = "chez-scheme-${version}";
version = "9.4-${dver}";
- dver = "20160501";
+ dver = "20160507";
src = fetchgit {
url = "https://github.com/cisco/chezscheme.git";
- rev = "8343b7172532a00d2d19914206fcf83c93798c80";
- sha256 = "1jq55sdk468lckccfnqh0iv868bhw6yb9ba9bakqg2pfydb8r4qf";
+ rev = "65df1d1f7c37f5b5a93cd7e5b475dda9dbafe03c";
+ sha256 = "024x79xcdqp665xjyccpn02w6dmdvnhw0h0vdc42g9s5wv5ry92m";
fetchSubmodules = true;
};
enableParallelBuilding = true;
buildInputs = [ ncurses libX11 ];
- /* Chez uses a strange default search path, which completely
- ** ignores the installation prefix for some reason, and instead
- ** defaults to {/usr,/usr/local,$HOME}/lib for finding the .boot
- ** file.
+ /* We patch out a very annoying 'feature' in ./configure, which
+ ** tries to use 'git' to update submodules.
**
- ** Also, we patch out a very annoying 'feature' in ./configure, too,
- ** which tries to use 'git' to update submodules.
- **
- ** Finally, we have to also fix a few occurrences to tools with
- ** absolute paths in some helper scripts, otherwise the build will
- ** fail on NixOS or in any chroot build.
+ ** We have to also fix a few occurrences to tools with absolute
+ ** paths in some helper scripts, otherwise the build will fail on
+ ** NixOS or in any chroot build.
*/
patchPhase = ''
- substituteInPlace ./c/scheme.c \
- --replace "/usr/lib/csv" "$out/lib/csv"
-
substituteInPlace ./configure \
--replace "git submodule init && git submodule update || exit 1" ""
substituteInPlace ./workarea \
- --replace "/bin/ln" "${coreutils}/bin/ln"
+ --replace "/bin/ln" "${coreutils}/bin/ln" \
+ --replace "/bin/cp" "${coreutils}/bin/cp"
substituteInPlace ./makefiles/installsh \
--replace "/usr/bin/true" "${coreutils}/bin/true"
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
new file mode 100644
index 00000000000..cbd4e1e340c
--- /dev/null
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -0,0 +1,538 @@
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langFortran ? false
+, langObjC ? stdenv.isDarwin
+, langObjCpp ? stdenv.isDarwin
+, langJava ? false
+, langAda ? false
+, langVhdl ? false
+, langGo ? false
+, profiledCompiler ? false
+, staticCompiler ? false
+, enableShared ? true
+, texinfo ? null
+, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, gmp, mpfr, libmpc, gettext, which
+, libelf # optional, for link-time optimizations (LTO)
+, isl ? null # optional, for the Graphite optimization framework.
+, zlib ? null, boehmgc ? null
+, zip ? null, unzip ? null, pkgconfig ? null
+, gtk ? null, libart_lgpl ? null
+, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
+, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
+, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
+, x11Support ? langJava
+, gnatboot ? null
+, enableMultilib ? false
+, enablePlugin ? true # whether to support user-supplied plug-ins
+, name ? "gcc"
+, cross ? null
+, binutilsCross ? null
+, libcCross ? null
+, crossStageStatic ? true
+, gnat ? null
+, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
+, stripped ? true
+, gnused ? null
+, binutils ? null
+, cloog # unused; just for compat with gcc4, as we override the parameter on some places
+}:
+
+assert langJava -> zip != null && unzip != null
+ && zlib != null && boehmgc != null
+ && perl != null; # for `--enable-java-home'
+assert langAda -> gnatboot != null;
+assert langVhdl -> gnat != null;
+
+# LTO needs libelf and zlib.
+assert libelf != null -> zlib != null;
+
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
+# Need c++filt on darwin
+assert stdenv.isDarwin -> binutils != null;
+
+# The go frontend is written in c++
+assert langGo -> langCC;
+
+with stdenv.lib;
+with builtins;
+
+let version = "6.1.0";
+
+ # Whether building a cross-compiler for GNU/Hurd.
+ crossGNU = cross != null && cross.config == "i586-pc-gnu";
+
+ enableParallelBuilding = true;
+
+ patches =
+ [ ../use-source-date-epoch.patch ]
+ ++ optional (cross != null) ../libstdc++-target.patch
+ ++ optional noSysDirs ../no-sys-dirs.patch
+ # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
+ # target libraries and tools.
+ ++ optional langAda ../gnat-cflags.patch
+ ++ optional langFortran ../gfortran-driving.patch;
+
+ javaEcj = fetchurl {
+ # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
+ # `configure' time.
+
+ # XXX: Eventually we might want to take it from upstream.
+ url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
+ sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
+ };
+
+ # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a
+ # binary distribution here to allow the whole chain to be bootstrapped.
+ javaAntlr = fetchurl {
+ url = http://www.antlr.org/download/antlr-4.4-complete.jar;
+ sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
+ };
+
+ xlibs = [
+ libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
+ xproto renderproto xextproto inputproto randrproto
+ ];
+
+ javaAwtGtk = langJava && x11Support;
+
+ /* Platform flags */
+ platformFlags = let
+ gccArch = stdenv.platform.gcc.arch or null;
+ gccCpu = stdenv.platform.gcc.cpu or null;
+ gccAbi = stdenv.platform.gcc.abi or null;
+ gccFpu = stdenv.platform.gcc.fpu or null;
+ gccFloat = stdenv.platform.gcc.float or null;
+ gccMode = stdenv.platform.gcc.mode or null;
+ withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+ withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+ withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+ withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+ withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+ withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+ in
+ withArch +
+ withCpu +
+ withAbi +
+ withFpu +
+ withFloat +
+ withMode;
+
+ /* Cross-gcc settings */
+ crossMingw = cross != null && cross.libc == "msvcrt";
+ crossDarwin = cross != null && cross.libc == "libSystem";
+ crossConfigureFlags = let
+ gccArch = stdenv.cross.gcc.arch or null;
+ gccCpu = stdenv.cross.gcc.cpu or null;
+ gccAbi = stdenv.cross.gcc.abi or null;
+ gccFpu = stdenv.cross.gcc.fpu or null;
+ gccFloat = stdenv.cross.gcc.float or null;
+ gccMode = stdenv.cross.gcc.mode or null;
+ withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+ withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+ withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+ withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+ withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+ withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+ in
+ "--target=${cross.config}" +
+ withArch +
+ withCpu +
+ withAbi +
+ withFpu +
+ withFloat +
+ withMode +
+ (if crossMingw && crossStageStatic then
+ " --with-headers=${libcCross}/include" +
+ " --with-gcc" +
+ " --with-gnu-as" +
+ " --with-gnu-ld" +
+ " --with-gnu-ld" +
+ " --disable-shared" +
+ " --disable-nls" +
+ " --disable-debug" +
+ " --enable-sjlj-exceptions" +
+ " --enable-threads=win32" +
+ " --disable-win32-registry"
+ else if crossStageStatic then
+ " --disable-libssp --disable-nls" +
+ " --without-headers" +
+ " --disable-threads " +
+ " --disable-libgomp " +
+ " --disable-libquadmath" +
+ " --disable-shared" +
+ " --disable-libatomic " + # libatomic requires libc
+ " --disable-decimal-float" # libdecnumber requires libc
+ else
+ (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
+ else " --with-headers=${libcCross}/include") +
+ # Ensure that -print-prog-name is able to find the correct programs.
+ (stdenv.lib.optionalString (crossMingw || crossDarwin) (
+ " --with-as=${binutilsCross}/bin/${cross.config}-as" +
+ " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+ )) +
+ " --enable-__cxa_atexit" +
+ " --enable-long-long" +
+ (if crossMingw then
+ " --enable-threads=win32" +
+ " --enable-sjlj-exceptions" +
+ " --enable-hash-synchronization" +
+ " --disable-libssp" +
+ " --disable-nls" +
+ " --with-dwarf2" +
+ # I think noone uses shared gcc libs in mingw, so we better do the same.
+ # In any case, mingw32 g++ linking is broken by default with shared libs,
+ # unless adding "-lsupc++" to any linking command. I don't know why.
+ " --disable-shared" +
+ # To keep ABI compatibility with upstream mingw-w64
+ " --enable-fully-dynamic-string"
+ else (if cross.libc == "uclibc" then
+ # In uclibc cases, libgomp needs an additional '-ldl'
+ # and as I don't know how to pass it, I disable libgomp.
+ " --disable-libgomp" else "") +
+ " --enable-threads=posix" +
+ " --enable-nls" +
+ " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
+ );
+ stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
+ crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+
+ bootstrap = cross == null;
+
+in
+
+# We need all these X libraries when building AWT with GTK+.
+assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
+
+stdenv.mkDerivation ({
+ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+
+ builder = ../builder.sh;
+
+ src = fetchurl {
+ url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
+ sha256 = "0ld3y4rgimyqgx1nwvzqyl5gr4wzc0ch4akkvsqp3fgbmdfcii09";
+ };
+
+ inherit patches;
+
+ outputs = [ "out" "lib" "man" "info" ];
+ setOutputFlags = false;
+ NIX_NO_SELF_RPATH = true;
+
+ libc_dev = stdenv.cc.libc_dev;
+
+ postPatch =
+ if (stdenv.isGNU
+ || (libcCross != null # e.g., building `gcc.crossDrv'
+ && libcCross ? crossConfig
+ && libcCross.crossConfig == "i586-pc-gnu")
+ || (crossGNU && libcCross != null))
+ then
+ # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
+ # in glibc, so add the right `-I' flags to the default spec string.
+ assert libcCross != null -> libpthreadCross != null;
+ let
+ libc = if libcCross != null then libcCross else stdenv.glibc;
+ gnu_h = "gcc/config/gnu.h";
+ extraCPPDeps =
+ libc.propagatedBuildInputs
+ ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
+ ++ stdenv.lib.optional (libpthread != null) libpthread;
+ extraCPPSpec =
+ concatStrings (intersperse " "
+ (map (x: "-I${x}/include") extraCPPDeps));
+ extraLibSpec =
+ if libpthreadCross != null
+ then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
+ else "-L${libpthread}/lib";
+ in
+ '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
+ sed -i "${gnu_h}" \
+ -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
+
+ echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
+ sed -i "${gnu_h}" \
+ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+ echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
+ sed -i "${gnu_h}" \
+ -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
+ ''
+ else if cross != null || stdenv.cc.libc != null then
+ # On NixOS, use the right path to the dynamic linker instead of
+ # `/lib/ld*.so'.
+ let
+ libc = if libcCross != null then libcCross else stdenv.cc.libc;
+ in
+ '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
+ for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+ do
+ grep -q LIBC_DYNAMIC_LINKER "$header" || continue
+ echo " fixing \`$header'..."
+ sed -i "$header" \
+ -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
+ done
+ ''
+ else null;
+
+ inherit noSysDirs staticCompiler langJava crossStageStatic
+ libcCross crossMingw;
+
+ nativeBuildInputs = [ texinfo which gettext ]
+ ++ (optional (perl != null) perl)
+ ++ (optional javaAwtGtk pkgconfig);
+
+ buildInputs = [ gmp mpfr libmpc libelf ]
+ ++ (optional (isl != null) isl)
+ ++ (optional (zlib != null) zlib)
+ ++ (optionals langJava [ boehmgc zip unzip ])
+ ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
+ ++ (optionals (cross != null) [binutilsCross])
+ ++ (optionals langAda [gnatboot])
+ ++ (optionals langVhdl [gnat])
+
+ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+ # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+ ++ (optional stdenv.isDarwin gnused)
+ ++ (optional stdenv.isDarwin binutils)
+ ;
+
+ NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl";
+
+ preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+ export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+ export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+ export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+ export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+ configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+ makeFlagsArray+=( \
+ CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+ CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+ FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+ )
+ fi
+ '';
+
+ dontDisableStatic = true;
+
+ configureFlags = "
+ ${if stdenv.isSunOS then
+ " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
+ # On Illumos/Solaris GNU as is preferred
+ " --with-gnu-as --without-gnu-ld "
+ else ""}
+ --enable-lto
+ ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
+ ${if enableShared then "" else "--disable-shared"}
+ ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
+ ${optionalString (isl != null) "--with-isl=${isl}"}
+ ${if langJava then
+ "--with-ecj-jar=${javaEcj} " +
+
+ # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
+ # .
+ "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre "
+ else ""}
+ ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+ ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
+ --with-gmp=${gmp}
+ --with-mpfr=${mpfr}
+ --with-mpc=${libmpc}
+ ${if libelf != null then "--with-libelf=${libelf}" else ""}
+ --disable-libstdcxx-pch
+ --without-included-gettext
+ --with-system-zlib
+ --enable-static
+ --enable-languages=${
+ concatStrings (intersperse ","
+ ( optional langC "c"
+ ++ optional langCC "c++"
+ ++ optional langFortran "fortran"
+ ++ optional langJava "java"
+ ++ optional langAda "ada"
+ ++ optional langVhdl "vhdl"
+ ++ optional langGo "go"
+ ++ optional langObjC "objc"
+ ++ optional langObjCpp "obj-c++"
+ ++ optionals crossDarwin [ "objc" "obj-c++" ]
+ )
+ )
+ }
+ ${if (stdenv ? glibc && cross == null)
+ then " --with-native-system-header-dir=${stdenv.glibc.dev}/include"
+ else ""}
+ ${if langAda then " --enable-libada" else ""}
+ ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
+ ${if cross != null then crossConfigureFlags else ""}
+ ${if !bootstrap then "--disable-bootstrap" else ""}
+ ${if cross == null then platformFlags else ""}
+ ";
+
+ targetConfig = if cross != null then cross.config else null;
+
+ buildFlags = if bootstrap then
+ (if profiledCompiler then "profiledbootstrap" else "bootstrap")
+ else "";
+
+ installTargets =
+ if stripped
+ then "install-strip"
+ else "install";
+
+ crossAttrs = let
+ xgccArch = stdenv.cross.gcc.arch or null;
+ xgccCpu = stdenv.cross.gcc.cpu or null;
+ xgccAbi = stdenv.cross.gcc.abi or null;
+ xgccFpu = stdenv.cross.gcc.fpu or null;
+ xgccFloat = stdenv.cross.gcc.float or null;
+ xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
+ xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
+ xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
+ xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
+ xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
+ in {
+ AR = "${stdenv.cross.config}-ar";
+ LD = "${stdenv.cross.config}-ld";
+ CC = "${stdenv.cross.config}-gcc";
+ CXX = "${stdenv.cross.config}-gcc";
+ AR_FOR_TARGET = "${stdenv.cross.config}-ar";
+ LD_FOR_TARGET = "${stdenv.cross.config}-ld";
+ CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
+ NM_FOR_TARGET = "${stdenv.cross.config}-nm";
+ CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+ # If we are making a cross compiler, cross != null
+ NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+ dontStrip = true;
+ configureFlags = ''
+ ${if enableMultilib then "" else "--disable-multilib"}
+ ${if enableShared then "" else "--disable-shared"}
+ ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
+ ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+ ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
+ --with-gmp=${gmp.crossDrv}
+ --with-mpfr=${mpfr.crossDrv}
+ --disable-libstdcxx-pch
+ --without-included-gettext
+ --with-system-zlib
+ --enable-languages=${
+ concatStrings (intersperse ","
+ ( optional langC "c"
+ ++ optional langCC "c++"
+ ++ optional langFortran "fortran"
+ ++ optional langJava "java"
+ ++ optional langAda "ada"
+ ++ optional langVhdl "vhdl"
+ ++ optional langGo "go"
+ )
+ )
+ }
+ ${if langAda then " --enable-libada" else ""}
+ --target=${stdenv.cross.config}
+ ${xwithArch}
+ ${xwithCpu}
+ ${xwithAbi}
+ ${xwithFpu}
+ ${xwithFloat}
+ '';
+ buildFlags = "";
+ };
+
+
+ # Needed for the cross compilation to work
+ AR = "ar";
+ LD = "ld";
+ # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+ CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";
+
+ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find
+ # the library headers and binaries, regarless of the language being
+ # compiled.
+
+ # Note: When building the Java AWT GTK+ peer, the build system doesn't
+ # honor `--with-gmp' et al., e.g., when building
+ # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just
+ # add them to $CPATH and $LIBRARY_PATH in this case.
+ #
+ # Likewise, the LTO code doesn't find zlib.
+
+ CPATH = concatStrings
+ (intersperse ":" (map (x: x + "/include")
+ (optionals (zlib != null) [ zlib ]
+ ++ optionals langJava [ boehmgc ]
+ ++ optionals javaAwtGtk xlibs
+ ++ optionals javaAwtGtk [ gmp mpfr ]
+ ++ optional (libpthread != null) libpthread
+ ++ optional (libpthreadCross != null) libpthreadCross
+
+ # On GNU/Hurd glibc refers to Mach & Hurd
+ # headers.
+ ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )
+ libcCross.propagatedBuildInputs)));
+
+ LIBRARY_PATH = concatStrings
+ (intersperse ":" (map (x: x + "/lib")
+ (optionals (zlib != null) [ zlib ]
+ ++ optionals langJava [ boehmgc ]
+ ++ optionals javaAwtGtk xlibs
+ ++ optionals javaAwtGtk [ gmp mpfr ]
+ ++ optional (libpthread != null) libpthread)));
+
+ EXTRA_TARGET_CFLAGS =
+ if cross != null && libcCross != null
+ then "-idirafter ${libcCross}/include"
+ else null;
+
+ EXTRA_TARGET_LDFLAGS =
+ if cross != null && libcCross != null
+ then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+ (optionalString (libpthreadCross != null)
+ " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
+ else null;
+
+ passthru =
+ { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+
+ inherit enableParallelBuilding enableMultilib;
+
+ inherit (stdenv) is64bit;
+
+ meta = {
+ homepage = http://gcc.gnu.org/;
+ license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
+ description = "GNU Compiler Collection, version ${version}"
+ + (if stripped then "" else " (with debugging info)");
+
+ longDescription = ''
+ The GNU Compiler Collection includes compiler front ends for C, C++,
+ Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
+ as libraries for these languages (libstdc++, libgcj, libgomp,...).
+
+ GCC development is a part of the GNU Project, aiming to improve the
+ compiler used in the GNU system including the GNU/Linux variant.
+ '';
+
+ maintainers = with stdenv.lib.maintainers; [ viric simons ];
+
+ # gnatboot is not available out of linux platforms, so we disable the darwin build
+ # for the gnat (ada compiler).
+ platforms =
+ stdenv.lib.platforms.linux ++
+ stdenv.lib.platforms.freebsd ++
+ optionals (langAda == false) stdenv.lib.platforms.darwin;
+ };
+}
+
+// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+ makeFlags = [ "all-gcc" "all-target-libgcc" ];
+ installTargets = "install-gcc install-target-libgcc";
+}
+
+# Strip kills static libs of other archs (hence cross != null)
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+
+// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
+)
diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 4efcdb53f47..be6f1a5402d 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand
, perl, which, pkgconfig, patch, fetchpatch
, pcre
-, Security, Foundation }:
+, Security, Foundation, bash }:
let
goBootstrap = runCommand "go-bootstrap" {} ''
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
# I'm not sure what go wants from its 'src', but the go installation manual
# describes an installation keeping the src.
preUnpack = ''
+ topdir=$PWD
mkdir -p $out/share
cd $out/share
'';
@@ -92,14 +93,22 @@ stdenv.mkDerivation rec {
sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+
+ sed -i '1 a\exit 0' misc/cgo/errors/test.bash
+
+ mkdir $topdir/dirtyhacks
+ cat < $topdir/dirtyhacks/clang
+ #!${bash}/bin/bash
+ $(type -P clang) "\$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
+ exit $?
+ EOF
+ chmod +x $topdir/dirtyhacks/clang
+ PATH=$topdir/dirtyhacks:$PATH
'';
patches = [
./remove-tools-1.5.patch
- ]
- # -ldflags=-s is required to compile on Darwin, see
- # https://github.com/golang/go/issues/11994
- ++ stdenv.lib.optional stdenv.isDarwin ./strip.patch;
+ ];
GOOS = if stdenv.isDarwin then "darwin" else "linux";
GOARCH = if stdenv.isDarwin then "amd64"
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index fe5b3b71258..79d962cd7ce 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -106,7 +106,8 @@ let result = stdenv.mkDerivation rec {
mv $sourceRoot $out
fi
- for file in $out/*
+ shopt -s extglob
+ for file in $out/!(*src.zip)
do
if test -f $file ; then
rm $file
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4a9857b20df..e4f4684fb9d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -175,9 +175,6 @@ self: super: {
wai-test = dontHaddock super.wai-test;
zlib-conduit = dontHaddock super.zlib-conduit;
- # The test suite won't even start.
- darcs = dontCheck super.darcs;
-
# https://github.com/massysett/rainbox/issues/1
rainbox = dontCheck super.rainbox;
@@ -704,10 +701,6 @@ self: super: {
then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate
else super.hmatrix;
- # https://github.com/commercialhaskell/stack/issues/408
- # https://github.com/commercialhaskell/stack/issues/409
- stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });
-
# Hydra no longer allows building texlive packages.
lhs2tex = dontDistribute super.lhs2tex;
@@ -1009,10 +1002,6 @@ self: super: {
# tinc is a new build driver a la Stack that's not yet available from Hackage.
tinc = self.callPackage ../tools/haskell/tinc {};
- # Avoid transient build failures because the QuickCheck testsuite cannot
- # generate enough conclusive test cases.
- split = dontCheck super.split;
-
# https://github.com/NixOS/nixpkgs/issues/14967
yi = markBroken super.yi;
yi-fuzzy-open = markBroken super.yi-fuzzy-open;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index ac829daa485..60c4146c79b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -203,4 +203,7 @@ self: super: {
# https://github.com/fpco/stackage/issues/1112
vector-algorithms = dontCheck super.vector-algorithms;
+ # Trigger rebuild to mitigate broken packaes on Hydra.
+ amazonka-core = triggerRebuild super.amazonka-core 1;
+
}
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 f5ca9626be6..c7f67fde221 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -86,6 +86,9 @@ self: super: {
force-layout = doJailbreak super.force-layout;
+ # packaged 0.2.2.6 is missing: base >=4.7 && <4.9
+ freer = doJailbreak super.freer;
+
# Partial fixes released in 1.20.5 upstream, full fixes only in git
linear = pkgs.haskell.lib.overrideCabal super.linear (oldAttrs: {
editedCabalFile = null;
@@ -113,6 +116,9 @@ self: super: {
servant-client = dontCheck (doJailbreak super.servant-client_0_7);
servant-server = dontCheck (doJailbreak super.servant-server_0_7);
+ # packaged shelly 1.6.6 complains: time >=1.3 && <1.6
+ shelly = doJailbreak super.shelly;
+
# The essential part is released in 2.1 upstream (needs hackage import)
singletons = (pkgs.haskell.lib.overrideCabal super.singletons (oldAttrs: {
src = pkgs.fetchgit {
@@ -140,15 +146,6 @@ self: super: {
};
}));
- # The essential part is released in 0.1.4.1 upstream (needs hackage import)
- th-reify-many = doJailbreak (pkgs.haskell.lib.overrideCabal super.th-reify-many (oldAttrs: {
- src = pkgs.fetchgit {
- url = https://github.com/mgsloan/th-reify-many.git;
- rev = "699eed232c2ccaf9fb109f131e80ed8d654d6f08";
- sha256 = "001fvpq039l9wj9v8id7kfjwmp4acf53zr4z6sppdvrv6npzz5yb";
- };
- }));
-
trifecta = doJailbreak super.trifecta;
turtle = doJailbreak super.turtle;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e6be3acaf53..be659d26ee7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -105,6 +105,7 @@ package-maintainers:
dont-distribute-packages:
# hard restrictions that really belong into meta.platforms
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin ]
dx9base: [ i686-linux, x86_64-linux, x86_64-darwin ]
dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -194,10 +195,12 @@ dont-distribute-packages:
AERN-RnToRm-Plot: [ i686-linux, x86_64-linux, x86_64-darwin ]
AERN-RnToRm: [ i686-linux, x86_64-darwin, x86_64-linux ]
aeson-bson: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ aeson-diff: [ i686-linux, x86_64-darwin, x86_64-linux ]
aeson-native: [ i686-linux, x86_64-darwin, x86_64-linux ]
aeson-schema: [ i686-linux, x86_64-darwin, x86_64-linux ]
aeson-smart: [ i686-linux, x86_64-darwin, x86_64-linux ]
AesonBson: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ AFSM: [ i686-linux, x86_64-darwin, x86_64-linux ]
afv: [ i686-linux, x86_64-darwin, x86_64-linux ]
Agata: [ i686-linux, x86_64-darwin, x86_64-linux ]
Agda-executable: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -316,6 +319,8 @@ dont-distribute-packages:
autonix-deps: [ x86_64-darwin ]
autoproc: [ i686-linux, x86_64-darwin, x86_64-linux ]
avahi: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ avers-api: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ avers-server: [ i686-linux, x86_64-darwin, x86_64-linux ]
AvlTree: [ i686-linux, x86_64-darwin, x86_64-linux ]
awesomium-glut: [ i686-linux, x86_64-darwin, x86_64-linux ]
awesomium-raw: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -476,6 +481,7 @@ dont-distribute-packages:
BlogLiterately-diagrams: [ x86_64-darwin ]
bloodhound-amazonka-auth: [ i686-linux, x86_64-darwin, x86_64-linux ]
bloodhound: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ bloomfilter-redis: [ i686-linux, x86_64-darwin, x86_64-linux ]
bloxorz: [ x86_64-darwin ]
blubber: [ x86_64-darwin ]
Blueprint: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -666,6 +672,7 @@ dont-distribute-packages:
cmdargs-browser: [ i686-linux, x86_64-darwin, x86_64-linux ]
cmdtheline: [ i686-linux, x86_64-darwin, x86_64-linux ]
cmonad: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ cmph: [ i686-linux, x86_64-darwin, x86_64-linux ]
cnc-spec-compiler: [ i686-linux, x86_64-darwin, x86_64-linux ]
cndict: [ i686-linux, x86_64-darwin, x86_64-linux ]
Coadjute: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -682,6 +689,7 @@ dont-distribute-packages:
collections-api: [ i686-linux, x86_64-darwin, x86_64-linux ]
collections-base-instances: [ i686-linux, x86_64-darwin, x86_64-linux ]
collections: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ color-counter: [ i686-linux, x86_64-darwin, x86_64-linux ]
coltrane: [ i686-linux, x86_64-darwin, x86_64-linux ]
com: [ i686-linux, x86_64-darwin, x86_64-linux ]
combinat-diagrams: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -814,6 +822,7 @@ dont-distribute-packages:
CV: [ i686-linux, x86_64-darwin, x86_64-linux ]
cyclotomic: [ i686-linux ]
cypher: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ d-bus: [ i686-linux, x86_64-darwin, x86_64-linux ]
DAG-Tournament: [ i686-linux, x86_64-darwin, x86_64-linux ]
Dangerous: [ i686-linux, x86_64-darwin, x86_64-linux ]
Dao: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1218,6 +1227,7 @@ dont-distribute-packages:
frag: [ i686-linux, x86_64-darwin, x86_64-linux ]
franchise: [ i686-linux, x86_64-darwin, x86_64-linux ]
Frank: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ freddy: [ i686-linux, x86_64-darwin, x86_64-linux ]
free-game: [ i686-linux, x86_64-darwin, x86_64-linux ]
free-operational: [ i686-linux, x86_64-darwin, x86_64-linux ]
free-theorems-counterexamples: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1305,6 +1315,7 @@ dont-distribute-packages:
ghc-dup: [ i686-linux, x86_64-darwin, x86_64-linux ]
ghc-events-parallel: [ i686-linux, x86_64-darwin, x86_64-linux ]
ghc-exactprint: [ x86_64-darwin ]
+ ghc-imported-from: [ i686-linux, x86_64-darwin, x86_64-linux ]
ghc-pkg-autofix: [ i686-linux, x86_64-darwin, x86_64-linux ]
ghc-syb: [ i686-linux, x86_64-darwin, x86_64-linux ]
ghc-vis: [ x86_64-darwin ]
@@ -1395,10 +1406,100 @@ dont-distribute-packages:
goal-probability: [ x86_64-darwin ]
goal-simulation: [ i686-linux, x86_64-darwin, x86_64-linux ]
gofer-prelude: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-adexchange-buyer: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-adexchange-seller: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-admin-datatransfer: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-admin-directory: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-admin-emailmigration: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-admin-reports: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-adsense-host: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-adsense: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-affiliates: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-analytics: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-android-enterprise: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-android-publisher: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-appengine: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-apps-activity: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-apps-calendar: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-apps-licensing: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-apps-reseller: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-apps-tasks: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-appstate: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-autoscaler: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-bigquery: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-billing: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-blogger: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-books: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-civicinfo: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-classroom: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-cloudtrace: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-compute: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-container: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-core: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-customsearch: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-dataflow: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-datastore: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-debugger: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-deploymentmanager: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-dfareporting: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-discovery: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-dns: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-doubleclick-bids: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-doubleclick-search: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-drive: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-fitness: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-fonts: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-freebasesearch: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-fusiontables: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-games-configuration: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-games-management: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-games: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-genomics: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-gmail: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-groups-migration: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-groups-settings: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-identity-toolkit: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-latencytest: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-logging: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-maps-coordinate: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-maps-engine: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-mirror: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-monitoring: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-oauth2: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-pagespeed: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-partners: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-play-moviespartner: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-plus-domains: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-plus: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-prediction: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-proximitybeacon: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-pubsub: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-qpxexpress: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-replicapool-updater: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-replicapool: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-resourcemanager: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-resourceviews: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-shopping-content: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-siteverification: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-spectrum: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-sqladmin: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-storage-transfer: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-storage: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-tagmanager: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-taskqueue: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-translate: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-urlshortener: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-useraccounts: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-webmaster-tools: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-youtube-analytics: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-youtube-reporting: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol-youtube: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ gogol: [ i686-linux, x86_64-darwin, x86_64-linux ]
gooey: [ i686-linux, x86_64-darwin, x86_64-linux ]
google-html5-slide: [ i686-linux, x86_64-darwin, x86_64-linux ]
google-mail-filters: [ i686-linux, x86_64-darwin, x86_64-linux ]
google-search: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ google-translate: [ i686-linux, x86_64-darwin, x86_64-linux ]
GoogleDirections: [ i686-linux, x86_64-darwin, x86_64-linux ]
googleplus: [ i686-linux, x86_64-darwin, x86_64-linux ]
GoogleSB: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1490,6 +1591,7 @@ dont-distribute-packages:
gtksourceview3: [ x86_64-darwin ]
GtkTV: [ x86_64-darwin ]
guess-combinator: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ guid: [ i686-linux, x86_64-darwin, x86_64-linux ]
GuiHaskell: [ i686-linux, x86_64-darwin, x86_64-linux ]
GuiTV: [ i686-linux, x86_64-darwin, x86_64-linux ]
gulcii: [ x86_64-darwin ]
@@ -1525,6 +1627,7 @@ dont-distribute-packages:
hackage2twitter: [ i686-linux, x86_64-darwin, x86_64-linux ]
hackernews: [ i686-linux, x86_64-darwin, x86_64-linux ]
HackMail: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ hackport: [ i686-linux, x86_64-darwin, x86_64-linux ]
hactor: [ i686-linux, x86_64-darwin, x86_64-linux ]
haddock-leksah: [ i686-linux, x86_64-darwin, x86_64-linux ]
haggis: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1622,6 +1725,7 @@ dont-distribute-packages:
haskell-ftp: [ i686-linux, x86_64-darwin, x86_64-linux ]
haskell-gi-base: [ i686-linux ]
haskell-gi: [ i686-linux, x86_64-darwin ]
+ haskell-kubernetes: [ i686-linux, x86_64-darwin, x86_64-linux ]
haskell-mpfr: [ i686-linux, x86_64-darwin, x86_64-linux ]
haskell-mpi: [ x86_64-darwin ]
haskell-names: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1749,6 +1853,7 @@ dont-distribute-packages:
her-lexer: [ i686-linux, x86_64-darwin, x86_64-linux ]
HERA: [ i686-linux, x86_64-darwin, x86_64-linux ]
herbalizer: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ heredocs: [ i686-linux, x86_64-darwin, x86_64-linux ]
Hermes: [ i686-linux, x86_64-darwin, x86_64-linux ]
hermit-syb: [ i686-linux, x86_64-darwin, x86_64-linux ]
hermit: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1814,7 +1919,7 @@ dont-distribute-packages:
hiernotify: [ i686-linux, x86_64-darwin, x86_64-linux ]
Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ]
HiggsSet: [ i686-linux, x86_64-darwin, x86_64-linux ]
- higher-leveldb: [ x86_64-darwin ]
+ higher-leveldb: [ i686-linux, x86_64-darwin, x86_64-linux ]
higherorder: [ i686-linux, x86_64-darwin, x86_64-linux ]
highjson: [ i686-linux ]
highWaterMark: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1961,6 +2066,7 @@ dont-distribute-packages:
HROOT-math: [ i686-linux, x86_64-darwin, x86_64-linux ]
HROOT: [ i686-linux, x86_64-darwin, x86_64-linux ]
hruby: [ i686-linux ]
+ hs-blake2: [ i686-linux, x86_64-darwin, x86_64-linux ]
hs-carbon-examples: [ i686-linux, x86_64-darwin, x86_64-linux ]
hs-cdb: [ i686-linux, x86_64-darwin, x86_64-linux ]
hs-dotnet: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2177,6 +2283,7 @@ dont-distribute-packages:
informative: [ i686-linux, x86_64-darwin, x86_64-linux ]
inilist: [ i686-linux, x86_64-darwin, x86_64-linux ]
inline-c-cpp: [ x86_64-darwin ]
+ inline-java: [ i686-linux, x86_64-darwin, x86_64-linux ]
inline-r: [ i686-linux, x86_64-darwin ]
instant-aeson: [ i686-linux, x86_64-darwin, x86_64-linux ]
instant-zipper: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2190,6 +2297,7 @@ dont-distribute-packages:
interruptible: [ i686-linux, x86_64-darwin, x86_64-linux ]
intricacy: [ x86_64-darwin ]
intset: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ io-capture: [ i686-linux, x86_64-darwin, x86_64-linux ]
io-reactive: [ i686-linux, x86_64-darwin, x86_64-linux ]
IOR: [ i686-linux, x86_64-darwin, x86_64-linux ]
IORefCAS: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2249,6 +2357,7 @@ dont-distribute-packages:
jsc: [ i686-linux, x86_64-linux, x86_64-darwin ]
JsContracts: [ i686-linux, x86_64-darwin, x86_64-linux ]
jsmw: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ json-ast-quickcheck: [ i686-linux, x86_64-darwin, x86_64-linux ]
json-b: [ i686-linux, x86_64-darwin, x86_64-linux ]
JSON-Combinator-Examples: [ i686-linux, x86_64-darwin, x86_64-linux ]
JSON-Combinator: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2390,7 +2499,7 @@ dont-distribute-packages:
leksah: [ x86_64-darwin ]
Level0: [ x86_64-darwin ]
leveldb-haskell-fork: [ i686-linux, x86_64-darwin, x86_64-linux ]
- leveldb-haskell: [ x86_64-darwin ]
+ leveldb-haskell: [ i686-linux, x86_64-darwin, x86_64-linux ]
levmar-chart: [ i686-linux, x86_64-linux, x86_64-darwin ]
levmar: [ i686-linux, x86_64-linux, x86_64-darwin ]
lgtk: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2729,6 +2838,7 @@ dont-distribute-packages:
nano-md5: [ i686-linux, x86_64-darwin, x86_64-linux ]
nanoAgda: [ i686-linux, x86_64-darwin, x86_64-linux ]
nanocurses: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ nanovg: [ i686-linux, x86_64-darwin, x86_64-linux ]
nanq: [ i686-linux ]
narc: [ i686-linux, x86_64-darwin, x86_64-linux ]
nats-queue: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2933,9 +3043,11 @@ dont-distribute-packages:
peparser: [ i686-linux, x86_64-darwin, x86_64-linux ]
perdure: [ i686-linux, x86_64-darwin, x86_64-linux ]
PerfectHash: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ perfecthash: [ i686-linux, x86_64-darwin, x86_64-linux ]
perm: [ i686-linux, x86_64-darwin, x86_64-linux ]
permute: [ i686-linux, x86_64-darwin, x86_64-linux ]
PermuteEffects: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ persistent-database-url: [ i686-linux, x86_64-darwin, x86_64-linux ]
persistent-hssqlppp: [ i686-linux, x86_64-darwin, x86_64-linux ]
persistent-map: [ i686-linux, x86_64-darwin, x86_64-linux ]
persistent-protobuf: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2970,8 +3082,10 @@ dont-distribute-packages:
pipes-key-value-csv: [ i686-linux, x86_64-darwin, x86_64-linux ]
pipes-network-tls: [ i686-linux, x86_64-darwin, x86_64-linux ]
pipes-p2p-examples: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ pipes-transduce: [ i686-linux, x86_64-darwin, x86_64-linux ]
pisigma: [ i686-linux, x86_64-darwin, x86_64-linux ]
pit: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ pivotal-tracker: [ i686-linux, x86_64-darwin, x86_64-linux ]
pkggraph: [ i686-linux, x86_64-darwin, x86_64-linux ]
planar-graph: [ i686-linux, x86_64-darwin, x86_64-linux ]
plat: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3057,6 +3171,7 @@ dont-distribute-packages:
process-listlike: [ i686-linux, x86_64-darwin, x86_64-linux ]
process-progress: [ i686-linux, x86_64-darwin, x86_64-linux ]
process-qq: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ process-streaming: [ i686-linux, x86_64-darwin, x86_64-linux ]
processing: [ i686-linux, x86_64-darwin, x86_64-linux ]
procrastinating-structure: [ i686-linux, x86_64-darwin, x86_64-linux ]
procrastinating-variable: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3114,7 +3229,7 @@ dont-distribute-packages:
quadratic-irrational: [ i686-linux, x86_64-darwin, x86_64-linux ]
quantum-arrow: [ i686-linux, x86_64-darwin, x86_64-linux ]
qudb: [ i686-linux, x86_64-darwin, x86_64-linux ]
- Quelea: [ x86_64-darwin ]
+ Quelea: [ i686-linux, x86_64-darwin, x86_64-linux ]
quenya-verb: [ i686-linux, x86_64-darwin, x86_64-linux ]
querystring-pickle: [ i686-linux, x86_64-darwin, x86_64-linux ]
queuelike: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3127,6 +3242,7 @@ dont-distribute-packages:
quickset: [ i686-linux, x86_64-darwin, x86_64-linux ]
Quickson: [ i686-linux, x86_64-darwin, x86_64-linux ]
quicktest: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ quickwebapp: [ i686-linux, x86_64-darwin, x86_64-linux ]
quoridor-hs: [ i686-linux, x86_64-darwin, x86_64-linux ]
qux: [ i686-linux, x86_64-darwin, x86_64-linux ]
R-pandoc: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3158,7 +3274,7 @@ dont-distribute-packages:
rcu: [ i686-linux, x86_64-darwin, x86_64-linux ]
rdf4h: [ i686-linux, x86_64-darwin, x86_64-linux ]
rdioh: [ i686-linux, x86_64-darwin, x86_64-linux ]
- re2: [ x86_64-darwin ]
+ re2: [ i686-linux, x86_64-darwin, x86_64-linux ]
reaction-logic: [ i686-linux, x86_64-darwin, x86_64-linux ]
reactive-bacon: [ i686-linux, x86_64-darwin, x86_64-linux ]
reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3171,6 +3287,7 @@ dont-distribute-packages:
reactive-thread: [ i686-linux, x86_64-darwin, x86_64-linux ]
reactive: [ i686-linux, x86_64-darwin, x86_64-linux ]
reactor: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ readshp: [ i686-linux, x86_64-darwin, x86_64-linux ]
really-simple-xml-parser: [ i686-linux, x86_64-darwin, x86_64-linux ]
reasonable-lens: [ i686-linux, x86_64-darwin, x86_64-linux ]
record-aeson: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3320,7 +3437,7 @@ dont-distribute-packages:
satchmo-funsat: [ i686-linux, x86_64-darwin, x86_64-linux ]
satchmo-minisat: [ i686-linux, x86_64-darwin, x86_64-linux ]
satchmo-toysat: [ i686-linux, x86_64-darwin, x86_64-linux ]
- satchmo: [ x86_64-darwin ]
+ satchmo: [ i686-linux, x86_64-darwin, x86_64-linux ]
SBench: [ i686-linux, x86_64-darwin, x86_64-linux ]
sbp: [ i686-linux, x86_64-darwin, x86_64-linux ]
scaleimage: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3384,8 +3501,12 @@ dont-distribute-packages:
seqloc-datafiles: [ i686-linux, x86_64-darwin, x86_64-linux ]
sequent-core: [ i686-linux, x86_64-darwin, x86_64-linux ]
sequor: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ servant-csharp: [ i686-linux, x86_64-darwin, x86_64-linux ]
servant-examples: [ i686-linux, x86_64-darwin, x86_64-linux ]
servant-foreign: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ servant-github: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ servant-haxl-client: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ servant-jquery: [ i686-linux, x86_64-darwin, x86_64-linux ]
servant-js: [ i686-linux, x86_64-darwin, x86_64-linux ]
servant-pool: [ i686-linux, x86_64-darwin, x86_64-linux ]
servant-postgresql: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3454,6 +3575,7 @@ dont-distribute-packages:
sindre: [ i686-linux, x86_64-darwin, x86_64-linux ]
sirkel: [ i686-linux, x86_64-darwin, x86_64-linux ]
sized: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ sjsp: [ i686-linux, x86_64-darwin, x86_64-linux ]
skeleton: [ i686-linux, x86_64-darwin, x86_64-linux ]
skulk: [ i686-linux, x86_64-darwin, x86_64-linux ]
skype4hs: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3467,6 +3589,7 @@ dont-distribute-packages:
smartword: [ i686-linux, x86_64-darwin, x86_64-linux ]
sme: [ i686-linux, x86_64-darwin, x86_64-linux ]
Smooth: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ smsaero: [ i686-linux, x86_64-darwin, x86_64-linux ]
smt-lib: [ i686-linux, x86_64-darwin, x86_64-linux ]
smtp-mail-ng: [ i686-linux, x86_64-darwin, x86_64-linux ]
smtp2mta: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3525,6 +3648,7 @@ dont-distribute-packages:
SpaceInvaders: [ i686-linux ]
SpacePrivateers: [ i686-linux, x86_64-darwin, x86_64-linux ]
spanout: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ sparkle: [ i686-linux, x86_64-darwin, x86_64-linux ]
sparse: [ i686-linux, x86_64-darwin, x86_64-linux ]
sparsebit: [ i686-linux, x86_64-darwin, x86_64-linux ]
sparsecheck: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3581,8 +3705,10 @@ dont-distribute-packages:
storablevector-streamfusion: [ i686-linux, x86_64-darwin, x86_64-linux ]
storablevector: [ i686-linux, x86_64-darwin, x86_64-linux ]
Strafunski-Sdf2Haskell: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ stratosphere: [ i686-linux, x86_64-darwin, x86_64-linux ]
stratum-tool: [ i686-linux, x86_64-darwin, x86_64-linux ]
stream-fusion: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ stream: [ i686-linux, x86_64-darwin, x86_64-linux ]
streamed: [ i686-linux, x86_64-linux, x86_64-darwin ]
streaming-utils: [ i686-linux ]
strict-concurrency: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3669,6 +3795,7 @@ dont-distribute-packages:
taskpool: [ x86_64-darwin ]
tasty-groundhog-converters: [ i686-linux, x86_64-darwin, x86_64-linux ]
tasty-integrate: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ tasty-laws: [ i686-linux, x86_64-darwin, x86_64-linux ]
TBC: [ i686-linux, x86_64-darwin, x86_64-linux ]
TBit: [ i686-linux, x86_64-darwin, x86_64-linux ]
tbox: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3677,6 +3804,7 @@ dont-distribute-packages:
tdd-util: [ i686-linux, x86_64-darwin, x86_64-linux ]
TeaHS: [ i686-linux, x86_64-linux, x86_64-darwin ]
teams: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ telegram-api: [ i686-linux, x86_64-darwin, x86_64-linux ]
telegram: [ i686-linux, x86_64-darwin, x86_64-linux ]
template-default: [ i686-linux, x86_64-darwin, x86_64-linux ]
template-haskell-util: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3773,6 +3901,7 @@ dont-distribute-packages:
transf: [ i686-linux, x86_64-darwin, x86_64-linux ]
transformers-convert: [ i686-linux, x86_64-darwin, x86_64-linux ]
transformers-runnable: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ transient-universe: [ i686-linux, x86_64-darwin, x86_64-linux ]
transient: [ i686-linux, x86_64-darwin, x86_64-linux ]
translate: [ i686-linux, x86_64-darwin, x86_64-linux ]
traypoweroff: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3782,7 +3911,7 @@ dont-distribute-packages:
triangulation: [ i686-linux, x86_64-darwin, x86_64-linux ]
TrieMap: [ i686-linux, x86_64-darwin, x86_64-linux ]
trimpolya: [ i686-linux, x86_64-darwin, x86_64-linux ]
- tripLL: [ x86_64-darwin ]
+ tripLL: [ i686-linux, x86_64-darwin, x86_64-linux ]
tropical: [ i686-linux, x86_64-darwin, x86_64-linux ]
tsession-happstack: [ i686-linux, x86_64-darwin, x86_64-linux ]
tsession: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3837,6 +3966,7 @@ dont-distribute-packages:
typescript-docs: [ i686-linux, x86_64-darwin, x86_64-linux ]
tz: [ x86_64-darwin ]
uAgda: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ uber: [ i686-linux, x86_64-darwin, x86_64-linux ]
uberlast: [ i686-linux, x86_64-darwin, x86_64-linux ]
uconv: [ i686-linux, x86_64-darwin, x86_64-linux ]
udbus-model: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3848,7 +3978,7 @@ dont-distribute-packages:
unamb-custom: [ i686-linux, x86_64-darwin, x86_64-linux ]
unbounded-delays-units: [ i686-linux, x86_64-darwin, x86_64-linux ]
unboxed-containers: [ i686-linux, x86_64-darwin, x86_64-linux ]
- unbreak: [ x86_64-darwin ]
+ unbreak: [ i686-linux, x86_64-darwin, x86_64-linux ]
unicode-normalization: [ i686-linux, x86_64-darwin, x86_64-linux ]
unicoder: [ i686-linux, x86_64-darwin, x86_64-linux ]
uniform-io: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3954,6 +4084,8 @@ dont-distribute-packages:
wai-middleware-preprocessor: [ i686-linux, x86_64-darwin, x86_64-linux ]
wai-middleware-route: [ i686-linux, x86_64-darwin, x86_64-linux ]
wai-middleware-static-caching: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ wai-predicates: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ wai-routing: [ i686-linux, x86_64-darwin, x86_64-linux ]
wai-session-tokyocabinet: [ i686-linux, x86_64-darwin, x86_64-linux ]
wai-static-cache: [ i686-linux, x86_64-darwin, x86_64-linux ]
wai-thrift: [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -4003,6 +4135,7 @@ dont-distribute-packages:
winerror: [ i686-linux, x86_64-darwin, x86_64-linux ]
winio: [ i686-linux, x86_64-darwin, x86_64-linux ]
Wired: [ x86_64-darwin ]
+ wkt: [ i686-linux, x86_64-darwin, x86_64-linux ]
WL500gPControl: [ i686-linux, x86_64-darwin, x86_64-linux ]
wlc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
WMSigner: [ i686-linux ]
@@ -4119,6 +4252,7 @@ dont-distribute-packages:
yesod-comments: [ i686-linux, x86_64-darwin, x86_64-linux ]
yesod-content-pdf: [ i686-linux, x86_64-darwin, x86_64-linux ]
yesod-continuations: [ i686-linux, x86_64-darwin, x86_64-linux ]
+ yesod-crud: [ i686-linux, x86_64-darwin, x86_64-linux ]
yesod-datatables: [ i686-linux, x86_64-darwin, x86_64-linux ]
yesod-examples: [ i686-linux, x86_64-darwin, x86_64-linux ]
yesod-goodies: [ i686-linux, x86_64-darwin, x86_64-linux ]
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 20e87e83c29..e4a68377f17 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -2673,6 +2673,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3577,6 +3578,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_2";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3982,6 +3984,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -6010,6 +6013,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7061,6 +7065,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 8142d61db1f..74f7ad4a489 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -2673,6 +2673,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3577,6 +3578,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_2";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3982,6 +3984,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -6010,6 +6013,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7061,6 +7065,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 93da6c8ea26..ae72d4f2d44 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -2673,6 +2673,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3577,6 +3578,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_2";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3982,6 +3984,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -6010,6 +6013,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7061,6 +7065,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 139587df0ca..54f08ded622 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -2673,6 +2673,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3577,6 +3578,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_2";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3982,6 +3984,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -6010,6 +6013,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7061,6 +7065,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index ebf71b233b2..0ab2ae057da 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -2673,6 +2673,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3576,6 +3577,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_2";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3979,6 +3981,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -6007,6 +6010,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7058,6 +7062,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 98602756736..39ebdb342de 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -2673,6 +2673,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3576,6 +3577,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_2";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3979,6 +3981,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -6007,6 +6010,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7058,6 +7062,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 36e7461a8cf..07e0797c5ee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -2672,6 +2672,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3575,6 +3576,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3978,6 +3980,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -6005,6 +6008,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7056,6 +7060,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 5b1578fd4c3..8e486e97dc3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -2672,6 +2672,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3575,6 +3576,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3978,6 +3980,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -6005,6 +6008,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7056,6 +7060,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index ee69deb9f1b..8db20350fe7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -2665,6 +2665,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3567,6 +3568,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3969,6 +3971,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5996,6 +5999,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7047,6 +7051,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 00e5a44a804..6430eb0b9e6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -2663,6 +2663,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3564,6 +3565,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3966,6 +3968,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5989,6 +5992,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7040,6 +7044,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 9a04c8e8c94..1772ea05317 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -2659,6 +2659,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3555,6 +3556,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3956,6 +3958,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5972,6 +5975,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7020,6 +7024,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 33d0a5b299b..711dfce2f7b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -2659,6 +2659,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3554,6 +3555,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3955,6 +3957,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5968,6 +5971,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7016,6 +7020,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 3fcd44271df..245d1cd63f2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -2659,6 +2659,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3554,6 +3555,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3955,6 +3957,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5967,6 +5970,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7015,6 +7019,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 1cedbc8be95..6dbede1453a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -2659,6 +2659,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3554,6 +3555,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3954,6 +3956,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5966,6 +5969,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7014,6 +7018,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 3483e76ea31..253d392a083 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -2656,6 +2656,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3551,6 +3552,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3951,6 +3953,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5963,6 +5966,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7010,6 +7014,7 @@ self: super: {
"quicklz" = dontDistribute super."quicklz";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 5cc0f9fffde..518b8b3b1b8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -2653,6 +2653,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3547,6 +3548,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3947,6 +3949,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5959,6 +5962,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7003,6 +7007,7 @@ self: super: {
"quicklz" = dontDistribute super."quicklz";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 7ac7464aa45..09655c3ab95 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -2661,6 +2661,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3561,6 +3562,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3963,6 +3965,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5986,6 +5989,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7036,6 +7040,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index b5e1d26ff19..31380f1ea2b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -2660,6 +2660,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3559,6 +3560,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3961,6 +3963,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5983,6 +5986,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7032,6 +7036,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 5e5d5ff2a2f..60bb9fd4473 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -2659,6 +2659,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3558,6 +3559,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3960,6 +3962,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5982,6 +5985,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7031,6 +7035,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 345a0efa8f4..c6f84999de6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -2659,6 +2659,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3558,6 +3559,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3960,6 +3962,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5977,6 +5980,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7026,6 +7030,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 4b1d4e7c9a2..c031f18467e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -2659,6 +2659,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3556,6 +3557,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3957,6 +3959,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5973,6 +5976,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7022,6 +7026,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 54c9bc0f5bf..fde9da194b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -2659,6 +2659,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3555,6 +3556,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_4";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3956,6 +3958,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = dontDistribute super."hackage-mirror";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5972,6 +5975,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -7021,6 +7025,7 @@ self: super: {
"quickpull" = doDistribute super."quickpull_0_4_0_0";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 1e4b541f524..be36e53631a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -2641,6 +2641,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3533,6 +3534,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3931,6 +3933,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5925,6 +5928,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6961,6 +6965,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 490801bae1b..c6f3f5df49b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -2640,6 +2640,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3532,6 +3533,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3930,6 +3932,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5924,6 +5927,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6960,6 +6964,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index a9e84b65523..7117655679d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -2627,6 +2627,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3515,6 +3516,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3911,6 +3913,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5899,6 +5902,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6932,6 +6936,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 17f0dc57766..8bc437ba511 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -2626,6 +2626,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3513,6 +3514,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3909,6 +3911,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5894,6 +5897,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6926,6 +6930,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 248c9d5bdb3..ce5accd348d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -2626,6 +2626,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3513,6 +3514,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3909,6 +3911,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5894,6 +5897,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6926,6 +6930,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index f2b2e400ab7..1ca0df12379 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -2626,6 +2626,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3513,6 +3514,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3908,6 +3910,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5892,6 +5895,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6924,6 +6928,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index aabae0822bf..06608df4462 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -2626,6 +2626,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3512,6 +3513,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3907,6 +3909,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5890,6 +5893,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6922,6 +6926,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index b1f729fc28f..54144d1a3fd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -2626,6 +2626,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3511,6 +3512,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3906,6 +3908,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5888,6 +5891,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6920,6 +6924,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 723d0c93c37..c5fb5f66fa5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -2625,6 +2625,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3508,6 +3509,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3903,6 +3905,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5884,6 +5887,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6916,6 +6920,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index eaf1fea3dae..061cd3029db 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -2623,6 +2623,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3504,6 +3505,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3899,6 +3901,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5880,6 +5883,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6911,6 +6915,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 073161b05b0..f7c844dc6f3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -2622,6 +2622,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3502,6 +3503,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3897,6 +3899,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5878,6 +5881,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6908,6 +6912,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index de94de5ae3c..b8f383f677c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -2622,6 +2622,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3501,6 +3502,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3896,6 +3898,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5876,6 +5879,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6906,6 +6910,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index ce113fd1467..cc8d31652af 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -2637,6 +2637,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3529,6 +3530,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3927,6 +3929,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5921,6 +5924,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6957,6 +6961,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index dae40ae5b4e..00b678af7ad 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -2621,6 +2621,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3500,6 +3501,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3895,6 +3897,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5875,6 +5878,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6904,6 +6908,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 36373c0e79a..e987f7c7edd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -2621,6 +2621,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3500,6 +3501,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3895,6 +3897,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5875,6 +5878,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6903,6 +6907,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 638c1833dc3..8b2fd373e07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -2621,6 +2621,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3500,6 +3501,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3895,6 +3897,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5874,6 +5877,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6902,6 +6906,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 7bc9200c110..68b2a4225e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -2637,6 +2637,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3528,6 +3529,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3926,6 +3928,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5919,6 +5922,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6955,6 +6959,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 17cfdfa1bcc..e7ab14804b4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -2636,6 +2636,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3527,6 +3528,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3925,6 +3927,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5918,6 +5921,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6953,6 +6957,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 54bdf226282..d94686e2de8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -2635,6 +2635,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3526,6 +3527,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3924,6 +3926,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5917,6 +5920,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6952,6 +6956,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 53a6ba088d3..e869acb8a51 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -2632,6 +2632,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3523,6 +3524,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3919,6 +3921,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5912,6 +5915,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6946,6 +6950,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 4bc47cb0bd8..46e293f904d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -2631,6 +2631,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3522,6 +3523,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3918,6 +3920,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5911,6 +5914,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6946,6 +6950,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index d9fbbb3de72..3f320f0eb2a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -2630,6 +2630,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3520,6 +3521,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3916,6 +3918,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5909,6 +5912,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6944,6 +6948,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 6a5856b036b..656e376ac4b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -2628,6 +2628,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3516,6 +3517,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_3_6";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3912,6 +3914,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5902,6 +5905,7 @@ self: super: {
"monad-skeleton" = dontDistribute super."monad-skeleton";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-stm" = dontDistribute super."monad-stm";
@@ -6937,6 +6941,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index e69cfb6680b..a3250546cb6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -2561,6 +2561,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3419,6 +3420,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3810,6 +3812,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5735,6 +5738,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5963,6 +5967,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6739,6 +6744,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 28c84d54ed9..705840e5e1c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -2560,6 +2560,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3417,6 +3418,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3808,6 +3810,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5732,6 +5735,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5960,6 +5964,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6735,6 +6740,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 9263d961f70..86dbc3d25fb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -2549,6 +2549,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3400,6 +3401,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3789,6 +3791,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5702,6 +5705,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5928,6 +5932,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6694,6 +6699,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 4a0c8ae04f2..bb58301757a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -2548,6 +2548,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3398,6 +3399,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3787,6 +3789,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5700,6 +5703,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5926,6 +5930,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6691,6 +6696,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index f87cc10c8a9..250384b1d28 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -2547,6 +2547,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3397,6 +3398,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3785,6 +3787,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5698,6 +5701,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5924,6 +5928,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6688,6 +6693,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 4d0b4b51f4b..9c89a4dde43 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -2547,6 +2547,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3397,6 +3398,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3785,6 +3787,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5696,6 +5699,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5922,6 +5926,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6685,6 +6690,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 79c0bd0d594..fb0f7c66192 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -2544,6 +2544,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3394,6 +3395,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3782,6 +3784,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5692,6 +5695,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5918,6 +5922,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6681,6 +6686,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 25a1f7d6102..703dc549352 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -2544,6 +2544,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3394,6 +3395,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3782,6 +3784,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5689,6 +5692,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5915,6 +5919,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6678,6 +6683,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index b060ad42b00..01a6769d9c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -2543,6 +2543,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3392,6 +3393,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3779,6 +3781,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5684,6 +5687,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5910,6 +5914,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6672,6 +6677,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 9d30a0fc183..87b70622d7e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -2542,6 +2542,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3391,6 +3392,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3777,6 +3779,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5679,6 +5682,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5905,6 +5909,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6667,6 +6672,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index ef8133df5c8..eefac3330c4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -2541,6 +2541,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3390,6 +3391,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3773,6 +3775,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3956,6 +3959,7 @@ self: super: {
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -5673,6 +5677,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5899,6 +5904,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6660,6 +6666,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 16e30cfc425..2ec3f78b218 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -2537,6 +2537,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3386,6 +3387,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3769,6 +3771,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3952,6 +3955,7 @@ self: super: {
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -5665,6 +5669,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5890,6 +5895,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6651,6 +6657,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 39f1eaddce5..9aa253b8ece 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -2558,6 +2558,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3413,6 +3414,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3804,6 +3806,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5727,6 +5730,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5955,6 +5959,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6729,6 +6734,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 7fcfebf2230..8fc5f9654c5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -2536,6 +2536,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3385,6 +3386,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3768,6 +3770,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3951,6 +3954,7 @@ self: super: {
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -5664,6 +5668,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5889,6 +5894,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6650,6 +6656,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index e8f29e893e5..576068260b5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -2535,6 +2535,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3382,6 +3383,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3765,6 +3767,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3948,6 +3951,7 @@ self: super: {
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -5659,6 +5663,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5883,6 +5888,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6642,6 +6648,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 25e927b694c..d48c58d6ab5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -2535,6 +2535,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3381,6 +3382,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3764,6 +3766,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3947,6 +3950,7 @@ self: super: {
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -5654,6 +5658,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5878,6 +5883,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6637,6 +6643,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 85f58d4dc75..47d9668fd7d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -2558,6 +2558,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3412,6 +3413,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3803,6 +3805,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5725,6 +5728,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5953,6 +5957,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6727,6 +6732,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 7ac520afb60..d5b0a6538cb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -2558,6 +2558,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3412,6 +3413,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3803,6 +3805,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5725,6 +5728,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5953,6 +5957,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6727,6 +6732,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index fc4a7679ff4..45dc2fcca11 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -2557,6 +2557,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3410,6 +3411,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3801,6 +3803,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5719,6 +5722,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5946,6 +5950,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6718,6 +6723,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 791a8a909c5..ab047df5f84 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -2557,6 +2557,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3410,6 +3411,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3799,6 +3801,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5714,6 +5717,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5941,6 +5945,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6713,6 +6718,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 63a27278bc0..8337bda39cb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -2554,6 +2554,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3407,6 +3408,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3796,6 +3798,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5710,6 +5713,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5937,6 +5941,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6707,6 +6712,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index b04324a3e14..43afe3fcc25 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -2552,6 +2552,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3404,6 +3405,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3793,6 +3795,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5706,6 +5709,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5933,6 +5937,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6702,6 +6707,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 3a41fc07bba..23f906f0302 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -2549,6 +2549,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"declarative" = dontDistribute super."declarative";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -3400,6 +3401,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3789,6 +3791,7 @@ self: super: {
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -5702,6 +5705,7 @@ self: super: {
"monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5929,6 +5933,7 @@ self: super: {
"network-bytestring" = dontDistribute super."network-bytestring";
"network-carbon" = doDistribute super."network-carbon_1_0_5";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6697,6 +6702,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index f242179e73a..84ce04ad25f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -2485,6 +2485,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3309,6 +3310,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3685,6 +3687,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3858,6 +3861,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -5068,6 +5072,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5516,6 +5521,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5733,6 +5739,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6462,6 +6469,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index c9e4182196f..c04f602d55d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -2483,6 +2483,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3304,6 +3305,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3680,6 +3682,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3853,6 +3856,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -5055,6 +5059,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5503,6 +5508,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5720,6 +5726,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6448,6 +6455,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index a1ebe60a9ec..17f07bbbe04 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -2476,6 +2476,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3293,6 +3294,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3667,6 +3669,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3837,6 +3840,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4707,6 +4711,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -5032,6 +5037,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5479,6 +5485,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5694,6 +5701,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6419,6 +6427,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6664,6 +6673,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"rev-state" = doDistribute super."rev-state_0_1_1";
"revdectime" = dontDistribute super."revdectime";
@@ -7218,6 +7228,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 7c814e27ccf..2e7ab1dda21 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -2445,6 +2445,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3248,6 +3249,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3618,6 +3620,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3787,6 +3790,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4654,6 +4658,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4977,6 +4982,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5420,6 +5426,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5633,6 +5640,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6348,6 +6356,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6590,6 +6599,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"rev-state" = doDistribute super."rev-state_0_1_1";
"revdectime" = dontDistribute super."revdectime";
@@ -7138,6 +7148,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index ea20f7e7d14..48ce764aff4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -2440,6 +2440,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3243,6 +3244,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3613,6 +3615,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3782,6 +3785,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4648,6 +4652,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4971,6 +4976,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5413,6 +5419,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5626,6 +5633,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6341,6 +6349,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6582,6 +6591,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"rev-state" = doDistribute super."rev-state_0_1_1";
"revdectime" = dontDistribute super."revdectime";
@@ -7129,6 +7139,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
index 38acdb238cf..3aa1204e725 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
@@ -2408,6 +2408,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -2443,6 +2444,7 @@ self: super: {
"dequeue" = dontDistribute super."dequeue";
"derangement" = dontDistribute super."derangement";
"derivation-trees" = dontDistribute super."derivation-trees";
+ "derive" = doDistribute super."derive_2_5_24";
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
@@ -3188,6 +3190,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3555,6 +3558,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3712,6 +3716,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3721,6 +3726,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4568,6 +4574,7 @@ self: super: {
"iptables-helpers" = dontDistribute super."iptables-helpers";
"iptadmin" = dontDistribute super."iptadmin";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4889,6 +4896,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5317,6 +5325,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5526,6 +5535,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6221,6 +6231,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6458,6 +6469,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -6997,6 +7009,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
index ae02a8e85a5..612dbe5c9c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
@@ -2400,6 +2400,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -2435,6 +2436,7 @@ self: super: {
"dequeue" = dontDistribute super."dequeue";
"derangement" = dontDistribute super."derangement";
"derivation-trees" = dontDistribute super."derivation-trees";
+ "derive" = doDistribute super."derive_2_5_24";
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
@@ -3178,6 +3180,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3545,6 +3548,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3702,6 +3706,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3711,6 +3716,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4553,6 +4559,7 @@ self: super: {
"iptables-helpers" = dontDistribute super."iptables-helpers";
"iptadmin" = dontDistribute super."iptadmin";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4874,6 +4881,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5301,6 +5309,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5510,6 +5519,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6204,6 +6214,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6441,6 +6452,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -6980,6 +6992,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
index 6b0728a07d7..9fa65e96512 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
@@ -2395,6 +2395,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -2430,6 +2431,7 @@ self: super: {
"dequeue" = dontDistribute super."dequeue";
"derangement" = dontDistribute super."derangement";
"derivation-trees" = dontDistribute super."derivation-trees";
+ "derive" = doDistribute super."derive_2_5_24";
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
@@ -3171,6 +3173,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3538,6 +3541,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3695,6 +3699,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3704,6 +3709,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4544,6 +4550,7 @@ self: super: {
"iptables-helpers" = dontDistribute super."iptables-helpers";
"iptadmin" = dontDistribute super."iptadmin";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4864,6 +4871,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5285,6 +5293,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5494,6 +5503,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6186,6 +6196,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6423,6 +6434,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -6960,6 +6972,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.13.nix b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
index c7c616b0c09..2bc6383a95a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
@@ -2385,6 +2385,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -2420,6 +2421,7 @@ self: super: {
"dequeue" = dontDistribute super."dequeue";
"derangement" = dontDistribute super."derangement";
"derivation-trees" = dontDistribute super."derivation-trees";
+ "derive" = doDistribute super."derive_2_5_24";
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
@@ -3160,6 +3162,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3527,6 +3530,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3684,6 +3688,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3693,6 +3698,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4527,6 +4533,7 @@ self: super: {
"iptables-helpers" = dontDistribute super."iptables-helpers";
"iptadmin" = dontDistribute super."iptadmin";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4847,6 +4854,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5267,6 +5275,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5475,6 +5484,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6163,6 +6173,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6400,6 +6411,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -6937,6 +6949,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
@@ -6979,6 +6992,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_3";
"standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
"standalone-haddock" = dontDistribute super."standalone-haddock";
"star-to-star" = dontDistribute super."star-to-star";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.14.nix b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
index e05ecd581b3..28f470e7dda 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
@@ -2373,6 +2373,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -2408,6 +2409,7 @@ self: super: {
"dequeue" = dontDistribute super."dequeue";
"derangement" = dontDistribute super."derangement";
"derivation-trees" = dontDistribute super."derivation-trees";
+ "derive" = doDistribute super."derive_2_5_24";
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
@@ -3145,6 +3147,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3512,6 +3515,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3669,6 +3673,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3678,6 +3683,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4511,6 +4517,7 @@ self: super: {
"iptables-helpers" = dontDistribute super."iptables-helpers";
"iptadmin" = dontDistribute super."iptadmin";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4830,6 +4837,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5248,6 +5256,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5455,6 +5464,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6140,6 +6150,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6376,6 +6387,7 @@ self: super: {
"resumable-exceptions" = dontDistribute super."resumable-exceptions";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -6909,6 +6921,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
@@ -6951,6 +6964,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_3";
"standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
"standalone-haddock" = dontDistribute super."standalone-haddock";
"star-to-star" = dontDistribute super."star-to-star";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.15.nix b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
index c0e68130c4a..a6d2b1237c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
@@ -2369,6 +2369,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -2404,6 +2405,7 @@ self: super: {
"dequeue" = dontDistribute super."dequeue";
"derangement" = dontDistribute super."derangement";
"derivation-trees" = dontDistribute super."derivation-trees";
+ "derive" = doDistribute super."derive_2_5_24";
"derive-IG" = dontDistribute super."derive-IG";
"derive-enumerable" = dontDistribute super."derive-enumerable";
"derive-gadt" = dontDistribute super."derive-gadt";
@@ -3138,6 +3140,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3505,6 +3508,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3662,6 +3666,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3671,6 +3676,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4502,6 +4508,7 @@ self: super: {
"iptables-helpers" = dontDistribute super."iptables-helpers";
"iptadmin" = dontDistribute super."iptadmin";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4820,6 +4827,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5237,6 +5245,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5244,6 +5253,7 @@ self: super: {
"monad-time" = doDistribute super."monad-time_0_1";
"monad-tx" = dontDistribute super."monad-tx";
"monad-unify" = dontDistribute super."monad-unify";
+ "monad-unlift" = doDistribute super."monad-unlift_0_1_2_0";
"monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
"monad-wrap" = dontDistribute super."monad-wrap";
"monadIO" = dontDistribute super."monadIO";
@@ -5443,6 +5453,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6125,6 +6136,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6361,6 +6373,7 @@ self: super: {
"resumable-exceptions" = dontDistribute super."resumable-exceptions";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -6894,6 +6907,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
@@ -6936,6 +6950,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_3";
"standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
"standalone-haddock" = dontDistribute super."standalone-haddock";
"star-to-star" = dontDistribute super."star-to-star";
@@ -7156,6 +7171,7 @@ self: super: {
"tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
"tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
"tamper" = dontDistribute super."tamper";
+ "tar" = doDistribute super."tar_0_5_0_2";
"tardis" = doDistribute super."tardis_0_3_0_0";
"target" = dontDistribute super."target";
"task" = dontDistribute super."task";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index a7e35e6c137..1250eb5119c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -2439,6 +2439,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3237,6 +3238,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3606,6 +3608,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3775,6 +3778,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4639,6 +4643,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4962,6 +4967,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5399,6 +5405,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5611,6 +5618,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6321,6 +6329,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6562,6 +6571,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -7108,6 +7118,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index ce377cc70cb..f9911c0a94d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -2431,6 +2431,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3221,6 +3222,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3589,6 +3591,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3758,6 +3761,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4621,6 +4625,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4944,6 +4949,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5379,6 +5385,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5591,6 +5598,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6299,6 +6307,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6538,6 +6547,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -7081,6 +7091,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index f10586dcc5a..790a2add670 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -2427,6 +2427,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3211,6 +3212,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3579,6 +3581,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3738,6 +3741,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3747,6 +3751,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4608,6 +4613,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4931,6 +4937,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5364,6 +5371,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5574,6 +5582,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6278,6 +6287,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6516,6 +6526,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -7059,6 +7070,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
index 7743af0949e..e52c401380f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -2424,6 +2424,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3208,6 +3209,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3576,6 +3578,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3734,6 +3737,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3743,6 +3747,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4603,6 +4608,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4926,6 +4932,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5359,6 +5366,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5569,6 +5577,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6273,6 +6282,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6511,6 +6521,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -7054,6 +7065,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
index 1299567a772..3393c7f35ea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
@@ -2418,6 +2418,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3200,6 +3201,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3567,6 +3569,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3725,6 +3728,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3734,6 +3738,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4592,6 +4597,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4914,6 +4920,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5346,6 +5353,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5555,6 +5563,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6257,6 +6266,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6494,6 +6504,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -7037,6 +7048,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
index 8b3c63bdb51..cdb0b7b2f7a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
@@ -2414,6 +2414,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3196,6 +3197,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3563,6 +3565,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3721,6 +3724,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3730,6 +3734,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4586,6 +4591,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4908,6 +4914,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5339,6 +5346,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5548,6 +5556,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6248,6 +6257,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6485,6 +6495,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -7027,6 +7038,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
index 8454d0b5a63..fdd720ddc07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
@@ -2414,6 +2414,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3196,6 +3197,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3563,6 +3565,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3721,6 +3724,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3730,6 +3734,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4586,6 +4591,7 @@ self: super: {
"iptadmin" = dontDistribute super."iptadmin";
"ipython-kernel" = doDistribute super."ipython-kernel_0_8_3_0";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4908,6 +4914,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5339,6 +5346,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5548,6 +5556,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6248,6 +6257,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6485,6 +6495,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -7027,6 +7038,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
index 1ca18de21a3..46a86d946a1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
@@ -2412,6 +2412,7 @@ self: super: {
"debug-diff" = dontDistribute super."debug-diff";
"debug-time" = dontDistribute super."debug-time";
"decepticons" = dontDistribute super."decepticons";
+ "decimal-arithmetic" = dontDistribute super."decimal-arithmetic";
"decode-utf8" = dontDistribute super."decode-utf8";
"decoder-conduit" = dontDistribute super."decoder-conduit";
"dedukti" = dontDistribute super."dedukti";
@@ -3193,6 +3194,7 @@ self: super: {
"ghci-ng" = dontDistribute super."ghci-ng";
"ghci-pretty" = dontDistribute super."ghci-pretty";
"ghcid" = doDistribute super."ghcid_0_5_1";
+ "ghcjs-ajax" = dontDistribute super."ghcjs-ajax";
"ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
"ghcjs-dom" = dontDistribute super."ghcjs-dom";
"ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3560,6 +3562,7 @@ self: super: {
"hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
"hackage-diff" = dontDistribute super."hackage-diff";
"hackage-plot" = dontDistribute super."hackage-plot";
+ "hackage-processing" = dontDistribute super."hackage-processing";
"hackage-proxy" = dontDistribute super."hackage-proxy";
"hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
"hackage-security" = dontDistribute super."hackage-security";
@@ -3717,6 +3720,7 @@ self: super: {
"haskell-mpfr" = dontDistribute super."haskell-mpfr";
"haskell-mpi" = dontDistribute super."haskell-mpi";
"haskell-names" = dontDistribute super."haskell-names";
+ "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_1";
"haskell-openflow" = dontDistribute super."haskell-openflow";
"haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
"haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3726,6 +3730,7 @@ self: super: {
"haskell-reflect" = dontDistribute super."haskell-reflect";
"haskell-rules" = dontDistribute super."haskell-rules";
"haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+ "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_13";
"haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
"haskell-token-utils" = dontDistribute super."haskell-token-utils";
"haskell-tor" = dontDistribute super."haskell-tor";
@@ -4576,6 +4581,7 @@ self: super: {
"iptables-helpers" = dontDistribute super."iptables-helpers";
"iptadmin" = dontDistribute super."iptadmin";
"irc-bytestring" = dontDistribute super."irc-bytestring";
+ "irc-client" = doDistribute super."irc-client_0_2_6_0";
"irc-colors" = dontDistribute super."irc-colors";
"irc-core" = dontDistribute super."irc-core";
"irc-dcc" = dontDistribute super."irc-dcc";
@@ -4898,6 +4904,7 @@ self: super: {
"lenz" = dontDistribute super."lenz";
"lenz-template" = dontDistribute super."lenz-template";
"level-monad" = dontDistribute super."level-monad";
+ "leveldb-haskell" = doDistribute super."leveldb-haskell_0_6_3";
"leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
"levmar" = dontDistribute super."levmar";
"levmar-chart" = dontDistribute super."levmar-chart";
@@ -5329,6 +5336,7 @@ self: super: {
"monad-resumption" = dontDistribute super."monad-resumption";
"monad-state" = dontDistribute super."monad-state";
"monad-statevar" = dontDistribute super."monad-statevar";
+ "monad-ste" = dontDistribute super."monad-ste";
"monad-stlike-io" = dontDistribute super."monad-stlike-io";
"monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
"monad-supply" = dontDistribute super."monad-supply";
@@ -5538,6 +5546,7 @@ self: super: {
"network-builder" = dontDistribute super."network-builder";
"network-bytestring" = dontDistribute super."network-bytestring";
"network-conduit" = dontDistribute super."network-conduit";
+ "network-conduit-tls" = doDistribute super."network-conduit-tls_1_2_0_1";
"network-connection" = dontDistribute super."network-connection";
"network-data" = dontDistribute super."network-data";
"network-dbus" = dontDistribute super."network-dbus";
@@ -6234,6 +6243,7 @@ self: super: {
"quickpull" = dontDistribute super."quickpull";
"quickset" = dontDistribute super."quickset";
"quickspec" = dontDistribute super."quickspec";
+ "quickterm" = dontDistribute super."quickterm";
"quicktest" = dontDistribute super."quicktest";
"quickwebapp" = dontDistribute super."quickwebapp";
"quiver" = dontDistribute super."quiver";
@@ -6471,6 +6481,7 @@ self: super: {
"rethinkdb" = doDistribute super."rethinkdb_2_2_0_3";
"rethinkdb-model" = dontDistribute super."rethinkdb-model";
"rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+ "retry" = doDistribute super."retry_0_7_1";
"retryer" = dontDistribute super."retryer";
"revdectime" = dontDistribute super."revdectime";
"reverse-apply" = dontDistribute super."reverse-apply";
@@ -7010,6 +7021,7 @@ self: super: {
"splaytree" = dontDistribute super."splaytree";
"spline3" = dontDistribute super."spline3";
"splines" = dontDistribute super."splines";
+ "split" = doDistribute super."split_0_2_3";
"split-channel" = dontDistribute super."split-channel";
"split-record" = dontDistribute super."split-record";
"split-tchan" = dontDistribute super."split-tchan";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8a88cce6753..975cbaa3ece 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -446,6 +446,7 @@ self: {
homepage = "https://github.com/PseudoPower/AFSM";
description = "Arrowized functional state machines";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"AGI" = callPackage
@@ -10784,6 +10785,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "HaskellNet_0_5_1" = callPackage
+ ({ mkDerivation, array, base, base64-string, bytestring, cryptohash
+ , mime-mail, mtl, network, old-time, pretty, text
+ }:
+ mkDerivation {
+ pname = "HaskellNet";
+ version = "0.5.1";
+ sha256 = "3245d31ad76f9f9013a2f6e2285d73ed37376eeb073c100b9a6d19e87f0ca838";
+ libraryHaskellDepends = [
+ array base base64-string bytestring cryptohash mime-mail mtl
+ network old-time pretty text
+ ];
+ homepage = "https://github.com/jtdaugherty/HaskellNet";
+ description = "Client support for POP3, SMTP, and IMAP";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"HaskellNet-SSL_0_3_2_1" = callPackage
({ mkDerivation, base, bytestring, connection, data-default
, HaskellNet, network, tls
@@ -16645,7 +16664,7 @@ self: {
homepage = "http://gowthamk.github.io/Quelea";
description = "Programming with Eventual Consistency over Cassandra";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"QuickAnnotate" = callPackage
@@ -20259,18 +20278,16 @@ self: {
"UTFTConverter" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, hspec
- , JuicyPixels, time
+ , image-type, JuicyPixels, time
}:
mkDerivation {
pname = "UTFTConverter";
- version = "0.1.0.0";
- sha256 = "5679130800bbb11e3a67ab638e97e733b4824edff8b8a6b2e88b7daaf56b934e";
- revision = "10";
- editedCabalFile = "abbfdf9c3e4816c0f010740a21d3360ceb55d2591329c92d6b163015fd581e01";
+ version = "0.1.0.1";
+ sha256 = "c4384218099d24e3002267c5ca2d2d168d65177f6b7c839e7fddb8eca84bc58d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring directory filepath JuicyPixels time
+ base bytestring directory filepath image-type JuicyPixels time
];
executableHaskellDepends = [
base bytestring directory filepath JuicyPixels time
@@ -23834,6 +23851,7 @@ self: {
homepage = "https://github.com/thsutton/aeson-diff";
description = "Extract and apply patches to JSON documents";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"aeson-extra_0_2_1_0" = callPackage
@@ -24032,11 +24050,11 @@ self: {
}:
mkDerivation {
pname = "aeson-flatten";
- version = "0.1.0.1";
- sha256 = "e5376ef651b659fdc38274087fdd976da077a6317ec6cd44249e63bd85934bdd";
+ version = "0.1.0.2";
+ sha256 = "2799b6a41aa112de21605a4407b7efef175fbd2a2fb72b37ec554f150398684d";
libraryHaskellDepends = [ aeson base text unordered-containers ];
testHaskellDepends = [ aeson base bytestring hspec ];
- homepage = "https://github.com/githubuser/aeson-flatten#readme";
+ homepage = "https://github.com/j1r1k/aeson-flatten#readme";
description = "JSON flatten for Aeson";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -35205,6 +35223,7 @@ self: {
homepage = "http://github.com/wereHamster/avers-api";
description = "Types describing the core and extended Avers APIs";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"avers-server_0_0_1" = callPackage
@@ -35272,6 +35291,7 @@ self: {
homepage = "http://github.com/wereHamster/avers-server";
description = "Server implementation of the Avers API";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"avl-static" = callPackage
@@ -40428,31 +40448,32 @@ self: {
}) {};
"biohazard" = callPackage
- ({ mkDerivation, aeson, array, async, attoparsec, base, binary
- , bytestring, bytestring-mmap, containers, deepseq, directory
- , exceptions, filepath, hashable, iteratee, ListLike
+ ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
+ , bytestring-mmap, containers, deepseq, directory, exceptions
+ , filepath, hashable, hmatrix, iteratee, ListLike
, nonlinear-optimization, primitive, random, scientific, stm
- , template-haskell, text, transformers, unix, unordered-containers
- , Vec, vector, vector-algorithms, vector-th-unbox, zlib
+ , strict, template-haskell, text, transformers, unix
+ , unordered-containers, Vec, vector, vector-algorithms
+ , vector-th-unbox, zlib
}:
mkDerivation {
pname = "biohazard";
- version = "0.6.3";
- sha256 = "063e812cb4c5c9c518363525cec4f309f9ebdf4c8af12e8bf88ca9f39edb47e5";
+ version = "0.6.5";
+ sha256 = "1510dd8d46bca9acfc8509dd6e220ab80ce771f7a87a34a49ce1c4c754d04e36";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson array async attoparsec base binary bytestring bytestring-mmap
- containers directory exceptions filepath iteratee ListLike
- primitive random scientific stm template-haskell text transformers
- unix unordered-containers Vec vector vector-algorithms
- vector-th-unbox zlib
+ aeson async attoparsec base binary bytestring bytestring-mmap
+ containers deepseq directory exceptions filepath iteratee ListLike
+ nonlinear-optimization primitive random scientific stm
+ template-haskell text transformers unix unordered-containers Vec
+ vector vector-algorithms vector-th-unbox zlib
];
executableHaskellDepends = [
- aeson async base binary bytestring containers deepseq directory
- exceptions hashable iteratee nonlinear-optimization random text
- transformers unordered-containers vector vector-algorithms
- vector-th-unbox
+ aeson async base binary bytestring containers directory filepath
+ hashable hmatrix iteratee nonlinear-optimization primitive random
+ strict text transformers unix unordered-containers Vec vector
+ vector-algorithms vector-th-unbox
];
jailbreak = true;
homepage = "http://github.com/udo-stenzel/biohazard";
@@ -42278,6 +42299,7 @@ self: {
];
description = "Distributed bloom filters on Redis (using the Hedis client)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bloxorz" = callPackage
@@ -44132,22 +44154,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "bytestring_0_10_6_0" = callPackage
+ "bytestring_0_10_8_0" = callPackage
({ mkDerivation, base, byteorder, deepseq, directory, dlist
, ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random
, test-framework, test-framework-hunit, test-framework-quickcheck2
}:
mkDerivation {
pname = "bytestring";
- version = "0.10.6.0";
- sha256 = "271b9a6b7b81bc259f8a947b12354951829580b0fe0bd8482e41af261b118977";
+ version = "0.10.8.0";
+ sha256 = "1d57175b5b0f7da1c1d43e8875fcc2a5bbcfbdadde2a19e59d975233dc751819";
+ revision = "1";
+ editedCabalFile = "288cc7c21a637c83679d5aae751916befefa8ed26811bf6975f076bf7b3cb01f";
libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
testHaskellDepends = [
base byteorder deepseq directory dlist ghc-prim HUnit mtl
QuickCheck random test-framework test-framework-hunit
test-framework-quickcheck2
];
- jailbreak = true;
homepage = "https://github.com/haskell/bytestring";
description = "Fast, compact, strict and lazy byte strings with a list interface";
license = stdenv.lib.licenses.bsd3;
@@ -45701,6 +45724,8 @@ self: {
pname = "cabal-install";
version = "1.24.0.0";
sha256 = "d840ecfd0a95a96e956b57fb2f3e9c81d9fc160e1fd0ea350b0d37d169d9e87e";
+ revision = "1";
+ editedCabalFile = "375b1a073b68c5531b11f70cdcf55a9add6f8337d9ff0c850c1da7e7bf7bbf39";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -48316,8 +48341,8 @@ self: {
({ mkDerivation, base, bytestring, comonad, text }:
mkDerivation {
pname = "category-printf";
- version = "0.1.0.0";
- sha256 = "e954c7ab4970551a334fae1fc4ef98f56c65290b366f17cfb00df85f93bd90e2";
+ version = "0.1.0.2";
+ sha256 = "135238d1fccf41277339c28c9479091b5ab5243674652ba4f644bcdcc2267de4";
libraryHaskellDepends = [ base bytestring comonad text ];
jailbreak = true;
description = "Highbrow approach to type-safe printf format specifications";
@@ -53718,6 +53743,7 @@ self: {
testSystemDepends = [ cmph ];
description = "low level interface to CMPH";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {cmph = null;};
"cmu" = callPackage
@@ -54313,6 +54339,7 @@ self: {
homepage = "https://bitbucket.org/functionally/color-counter";
description = "Count colors in images";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"colorize-haskell" = callPackage
@@ -56163,6 +56190,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "conduit_1_2_6_5" = callPackage
+ ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
+ , mmorph, mtl, QuickCheck, resourcet, safe, transformers
+ , transformers-base
+ }:
+ mkDerivation {
+ pname = "conduit";
+ version = "1.2.6.5";
+ sha256 = "b7915cd0d1dea9bbbf47060c980bbc5b214717874533f88ced763a49d905b4f8";
+ libraryHaskellDepends = [
+ base exceptions lifted-base mmorph mtl resourcet transformers
+ transformers-base
+ ];
+ testHaskellDepends = [
+ base containers exceptions hspec mtl QuickCheck resourcet safe
+ transformers
+ ];
+ homepage = "http://github.com/snoyberg/conduit";
+ description = "Streaming data processing library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"conduit-audio" = callPackage
({ mkDerivation, base, conduit, vector }:
mkDerivation {
@@ -61997,26 +62047,28 @@ self: {
];
description = "Permissively licensed D-Bus client library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"d3d11binding" = callPackage
({ mkDerivation, base, c-storable-deriving, d3d11, D3DCompiler
- , d3dx11, d3dxof, dxgi, dxguid, Win32
+ , d3dx11, d3dxof, dxgi, dxguid, vect, Win32
}:
mkDerivation {
pname = "d3d11binding";
- version = "0.0.0.3";
- sha256 = "f156ed2e733df23922146d95cc438647a3685382fad7db424ebc459847668282";
+ version = "0.0.0.5";
+ sha256 = "036c759c06663100d0de0ce8e0bdd8e8d476bfbf02221c4678faecbaf229400f";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base c-storable-deriving Win32 ];
+ libraryHaskellDepends = [ base c-storable-deriving vect Win32 ];
librarySystemDepends = [
d3d11 D3DCompiler d3dx11 d3dxof dxgi dxguid
];
- executableHaskellDepends = [ base Win32 ];
+ executableHaskellDepends = [ base c-storable-deriving vect Win32 ];
homepage = "https://github.com/jwvg0425/d3d11binding";
description = "A raw binding for the directX 11";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {D3DCompiler = null; d3d11 = null; d3dx11 = null;
d3dxof = null; dxgi = null; dxguid = null;};
@@ -62219,6 +62271,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 text unix-compat
zip-archive zlib
];
+ doCheck = false;
postInstall = ''
mkdir -p $out/etc/bash_completion.d
mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -62266,6 +62319,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 text unix-compat
zip-archive zlib
];
+ doCheck = false;
postInstall = ''
mkdir -p $out/etc/bash_completion.d
mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -64707,8 +64761,8 @@ self: {
}:
mkDerivation {
pname = "ddc-build";
- version = "0.4.2.1";
- sha256 = "2704257a4e47a432e0b4873297d833910f86435e7fd1add4530089849313f8ad";
+ version = "0.4.2.2";
+ sha256 = "bc3c37ab56bdcc3ea08a73a5964382bcba0b9844ceab6408bf5dc7eb1b6a02e7";
libraryHaskellDepends = [
base containers ddc-base ddc-core ddc-core-babel ddc-core-flow
ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra
@@ -64810,8 +64864,8 @@ self: {
}:
mkDerivation {
pname = "ddc-core-llvm";
- version = "0.4.2.1";
- sha256 = "83780f3d1ee27ee5d754ceb2e221c262280fcdf96b28691519859deb7bc7ea61";
+ version = "0.4.2.2";
+ sha256 = "9d17fb120cdcd96793fa82be1a715db44f1ff5e9a99afbf617b778f75d124b50";
libraryHaskellDepends = [
array base bytestring containers ddc-base ddc-core ddc-core-salt
ddc-core-simpl mtl text transformers
@@ -64884,8 +64938,8 @@ self: {
}:
mkDerivation {
pname = "ddc-driver";
- version = "0.4.2.1";
- sha256 = "fe3427d7f5967f782ac67742345cad132c1bc9e576e9c369e3bba4fbc4c5d1cd";
+ version = "0.4.2.2";
+ sha256 = "61192fb5712e503a30a8e214b4ec0f41056a08845f6becd2b91c23a1d2538984";
libraryHaskellDepends = [
base containers ddc-base ddc-build ddc-core ddc-core-flow
ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra
@@ -64937,8 +64991,8 @@ self: {
}:
mkDerivation {
pname = "ddc-tools";
- version = "0.4.2.1";
- sha256 = "cc22d2bfef1d9de385da0e2eb31362c6f61e36b2784436b23d3beb24b9fa7e67";
+ version = "0.4.2.2";
+ sha256 = "deb2f30547bf191cf244a604db3add63017569cdeeb7dcec5b93388d6c1ff0d6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -65165,6 +65219,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "decimal-arithmetic" = callPackage
+ ({ mkDerivation, base, QuickCheck }:
+ mkDerivation {
+ pname = "decimal-arithmetic";
+ version = "0.1.0.1";
+ sha256 = "98af68f955862933cbb38d887949d491e135dbb107ac87062717c9188a6b95fe";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base QuickCheck ];
+ homepage = "https://github.com/verement/decimal-arithmetic#readme";
+ description = "An implementation of Mike Cowlishaw's General Decimal Arithmetic Specification";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"declarative" = callPackage
({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types
, mighty-metropolis, mwc-probability, pipes, primitive
@@ -66116,7 +66183,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "derive" = callPackage
+ "derive_2_5_24" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, haskell-src-exts, pretty, process, syb, template-haskell
, transformers, uniplate
@@ -66135,6 +66202,28 @@ self: {
homepage = "https://github.com/ndmitchell/derive#readme";
description = "A program and library to derive instances for data types";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "derive" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , haskell-src-exts, pretty, process, syb, template-haskell
+ , transformers, uniplate
+ }:
+ mkDerivation {
+ pname = "derive";
+ version = "2.5.25";
+ sha256 = "41a18ba70698a7be1c62e1567da0159bc11b10ba0c60b500cb1634eec0b410f1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring containers directory filepath haskell-src-exts
+ pretty process syb template-haskell transformers uniplate
+ ];
+ executableHaskellDepends = [ base ];
+ homepage = "https://github.com/ndmitchell/derive#readme";
+ description = "A program and library to derive instances for data types";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"derive-IG" = callPackage
@@ -79064,8 +79153,8 @@ self: {
}:
mkDerivation {
pname = "fast-tagsoup";
- version = "1.0.9";
- sha256 = "20c9895e01e522215bf0b36df084dc78b53b1e9a05d4be220c4816a6d1260d9b";
+ version = "1.0.10";
+ sha256 = "83e90610fdd1c0f6587e293a7f188cdc5376425e002be2226c83afea2b20d046";
libraryHaskellDepends = [
base bytestring containers tagsoup text text-icu
];
@@ -84314,6 +84403,7 @@ self: {
homepage = "https://github.com/salemove/freddy-hs";
description = "RabbitMQ Messaging API supporting request-response";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"free_4_9" = callPackage
@@ -87622,6 +87712,7 @@ self: {
homepage = "https://github.com/carlohamalainen/ghc-imported-from";
description = "Find the Haddock documentation for a symbol";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ghc-make" = callPackage
@@ -88494,6 +88585,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghcjs-ajax" = callPackage
+ ({ mkDerivation, base, http-types, text }:
+ mkDerivation {
+ pname = "ghcjs-ajax";
+ version = "0.1.0.0";
+ sha256 = "c6108172d6626c120ad2f5af3e5cb9f36821ac04c3d382214149eff39f4b9643";
+ libraryHaskellDepends = [ base http-types text ];
+ homepage = "https://github.com/agrafix/ghcjs-ajax#readme";
+ description = "Crossbrowser AJAX Bindings for GHCJS";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ghcjs-codemirror" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -91855,6 +91958,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Comprehensive Google Services SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-adexchange-buyer" = callPackage
@@ -91867,6 +91971,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Ad Exchange Buyer SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-adexchange-seller" = callPackage
@@ -91879,6 +91984,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Ad Exchange Seller SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-admin-datatransfer" = callPackage
@@ -91891,6 +91997,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Admin Data Transfer SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-admin-directory" = callPackage
@@ -91903,6 +92010,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Admin Directory SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-admin-emailmigration" = callPackage
@@ -91915,6 +92023,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Email Migration API v2 SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-admin-reports" = callPackage
@@ -91927,6 +92036,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Admin Reports SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-adsense" = callPackage
@@ -91939,6 +92049,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google AdSense Management SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-adsense-host" = callPackage
@@ -91951,6 +92062,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google AdSense Host SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-affiliates" = callPackage
@@ -91963,6 +92075,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Affiliate Network SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-analytics" = callPackage
@@ -91975,6 +92088,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Analytics SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-android-enterprise" = callPackage
@@ -91987,6 +92101,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Play EMM SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-android-publisher" = callPackage
@@ -91999,6 +92114,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Play Developer SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-appengine" = callPackage
@@ -92011,6 +92127,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google App Engine Admin SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-apps-activity" = callPackage
@@ -92023,6 +92140,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Apps Activity SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-apps-calendar" = callPackage
@@ -92035,6 +92153,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Calendar SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-apps-licensing" = callPackage
@@ -92047,6 +92166,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Enterprise License Manager SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-apps-reseller" = callPackage
@@ -92059,6 +92179,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Enterprise Apps Reseller SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-apps-tasks" = callPackage
@@ -92071,6 +92192,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Tasks SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-appstate" = callPackage
@@ -92083,6 +92205,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google App State SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-autoscaler" = callPackage
@@ -92095,6 +92218,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Compute Engine Autoscaler SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-bigquery" = callPackage
@@ -92107,6 +92231,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google BigQuery SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-billing" = callPackage
@@ -92119,6 +92244,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Billing SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-blogger" = callPackage
@@ -92131,6 +92257,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Blogger SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-books" = callPackage
@@ -92143,6 +92270,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Books SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-civicinfo" = callPackage
@@ -92155,6 +92283,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Civic Information SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-classroom" = callPackage
@@ -92167,6 +92296,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Classroom SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-cloudtrace" = callPackage
@@ -92179,6 +92309,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Trace SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-compute" = callPackage
@@ -92191,6 +92322,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Compute Engine SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-container" = callPackage
@@ -92203,6 +92335,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Container Engine SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-core" = callPackage
@@ -92224,6 +92357,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Core data types and functionality for Gogol libraries";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-customsearch" = callPackage
@@ -92236,6 +92370,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google CustomSearch SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-dataflow" = callPackage
@@ -92248,6 +92383,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Dataflow SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-datastore" = callPackage
@@ -92260,6 +92396,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Datastore SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-debugger" = callPackage
@@ -92272,6 +92409,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Debugger SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-deploymentmanager" = callPackage
@@ -92284,6 +92422,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Deployment Manager SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-dfareporting" = callPackage
@@ -92296,6 +92435,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google DCM/DFA Reporting And Trafficking SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-discovery" = callPackage
@@ -92308,6 +92448,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google APIs Discovery Service SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-dns" = callPackage
@@ -92320,6 +92461,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud DNS SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-doubleclick-bids" = callPackage
@@ -92332,6 +92474,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google DoubleClick Bid Manager SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-doubleclick-search" = callPackage
@@ -92344,6 +92487,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google DoubleClick Search SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-drive" = callPackage
@@ -92356,6 +92500,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Drive SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-fitness" = callPackage
@@ -92368,6 +92513,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Fitness SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-fonts" = callPackage
@@ -92380,6 +92526,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Fonts Developer SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-freebasesearch" = callPackage
@@ -92392,6 +92539,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Freebase Search SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-fusiontables" = callPackage
@@ -92404,6 +92552,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Fusion Tables SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-games" = callPackage
@@ -92416,6 +92565,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Play Game Services SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-games-configuration" = callPackage
@@ -92428,6 +92578,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Play Game Services Publishing SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-games-management" = callPackage
@@ -92440,6 +92591,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Play Game Services Management SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-genomics" = callPackage
@@ -92452,6 +92604,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Genomics SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-gmail" = callPackage
@@ -92464,6 +92617,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Gmail SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-groups-migration" = callPackage
@@ -92476,6 +92630,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Groups Migration SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-groups-settings" = callPackage
@@ -92488,6 +92643,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Groups Settings SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-identity-toolkit" = callPackage
@@ -92500,6 +92656,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Identity Toolkit SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-latencytest" = callPackage
@@ -92512,6 +92669,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Network Performance Monitoring SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-logging" = callPackage
@@ -92524,6 +92682,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Logging SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-maps-coordinate" = callPackage
@@ -92536,6 +92695,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Maps Coordinate SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-maps-engine" = callPackage
@@ -92548,6 +92708,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Maps Engine SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-mirror" = callPackage
@@ -92560,6 +92721,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Mirror SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-monitoring" = callPackage
@@ -92572,6 +92734,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Monitoring SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-oauth2" = callPackage
@@ -92584,6 +92747,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google OAuth2 SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-pagespeed" = callPackage
@@ -92596,6 +92760,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google PageSpeed Insights SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-partners" = callPackage
@@ -92608,6 +92773,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Partners SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-play-moviespartner" = callPackage
@@ -92620,6 +92786,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Play Movies Partner SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-plus" = callPackage
@@ -92632,6 +92799,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google + SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-plus-domains" = callPackage
@@ -92644,6 +92812,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google + Domains SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-prediction" = callPackage
@@ -92656,6 +92825,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Prediction SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-proximitybeacon" = callPackage
@@ -92668,6 +92838,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Proximity Beacon SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-pubsub" = callPackage
@@ -92680,6 +92851,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Pub/Sub SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-qpxexpress" = callPackage
@@ -92692,6 +92864,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google QPX Express SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-replicapool" = callPackage
@@ -92704,6 +92877,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Compute Engine Instance Group Manager SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-replicapool-updater" = callPackage
@@ -92716,6 +92890,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Compute Engine Instance Group Updater SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-resourcemanager" = callPackage
@@ -92728,6 +92903,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Resource Manager SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-resourceviews" = callPackage
@@ -92740,6 +92916,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Compute Engine Instance Groups SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-shopping-content" = callPackage
@@ -92752,6 +92929,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Content API for Shopping SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-siteverification" = callPackage
@@ -92764,6 +92942,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Site Verification SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-spectrum" = callPackage
@@ -92776,6 +92955,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Spectrum Database SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-sqladmin" = callPackage
@@ -92788,6 +92968,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud SQL Administration SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-storage" = callPackage
@@ -92800,6 +92981,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud Storage JSON SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-storage-transfer" = callPackage
@@ -92812,6 +92994,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Storage Transfer SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-tagmanager" = callPackage
@@ -92824,6 +93007,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Tag Manager SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-taskqueue" = callPackage
@@ -92836,6 +93020,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google TaskQueue SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-translate" = callPackage
@@ -92848,6 +93033,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Translate SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-urlshortener" = callPackage
@@ -92860,6 +93046,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google URL Shortener SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-useraccounts" = callPackage
@@ -92872,6 +93059,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Cloud User Accounts SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-webmaster-tools" = callPackage
@@ -92884,6 +93072,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google Webmaster Tools SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-youtube" = callPackage
@@ -92896,6 +93085,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google YouTube Data SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-youtube-analytics" = callPackage
@@ -92908,6 +93098,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google YouTube Analytics SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gogol-youtube-reporting" = callPackage
@@ -92920,6 +93111,7 @@ self: {
homepage = "https://github.com/brendanhay/gogol";
description = "Google YouTube Reporting SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gooey" = callPackage
@@ -93071,6 +93263,7 @@ self: {
jailbreak = true;
description = "Google Translate API bindings";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"googleplus" = callPackage
@@ -95895,6 +96088,7 @@ self: {
testHaskellDepends = [ base HUnit ];
description = "A simple wrapper around uuid";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gulcii" = callPackage
@@ -97316,6 +97510,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hackage-processing" = callPackage
+ ({ mkDerivation, base, Cabal, containers, hackage-db }:
+ mkDerivation {
+ pname = "hackage-processing";
+ version = "0.0.0.1";
+ sha256 = "98de2ade50bf613a9172322b00d05c9d40a51e8f65aedfe4a876ed9c3b4f8b67";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base Cabal containers hackage-db ];
+ homepage = "http://hub.darcs.net/thielema/hackage-processing";
+ description = "Process 00-index.tar.gz from Hackage";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hackage-proxy" = callPackage
({ mkDerivation, base, basic-prelude, blaze-builder, bytestring
, Cabal, case-insensitive, conduit, containers, filepath
@@ -97617,6 +97825,7 @@ self: {
];
description = "Hackage and Portage integration tool";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hactor" = callPackage
@@ -101813,6 +102022,7 @@ self: {
homepage = "https://github.com/soundcloud/haskell-kubernetes";
description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-lexer" = callPackage
@@ -102056,7 +102266,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "haskell-neo4j-client" = callPackage
+ "haskell-neo4j-client_0_3_2_1" = callPackage
({ mkDerivation, aeson, base, bytestring, Cabal, containers
, data-default, hashable, HTTP, http-client, http-conduit
, http-types, HUnit, lifted-base, mtl, network-uri, QuickCheck
@@ -102086,6 +102296,40 @@ self: {
homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
description = "A Haskell neo4j client";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "haskell-neo4j-client" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+ , data-default, hashable, HTTP, http-client, http-client-tls
+ , http-conduit, http-types, HUnit, lifted-base, mtl, network-uri
+ , QuickCheck, resourcet, scientific, test-framework
+ , test-framework-hunit, test-framework-quickcheck2
+ , test-framework-th, text, transformers, transformers-base
+ , transformers-compat, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "haskell-neo4j-client";
+ version = "0.3.2.2";
+ sha256 = "4ed871df5e235170863d6890af6c3d241e2672b335b199b05504b635a409d9b1";
+ libraryHaskellDepends = [
+ aeson base bytestring containers data-default hashable HTTP
+ http-client http-client-tls http-conduit http-types lifted-base mtl
+ network-uri resourcet scientific text transformers
+ transformers-base transformers-compat unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring Cabal data-default hashable HTTP http-client
+ http-client-tls http-conduit http-types HUnit lifted-base mtl
+ network-uri QuickCheck resourcet scientific test-framework
+ test-framework-hunit test-framework-quickcheck2 test-framework-th
+ text transformers transformers-base transformers-compat
+ unordered-containers vector
+ ];
+ doCheck = false;
+ homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
+ description = "A Haskell neo4j client";
+ license = stdenv.lib.licenses.mit;
}) {};
"haskell-openflow" = callPackage
@@ -102506,7 +102750,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "haskell-src-meta" = callPackage
+ "haskell-src-meta_0_6_0_13" = callPackage
({ mkDerivation, base, haskell-src-exts, pretty, syb
, template-haskell, th-orphans
}:
@@ -102519,6 +102763,22 @@ self: {
];
description = "Parse source to template-haskell abstract syntax";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "haskell-src-meta" = callPackage
+ ({ mkDerivation, base, haskell-src-exts, pretty, syb
+ , template-haskell, th-orphans
+ }:
+ mkDerivation {
+ pname = "haskell-src-meta";
+ version = "0.6.0.14";
+ sha256 = "769124392398695667c800225cd908cb455dadf54a9317870bd9384e0eeb20c9";
+ libraryHaskellDepends = [
+ base haskell-src-exts pretty syb template-haskell th-orphans
+ ];
+ description = "Parse source to template-haskell abstract syntax";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"haskell-src-meta-mwotton" = callPackage
@@ -107389,6 +107649,7 @@ self: {
homepage = "http://github.com/cutsea110/heredoc.git";
description = "heredocument";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"herf-time" = callPackage
@@ -108645,7 +108906,7 @@ self: {
homepage = "https://github.com/jeremyjh/higher-leveldb";
description = "A rich monadic API for working with leveldb databases";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"higherorder" = callPackage
@@ -110781,6 +111042,8 @@ self: {
pname = "hledger-ui";
version = "0.27.3";
sha256 = "87dcd09479acc3e84a883d427c988a110451dee75a5e1f1c9d5ea2b34e99c4c1";
+ revision = "1";
+ editedCabalFile = "eac7bd60f3e8f1ff44ed1e41716080df6a8e0533779963aa2a43b18a79121ef0";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -114357,12 +114620,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "hpc_0_6_0_2" = callPackage
+ "hpc_0_6_0_3" = callPackage
({ mkDerivation, base, containers, directory, filepath, time }:
mkDerivation {
pname = "hpc";
- version = "0.6.0.2";
- sha256 = "95e6f1e5ccfe9e6415eec9d7bb3eccc2c113cecf2079d1f792646269ab4c0aaf";
+ version = "0.6.0.3";
+ sha256 = "16dac73e55899815a32715c35fa5986da077d7e7887ce8ef1c72b4f33a73a2aa";
libraryHaskellDepends = [
base containers directory filepath time
];
@@ -115150,6 +115413,7 @@ self: {
homepage = "https://github.com/tsuraan/hs-blake2";
description = "A cryptohash-inspired library for blake2";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libb2;};
"hs-captcha" = callPackage
@@ -121932,22 +122196,28 @@ self: {
}) {};
"http-proxy" = callPackage
- ({ mkDerivation, base, base64-bytestring, blaze-builder
- , blaze-builder-conduit, bytestring, bytestring-lexing
- , case-insensitive, conduit, ghc-prim, http-conduit, http-types
- , lifted-base, network, resourcet, tls, transformers, wai
+ ({ mkDerivation, async, base, blaze-builder, bytestring
+ , bytestring-lexing, case-insensitive, conduit, conduit-extra
+ , connection, hspec, http-client, http-conduit, http-types, mtl
+ , network, QuickCheck, random, resourcet, text, tls, transformers
+ , vault, wai, wai-conduit, warp, warp-tls
}:
mkDerivation {
pname = "http-proxy";
- version = "0.0.12";
- sha256 = "2fb6fbcd49babf663fe2d52f3ebb8bddc5b712fb5b0a1741e2c1cfdc47aed84c";
+ version = "0.1.0.1";
+ sha256 = "e83df2fb719079d0da38b200a1e5f1ee45f734504e59f1eecde4d81cfd499870";
libraryHaskellDepends = [
- base base64-bytestring blaze-builder blaze-builder-conduit
- bytestring bytestring-lexing case-insensitive conduit ghc-prim
- http-conduit http-types lifted-base network resourcet tls
- transformers wai
+ async base blaze-builder bytestring bytestring-lexing
+ case-insensitive conduit conduit-extra http-client http-conduit
+ http-types mtl network resourcet text tls transformers wai
+ wai-conduit warp warp-tls
+ ];
+ testHaskellDepends = [
+ async base blaze-builder bytestring bytestring-lexing
+ case-insensitive conduit conduit-extra connection hspec http-client
+ http-conduit http-types network QuickCheck random resourcet text
+ vault wai wai-conduit warp warp-tls
];
- jailbreak = true;
homepage = "https://github.com/erikd/http-proxy";
description = "A library for writing HTTP and HTTPS proxies";
license = stdenv.lib.licenses.bsd3;
@@ -123087,8 +123357,8 @@ self: {
}:
mkDerivation {
pname = "hw-conduit";
- version = "0.0.0.8";
- sha256 = "574c7d719bd647f03b6b8f3942c45027ac0a4e49507c38330876507ce2d8b301";
+ version = "0.0.0.9";
+ sha256 = "48bbf4936ee486f79f40cfac76b425dc019b82dfdfce40539c2ec495436e6293";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -127518,6 +127788,7 @@ self: {
homepage = "http://github.com/tweag/inline-java#readme";
description = "Java interop via inline Java code in Haskell modules";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {jvm = null;};
"inline-r" = callPackage
@@ -128319,6 +128590,7 @@ self: {
homepage = "https://github.com/mitchellwrosen/io-capture#readme";
description = "Capture IO actions' stdout and stderr";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"io-choice_0_0_5" = callPackage
@@ -129034,7 +129306,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "irc-client" = callPackage
+ "irc-client_0_2_6_0" = callPackage
({ mkDerivation, base, bytestring, conduit, data-default-class
, irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time
, transformers
@@ -129050,6 +129322,25 @@ self: {
homepage = "https://github.com/barrucadu/irc-client";
description = "An IRC client library";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "irc-client" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, data-default-class
+ , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time
+ , transformers
+ }:
+ mkDerivation {
+ pname = "irc-client";
+ version = "0.3.0.0";
+ sha256 = "ddc97ede9d741130d9ee0ff5128550ae9a5f6f4a04f4cb3b0d5c05c887314e0c";
+ libraryHaskellDepends = [
+ base bytestring conduit data-default-class irc-conduit irc-ctcp
+ old-locale stm stm-conduit text time transformers
+ ];
+ homepage = "https://github.com/barrucadu/irc-client";
+ description = "An IRC client library";
+ license = stdenv.lib.licenses.mit;
}) {};
"irc-colors" = callPackage
@@ -131100,6 +131391,7 @@ self: {
homepage = "https://github.com/nikita-volkov/json-ast-quickcheck";
description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"json-autotype_0_2_5_4" = callPackage
@@ -138231,7 +138523,7 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
- "leveldb-haskell" = callPackage
+ "leveldb-haskell_0_6_3" = callPackage
({ mkDerivation, async, base, bytestring, data-default, directory
, exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty
, tasty-quickcheck, temporary, transformers
@@ -138257,7 +138549,36 @@ self: {
homepage = "http://github.com/kim/leveldb-haskell";
description = "Haskell bindings to LevelDB";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) leveldb;};
+
+ "leveldb-haskell" = callPackage
+ ({ mkDerivation, async, base, bytestring, data-default, directory
+ , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty
+ , tasty-quickcheck, temporary, transformers
+ }:
+ mkDerivation {
+ pname = "leveldb-haskell";
+ version = "0.6.4";
+ sha256 = "25a8f9c2cdd5a32423389173a6323bd804689f69aee1082c57887ea74ead1b04";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring data-default exceptions filepath resourcet
+ transformers
+ ];
+ librarySystemDepends = [ leveldb ];
+ executableHaskellDepends = [
+ async base bytestring data-default resourcet transformers
+ ];
+ testHaskellDepends = [
+ base bytestring data-default directory exceptions mtl QuickCheck
+ tasty tasty-quickcheck temporary transformers
+ ];
+ homepage = "http://github.com/kim/leveldb-haskell";
+ description = "Haskell bindings to LevelDB";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) leveldb;};
"leveldb-haskell-fork" = callPackage
@@ -144918,6 +145239,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mandrill_0_5_2_1" = 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.2.1";
+ sha256 = "3b80c10d9a55dfa3e9bbe5b00e65573e29e60b5186699e30b012f911d3acfa5c";
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mandulia" = callPackage
({ mkDerivation, array, base, bytestring, containers, directory
, filepath, GLUT, hslua, time
@@ -150520,6 +150866,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "monad-ste" = callPackage
+ ({ mkDerivation, base, exceptions, ghc-prim, hspec, HUnit
+ , primitive
+ }:
+ mkDerivation {
+ pname = "monad-ste";
+ version = "0.1.0.0";
+ sha256 = "86677d1b349d2ec5ab8a499c440089de21d86df181acea233fbaba4cf3e9137b";
+ libraryHaskellDepends = [ base exceptions ghc-prim primitive ];
+ testHaskellDepends = [ base hspec HUnit ];
+ homepage = "http://github.com/cartazio/monad-ste";
+ description = "ST monad with efficient explicit errors";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
"monad-stlike-io" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, monads-tf
}:
@@ -150656,7 +151017,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "monad-unlift" = callPackage
+ "monad-unlift_0_1_2_0" = callPackage
({ mkDerivation, base, constraints, exceptions, monad-control, mtl
, mutable-containers, resourcet, stm, transformers
, transformers-base
@@ -150672,9 +151033,10 @@ self: {
homepage = "https://github.com/fpco/monad-unlift";
description = "Typeclasses for representing monad transformer unlifting";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "monad-unlift_0_2_0" = callPackage
+ "monad-unlift" = callPackage
({ mkDerivation, base, constraints, monad-control, transformers
, transformers-base
}:
@@ -150688,7 +151050,6 @@ self: {
homepage = "https://github.com/fpco/monad-unlift";
description = "Typeclasses for representing monad transformer unlifting";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"monad-unlift-ref" = callPackage
@@ -150704,7 +151065,6 @@ self: {
base constraints exceptions monad-control monad-unlift mtl
mutable-containers resourcet stm transformers transformers-base
];
- jailbreak = true;
homepage = "https://github.com/fpco/monad-unlift";
description = "Typeclasses for representing monad transformer unlifting";
license = stdenv.lib.licenses.mit;
@@ -154585,6 +154945,7 @@ self: {
homepage = "https://github.com/cocreature/nanovg-hs";
description = "Haskell bindings for nanovg";
license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {GLEW = null; inherit (pkgs) freeglut; inherit (pkgs) mesa;};
"nanq" = callPackage
@@ -155353,6 +155714,45 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "nested-routes_7_1_0" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, composition-extra
+ , errors, exceptions, hashable, hashtables, hspec, hspec-wai
+ , http-types, mtl, poly-arity, pred-set, pred-trie, regex-compat
+ , semigroups, text, transformers, tries, unordered-containers
+ , wai-middleware-content-type, wai-middleware-verbs
+ , wai-transformers, warp
+ }:
+ mkDerivation {
+ pname = "nested-routes";
+ version = "7.1.0";
+ sha256 = "1fbd722b6a9e637ff1794d1a122d6f52ae6b3cf9b70ebfc0afd5bcd593a12861";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base bytestring composition-extra errors exceptions
+ hashable hashtables mtl poly-arity pred-set pred-trie regex-compat
+ semigroups text transformers tries unordered-containers
+ wai-middleware-content-type wai-middleware-verbs wai-transformers
+ ];
+ executableHaskellDepends = [
+ attoparsec base bytestring composition-extra errors exceptions
+ hashable hashtables http-types mtl poly-arity pred-set pred-trie
+ regex-compat semigroups text transformers tries
+ unordered-containers wai-middleware-content-type
+ wai-middleware-verbs wai-transformers warp
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring composition-extra errors exceptions
+ hashable hspec hspec-wai http-types mtl poly-arity pred-trie
+ regex-compat semigroups text transformers tries
+ unordered-containers wai-middleware-content-type
+ wai-middleware-verbs wai-transformers
+ ];
+ description = "Declarative, compositional Wai responses";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"nested-sets" = callPackage
({ mkDerivation, base, containers, hspec }:
mkDerivation {
@@ -156211,7 +156611,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "network-conduit-tls" = callPackage
+ "network-conduit-tls_1_2_0_1" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-extra
, connection, cprng-aes, data-default, HUnit, monad-control, mtl
, network, streaming-commons, tls, transformers
@@ -156231,6 +156631,29 @@ self: {
homepage = "https://github.com/snoyberg/conduit";
description = "Create TLS-aware network code with conduits";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "network-conduit-tls" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, conduit-extra
+ , connection, cprng-aes, data-default, HUnit, monad-control, mtl
+ , network, streaming-commons, tls, transformers
+ }:
+ mkDerivation {
+ pname = "network-conduit-tls";
+ version = "1.2.1";
+ sha256 = "3afaab3abeb6933cdd199d8d419c2fe916e07915c672a6d9eb4be038c22de787";
+ libraryHaskellDepends = [
+ base bytestring conduit conduit-extra connection cprng-aes
+ data-default monad-control network streaming-commons tls
+ transformers
+ ];
+ testHaskellDepends = [
+ base bytestring conduit conduit-extra connection HUnit mtl
+ ];
+ homepage = "https://github.com/snoyberg/conduit";
+ description = "Create TLS-aware network code with conduits";
+ license = stdenv.lib.licenses.mit;
}) {};
"network-connection" = callPackage
@@ -158779,30 +159202,6 @@ self: {
}) {};
"octane" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary
- , binary-bits, bytestring, containers, data-binary-ieee754, deepseq
- , newtype-generics, tasty, tasty-hspec, text
- }:
- mkDerivation {
- pname = "octane";
- version = "0.4.18";
- sha256 = "75662d122bf7eb1f552cda017e45d74b2f0364a45ac0a11eb3af1687d8ce8f44";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson aeson-pretty autoexporter base binary binary-bits bytestring
- containers data-binary-ieee754 deepseq newtype-generics text
- ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [
- base binary bytestring containers tasty tasty-hspec
- ];
- homepage = "https://github.com/tfausak/octane#readme";
- description = "Parse Rocket League replays";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "octane_0_4_19" = callPackage
({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary
, binary-bits, bytestring, containers, data-binary-ieee754, deepseq
, newtype-generics, tasty, tasty-hspec, text
@@ -158824,7 +159223,6 @@ self: {
homepage = "https://github.com/tfausak/octane#readme";
description = "Parse Rocket League replays";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"octohat" = callPackage
@@ -165145,6 +165543,7 @@ self: {
];
description = "A perfect hashing library for mapping bytestrings to values";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"period" = callPackage
@@ -165900,6 +166299,7 @@ self: {
jailbreak = true;
description = "Parse DATABASE_URL into configuration types for Persistent";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"persistent-equivalence" = callPackage
@@ -169398,6 +169798,7 @@ self: {
];
description = "Interfacing pipes with foldl folds";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pipes-vector" = callPackage
@@ -169595,6 +169996,7 @@ self: {
];
description = "A library and a CLI tool for accessing Pivotal Tracker API";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pkcs1" = callPackage
@@ -173559,6 +173961,7 @@ self: {
];
description = "Streaming interface to system processes";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"processing" = callPackage
@@ -176923,6 +177326,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "quickterm" = callPackage
+ ({ mkDerivation, base, edit-distance, hashmap }:
+ mkDerivation {
+ pname = "quickterm";
+ version = "0.1.0.0";
+ sha256 = "389310e766ef5169819a296719827b0c4aa50c5c6a9eef2a58c3500e6bc147f9";
+ libraryHaskellDepends = [ base edit-distance hashmap ];
+ homepage = "https://github.com/SamuelSchlesinger/Quickterm";
+ description = "An interface for describing and executing terminal applications";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"quicktest" = callPackage
({ mkDerivation, base, directory, haskell98, mtl, process }:
mkDerivation {
@@ -176957,6 +177372,7 @@ self: {
homepage = "https://github.com/jtanguy/quickwebapp";
description = "A quick webapp generator for any file processing tool";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"quiver" = callPackage
@@ -178417,7 +178833,7 @@ self: {
homepage = "https://john-millikin.com/software/haskell-re2/";
description = "Bindings to the re2 regular expression library";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"react-flux" = callPackage
@@ -178873,6 +179289,7 @@ self: {
];
description = "Code for reading ESRI Shapefiles";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"really-simple-xml-parser" = callPackage
@@ -182339,6 +182756,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "resourcet_1_1_7_4" = callPackage
+ ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
+ , mmorph, monad-control, mtl, transformers, transformers-base
+ , transformers-compat
+ }:
+ mkDerivation {
+ pname = "resourcet";
+ version = "1.1.7.4";
+ sha256 = "a757d3a4d17373dc48a7072c2d98574934a53eb0ac98a32642952beb751e8f85";
+ libraryHaskellDepends = [
+ base containers exceptions lifted-base mmorph monad-control mtl
+ transformers transformers-base transformers-compat
+ ];
+ testHaskellDepends = [ base hspec lifted-base transformers ];
+ homepage = "http://github.com/snoyberg/conduit";
+ description = "Deterministic allocation and freeing of scarce resources";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"respond" = callPackage
({ mkDerivation, aeson, base, bifunctors, bytestring, containers
, data-default-class, exceptions, fast-logger, formatting, HList
@@ -183961,7 +184398,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "retry" = callPackage
+ "retry_0_7_1" = callPackage
({ mkDerivation, base, data-default-class, exceptions, hspec, HUnit
, QuickCheck, random, stm, time, transformers
}:
@@ -183981,6 +184418,28 @@ self: {
homepage = "http://github.com/Soostone/retry";
description = "Retry combinators for monadic actions that may fail";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "retry" = callPackage
+ ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
+ , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers
+ }:
+ mkDerivation {
+ pname = "retry";
+ version = "0.7.2";
+ sha256 = "26e5317e9b5110b1a2092b0316ae0588a3d00d4fd68d222324f2a2a8fec25bad";
+ libraryHaskellDepends = [
+ base data-default-class exceptions ghc-prim random transformers
+ ];
+ testHaskellDepends = [
+ base data-default-class exceptions ghc-prim hspec HUnit mtl
+ QuickCheck random stm time transformers
+ ];
+ doCheck = false;
+ homepage = "http://github.com/Soostone/retry";
+ description = "Retry combinators for monadic actions that may fail";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"retryer" = callPackage
@@ -184261,8 +184720,8 @@ self: {
}:
mkDerivation {
pname = "riak";
- version = "1.0.0.1";
- sha256 = "9d8a75de0ca371cb842bafe49358ae6309ed484b976aa87e15ddf2d77e64cc87";
+ version = "1.0.1.1";
+ sha256 = "d35e67fdcb397eedd3cddeae13dcbfa397b3ce36e7e76bb0c49d5a74f8bfc13f";
libraryHaskellDepends = [
aeson attoparsec base binary blaze-builder bytestring containers
data-default-class deepseq enclosed-exceptions exceptions hashable
@@ -184280,37 +184739,6 @@ self: {
license = "unknown";
}) {};
- "riak_1_0_1_0" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder
- , bytestring, containers, data-default-class, deepseq
- , enclosed-exceptions, exceptions, hashable, HUnit
- , mersenne-random-pure64, monad-control, mtl, network
- , protocol-buffers, pureMD5, QuickCheck, random, random-shuffle
- , resource-pool, riak-protobuf, semigroups, tasty, tasty-hunit
- , tasty-quickcheck, text, time, transformers, unordered-containers
- , vector
- }:
- mkDerivation {
- pname = "riak";
- version = "1.0.1.0";
- sha256 = "d851130b0e59c4e432c050349c5c288740b6b27cafddc719dccc6c36608f6bde";
- libraryHaskellDepends = [
- aeson attoparsec base binary blaze-builder bytestring containers
- data-default-class deepseq enclosed-exceptions exceptions hashable
- mersenne-random-pure64 monad-control network protocol-buffers
- pureMD5 random random-shuffle resource-pool riak-protobuf
- semigroups text time transformers unordered-containers vector
- ];
- testHaskellDepends = [
- base bytestring containers data-default-class HUnit mtl QuickCheck
- semigroups tasty tasty-hunit tasty-quickcheck text
- ];
- homepage = "http://github.com/markhibberd/riak-haskell-client";
- description = "A Haskell client for the Riak decentralized data store";
- license = "unknown";
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"riak-protobuf_0_20_0_0" = callPackage
({ mkDerivation, array, base, parsec, protocol-buffers
, protocol-buffers-descriptor
@@ -186567,7 +186995,7 @@ self: {
homepage = "https://github.com/jwaldmann/satchmo";
description = "SAT encoding monad";
license = "GPL";
- hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"satchmo-backends" = callPackage
@@ -190399,6 +190827,7 @@ self: {
homepage = "https://github.com/cutsea110/servant-csharp.git";
description = "Generate servant client library for C#";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-docs_0_3_1" = callPackage
@@ -190778,6 +191207,7 @@ self: {
homepage = "http://github.com/finlay/servant-github#readme";
description = "Bindings to GitHub API using servant";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-haxl-client" = callPackage
@@ -190807,6 +191237,7 @@ self: {
homepage = "http://github.com/ElvishJerricco/servant-haxl-client/";
description = "automatical derivation of querying functions for servant webservices";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-jquery_0_2_2_1" = callPackage
@@ -190977,6 +191408,7 @@ self: {
homepage = "http://haskell-servant.github.io/";
description = "Automatically derive (jquery) javascript functions to query servant webservices";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-js" = callPackage
@@ -195517,6 +195949,7 @@ self: {
executableToolDepends = [ alex happy ];
description = "Simple JavaScript Profiler";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"skein_1_0_9_1" = callPackage
@@ -196407,6 +196840,7 @@ self: {
homepage = "https://github.com/GetShopTV/smsaero";
description = "SMSAero API and HTTP client based on servant library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"smt-lib" = callPackage
@@ -198036,8 +198470,8 @@ self: {
}:
mkDerivation {
pname = "snaplet-riak";
- version = "0.2.0.0";
- sha256 = "004ab45915a7aaf5be4f238982ca0d64a4ba14df502dd3558b3d0ccac0b41560";
+ version = "0.2.1.0";
+ sha256 = "3c40c97eb65134f44d1418d37a43948fb8dd0b1e34252b5010578352b409c639";
libraryHaskellDepends = [
aeson base containers data-lens data-lens-template mtl riak
riak-protobuf snap snap-core time transformers
@@ -198768,6 +199202,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "socks_0_5_5" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, network }:
+ mkDerivation {
+ pname = "socks";
+ version = "0.5.5";
+ sha256 = "2647ea93e21ad1dfd77e942c022c8707e468d25e1ff672a88be82508034fc868";
+ libraryHaskellDepends = [ base bytestring cereal network ];
+ homepage = "http://github.com/vincenthz/hs-socks";
+ description = "Socks proxy (version 5) implementation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sodium_0_11_0_2" = callPackage
({ mkDerivation, base, containers, mtl }:
mkDerivation {
@@ -199201,6 +199648,7 @@ self: {
];
description = "Distributed Apache Spark applications in Haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"sparse" = callPackage
@@ -199775,7 +200223,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "split" = callPackage
+ "split_0_2_3" = callPackage
({ mkDerivation, base, QuickCheck }:
mkDerivation {
pname = "split";
@@ -199785,9 +200233,10 @@ self: {
testHaskellDepends = [ base QuickCheck ];
description = "Combinator library for splitting lists";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "split_0_2_3_1" = callPackage
+ "split" = callPackage
({ mkDerivation, base, QuickCheck }:
mkDerivation {
pname = "split";
@@ -199797,7 +200246,6 @@ self: {
testHaskellDepends = [ base QuickCheck ];
description = "Combinator library for splitting lists";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"split-channel" = callPackage
@@ -200616,7 +201064,7 @@ self: {
];
jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -200685,7 +201133,7 @@ self: {
];
jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -200755,7 +201203,7 @@ self: {
];
jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -200825,7 +201273,7 @@ self: {
];
jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -200895,7 +201343,7 @@ self: {
];
jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -200965,7 +201413,7 @@ self: {
];
jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -201036,7 +201484,7 @@ self: {
];
jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -201107,7 +201555,7 @@ self: {
];
jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -201179,7 +201627,7 @@ self: {
doHaddock = false;
jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -201249,8 +201697,9 @@ self: {
QuickCheck resourcet retry temporary text transformers unix-compat
];
doHaddock = false;
+ jailbreak = true;
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -201272,21 +201721,22 @@ self: {
, errors, exceptions, extra, fast-logger, filelock, filepath
, fsnotify, gitrev, hashable, hastache, hpack, hpc, hspec
, http-client, http-client-tls, http-conduit, http-types
- , lifted-base, monad-control, monad-logger, mtl
- , optparse-applicative, optparse-simple, path, path-io, persistent
- , persistent-sqlite, persistent-template, pretty, process
- , project-template, QuickCheck, resourcet, retry, safe, semigroups
- , split, stm, streaming-commons, tar, template-haskell, temporary
- , text, text-binary, time, transformers, transformers-base, unix
- , unix-compat, unordered-containers, uuid, vector
- , vector-binary-instances, yaml, zip-archive, zlib
+ , lifted-base, microlens, monad-control, monad-logger, mtl
+ , open-browser, optparse-applicative, optparse-simple, path
+ , path-io, persistent, persistent-sqlite, persistent-template
+ , pretty, process, project-template, QuickCheck, resourcet, retry
+ , safe, semigroups, split, stm, streaming-commons, tar
+ , template-haskell, temporary, text, text-binary, time
+ , transformers, transformers-base, unix, unix-compat
+ , unordered-containers, vector, vector-binary-instances, yaml
+ , zip-archive, zlib
}:
mkDerivation {
pname = "stack";
- version = "1.0.4.3";
- sha256 = "2a445ff671cfd75ccf3185c52832298598dc03dbfbede2b7be21237f63c305b2";
- revision = "4";
- editedCabalFile = "a1315a0d9d005e7e93d6c0893eec2f2d055dda364543edf7b9e172c8d54d7ae2";
+ version = "1.1.0";
+ sha256 = "58cce7048438bc452a81384493b4644034d5a0b456acd51bf7c19098a9cf406a";
+ revision = "1";
+ editedCabalFile = "6ea3e00f37c34ddbb05c71a6cf0db9c7d8cedcf48f16be66e347e02b4357b0c4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -201296,18 +201746,18 @@ self: {
cryptohash-conduit deepseq directory edit-distance either
enclosed-exceptions errors exceptions extra fast-logger filelock
filepath fsnotify hashable hastache hpack hpc http-client
- http-client-tls http-conduit http-types lifted-base monad-control
- monad-logger mtl optparse-applicative path path-io persistent
- persistent-sqlite persistent-template pretty process
- project-template resourcet retry safe semigroups split stm
- streaming-commons tar template-haskell temporary text text-binary
- time transformers transformers-base unix unix-compat
- unordered-containers uuid vector vector-binary-instances yaml
+ http-client-tls http-conduit http-types lifted-base microlens
+ monad-control monad-logger mtl open-browser optparse-applicative
+ path path-io persistent persistent-sqlite persistent-template
+ pretty process project-template resourcet retry safe semigroups
+ split stm streaming-commons tar template-haskell temporary text
+ text-binary time transformers transformers-base unix unix-compat
+ unordered-containers vector vector-binary-instances yaml
zip-archive zlib
];
executableHaskellDepends = [
base bytestring Cabal containers directory filelock filepath gitrev
- http-client lifted-base monad-control monad-logger mtl
+ http-client lifted-base microlens monad-control monad-logger mtl
optparse-applicative optparse-simple path path-io text transformers
];
testHaskellDepends = [
@@ -201317,7 +201767,7 @@ self: {
retry temporary text transformers unix-compat
];
doCheck = false;
- enableSharedExecutables = false;
+ preCheck = "export HOME=$TMPDIR";
postInstall = ''
exe=$out/bin/stack
mkdir -p $out/share/bash-completion/completions
@@ -201861,7 +202311,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "stackage-curator" = callPackage
+ "stackage-curator_0_13_3" = callPackage
({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
, base, base16-bytestring, binary, binary-tagged, blaze-html
, byteable, bytestring, Cabal, classy-prelude-conduit, conduit
@@ -201904,6 +202354,55 @@ self: {
homepage = "https://github.com/fpco/stackage";
description = "Tools for curating Stackage bundles";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "stackage-curator" = callPackage
+ ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
+ , base, base16-bytestring, binary, binary-orphans, binary-tagged
+ , blaze-html, byteable, bytestring, Cabal, classy-prelude-conduit
+ , conduit, conduit-extra, containers, cryptohash
+ , cryptohash-conduit, data-default-class, directory, exceptions
+ , filepath, hashable, hspec, html-conduit, http-client
+ , http-client-tls, http-conduit, lucid, mime-types, monad-unlift
+ , monad-unlift-ref, mono-traversable, mtl, old-locale
+ , optparse-applicative, optparse-simple, process, QuickCheck
+ , resourcet, safe, semigroups, stackage-cli, stackage-install, stm
+ , streaming-commons, syb, system-fileio, system-filepath, tar
+ , temporary, text, time, transformers, unix-compat
+ , unordered-containers, utf8-string, vector, xml-conduit, xml-types
+ , yaml, zlib
+ }:
+ mkDerivation {
+ pname = "stackage-curator";
+ version = "0.14.0";
+ sha256 = "13ad2b94821402f533d0e5b4ac38ea1107fa015ab1a5d997f03f0ae05d38fa67";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson amazonka amazonka-core amazonka-s3 async base
+ base16-bytestring binary binary-orphans binary-tagged blaze-html
+ byteable bytestring Cabal classy-prelude-conduit conduit
+ conduit-extra containers cryptohash cryptohash-conduit
+ data-default-class directory exceptions filepath hashable
+ html-conduit http-client http-client-tls http-conduit lucid
+ mime-types monad-unlift monad-unlift-ref mono-traversable mtl
+ old-locale process resourcet safe semigroups stackage-install stm
+ streaming-commons syb system-fileio system-filepath tar temporary
+ text time transformers unix-compat unordered-containers utf8-string
+ vector xml-conduit xml-types yaml zlib
+ ];
+ executableHaskellDepends = [
+ aeson base http-client http-client-tls optparse-applicative
+ optparse-simple stackage-cli system-filepath text
+ ];
+ testHaskellDepends = [
+ base Cabal classy-prelude-conduit containers directory hspec
+ http-client http-client-tls QuickCheck text yaml
+ ];
+ homepage = "https://github.com/fpco/stackage";
+ description = "Tools for curating Stackage bundles";
+ license = stdenv.lib.licenses.mit;
}) {};
"stackage-install_0_1_0_3" = callPackage
@@ -203527,11 +204026,10 @@ self: {
({ mkDerivation, base, clock, hspec, transformers }:
mkDerivation {
pname = "stopwatch";
- version = "0.1.0";
- sha256 = "17f488ef8e74a9dc4ad7e8a649abc386d010379a9b63f88d52638a078fbc16f6";
+ version = "0.1.0.1";
+ sha256 = "647e89db9b9b23631c751b6d73cdee124b86c1768186d3a572ba6951a57c46da";
libraryHaskellDepends = [ base clock transformers ];
testHaskellDepends = [ base clock hspec ];
- jailbreak = true;
homepage = "https://github.com/debug-ito/stopwatch";
description = "A simple stopwatch utility";
license = stdenv.lib.licenses.bsd3;
@@ -203731,6 +204229,7 @@ self: {
homepage = "https://github.com/frontrowed/stratosphere#readme";
description = "EDSL for AWS CloudFormation";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"stratum-tool" = callPackage
@@ -203769,6 +204268,7 @@ self: {
homepage = "https://github.com/githubuser/stream#readme";
description = "Initial project template from stack";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"stream-fusion" = callPackage
@@ -204549,11 +205049,10 @@ self: {
({ mkDerivation, base, bytestring, text }:
mkDerivation {
pname = "string-conv";
- version = "0.1";
- sha256 = "861a5402709202a1594f5e2ee2792c1ff31be73255619c967516c756e5a4557e";
- revision = "1";
- editedCabalFile = "e6fd8d1b56031e7c1ea24129ddb8bd2c6ab26a63d24b2e90ca40300f217602a9";
+ version = "0.1.1";
+ sha256 = "981d8a42297e349b8ea0a53477492282bd94d42955e547601e32be5d8798d03d";
libraryHaskellDepends = [ base bytestring text ];
+ homepage = "https://github.com/Soostone/string-conv";
description = "Standardized conversion between string types";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -207702,8 +208201,8 @@ self: {
}:
mkDerivation {
pname = "table-layout";
- version = "0.5.1.1";
- sha256 = "11c47bed5d8c6dd6d003dad96f80ad9e6a5bcc0566aefd8ff97afa3889950b11";
+ version = "0.5.2.0";
+ sha256 = "5000afb85689a2b1e9141887bdf8d589a0cb6a9026ce600be269f856f27a88d3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -208607,7 +209106,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "tar" = callPackage
+ "tar_0_5_0_2" = callPackage
({ mkDerivation, array, base, bytestring, bytestring-handle
, containers, deepseq, directory, filepath, QuickCheck, tasty
, tasty-quickcheck, time
@@ -208625,6 +209124,27 @@ self: {
];
description = "Reading, writing and manipulating \".tar\" archive files.";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "tar" = callPackage
+ ({ mkDerivation, array, base, bytestring, bytestring-handle
+ , containers, deepseq, directory, filepath, QuickCheck, tasty
+ , tasty-quickcheck, time
+ }:
+ mkDerivation {
+ pname = "tar";
+ version = "0.5.0.3";
+ sha256 = "d8d9ad876365f88bdccd02073049e58715cd5ba94de06eb98e21d595244918a3";
+ libraryHaskellDepends = [
+ array base bytestring containers deepseq directory filepath time
+ ];
+ testHaskellDepends = [
+ array base bytestring bytestring-handle containers deepseq
+ directory filepath QuickCheck tasty tasty-quickcheck time
+ ];
+ description = "Reading, writing and manipulating \".tar\" archive files.";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"tardis_0_3_0_0" = callPackage
@@ -209262,6 +209782,7 @@ self: {
homepage = "https://github.com/jdnavarro/tasty-laws";
description = "Test common laws";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tasty-lens" = callPackage
@@ -209721,8 +210242,8 @@ self: {
}:
mkDerivation {
pname = "telegram-api";
- version = "0.2.1.1";
- sha256 = "fd2ca89b40cdf7128c8739e5d3ff32278c5ab30aa9de21e8ab5a4ff0a2867705";
+ version = "0.3.0.0";
+ sha256 = "f32039ab9d0a6090c32a0b5d3c1ed83c6ecadf784cd97de680dce33eb52b880a";
libraryHaskellDepends = [
aeson base either servant servant-client text
];
@@ -209732,6 +210253,7 @@ self: {
homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
description = "Telegram Bot API bindings";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"teleport" = callPackage
@@ -210885,11 +211407,12 @@ self: {
pname = "testloop";
version = "0.1.1.0";
sha256 = "ffac18cca070139638a85d7b83a5d0237726b49e9f8ceba104c683665973cfaf";
+ revision = "2";
+ editedCabalFile = "cbf63f33f18f023e56798ab7f354db64fff71eba3209deb411f5ae3cfb252a9e";
libraryHaskellDepends = [
base Cabal directory filepath fsnotify hint mtl system-filepath
time unix
];
- jailbreak = true;
homepage = "http://github.com/roman/testloop";
description = "Quick feedback loop for test suites";
license = stdenv.lib.licenses.mit;
@@ -215902,6 +216425,7 @@ self: {
homepage = "http://www.fpcomplete.com/user/agocorona";
description = "remote execution and map-reduce: distributed computing for transient";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"translatable-intset" = callPackage
@@ -216279,7 +216803,7 @@ self: {
homepage = "https://github.com/aphorisme/tripLL";
description = "A very simple triple store";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"trivia" = callPackage
@@ -216717,14 +217241,20 @@ self: {
}) {};
"tubes" = callPackage
- ({ mkDerivation, base, comonad, free, mtl, transformers }:
+ ({ mkDerivation, base, comonad, contravariant, free, mtl
+ , profunctors, semigroups, transformers
+ }:
mkDerivation {
pname = "tubes";
- version = "1.1.0.0";
- sha256 = "c1b6623455b98cb956ec37f290a51e61c6f372aeb5ecffa12c5c182f713fb86d";
- libraryHaskellDepends = [ base comonad free mtl transformers ];
+ version = "2.0.0.0";
+ sha256 = "19277b8c3f86a431ee64776aa101826d12ab33df1083813d1cbf78939a7b4422";
+ libraryHaskellDepends = [
+ base comonad contravariant free mtl profunctors semigroups
+ transformers
+ ];
+ jailbreak = true;
homepage = "https://github.com/gatlin/tubes";
- description = "Effectful, iteratee-inspired stream processing based on a free monad";
+ description = "Write stream processing computations with side effects in a series of tubes";
license = stdenv.lib.licenses.gpl3;
}) {};
@@ -218773,6 +219303,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 test-framework-th
time tzdata unix vector
];
+ preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
homepage = "https://github.com/nilcons/haskell-tz";
description = "Efficient time zone handling";
license = stdenv.lib.licenses.asl20;
@@ -218799,6 +219330,7 @@ self: {
test-framework-hunit test-framework-quickcheck2 test-framework-th
time tzdata unix vector
];
+ preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
homepage = "https://github.com/nilcons/haskell-tz";
description = "Efficient time zone handling";
license = stdenv.lib.licenses.asl20;
@@ -218919,6 +219451,7 @@ self: {
homepage = "https://github.com/byteally/webapi-uber.git";
description = "Uber client for Haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"uberlast" = callPackage
@@ -219381,7 +219914,7 @@ self: {
homepage = "https://e.xtendo.org/scs/unbreak";
description = "Secure and resilient remote file storage utility";
license = stdenv.lib.licenses.agpl3;
- hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"unexceptionalio" = callPackage
@@ -227129,6 +227662,7 @@ self: {
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
@@ -227411,6 +227945,7 @@ self: {
homepage = "https://gitlab.com/twittner/wai-routing/";
description = "Declarative routing for WAI";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-session" = callPackage
@@ -231063,6 +231598,7 @@ self: {
homepage = "http://github.com/bgamari/wkt";
description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wl-pprint_1_1" = callPackage
@@ -239673,6 +240209,7 @@ self: {
homepage = "https://github.com/league/yesod-crud";
description = "Generic administrative CRUD operations as a Yesod subsite";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-crud-persist" = callPackage
@@ -240222,33 +240759,6 @@ self: {
}) {};
"yesod-job-queue" = callPackage
- ({ mkDerivation, aeson, api-field-json-th, base, bytestring
- , classy-prelude-yesod, cron, file-embed, hedis, lens, monad-logger
- , persistent-sqlite, resourcet, stm, text, time, uuid, yesod
- , yesod-core
- }:
- mkDerivation {
- pname = "yesod-job-queue";
- version = "0.2.0.0";
- sha256 = "42e294394434fcca8ee048a6f6cd365e1979761e24078eb0cc8f090ffcf4070c";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson api-field-json-th base bytestring classy-prelude-yesod cron
- file-embed hedis lens monad-logger stm text time uuid yesod
- ];
- executableHaskellDepends = [
- base classy-prelude-yesod monad-logger persistent-sqlite resourcet
- yesod yesod-core
- ];
- testHaskellDepends = [ base ];
- doHaddock = false;
- homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
- description = "Background jobs library for Yesod";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "yesod-job-queue_0_2_0_1" = callPackage
({ mkDerivation, aeson, api-field-json-th, base, bytestring
, classy-prelude-yesod, cron, file-embed, hedis, lens, monad-logger
, persistent-sqlite, resourcet, stm, text, time, uuid, yesod
@@ -240269,10 +240779,10 @@ self: {
resourcet yesod yesod-core
];
testHaskellDepends = [ base ];
+ doHaddock = false;
homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
description = "Background jobs library for Yesod";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-json" = callPackage
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index b612033c8e5..9ae2b9838c4 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash,
+{ stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, coreutils, curl, bash,
debugInfo ? false }:
stdenv.mkDerivation rec {
name = "elixir-${version}";
- version = "1.2.4";
+ version = "1.2.5";
- src = fetchurl {
- url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
- sha256 = "16759ff84d08b480b7e5499716e663b2fffd26e20cf2863de5613bc7bb05c817";
+ src = fetchFromGitHub {
+ owner = "elixir-lang";
+ repo = "elixir";
+ rev = "v${version}";
+ sha256 = "0qnmsmzmr431y1chkzk2aq501fk734mncdbn7nsiq98bnqgb6php";
};
buildInputs = [ erlang rebar makeWrapper ];
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index d6b4e03a2f6..8c51cd2b3a8 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -265,14 +265,12 @@ let
--replace '@PHP_LDFLAGS@' ""
done
- iniFile=$out/etc/php-recommended.ini
[[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
'';
- installPhase = ''
- unset installPhase; installPhase;
- cp php.ini-production $iniFile
+ postInstall = ''
+ cp php.ini-production $out/etc/php.ini
'';
src = fetchurl {
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 03d646a3b4d..a0d4a3d95ed 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -28,20 +28,15 @@ let
sqlite
];
- boolPatch = fetchurl {
- url = "http://copr-dist-git.fedorainfracloud.org/cgit/bthomas/racket/racket.git/plain/xform-errors-converting-fix.patch";
- sha256 = "0h5g7a7w8wwj43jb8q69xldgbyxkn0y0i1na6r9fk17dd56nsm68";
- };
-
in
stdenv.mkDerivation rec {
name = "racket-${version}";
- version = "6.4";
+ version = "6.5";
src = fetchurl {
url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
- sha256 = "1qyzq91r1kzk2k0faggqd5idwmsxizkjbdgxn6ik9iwwsjycxbw6";
+ sha256 = "0gvh7i5k87mg1gpqk8gaq50ja9ksbhnvdqn7qqh0n17byidd6999";
};
FONTCONFIG_FILE = fontsConf;
@@ -56,10 +51,6 @@ stdenv.mkDerivation rec {
cd src/build
'';
- # https://github.com/racket/racket/issues/1222
- # Fixed upstream after the release of 6.4
- patches = [ boolPatch ];
-
shared = if stdenv.isDarwin then "dylib" else "shared";
configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
++ stdenv.lib.optional disableDocs [ "--disable-docs" ]
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 5df6ac2cace..302d63aa759 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -4,7 +4,20 @@
}:
stdenv.mkDerivation {
- name = "appstream-0.8.0";
+ name = "appstream-0.9.5";
+
+ src = fetchurl {
+ url = "https://github.com/ximion/appstream/archive/APPSTREAM_0_8_0.tar.gz";
+ sha256 = "16a3b38avrwyl1pp8jdgfjv6cd5mccbmk4asni92l40y5r0xfycr";
+ };
+
+ nativeBuildInputs = [
+ cmake pkgconfig gettext intltool
+ xmlto docbook_xsl docbook_xml_dtd_45
+ gobjectIntrospection
+ ];
+
+ buildInputs = [ glib xapian libxml2 libyaml ];
meta = with stdenv.lib; {
description = "Software metadata handling library";
@@ -19,17 +32,4 @@ stdenv.mkDerivation {
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
-
- src = fetchurl {
- url = "https://github.com/ximion/appstream/archive/APPSTREAM_0_8_0.tar.gz";
- sha256 = "16a3b38avrwyl1pp8jdgfjv6cd5mccbmk4asni92l40y5r0xfycr";
- };
-
- nativeBuildInputs = [
- cmake pkgconfig gettext intltool
- xmlto docbook_xsl docbook_xml_dtd_45
- gobjectIntrospection
- ];
-
- buildInputs = [ glib xapian libxml2 libyaml ];
}
diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix
new file mode 100644
index 00000000000..a3d04fee7f6
--- /dev/null
+++ b/pkgs/development/libraries/audio/jamomacore/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2, ninja }:
+
+stdenv.mkDerivation rec {
+ version = "1.0-beta.1";
+ name = "JamomaCore-${version}";
+
+ src = fetchFromGitHub {
+ owner = "jamoma";
+ repo = "JamomaCore";
+ rev = "v${version}";
+ sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln";
+ };
+
+ buildInputs = [ pkgconfig alsaLib portaudio portmidi libsndfile cmake libxml2 ninja ];
+
+ meta = {
+ description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media";
+ homepage = https://jamoma.org;
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
new file mode 100644
index 00000000000..326572996b4
--- /dev/null
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, rtmidi }:
+
+stdenv.mkDerivation rec {
+ version = "4.1.2";
+ name = "rtaudio-${version}";
+
+ src = fetchFromGitHub {
+ owner = "thestk";
+ repo = "rtaudio";
+ rev = "${version}";
+ sha256 = "09j84l9l3q0g238z5k89rm8hgk0i1ir8917an7amq474nwjp80pq";
+ };
+
+ buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ];
+
+ preConfigure = ''
+ ./autogen.sh --no-configure
+ ./configure
+ '';
+
+ meta = {
+ description = "A set of C++ classes that provide a cross platform API for realtime audio input/output";
+ homepage = http://www.music.mcgill.ca/~gary/rtaudio/;
+ license = stdenv.lib.licenses.mit;
+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
+ };
+}
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
new file mode 100644
index 00000000000..b41db495dba
--- /dev/null
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ version = "2.1.1";
+ name = "rtmidi-${version}";
+
+ src = fetchFromGitHub {
+ owner = "thestk";
+ repo = "rtmidi";
+ rev = "${version}";
+ sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96";
+ };
+
+ buildInputs = [ autoconf automake libtool libjack2 alsaLib pkgconfig ];
+
+ preConfigure = ''
+ ./autogen.sh --no-configure
+ ./configure
+ '';
+
+ meta = {
+ description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output";
+ homepage = http://www.music.mcgill.ca/~gary/rtmidi/;
+ license = stdenv.lib.licenses.mit;
+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
+ };
+}
diff --git a/pkgs/development/libraries/bullet/bullet283.nix b/pkgs/development/libraries/bullet/bullet283.nix
new file mode 100644
index 00000000000..ea792b98a32
--- /dev/null
+++ b/pkgs/development/libraries/bullet/bullet283.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, mesa, freeglut }:
+
+stdenv.mkDerivation rec {
+ name = "bullet-2.83.7"; # vdrift 2012-07-22 doesn't build with 2.81
+ src = fetchurl {
+ url = "https://github.com/bulletphysics/bullet3/archive/2.83.7.tar.gz";
+ sha256 = "0hqjnmlb2p29yiasrm7kvgv0nklz5zkwhfk4f78zz1gf0vrdil80";
+ };
+
+ buildInputs = [ cmake mesa freeglut ];
+ configurePhase = ''
+ cmake -DBUILD_SHARED_LIBS=ON -DINSTALL_EXTRA_LIBS=TRUE \
+ -DCMAKE_INSTALL_PREFIX=$out .
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A professional free 3D Game Multiphysics Library";
+ longDescription = ''
+ Bullet 3D Game Multiphysics Library provides state of the art collision
+ detection, soft body and rigid body dynamics.
+ '';
+ homepage = https://github.com/bulletphysics/bullet3;
+ license = stdenv.lib.licenses.zlib;
+ maintainers = with stdenv.lib.maintainers; [ aforemny ];
+ };
+}
diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix
index c7d7aa4d67a..7e5c768036f 100644
--- a/pkgs/development/libraries/cegui/default.nix
+++ b/pkgs/development/libraries/cegui/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cegui-${version}";
- version = "0.8.4";
+ version = "0.8.7";
src = fetchurl {
url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2";
- sha256 = "1253aywv610rbs96hwqiw2z7xrrv24l3jhfsqj95w143idabvz5m";
+ sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk";
};
diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix
index d77946e5ec3..4287c86dbd5 100644
--- a/pkgs/development/libraries/libgcrypt/1.5.nix
+++ b/pkgs/development/libraries/libgcrypt/1.5.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
postInstall = ''
sed -i 's,#include ,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
'' + stdenv.lib.optionalString enableCapabilities ''
- sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la
+ sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
'';
doCheck = true;
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index d566a0e8567..dd57e74e156 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
postFixup = ''
sed -i 's,#include ,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
'' + stdenv.lib.optionalString enableCapabilities ''
- sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la
+ sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
'';
# TODO: figure out why this is even necessary and why the missing dylib only crashes
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 547c7647b7a..85d30fdd79b 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig
-, Carbon
+, Carbon, AudioToolbox
}:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig flac libogg libvorbis ]
- ++ stdenv.lib.optional stdenv.isDarwin Carbon;
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix
new file mode 100644
index 00000000000..959c544876f
--- /dev/null
+++ b/pkgs/development/libraries/libtcod/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromBitbucket, cmake, SDL, mesa, upx }:
+
+stdenv.mkDerivation rec {
+
+ name = "libtcod-${version}";
+ version = "1.5.1";
+
+ src = fetchFromBitbucket {
+ owner = "libtcod";
+ repo = "libtcod";
+ rev = "1.5.1";
+ sha256 = "1ibsnmnim712npxkqklc5ibnd32hgsx2yzyfzzc5fis5mhinbl63";
+ };
+
+ prePatch = ''
+ sed -i CMakeLists.txt \
+ -e "s,SET(ROOT_DIR.*,SET(ROOT_DIR $out),g" \
+ -e "s,SET(INSTALL_DIR.*,SET(INSTALL_DIR $out),g"
+ echo 'INSTALL(DIRECTORY include DESTINATION .)' >> CMakeLists.txt
+ '';
+
+ cmakeFlags="-DLIBTCOD_SAMPLES=OFF";
+
+ buildInputs = [ cmake SDL mesa upx ];
+
+ meta = {
+ description = "API for roguelike games";
+ homepage = http://roguecentral.org/doryen/libtcod/;
+ license = stdenv.lib.licenses.bsd3;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.skeidel ];
+ };
+}
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index de976002f03..5830786f644 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "mediastreamer-2.11.2";
+ name = "mediastreamer-2.12.1";
src = fetchurl {
url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
- sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc";
+ sha256 = "1rzjh2ln8qd6jvfmxlnbrcx2vbajx2j9hblqq2gdn10sf97qvgqd";
};
patches = [ ./plugins_dir.patch ];
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index f2a9bdc1230..e08e7c06815 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }:
stdenv.mkDerivation rec {
- name = "p11-kit-0.23.1";
+ name = "p11-kit-0.23.2";
src = fetchurl {
url = "${meta.homepage}releases/${name}.tar.gz";
- sha256 = "1i3a1wdpagm0p3y1bwaz5x5rjhcpqbcrnhkcp10p259vkxk72wz5";
+ sha256 = "1w7szm190phlkg7qx05ychlj2dbvkgkhx9gw6dx4d5rw62l6wwms";
};
outputs = [ "dev" "out" "docdev" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
meta = with stdenv.lib; {
- homepage = http://p11-glue.freedesktop.org/;
+ homepage = https://p11-glue.freedesktop.org/;
platforms = platforms.all;
maintainers = with maintainers; [ urkud wkennington ];
license = licenses.mit;
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index 2dc3cbc3ff9..0ebbb34f8ae 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -16,12 +16,12 @@ rec {
};
pharo-spur = pharo-vm-build rec {
- version = "2016.04.04";
+ version = "2016.05.04";
name = "pharo-vm-spur-i386-${version}";
binary-basename = "pharo-spur-vm";
src = fetchurl {
url = "${base-url}/pharo-vm-spur-${version}.tar.bz2";
- sha256 = "1kmf782vdk9xbzi2yn1vpzksv8m04ry8n2ih16jhcihibxzcmz23";
+ sha256 = "01xvpcp9mslxmfjpi43jhgf8jnx20dqngwrfyi838il61128hwq2";
};
};
}
diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
index 27485af6f98..46d25334260 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd";
};
+ sources50Zip = fetchurl {
+ url = http://files.pharo.org/sources/PharoV50.sources.zip;
+ sha256 = "0ykl1y0a4yy5qn8fwz0wkl8fcn4pqv9q0w0r2llhzdz3jdg1k69g";
+ };
+
buildInputs = [ unzip ];
installPhase = ''
@@ -37,6 +42,7 @@ stdenv.mkDerivation rec {
unzip ${sources20Zip} -d $prefix/lib/
unzip ${sources30Zip} -d $prefix/lib/
unzip ${sources40Zip} -d $prefix/lib/
+ unzip ${sources50Zip} -d $prefix/lib/
'';
meta = {
diff --git a/pkgs/development/python-modules/httpretty/setup.py.patch b/pkgs/development/python-modules/httpretty/setup.py.patch
new file mode 100644
index 00000000000..e07ba931705
--- /dev/null
+++ b/pkgs/development/python-modules/httpretty/setup.py.patch
@@ -0,0 +1,11 @@
+--- setup.py 2016-04-18 10:44:27.915536022 -0500
++++ setup-new.py 2016-04-18 10:44:13.515537377 -0500
+@@ -75,7 +75,7 @@
+
+
+ local_file = lambda *f: \
+- open(os.path.join(os.path.dirname(__file__), *f)).read()
++ open(os.path.join(os.path.dirname(__file__), *f), encoding="utf-8").read()
+
+
+ install_requires, dependency_links = \
diff --git a/pkgs/development/python-modules/mathics/disable_console_tests.patch b/pkgs/development/python-modules/mathics/disable_console_tests.patch
deleted file mode 100644
index 6e20686fc41..00000000000
--- a/pkgs/development/python-modules/mathics/disable_console_tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-These tests require that Mathics already be installed to work,
-which is not true when nix runs them.
-
---- a/test/test_console.py 2015-09-07 21:41:08.530501979 -0700
-+++ b/test/test_console.py 2015-09-07 21:42:44.082176084 -0700
-@@ -13,6 +13,7 @@
- os.environ["TERM"] = "dumb"
- self.console = pexpect.spawn('python2 mathics/main.py --color NOCOLOR')
-
-+ @unittest.expectedFailure
- def testLaunch(self):
- cons = self.console
-
-@@ -41,6 +42,7 @@
- 'Quit by pressing CONTROL-D\r\n'
- '\r\n')
-
-+ @unittest.expectedFailure
- def testPrompt(self):
- cons = self.console
- cons.expect('Quit by pressing CONTROL-D\r\n\r\n')
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 72e483bc77d..1349a4a53ac 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -57,6 +57,12 @@ in
buildInputs = [ gpgme ];
};
+ hitimes = attrs: {
+ buildInputs =
+ stdenv.lib.optionals stdenv.isDarwin
+ [ darwin.apple_sdk.frameworks.CoreServices ];
+ };
+
# note that you need version >= v3.16.14.8,
# otherwise the gem will fail to link to the libv8 binary.
# see: https://github.com/cowboyd/libv8/pull/161
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index 4a33a0cd8f3..00eb5b9afc1 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "code coverage tester for compiled programs, Python scripts and shell scripts";
- longDescription =
- '' Kcov is a code coverage tester for compiled programs, Python
+ longDescription = ''
+ Kcov is a code coverage tester for compiled programs, Python
scripts and shell scripts. It allows collecting code coverage
information from executables without special command-line
arguments, and continuosly produces output from long-running
applications.
- '';
+ '';
- homePage = http://simonkagstrom.github.io/kcov/index.html;
+ homepage = http://simonkagstrom.github.io/kcov/index.html;
license = licenses.gpl2;
maintainers = [ maintainers.gal_bolle ];
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 7fae5604e2a..1ef53867cb1 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -51,11 +51,11 @@ rec {
};
gradleLatest = gradleGen rec {
- name = "gradle-2.12";
+ name = "gradle-2.13";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
- sha256 = "0p5b6dngza6c2lchz5j0w4cbsizpzvkf638yzxv09k8636c68w77";
+ sha256 = "0r5nrgrb14fi1p4cx5q5x82nghhrzdd843dsyzx6ay56lp35wrhg";
};
};
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 69270f8a518..9ff9b05b5ed 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yodl-${version}";
- version = "3.08.00";
+ version = "3.08.01";
buildInputs = [ perl icmake ];
src = fetchFromGitHub {
- sha256 = "107jhywx0xdyp7yll1c5zwngzjl3yvg1b4yan8wl2acnbrv6hwa4";
+ sha256 = "0sks4phdy8qf6lmbjardrk0gl4v7crr4vjdgwpkkc8d5lzvcx7j5";
rev = version;
repo = "yodl";
owner = "fbb-git";
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
new file mode 100644
index 00000000000..74c537763da
--- /dev/null
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchurl, python, zip, makeWrapper
+}:
+
+let
+ deps = import ./deps.nix { inherit fetchurl; };
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
+ sha256 = "1rbwkmsllg8wxv45xyvc3vh97na0zxxydcfqrvig496xkylvw2rn";
+
+ };
+in stdenv.mkDerivation rec {
+ name = "pypi2nix-${version}";
+ srcs = with deps; [ src pip click setuptools zcbuildout zcrecipeegg ];
+ buildInputs = [ python zip makeWrapper ];
+ sourceRoot = ".";
+
+ postUnpack = ''
+ mkdir -p $out/pkgs
+
+ mv pip-*/pip $out/pkgs/pip
+ mv click-*/click $out/pkgs/click
+ mv setuptools-*/setuptools $out/pkgs/setuptools
+ mv zc.buildout-*/src/zc $out/pkgs/zc
+ mv zc.recipe.egg-*/src/zc/recipe $out/pkgs/zc/recipe
+
+ if [ "$IN_NIX_SHELL" != "1" ]; then
+ if [ -e git-export ]; then
+ mv git-export/src/pypi2nix $out/pkgs/pypi2nix
+ else
+ mv pypi2nix*/src/pypi2nix $out/pkgs/pypi2nix
+ fi
+ fi
+ '';
+
+ commonPhase = ''
+ mkdir -p $out/bin
+
+ echo "#!${python}/bin/python" > $out/bin/pypi2nix
+ echo "import pypi2nix.cli" >> $out/bin/pypi2nix
+ echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
+
+ chmod +x $out/bin/pypi2nix
+
+ export PYTHONPATH=$out/pkgs:$PYTHONPATH
+ '';
+
+ installPhase = commonPhase + ''
+ wrapProgram $out/bin/pypi2nix --prefix PYTHONPATH : "$PYTHONPATH"
+ '';
+
+ shellHook = ''
+ export home=`pwd`
+ export out=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name
+
+ rm -rf $out
+ mkdir -p $out
+
+ cd $out
+ runHook unpackPhase
+ runHook commonPhase
+ cd $home
+
+ export PATH=$out/bin:$PATH
+ export PYTHONPATH=`pwd`/src:$PYTHONPATH
+ '';
+ meta = {
+ homepage = https://github.com/garbas/pypi2nix;
+ description = "A tool that generates nix expressions for your python packages, so you don't have to.";
+ maintainers = with stdenv.lib.maintainers; [ garbas ];
+ };
+}
diff --git a/pkgs/development/tools/pypi2nix/deps.nix b/pkgs/development/tools/pypi2nix/deps.nix
new file mode 100644
index 00000000000..39fc9329d5e
--- /dev/null
+++ b/pkgs/development/tools/pypi2nix/deps.nix
@@ -0,0 +1,68 @@
+{ fetchurl
+#, pypi_url ? "https://files.pythonhosted.org/packages"
+, pypi_url ? "https://pypi.io/packages/source/packages"
+}:
+
+rec {
+
+ pipVersion = "8.1.1";
+ pipHash = "6b86f11841e89c8241d689956ba99ed7";
+ pipWhlHash = "22db7b6a517a09c29d54a76650f170eb";
+
+ setuptoolsVersion = "21.0.0";
+ setuptoolsHash = "81964fdb89534118707742e6d1a1ddb4";
+ setuptoolsWhlHash = "6027400d6870a7dad29952b7d2dfdc7b";
+
+ zcbuildoutVersion = "2.5.1";
+ zcbuildoutHash = "c88947a3c021ee1509a331c4fa9be187";
+
+ zcrecipeeggVersion = "2.0.3";
+ zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4";
+
+ wheelVersion = "0.29.0";
+ wheelHash = "555a67e4507cedee23a0deb9651e452f";
+
+ clickVersion = "6.6";
+ clickHash = "d0b09582123605220ad6977175f3e51d";
+
+ pipWhl = fetchurl {
+ url = "https://pypi.python.org/packages/31/6a/0f19a7edef6c8e5065f4346137cc2a08e22e141942d66af2e1e72d851462/pip-${pipVersion}-py2.py3-none-any.whl";
+ md5 = pipWhlHash;
+ };
+
+ setuptoolsWhl = fetchurl {
+ url = "https://pypi.python.org/packages/15/b7/a76624e5a3b18c8c1c8d33a5240b34cdabb08aef2da44b536a8b53ba1a45/setuptools-${setuptoolsVersion}-py2.py3-none-any.whl";
+ md5 = setuptoolsWhlHash;
+ };
+
+ pip = fetchurl {
+ url = "${pypi_url}/source/p/pip/pip-${pipVersion}.tar.gz";
+ md5 = pipHash;
+ };
+
+ setuptools = fetchurl {
+ url = "${pypi_url}/source/s/setuptools/setuptools-${setuptoolsVersion}.tar.gz";
+ md5 = setuptoolsHash;
+ };
+
+ zcbuildout = fetchurl {
+ url = "${pypi_url}/source/z/zc.buildout/zc.buildout-${zcbuildoutVersion}.tar.gz";
+ md5 = zcbuildoutHash;
+ };
+
+ zcrecipeegg = fetchurl {
+ url = "${pypi_url}/source/z/zc.recipe.egg/zc.recipe.egg-${zcrecipeeggVersion}.tar.gz";
+ md5 = zcrecipeeggHash;
+ };
+
+ wheel = fetchurl {
+ url = "${pypi_url}/source/w/wheel/wheel-${wheelVersion}.tar.gz";
+ md5 = wheelHash;
+ };
+
+ click = fetchurl {
+ url = "${pypi_url}/source/c/click/click-${clickVersion}.tar.gz";
+ md5 = clickHash;
+ };
+
+}
diff --git a/pkgs/development/tools/redis-dump/.bundle/config b/pkgs/development/tools/redis-dump/.bundle/config
new file mode 100644
index 00000000000..b81abe028c3
--- /dev/null
+++ b/pkgs/development/tools/redis-dump/.bundle/config
@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: vendor
+BUNDLE_DISABLE_SHARED_GEMS: '1'
diff --git a/pkgs/development/tools/redis-dump/Gemfile b/pkgs/development/tools/redis-dump/Gemfile
new file mode 100644
index 00000000000..f78cb0873c0
--- /dev/null
+++ b/pkgs/development/tools/redis-dump/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'redis-dump'
diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/pkgs/development/tools/redis-dump/Gemfile.lock
new file mode 100644
index 00000000000..283a3815f22
--- /dev/null
+++ b/pkgs/development/tools/redis-dump/Gemfile.lock
@@ -0,0 +1,21 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ drydock (0.6.9)
+ redis (3.3.0)
+ redis-dump (0.3.5)
+ drydock (>= 0.6.9)
+ redis (>= 2.0)
+ uri-redis (>= 0.4.0)
+ yajl-ruby (>= 0.1)
+ uri-redis (0.4.2)
+ yajl-ruby (1.2.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ redis-dump
+
+BUNDLED WITH
+ 1.11.2
diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix
new file mode 100644
index 00000000000..bc1adf730a3
--- /dev/null
+++ b/pkgs/development/tools/redis-dump/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }:
+
+bundlerEnv {
+ name = "redis-dump-0.3.5";
+
+ inherit ruby;
+ gemfile = ./Gemfile;
+ lockfile = ./Gemfile.lock;
+ gemset = ./gemset.nix;
+
+ buildInputs = [ perl autoconf ];
+
+ meta = with lib; {
+ description = "Backup and restore your Redis data to and from JSON";
+ homepage = http://delanotes.com/redis-dump/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ offline ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/tools/redis-dump/gemset.nix b/pkgs/development/tools/redis-dump/gemset.nix
new file mode 100644
index 00000000000..4054f4bb0a7
--- /dev/null
+++ b/pkgs/development/tools/redis-dump/gemset.nix
@@ -0,0 +1,41 @@
+{
+ drydock = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0grf3361mh93lczljmnwafl7gbcp9kk1bjpfwx4ykpd43fzdbfyj";
+ type = "gem";
+ };
+ version = "0.6.9";
+ };
+ redis = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1v68ggm0pwcyml3ngfyngwgvypwmsrmji1kyx48qqcg045zjs5p6";
+ type = "gem";
+ };
+ version = "3.3.0";
+ };
+ redis-dump = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0y6s3nvcw84jqqvp9pjg9qmqyc0b8jkrp0dknhjjr0lg2q3fq87h";
+ type = "gem";
+ };
+ version = "0.3.5";
+ };
+ uri-redis = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13n8ak41rikkbmml054pir4i1xbgjpmf3dbqihc2kcrgmz3dg81a";
+ type = "gem";
+ };
+ version = "0.4.2";
+ };
+ yajl-ruby = {
+ source = {
+ sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+ type = "gem";
+ };
+ version = "1.2.1";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix
new file mode 100644
index 00000000000..134e94d1fc2
--- /dev/null
+++ b/pkgs/games/brogue/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, SDL, ncurses, libtcod, binutils }:
+
+stdenv.mkDerivation rec {
+ name = "brogue-${version}";
+ version = "1.7.4";
+
+ src = fetchurl {
+ url = "https://sites.google.com/site/broguegame/brogue-${version}-linux-amd64.tbz2";
+ sha256 = "1lygf17hm7wqlp0jppaz8dn9a9ksmxz12vw7jyfavvqpwdgz79gb";
+ };
+
+ prePatch = ''
+ sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \
+ -e 's,sdl-config,${SDL}/bin/sdl-config,g'
+ sed -i src/platform/tcod-platform.c -e "s,fonts/font,$out/share/brogue/fonts/font,g"
+ make clean
+ rm -rf src/libtcod*
+ '';
+
+ buildInputs = [ SDL ncurses libtcod ];
+
+ installPhase = ''
+ install -m 555 -D bin/brogue $out/bin/brogue
+ mkdir -p $out/share/brogue
+ cp -r bin/fonts $out/share/brogue/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A roguelike game";
+ homepage = https://sites.google.com/site/broguegame/;
+ license = licenses.agpl3;
+ maintainers = [ maintainers.skeidel ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix
index 1465a65a2bd..1d151b66920 100644
--- a/pkgs/games/ckan/default.nix
+++ b/pkgs/games/ckan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk }:
+{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk, curl }:
stdenv.mkDerivation rec {
name = "ckan-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0lfvl8w09lakz35szp5grfvhq8xx486f5igvj1m6azsql4n929lg";
};
- buildInputs = [ makeWrapper perl mono gtk ];
+ buildInputs = [ makeWrapper perl mono ];
postPatch = ''
substituteInPlace bin/build \
@@ -22,13 +22,15 @@ stdenv.mkDerivation rec {
doCheck = false;
checkTarget = "test";
+ libraries = stdenv.lib.makeLibraryPath [ gtk curl ];
+
installPhase = ''
mkdir -p $out/bin
for exe in *.exe; do
install -m 0644 $exe $out/bin
makeWrapper ${mono}/bin/mono $out/bin/$(basename $exe .exe) \
--add-flags $out/bin/$exe \
- --set LD_LIBRARY_PATH ${gtk.out}/lib
+ --set LD_LIBRARY_PATH $libraries
done
'';
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index cf96756b8b6..bf8dcb1ca63 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -1,17 +1,14 @@
{ stdenv, callPackage, fetchurl, makeWrapper
-# Begin libraries
, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu
-# Begin download parameters
-, username ? ""
-, password ? ""
, releaseType
+, username ? "" , password ? ""
}:
assert releaseType == "alpha" || releaseType == "headless";
with stdenv.lib;
let
- version = "0.12.29";
+ version = "0.12.33";
isHeadless = releaseType == "headless";
arch = if stdenv.system == "x86_64-linux" then {
@@ -28,12 +25,12 @@ let
url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; # TODO take this from 302 redirection somehow? fetchurl doesn't help.
x64 = {
- headless = fetchurl { inherit name url; sha256 = "1hr5dhpfagknjjd47qw3fa3ap8ikjc9hvxavrg4mpslbr0iqww8v"; };
- alpha = authenticatedFetch { inherit url; sha256 = "0vngfrjjib99k6czhg32rikfi36i3p3adx4mxc1z8bi5n70dbwqb"; };
+ headless = fetchurl { inherit name url; sha256 = "073bwkpw2bwhbr3m8k3imlns89x5035xl4b7yq1c6npm4m7qcdnp"; };
+ alpha = authenticatedFetch { inherit url; sha256 = "0dmq0kvzz885gcvj57h22icqhx0nvyfav4dvwsvpi15833208ca3"; };
};
i386 = {
headless = abort "Factorio 32-bit headless binaries are not available for download.";
- alpha = authenticatedFetch { inherit url; sha256 = "10135rd9103x79i89p6fh5ssmw612012yyx3yyhb3nzl554zqzbm"; };
+ alpha = authenticatedFetch { inherit url; sha256 = "1yxv6kr89iavpfsg21fx3q12m97ls0m9h3x33m4xnqp8px55851v"; };
};
};
@@ -55,15 +52,51 @@ let
fi
'';
-in
+ base = {
+ name = "factorio-${releaseType}-${version}";
-stdenv.mkDerivation rec {
- name = "factorio-${releaseType}-${version}";
+ src = fetch.${arch.inTar}.${releaseType};
- src = fetch.${arch.inTar}.${releaseType};
+ dontBuild = true;
- libPath = stdenv.lib.makeLibraryPath (
- optionals (! isHeadless) [
+ # TODO detangle headless/normal mode wrapping, libs, etc. test all urls 32/64/headless/gfx
+ installPhase = ''
+ mkdir -p $out/{bin,share/factorio}
+ cp -a data $out/share/factorio
+ cp -a bin/${arch.inTar}/factorio $out/bin/factorio
+ patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ $out/bin/factorio
+ '';
+
+ preferLocalBuild = true;
+
+ meta = {
+ description = "A game in which you build and maintain factories";
+ longDescription = ''
+ Factorio is a game in which you build and maintain factories.
+
+ You will be mining resources, researching technologies, building
+ infrastructure, automating production and fighting enemies. Use your
+ imagination to design your factory, combine simple elements into
+ ingenious structures, apply management skills to keep it working and
+ finally protect it from the creatures who don't really like you.
+
+ Factorio has been in development since spring of 2012 and it is
+ currently in late alpha.
+ '';
+ homepage = https://www.factorio.com/;
+ license = stdenv.lib.licenses.unfree;
+ maintainers = with stdenv.lib.maintainers; [ Baughn elitak ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+ };
+ headless = base;
+ alpha = base // {
+
+ buildInputs = [ makeWrapper ];
+
+ libPath = stdenv.lib.makeLibraryPath [
alsaLib
libX11
libXcursor
@@ -71,61 +104,25 @@ stdenv.mkDerivation rec {
libXrandr
libXi
mesa_noglu
- ]
- );
+ ];
- buildInputs = [ makeWrapper ];
+ installPhase = base.installPhase + ''
+ wrapProgram $out/bin/factorio \
+ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
+ --run "$out/share/factorio/update-config.sh" \
+ --add-flags "-c \$HOME/.factorio/config.cfg"
- dontBuild = true;
+ install -m0644 <(cat << EOF
+ ${configBaseCfg}
+ EOF
+ ) $out/share/factorio/config-base.cfg
- # TODO detangle headless/normal mode wrapping, libs, etc. test all urls 32/64/headless/gfx
- installPhase = ''
- mkdir -p $out/{bin,share/factorio}
- cp -a data $out/share/factorio
- cp -a bin/${arch.inTar}/factorio $out/bin/factorio
- patchelf \
- --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- $out/bin/factorio
+ install -m0755 <(cat << EOF
+ ${updateConfigSh}
+ EOF
+ ) $out/share/factorio/update-config.sh
- '' + optionalString (! isHeadless) (''
- mv $out/bin/factorio $out/bin/factorio.${arch.inTar}
- makeWrapper $out/bin/factorio.${arch.inTar} $out/bin/factorio \
- --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
- --run "$out/share/factorio/update-config.sh" \
- --add-flags "-c \$HOME/.factorio/config.cfg"
- # Fortunately, Factorio already supports system-wide installs.
- # Unfortunately it's a bit inconvenient to set the paths.
- install -m0644 <(cat << EOF
- '' + configBaseCfg + ''
- EOF
- ) $out/share/factorio/config-base.cfg
-
- install -m0755 <(cat << EOF
- '' + updateConfigSh + ''
- EOF
- ) $out/share/factorio/update-config.sh
- cp -a doc-html $out/share/factorio
- '');
-
- preferLocalBuild = true;
-
- meta = {
- description = "A game in which you build and maintain factories";
- longDescription = ''
- Factorio is a game in which you build and maintain factories.
-
- You will be mining resources, researching technologies, building
- infrastructure, automating production and fighting enemies. Use your
- imagination to design your factory, combine simple elements into
- ingenious structures, apply management skills to keep it working and
- finally protect it from the creatures who don't really like you.
-
- Factorio has been in development since spring of 2012 and it is
- currently in late alpha.
+ cp -a doc-html $out/share/factorio
'';
- homepage = https://www.factorio.com/;
- license = stdenv.lib.licenses.unfree;
- maintainers = with stdenv.lib.maintainers; [ Baughn elitak ];
- platforms = [ "i686-linux" "x86_64-linux" ];
};
-}
+in stdenv.mkDerivation (if isHeadless then headless else alpha)
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index 475a844c1ab..2203bb6337e 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2,
+{ stdenv, lib, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2,
SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }:
assert withOpenal -> openal != null;
@@ -20,11 +20,10 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs =
- with stdenv.lib;
[ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
- ++ optional withOpenal openal;
+ ++ lib.optional withOpenal openal;
- cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" ];
+ cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ];
enableParallelBuilding = true;
@@ -34,17 +33,10 @@ stdenv.mkDerivation rec {
};
preBuild = ''
- cp $devPack Resources/DevPaks27.zip
- unzip -u -o Resources/DevPaks27.zip -d Resources/DevPak
+ unzip -u -o $devPack -d Resources/DevPak
'';
- # OpenAL is loaded dynamicly
- postInstall =
- if withOpenal then ''
- wrapProgram "$out/bin/openspades" \
- --prefix LD_LIBRARY_PATH : "${openal}/lib"
- ''
- else null;
+ NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal";
meta = with stdenv.lib; {
description = "A compatible client of Ace of Spades 0.75";
diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix
new file mode 100644
index 00000000000..8212f160cda
--- /dev/null
+++ b/pkgs/games/openspades/git.nix
@@ -0,0 +1,43 @@
+{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, curl, glew, makeWrapper, mesa, SDL2,
+ SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }:
+
+assert withOpenal -> openal != null;
+
+stdenv.mkDerivation rec {
+ name = "openspades-${version}";
+ version = "2016-04-17";
+
+ src = fetchFromGitHub {
+ owner = "yvt";
+ repo = "openspades";
+ rev = "cadc0b6a57fbee05abcaf42d15664502c94b58cf";
+ sha256 = "0vyvmgim03q8pcmfa1i0njr4w1lpjq5g3b47f67v9b5c5jcjycwn";
+ };
+
+ nativeBuildInputs =
+ with stdenv.lib;
+ [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
+ ++ lib.optional withOpenal openal;
+
+ cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ];
+
+ #enableParallelBuilding = true;
+
+ devPack = fetchurl {
+ url = "http://yvt.jp/files/programs/osppaks/DevPaks29.zip";
+ sha256 = "1fhwxm6wifg0l3ykmiiqa1h4ch5ika2kw2j0v9xnrz24cabsi6cc";
+ };
+
+ preBuild = ''
+ unzip -u -o $devPack -d Resources/DevPak
+ '';
+
+ NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal";
+
+ meta = with stdenv.lib; {
+ description = "A compatible client of Ace of Spades 0.75";
+ homepage = "https://github.com/yvt/openspades/";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index f919b9683e6..a07cc6dca3b 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -1,32 +1,36 @@
{ stdenv, fetchurl, unzip }:
+
+let arch = if stdenv.isx86_64 then "x86-64" else
+ if stdenv.isi686 then "x86-32" else
+ "unknown";
+in
+
stdenv.mkDerivation rec {
- version = "6";
- name = "stockfish-${version}";
+
+ name = "stockfish-7";
+
src = fetchurl {
- url = https://stockfish.s3.amazonaws.com/stockfish-6-src.zip;
- sha256 = "a69a371d3f84338cefde4575669bd930d186b046a10fa5ab0f8d1aed6cb204c3";
+ url = "https://stockfish.s3.amazonaws.com/${name}-src.zip";
+ sha256 = "0djzg3h5d9qs27snf0rr6zl6iaki1jb84v8m8k3c2lcjbj2vpwc9";
};
- buildPhase = ''
- cd src
- make build ARCH=x86-64
- '';
- buildInputs = [
- stdenv
- unzip
- ];
+
+ buildInputs = [ unzip ];
+ postUnpack = "sourceRoot+=/src";
+ makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ];
+ buildFlags = "build ";
+
enableParallelBuilding = true;
- installPhase = ''
- mkdir -p $out/bin
- cp -pr stockfish $out/bin
- '';
+
meta = with stdenv.lib; {
- homepage = https://stockfishchess.org/;
+ homepage = "https://stockfishchess.org/";
description = "Strong open source chess engine";
longDescription = ''
Stockfish is one of the strongest chess engines in the world. It is also
much stronger than the best human chess grandmasters.
'';
- maintainers = with maintainers; [ luispedro ];
+ maintainers = with maintainers; [ luispedro simons ];
+ platforms = with platforms; i686 ++ x86_64;
license = licenses.gpl2;
};
+
}
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index 436ac958f34..24e54c7b13a 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -1,40 +1,42 @@
-{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkgconfig
-, makeWrapper, enet, libXcursor }:
+{ fetchurl, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkgconfig
+, makeWrapper, enet, libXcursor, bullet, openal }:
stdenv.mkDerivation rec {
name = "stunt-rally-${version}";
version = "2.6";
- src = fetchgit {
- url = git://github.com/stuntrally/stuntrally.git;
- rev = "refs/tags/${version}";
- sha256 = "0rrfmldl6m7igni1n4rv2i0s2q5j1ik8dh05ydkaqrpcky96bdr8";
+ src = fetchurl {
+ url = "https://github.com/stuntrally/stuntrally/archive/${version}.tar.gz";
+ sha256 = "1jmsxd2isq9q5paz43c3xw11vr5md1ym8h34b768vxr6gp90khwc";
};
- tracks = fetchgit {
- url = git://github.com/stuntrally/tracks.git;
- rev = "refs/tags/${version}";
- sha256 = "186qqyr1nrabfzsgy7b4sjgm38mgd875f4c7qwkm8k2bl7zjkrm2";
+ tracks = fetchurl {
+ url = "https://github.com/stuntrally/tracks/archive/${version}.tar.gz";
+ sha256 = "0yv88l9s03kp1xkkwnigh0jj593vi3r7vgyg0jn7i8d22q2p1kjb";
};
+ # include/OGRE/OgreException.h:265:126: error: invalid conversion from
+ # 'int' to 'Ogre::Exception::ExceptionCodes' [-fpermissive]
+ NIX_CFLAGS_COMPILE="-fpermissive";
+
preConfigure = ''
- cp -R ${tracks} data/tracks
- chmod u+rwX -R data
+ pushd data
+ tar xf ${tracks}
+ mv tracks-2.6 tracks
+ popd
'';
buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis pkgconfig
- makeWrapper enet libXcursor
+ makeWrapper enet libXcursor bullet openal
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Stunt Rally game with Track Editor, based on VDrift and OGRE";
- homepage = http://code.google.com/p/vdrift-ogre/;
+ homepage = http://stuntrally.tuxfamily.org/;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
- # Build failure
- broken = true;
};
}
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 3b39a685a2d..d90bb66410c 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -10,16 +10,16 @@
let
name = "hplip-${version}";
- version = "3.16.3";
+ version = "3.16.5";
src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz";
- sha256 = "1501qdnkjp1ybgagy5188fmf6cgmj5555ygjl3543nlbwcp31lj2";
+ sha256 = "1nay65q1zmx2jxiwn66n7mlr73azacz5097gw98kqqf90dh522f6";
};
plugin = fetchurl {
url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
- sha256 = "03q730w0kbh8i55i95vfb59yc0kjxz01hjpb3l05w2jw3hmfzvdp";
+ sha256 = "15qrcd3ndnxri6pfdfmsjyv2f3zfkig80yghs76jbsm106rp8g3q";
};
hplipState =
diff --git a/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix
index de0060032f7..555e1ef508c 100644
--- a/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix
+++ b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "2.2.3";
+ version = "2.5.1";
name = "numix-gtk-theme-${version}";
src = fetchurl {
- url = "https://github.com/shimmerproject/Numix/archive/v${version}.tar.gz";
- sha256 = "b0acc2d81300b898403766456d3406304553cc7016677381f3179dbeb1192a2d";
+ url = "https://github.com/numixproject/Numix/archive/v${version}.tar.gz";
+ sha256 = "0y6c4xr2n9sygxhgviwd97l02n17n53bkpfp62srkm05cq0jy87k";
};
dontBuild = true;
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index e30073339fd..1bc2570f157 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -67,7 +67,9 @@ rec {
Gundo = gundo-vim; # backwards compat, added 2015-10-03
haskellConceal = haskellconceal; # backwards compat, added 2014-10-18
haskellconceal = vim-haskellconceal;
+ haskellConcealPlus = vim-haskellConcealPlus;
hier = vim-hier;
+ hlint-refactor = hlint-refactor-vim;
hoogle = Hoogle;
ipython = vim-ipython;
latex-live-preview = vim-latex-live-preview;
@@ -1703,4 +1705,37 @@ rec {
dependencies = [];
};
+
+ vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-haskellConcealPlus-2015-11-14";
+ src = fetchgit {
+ url = "git://github.com/enomsg/vim-haskellConcealPlus";
+ rev = "fdd4e15800121edcb72e050650b02537af2d64ce";
+ sha256 = "0dw9ibj54bnszvkzxhfdwxwyjlv5a5k1pbyjmbw44ldqx48x4651";
+ };
+ dependencies = [];
+
+ };
+
+ hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "hlint-refactor-vim-2015-12-05";
+ src = fetchgit {
+ url = "git://github.com/mpickering/hlint-refactor-vim";
+ rev = "fffb044ecef854a82c5c2efda252e09044ba03e0";
+ sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8";
+ };
+ dependencies = [];
+
+ };
+
+ haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "haskell-vim-2016-04-18";
+ src = fetchgit {
+ url = "git://github.com/neovimhaskell/haskell-vim";
+ rev = "40bb7c933d2e95432571fcb353d69323a1432d4e";
+ sha256 = "08da8hp1jirxzlwbnzf2zlpzya1jc74mahwsb37xnbs6hgvvpd86";
+ };
+ dependencies = [];
+
+ };
}
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 2b8d71b8760..7a2f018a81b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -30,6 +30,7 @@
"github:digitaltoad/vim-jade"
"github:eagletmt/neco-ghc"
"github:esneider/YUNOcommit.vim"
+"github:enomsg/vim-haskellConcealPlus"
"github:fatih/vim-go"
"github:flazz/vim-colorschemes"
"github:google/vim-jsonnet"
@@ -56,7 +57,9 @@
"github:lyokha/vim-xkbswitch"
"github:mhinz/vim-startify"
"github:mkasa/lushtags"
+"github:mpickering/hlint-refactor-vim"
"github:nbouscal/vim-stylish-haskell"
+"github:neovimhaskell/haskell-vim"
"github:osyo-manga/shabadou.vim"
"github:osyo-manga/vim-watchdogs"
"github:racer-rust/vim-racer"
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 5f328bd90c8..6813b5bcf1b 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "iproute2-4.3.0";
+ name = "iproute2-4.5.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
- sha256 = "159988vv3fd78bzhisfl1dl4dd7km3vjzs2d8899a0vcvn412fzh";
+ sha256 = "0jj9phsi8m2sbnz7bbh9cf9vckm67hs62ab5srdwnrg4acpjj59z";
};
patches = lib.optionals enableFan [
diff --git a/pkgs/os-specific/linux/iptables/1.6.nix b/pkgs/os-specific/linux/iptables/1.6.nix
deleted file mode 100644
index 88821a15d73..00000000000
--- a/pkgs/os-specific/linux/iptables/1.6.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}:
-
-stdenv.mkDerivation rec {
- name = "iptables-${version}";
- version = "1.6.0";
-
- src = fetchurl {
- url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
- sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
- };
-
- nativeBuildInputs = [bison flex];
-
- buildInputs = [libnetfilter_conntrack libnftnl libmnl];
-
- preConfigure = ''
- export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
- '';
-
- configureFlags = ''
- --enable-devel
- --enable-shared
- '';
-
- meta = {
- description = "A program to configure the Linux IP packet filtering ruleset";
- homepage = http://www.netfilter.org/projects/iptables/index.html;
- platforms = stdenv.lib.platforms.linux;
- downloadPage = "http://www.netfilter.org/projects/iptables/files/";
- updateWalker = true;
- inherit version;
- };
-}
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index ba3ee64f08b..8c815029661 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -1,14 +1,22 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}:
stdenv.mkDerivation rec {
name = "iptables-${version}";
- version = "1.4.21"; # before updating check #12178
+ version = "1.6.0";
src = fetchurl {
url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
- sha256 = "1q6kg7sf0pgpq0qhab6sywl23cngxxfzc9zdzscsba8x09l4q02j";
+ sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
};
+ nativeBuildInputs = [bison flex];
+
+ buildInputs = [libnetfilter_conntrack libnftnl libmnl];
+
+ preConfigure = ''
+ export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
+ '';
+
configureFlags = ''
--enable-devel
--enable-shared
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 73ce1e7780a..31ba5e1152c 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -1,22 +1,43 @@
-{ stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11
-, mujs, mupdf, ncurses, openjpeg, openssl }:
+{ stdenv, fetchFromGitHub
+, freetype, harfbuzz, jbig2dec, libjpeg, libX11, mujs, mupdf, ncurses, openjpeg
+, openssl
+
+, imageSupport ? true, imlib2 ? null }:
let
- binaries = [ "jfbpdf" "jfbview" "jpdfcat" "jpdfgrep" ];
+ package = if imageSupport
+ then "jfbview"
+ else "jfbpdf";
+ binaries = if imageSupport
+ then [ "jfbview" "jpdfcat" "jpdfgrep" ] # all require imlib2
+ else [ "jfbpdf" ]; # does not
in
+
stdenv.mkDerivation rec {
- name = "jfbview-${version}";
- version = "0.5.1";
+ name = "${package}-${version}";
+ version = "0.5.2";
src = fetchFromGitHub {
- sha256 = "113bkf49q04k9rjps5l28ychmzsfjajp9cjhr433s9ld0972z01m";
+ sha256 = "1vd2ndl4ar2bzqf0k11qid6gvma59qg62imsa81mgczsqw7kvbx6";
rev = version;
repo = "JFBView";
owner = "jichu4n";
};
- buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf
- ncurses openjpeg openssl ];
+ buildInputs = [
+ freetype harfbuzz jbig2dec libjpeg libX11 mujs mupdf ncurses openjpeg
+ openssl
+ ] ++ stdenv.lib.optionals imageSupport [
+ imlib2
+ ];
+
+ configurePhase = ''
+ # Hack. Probing (`ldconfig -p`) fails with ‘cannot execute binary file’.
+ # Overriding `OPENJP2 =` later works, but makes build output misleading:
+ substituteInPlace Makefile --replace "ldconfig -p" "echo libopenjp2"
+
+ make config.mk
+ '';
buildFlags = binaries;
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 6b997943d7c..ab41e369b6a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.4.8";
+ version = "4.4.9";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "02gf7dkdibhxv8n4qfnyqh645d102g9z7pdid8pcq4jhd99sg9yj";
+ sha256 = "1fgkcl1dgljb4s8ciwc4gpz5g92cf6x31rj7016bd6r0hmvcl1bn";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.5.nix b/pkgs/os-specific/linux/kernel/linux-4.5.nix
index 267d0d58de4..469ca05bb91 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.5.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.5.2";
+ version = "4.5.3";
extraMeta.branch = "4.5";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "17r063zx880ka3ayv9cf1yjfilvxlifhja1rhw5z3w35hgdkj8z3";
+ sha256 = "1z0265cxv63br147vridmcqbz3cx3q3finy40hwljwv1r2lggid4";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
index 267d0d58de4..469ca05bb91 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.5.2";
+ version = "4.5.3";
extraMeta.branch = "4.5";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "17r063zx880ka3ayv9cf1yjfilvxlifhja1rhw5z3w35hgdkj8z3";
+ sha256 = "1z0265cxv63br147vridmcqbz3cx3q3finy40hwljwv1r2lggid4";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 5f2bc2d2c55..8da8f20eae2 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -109,6 +109,7 @@ let
buildFlags = [
"KBUILD_BUILD_VERSION=1-NixOS"
platform.kernelTarget
+ "vmlinux" # for "perf" and things like that
] ++ optional isModular "modules";
installFlags = [
@@ -122,7 +123,10 @@ let
if platform.kernelTarget == "zImage" then "zinstall" else
"install") ];
- postInstall = (optionalString installsFirmware ''
+ postInstall = ''
+ mkdir -p $dev
+ cp $buildRoot/vmlinux $dev/
+ '' + (optionalString installsFirmware ''
mkdir -p $out/lib/firmware
'') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
make $makeFlags "''${makeFlagsArray[@]}" dtbs
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c4bc4513395..c22ef98249c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -105,9 +105,9 @@ rec {
grsecurity_4_5 = grsecPatch
{ kernel = pkgs.grsecurity_base_linux_4_5;
patches = [ grsecurity_fix_path_4_5 ];
- kversion = "4.5.2";
- revision = "201604290633";
- sha256 = "0qrs4fk6lyqngq3fnsmrv0y3yp1lrbiwadfc6v7hy4lyv77wz107";
+ kversion = "4.5.3";
+ revision = "201605060852";
+ sha256 = "1yg5fp60nay2cvnpxnx29995wk04r995y9030dwkgk3xpxifr6z1";
};
grsecurity_latest = grsecurity_4_5;
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index c8484babcdf..13d2fb7f5c5 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -1,27 +1,55 @@
-{ stdenv, fetchurl, attr, perl }:
+{ stdenv, fetchurl, attr, perl, pam ? null }:
+assert pam != null -> stdenv.isLinux;
stdenv.mkDerivation rec {
name = "libcap-${version}";
- version = "2.24";
+ version = "2.25";
src = fetchurl {
url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz";
- sha256 = "0rbc9qbqs5bp9am9s9g83wxj5k4ixps2agy9dxr1v1fwg27mdr6f";
+ sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39";
};
- outputs = [ "dev" "out" ];
+ outputs = [ "dev" "lib" "doc" "out" ]
+ ++ stdenv.lib.optional (pam != null) "pam";
nativeBuildInputs = [ perl ];
+
+ buildInputs = [ pam ];
+
propagatedBuildInputs = [ attr ];
- preConfigure = "cd libcap";
+ makeFlags = [
+ "lib=lib"
+ (stdenv.lib.optional (pam != null) "PAM_CAP=yes")
+ ];
- makeFlags = "lib=lib prefix=$(out)";
+ prePatch = ''
+ # use relative bash path
+ substituteInPlace progs/capsh.c --replace "/bin/bash" "bash"
+
+ # ensure capsh can find bash in $PATH
+ substituteInPlace progs/capsh.c --replace execve execvpe
+ '';
+
+ preInstall = ''
+ substituteInPlace Make.Rules \
+ --replace 'prefix=/usr' "prefix=$lib" \
+ --replace 'exec_prefix=' "exec_prefix=$out" \
+ --replace 'lib_prefix=$(exec_prefix)' "lib_prefix=$lib" \
+ --replace 'inc_prefix=$(prefix)' "inc_prefix=$dev" \
+ --replace 'man_prefix=$(prefix)' "man_prefix=$doc"
+ '';
+
+ installFlags = "RAISE_SETFCAP=no";
postInstall = ''
- rm "$out"/lib/*.a
- mkdir -p "$dev/share/doc/${name}"
- cp ../License "$dev/share/doc/${name}/License"
+ rm "$lib"/lib/*.a
+ mkdir -p "$doc/share/doc/${name}"
+ cp License "$doc/share/doc/${name}/"
+ '' + stdenv.lib.optionalString (pam != null) ''
+ mkdir -p "$pam/lib/security"
+ mv "$lib"/lib/security "$pam/lib"
'';
meta = {
diff --git a/pkgs/os-specific/linux/libcap/man.nix b/pkgs/os-specific/linux/libcap/man.nix
deleted file mode 100644
index eeb780f095b..00000000000
--- a/pkgs/os-specific/linux/libcap/man.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, libcap}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation rec {
- name = "libcap-docs-${libcap.version}";
-
- inherit (libcap) src;
-
- makeFlags = "MANDIR=$(out)/share/man";
-
- preConfigure = "cd doc";
-}
diff --git a/pkgs/os-specific/linux/libcap/pam.nix b/pkgs/os-specific/linux/libcap/pam.nix
deleted file mode 100644
index 3dd7cd947af..00000000000
--- a/pkgs/os-specific/linux/libcap/pam.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, pam, libcap}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation rec {
- name = "libcap-pam-${libcap.version}";
-
- inherit (libcap) src;
-
- buildInputs = [ libcap pam ];
-
- preConfigure = "cd pam_cap";
-
- makeFlags = "${libcap.makeFlags} PAM_CAP=yes";
-}
diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix
deleted file mode 100644
index e3871f15f88..00000000000
--- a/pkgs/os-specific/linux/libcap/progs.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{stdenv, libcap}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation rec {
- name = "libcap-progs-${libcap.version}";
-
- inherit (libcap) src makeFlags;
-
- buildInputs = [ libcap ];
-
- prePatch = ''
- # use relative bash path
- substituteInPlace progs/capsh.c --replace "/bin/bash" "bash"
-
- # ensure capsh can find bash in $PATH
- substituteInPlace progs/capsh.c --replace execve execvpe
- '';
-
- preConfigure = "cd progs";
-
- installFlags = "RAISE_SETFCAP=no";
-
- postInstall = ''
- mkdir -p "$out/share/doc/${name}"
- cp ../License "$out/share/doc/${name}/"
- '';
-}
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 9147cb81371..5af100eacb2 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, enable_dmeventd ? false }:
+{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid, enable_dmeventd ? false }:
let
version = "2.02.140";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libudev ];
+ buildInputs = [ libudev libuuid ];
preConfigure =
''
diff --git a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
index cca9dc09e93..b4997714cea 100644
--- a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
+++ b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Set the energy versus performance policy preference bias on recent X86 processors";
- homepage = https://www.kernel.org.org/;
+ homepage = https://www.kernel.org/;
license = licenses.gpl2;
platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific
};
diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
index 4854f9e18dd..18cfe488f83 100644
--- a/pkgs/servers/http/4store/default.nix
+++ b/pkgs/servers/http/4store/default.nix
@@ -1,48 +1,44 @@
-x@{builderDefsPackage
- , librdf_raptor, librdf_rasqal,
- glib, libxml2, pcre, avahi,
- readline, ncurses, expat,
- zlib, pkgconfig, which,
- perl, libuuid, gmp, mpfr
- , db_dir ? "/var/lib/4store"
- , ...}:
-builderDefsPackage
-(a :
-let
- s = import ./src-for-default.nix;
- helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
- ["db_dir"];
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-in
-rec {
- src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchFromGitHub, librdf_raptor
+, librdf_rasqal, glib, libxml2, pcre
+, avahi, readline, ncurses, expat, autoreconfHook
+, zlib, pkgconfig, which, perl, libuuid
+, gmp, mpfr
+, db_dir ? "/var/lib/4store" }:
- inherit (s) name;
- inherit buildInputs;
- /* doConfigure should be removed if not needed */
- phaseNames = ["doFixConfigure" "doConfigure" "doMakeInstall"
- "fixInterpreter"];
+stdenv.mkDerivation rec {
+ name = "4store-${version}";
+ version = "1.1.6";
- doFixConfigure = a.fullDepEntry ''
- sed -e 's@#! */bin/bash@#! ${a.stdenv.shell}@' -i configure
+ src = fetchFromGitHub {
+ owner = "garlik";
+ repo = "4store";
+ rev = "v${version}";
+ sha256 = "1kzdfmwpzy64cgqlkcz5v4klwx99w0jk7afckyf7yqbqb4rydmpk";
+ };
+
+ buildInputs = [ librdf_raptor librdf_rasqal glib libxml2 pcre
+ avahi readline ncurses expat zlib pkgconfig which perl libuuid
+ gmp mpfr autoreconfHook ];
+
+ # needed for ./autogen.sh
+ prePatch = ''
+ echo "${version}" > .version
+ '';
+
+ preConfigure = ''
+ sed -e 's@#! */bin/bash@#! ${stdenv.shell}@' -i configure
find . -name Makefile -exec sed -e "s@/usr/local@$out@g" -i '{}' ';'
- sed -e 's@/var/lib/4store@${db_dir}@g' -i src/common/params.h src/utilities/*
+ rm src/utilities/4s-backend
+ sed -e 's@/var/lib/4store@${db_dir}@g' -i configure.ac src/utilities/*
sed -e '/FS_STORE_ROOT/d' -i src/utilities/Makefile*
- '' ["minInit" "doUnpack"];
+ '';
- fixInterpreter = (a.doPatchShebangs "$out/bin");
-
- meta = {
+ meta = with stdenv.lib; {
description = "SparQL query server (RDF storage)";
homepage = http://4store.org/;
- maintainers = with a.lib.maintainers;
- [
- raskin
- ];
- platforms = with a.lib.platforms;
- linux;
+ maintainers = with maintainers; [ raskin ];
+ platforms = platforms.linux;
};
-}) x
+}
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index b3bc092dc40..c522f442e2f 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,34 +1,29 @@
{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
, gd, geoip
+, withStream ? false
, modules ? []
, hardening ? true
}:
with stdenv.lib;
-let
- version = "1.8.1";
- mainSrc = fetchurl {
- url = "http://nginx.org/download/nginx-${version}.tar.gz";
- sha256 = "1dwpyw4pvhj68vxramqxm8f79pqz9lrm8mvifbn49h3615ikqjwg";
- };
-
-in
-
stdenv.mkDerivation rec {
name = "nginx-${version}";
- src = mainSrc;
+ version = "1.10.0";
+
+ src = fetchurl {
+ url = "http://nginx.org/download/nginx-${version}.tar.gz";
+ sha256 = "0kdyqa5xaxvhz6y75ixs05mzygk3kszzdq5h0gnlrg35vp1lgmlf";
+ };
+
buildInputs =
[ openssl zlib pcre libxml2 libxslt gd geoip ]
++ concatMap (mod: mod.inputs or []) modules;
configureFlags = [
- "--with-select_module"
- "--with-poll_module"
- "--with-threads"
"--with-http_ssl_module"
- "--with-http_spdy_module"
+ "--with-http_v2_module"
"--with-http_realip_module"
"--with-http_addition_module"
"--with-http_xslt_module"
@@ -48,11 +43,11 @@ stdenv.mkDerivation rec {
"--with-ipv6"
# Install destination problems
# "--with-http_perl_module"
- ] ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd))
- [ "--with-file-aio" "--with-aio_module" ]
+ ] ++ optional withStream "--with-stream"
+ ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules;
- NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
+ NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
+ optionalString (hardening && (stdenv.cc.cc.isGNU or false)) ''
@@ -63,6 +58,10 @@ stdenv.mkDerivation rec {
''
;
+ postInstall = ''
+ mv $out/sbin $out/bin
+ '';
+
meta = {
description = "A reverse proxy and lightweight webserver";
homepage = http://nginx.org;
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
deleted file mode 100644
index 5af882bac52..00000000000
--- a/pkgs/servers/http/nginx/unstable.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
-, gd, geoip
-, withStream ? false
-, modules ? []
-, hardening ? true
-}:
-
-with stdenv.lib;
-
-let
- version = "1.9.14";
- mainSrc = fetchurl {
- url = "http://nginx.org/download/nginx-${version}.tar.gz";
- sha256 = "1ljpyigqb6sbm4f8mi4fyvwfcvfapzg4z35s9cwb9ri8dl3r6j1b";
- };
-
-in
-
-stdenv.mkDerivation rec {
- name = "nginx-${version}";
- src = mainSrc;
-
- buildInputs =
- [ openssl zlib pcre libxml2 libxslt gd geoip ]
- ++ concatMap (mod: mod.inputs or []) modules;
-
- configureFlags = [
- "--with-http_ssl_module"
- "--with-http_v2_module"
- "--with-http_realip_module"
- "--with-http_addition_module"
- "--with-http_xslt_module"
- "--with-http_image_filter_module"
- "--with-http_geoip_module"
- "--with-http_sub_module"
- "--with-http_dav_module"
- "--with-http_flv_module"
- "--with-http_mp4_module"
- "--with-http_gunzip_module"
- "--with-http_gzip_static_module"
- "--with-http_auth_request_module"
- "--with-http_random_index_module"
- "--with-http_secure_link_module"
- "--with-http_degradation_module"
- "--with-http_stub_status_module"
- "--with-ipv6"
- # Install destination problems
- # "--with-http_perl_module"
- ] ++ optional withStream "--with-stream"
- ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
- ++ map (mod: "--add-module=${mod.src}") modules;
-
- NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
-
- preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
- + optionalString (hardening && (stdenv.cc.cc.isGNU or false)) ''
- configureFlagsArray=(
- --with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
- --with-ld-opt="-pie -Wl,-z,relro,-z,now"
- )
- ''
- ;
-
- postInstall = ''
- mv $out/sbin $out/bin
- '';
-
- meta = {
- description = "A reverse proxy and lightweight webserver";
- homepage = http://nginx.org;
- license = licenses.bsd2;
- platforms = platforms.all;
- maintainers = with maintainers; [ thoughtpolice raskin ];
- };
-}
diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix
index c8e4e92a404..f3c566596c4 100644
--- a/pkgs/tools/archivers/unarj/default.nix
+++ b/pkgs/tools/archivers/unarj/default.nix
@@ -14,8 +14,11 @@ stdenv.mkDerivation rec {
sed -i -e s,/usr/local/bin,$out/bin, Makefile
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Unarchiver of ARJ files";
- license = stdenv.lib.licenses.free;
+ license = licenses.free;
+ maintainers = with maintainers; [ nckx ];
+ # Vulnerable to CVE-2015-0557 & possibly CVE-2015-0556, CVE-2015-2782:
+ broken = true;
};
}
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 3b647dc5283..eb23524d3ac 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, unzip }:
stdenv.mkDerivation rec {
name = "zpaq-${version}";
- version = "7.12";
+ version = "7.13";
src = let
mungedVersion = with stdenv.lib; concatStrings (splitString "." version);
in fetchurl {
- sha256 = "1lgkxiinam80pqqyvs3x845k6kf0wgw121vz0gr8za4blb756n30";
+ sha256 = "06fry12c92nxds2m5cd69h0cpxvp0mxhssagmjiwxpmgn57wy84i";
url = "http://mattmahoney.net/dc/zpaq${mungedVersion}.zip";
};
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index 3bd44fb07b7..f0dfee7882a 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -22,9 +22,13 @@ in
mkdir -p "$out/etc/bash_completion.d"
cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d"
- # FIXME: What's the right place for `autojump.zsh'?
- # This can be used as a workaround in .zshrc:
- # . $HOME/.nix-profile/share/autojump/autojump.zsh
+ cat <