Merge remote-tracking branch 'upstream/master' into xfce4-whiskermenu-plugin

Merge upstream.
2015-10-14 16:26:40 -04:00 · 2015-10-14 16:26:40 -04:00 · 3d087ed3b1
parent 79321fbecd 66fc345cba
commit 3d087ed3b1
115 changed files with 1113 additions and 443 deletions
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -81,6 +81,7 @@
  dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";
  dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>";
  dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
+  dochang = "Desmond O. Chang <dochang@gmail.com>";
  doublec = "Chris Double <chris.double@double.co.nz>";
  ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
  ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
@ -101,6 +102,7 @@
  fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
  forkk = "Andrew Okin <forkk@forkk.net>";
  fpletz = "Franz Pletz <fpletz@fnordicwalking.de>";
+  fps = "Florian Paul Schmidt <mista.tapas@gmx.net>";
  fridh = "Frederik Rietdijk <fridh@fridh.nl>";
  fro_ozen = "fro_ozen <fro_ozen@gmx.de>";
  ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>";
--- a/lib/modules.nix
+++ b/lib/modules.nix
@ -469,6 +469,7 @@ rec {
  mkBefore = mkOrder 500;
  mkAfter = mkOrder 1500;

+
  # Convenient property used to transfer all definitions and their
  # properties from one option to another. This property is useful for
  # renaming options, and also for including properties from another module
@ -498,4 +499,68 @@ rec {
  /* Compatibility. */
  fixMergeModules = modules: args: evalModules { inherit modules args; check = false; };

+
+  /* Return a module that causes a warning to be shown if the
+     specified option is defined. For example,
+
+       mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ]
+
+     causes a warning if the user defines boot.loader.grub.bootDevice.
+  */
+  mkRemovedOptionModule = optionName:
+    { options, ... }:
+    { options = setAttrByPath optionName (mkOption {
+        visible = false;
+      });
+      config.warnings =
+        let opt = getAttrFromPath optionName options; in
+        optional opt.isDefined
+          "The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it.";
+    };
+
+  /* Return a module that causes a warning to be shown if the
+     specified "from" option is defined; the defined value is however
+     forwarded to the "to" option. This can be used to rename options
+     while providing backward compatibility. For example,
+
+       mkRenamedOptionModule [ "boot" "copyKernels" ] [ "boot" "loader" "grub" "copyKernels" ]
+
+     forwards any definitions of boot.copyKernels to
+     boot.loader.grub.copyKernels while printing a warning.
+  */
+  mkRenamedOptionModule = from: to: doRename {
+    inherit from to;
+    visible = false;
+    warn = true;
+    use = builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'.";
+  };
+
+  /* Like ‘mkRenamedOptionModule’, but doesn't show a warning. */
+  mkAliasOptionModule = from: to: doRename {
+    inherit from to;
+    visible = true;
+    warn = false;
+    use = id;
+  };
+
+  doRename = { from, to, visible, warn, use }:
+    let
+      toOf = attrByPath to
+        (abort "Renaming error: option `${showOption to}' does not exists.");
+    in
+      { config, options, ... }:
+      { options = setAttrByPath from (mkOption {
+          description = "Alias of <option>${showOption to}</option>.";
+          apply = x: use (toOf config);
+        });
+        config = {
+        /*
+          warnings =
+            let opt = getAttrFromPath from options; in
+            optional (warn && opt.isDefined)
+              "The option `${showOption from}' defined in ${showFiles opt.files} has been renamed to `${showOption to}'.";
+              */
+        } // setAttrByPath to (mkAliasDefinitions (getAttrFromPath from options));
+      };
+
 }
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@ -550,4 +550,8 @@ in {

  };

+  imports =
+    [ (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
+      (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
+    ];
 }
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@ -1,170 +1,88 @@
-{ config, lib, options, ... }:
+{ lib, ... }:

 with lib;

-let
+{
+  imports = [
+    (mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ])
+    (mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ])
+    (mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ])
+    (mkRenamedOptionModule [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ])
+    (mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ])

-  alias = from: to: rename {
-    inherit from to;
-    name = "Alias";
-    use = id;
-    define = id;
-    visible = true;
-  };
+    (mkRenamedOptionModule [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ])
+    (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
+    (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])

-  # warn option was renamed
-  obsolete = from: to: rename {
-    inherit from to;
-    name = "Obsolete name";
-    use = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x;
-    define = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x;
-  };
+    # Old Grub-related options.
+    (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
+    (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])

-  # abort if deprecated option is used
-  deprecated = from: to: rename {
-    inherit from to;
-    name = "Deprecated name";
-    use = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'.";
-    define = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'.";
-  };
+    # smartd
+    (mkRenamedOptionModule [ "services" "smartd" "deviceOpts" ] [ "services" "smartd" "defaults" "monitored" ])

-  showOption = concatStringsSep ".";
+    # OpenSSH
+    (mkRenamedOptionModule [ "services" "sshd" "ports" ] [ "services" "openssh" "ports" ])
+    (mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
+    (mkRenamedOptionModule [ "services" "sshd" "allowSFTP" ] [ "services" "openssh" "allowSFTP" ])
+    (mkRenamedOptionModule [ "services" "sshd" "forwardX11" ] [ "services" "openssh" "forwardX11" ])
+    (mkRenamedOptionModule [ "services" "sshd" "gatewayPorts" ] [ "services" "openssh" "gatewayPorts" ])
+    (mkRenamedOptionModule [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ])
+    (mkRenamedOptionModule [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ])
+    (mkRenamedOptionModule [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ])
+    (mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])

-  zipModules = list:
-    zipAttrsWith (n: v:
-      if tail v != [] then
-        if all (o: isAttrs o && o ? _type) v then mkMerge v
-        else if n == "_type" then head v
-        else if n == "warnings" then concatLists v
-        else if n == "description" || n == "apply" then
-          abort "Cannot rename an option to multiple options."
-        else zipModules v
-      else head v
-    ) list;
+    # VirtualBox
+    (mkRenamedOptionModule [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ])
+    (mkRenamedOptionModule [ "services" "virtualboxGuest" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ])
+    (mkRenamedOptionModule [ "programs" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ])
+    (mkRenamedOptionModule [ "programs" "virtualbox" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ])
+    (mkRenamedOptionModule [ "programs" "virtualbox" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ])
+    (mkRenamedOptionModule [ "services" "virtualboxHost" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ])
+    (mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ])
+    (mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ])

-  rename = { from, to, name, use, define, visible ? false }:
-    let
-      setTo = setAttrByPath to;
-      setFrom = setAttrByPath from;
-      toOf = attrByPath to
-        (abort "Renaming error: option `${showOption to}' does not exists.");
-      fromOf = attrByPath from
-        (abort "Internal error: option `${showOption from}' should be declared.");
-    in
-      [ { options = setFrom (mkOption {
-            description = "${name} of <option>${showOption to}</option>.";
-            apply = x: use (toOf config);
-            inherit visible;
-          });
+    # Tarsnap
+    (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ])

-          config = setTo (mkAliasAndWrapDefinitions define (fromOf options));
-        }
-      ];
+    # proxy
+    (mkRenamedOptionModule [ "nix" "proxy" ] [ "networking" "proxy" "default" ])

-  obsolete' = option: singleton
-    { options = setAttrByPath option (mkOption {
-        default = null;
-        visible = false;
-      });
-      config.warnings = optional (getAttrFromPath option config != null)
-        "The option `${showOption option}' defined in your configuration no longer has any effect; please remove it.";
-    };
+    # KDE
+    (mkRenamedOptionModule [ "kde" "extraPackages" ] [ "environment" "systemPackages" ])
+    (mkRenamedOptionModule [ "environment" "kdePackages" ] [ "environment" "systemPackages" ])

-in zipModules ([]
+    # Multiple efi bootloaders now
+    (mkRenamedOptionModule [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ])

-++ obsolete [ "environment" "x11Packages" ] [ "environment" "systemPackages" ]
-++ obsolete [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ]
-++ obsolete [ "environment" "nix" ] [ "nix" "package" ]
-++ obsolete [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ]
-++ obsolete [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]
-++ alias [ "users" "extraUsers" ] [ "users" "users" ]
-++ alias [ "users" "extraGroups" ] [ "users" "groups" ]
+    # NixOS environment changes
+    # !!! this hardcodes bash, could we detect from config which shell is actually used?
+    (mkRenamedOptionModule [ "environment" "promptInit" ] [ "programs" "bash" "promptInit" ])

-++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ]
-++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]
-++ obsolete [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]
+    (mkRenamedOptionModule [ "services" "xserver" "driSupport" ] [ "hardware" "opengl" "driSupport" ])
+    (mkRenamedOptionModule [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ])
+    (mkRenamedOptionModule [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ])
+    (mkRenamedOptionModule [ "hardware" "opengl" "videoDrivers" ] [ "services" "xserver" "videoDrivers" ])

-# FIXME: Remove these eventually.
-++ obsolete [ "boot" "systemd" "sockets" ] [ "systemd" "sockets" ]
-++ obsolete [ "boot" "systemd" "targets" ] [ "systemd" "targets" ]
-++ obsolete [ "boot" "systemd" "services" ] [ "systemd" "services" ]
+    (mkRenamedOptionModule [ "services" "mysql55" ] [ "services" "mysql" ])

-# Old Grub-related options.
-++ obsolete [ "boot" "copyKernels" ] [ "boot" "loader" "grub" "copyKernels" ]
-++ obsolete [ "boot" "extraGrubEntries" ] [ "boot" "loader" "grub" "extraEntries" ]
-++ obsolete [ "boot" "extraGrubEntriesBeforeNixos" ] [ "boot" "loader" "grub" "extraEntriesBeforeNixOS" ]
-++ obsolete [ "boot" "grubDevice" ] [ "boot" "loader" "grub" "device" ]
-++ obsolete [ "boot" "bootMount" ] [ "boot" "loader" "grub" "bootDevice" ]
-++ obsolete [ "boot" "grubSplashImage" ] [ "boot" "loader" "grub" "splashImage" ]
+    (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])

-++ obsolete [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]
-++ obsolete [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]
+    # XBMC
+    (mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
+    (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])

-# smartd
-++ obsolete [ "services" "smartd" "deviceOpts" ] [ "services" "smartd" "defaults" "monitored" ]
+    # DNSCrypt-proxy
+    (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ])

-# OpenSSH
-++ obsolete [ "services" "sshd" "ports" ] [ "services" "openssh" "ports" ]
-++ alias [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ]
-++ obsolete [ "services" "sshd" "allowSFTP" ] [ "services" "openssh" "allowSFTP" ]
-++ obsolete [ "services" "sshd" "forwardX11" ] [ "services" "openssh" "forwardX11" ]
-++ obsolete [ "services" "sshd" "gatewayPorts" ] [ "services" "openssh" "gatewayPorts" ]
-++ obsolete [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ]
-++ obsolete [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ]
-++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]
-++ alias [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ]
+    # Options that are obsolete and have no replacement.
+    (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ])
+    (mkRemovedOptionModule [ "programs" "bash" "enable" ])
+    (mkRemovedOptionModule [ "services" "samba" "defaultShare" ])
+    (mkRemovedOptionModule [ "services" "syslog-ng" "serviceName" ])
+    (mkRemovedOptionModule [ "services" "syslog-ng" "listenToJournal" ])
+    (mkRemovedOptionModule [ "ec2" "metadata" ])
+    (mkRemovedOptionModule [ "services" "openvpn" "enable" ])

-# VirtualBox
-++ obsolete [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]
-++ obsolete [ "services" "virtualboxGuest" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]
-++ obsolete [ "programs" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]
-++ obsolete [ "programs" "virtualbox" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]
-++ obsolete [ "programs" "virtualbox" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]
-++ obsolete [ "services" "virtualboxHost" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]
-++ obsolete [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]
-++ obsolete [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]
-
-# Tarsnap
-++ obsolete [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ]
-
-# proxy
-++ obsolete [ "nix" "proxy" ] [ "networking" "proxy" "default" ]
-
-# KDE
-++ deprecated [ "kde" "extraPackages" ] [ "environment" "systemPackages" ]
-++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ]
-
-# Multiple efi bootloaders now
-++ obsolete [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ]
-
-# NixOS environment changes
-# !!! this hardcodes bash, could we detect from config which shell is actually used?
-++ obsolete [ "environment" "promptInit" ] [ "programs" "bash" "promptInit" ]
-
-++ obsolete [ "services" "xserver" "driSupport" ] [ "hardware" "opengl" "driSupport" ]
-++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ]
-++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ]
-++ obsolete [ "hardware" "opengl" "videoDrivers" ] [ "services" "xserver" "videoDrivers" ]
-
-++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ]
-
-++ alias    [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]
-
-# XBMC
-++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]
-++ obsolete [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]
-
-# DNSCrypt-proxy
-++ obsolete [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ]
-
-# Options that are obsolete and have no replacement.
-++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
-++ obsolete' [ "boot" "initrd" "luks" "enable" ]
-++ obsolete' [ "programs" "bash" "enable" ]
-++ obsolete' [ "services" "samba" "defaultShare" ]
-++ obsolete' [ "services" "syslog-ng" "serviceName" ]
-++ obsolete' [ "services" "syslog-ng" "listenToJournal" ]
-++ obsolete' [ "ec2" "metadata" ]
-++ obsolete' [ "services" "openvpn" "enable" ]
-
-)
+  ];
+}
--- a/nixos/modules/services/misc/synergy.nix
+++ b/nixos/modules/services/misc/synergy.nix
@ -89,6 +89,7 @@ in
        wantedBy = optional cfgC.autoStart "multi-user.target";
        path = [ pkgs.synergy ];
        serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}'';
+        serviceConfig.Restart = "on-failure";
      };
    })
    (mkIf cfgS.enable {
@ -98,6 +99,7 @@ in
        wantedBy = optional cfgS.autoStart "multi-user.target";
        path = [ pkgs.synergy ];
        serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }'';
+        serviceConfig.Restart = "on-failure";
      };
    })
  ];
--- a/nixos/modules/services/networking/copy-com.nix
+++ b/nixos/modules/services/networking/copy-com.nix
@ -39,7 +39,8 @@ in

    systemd.services."copy-com-${cfg.user}" = {
      description = "Copy.com client";
-      after = [ "network.target" "local-fs.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" "local-fs.target" ];
      wantedBy = [ "multi-user.target" ];
      serviceConfig = {
        ExecStart = "${pkgs.copy-com}/bin/CopyConsole ${if cfg.debug then "-consoleOutput -debugToConsole=dirwatch,path-watch,csm_path,csm -debug -console" else ""}";
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@ -488,4 +488,15 @@ in

  ];

+
+  imports =
+    [ (mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ])
+      (mkRenamedOptionModule [ "boot" "copyKernels" ] [ "boot" "loader" "grub" "copyKernels" ])
+      (mkRenamedOptionModule [ "boot" "extraGrubEntries" ] [ "boot" "loader" "grub" "extraEntries" ])
+      (mkRenamedOptionModule [ "boot" "extraGrubEntriesBeforeNixos" ] [ "boot" "loader" "grub" "extraEntriesBeforeNixOS" ])
+      (mkRenamedOptionModule [ "boot" "grubDevice" ] [ "boot" "loader" "grub" "device" ])
+      (mkRenamedOptionModule [ "boot" "bootMount" ] [ "boot" "loader" "grub" "bootDevice" ])
+      (mkRenamedOptionModule [ "boot" "grubSplashImage" ] [ "boot" "loader" "grub" "splashImage" ])
+    ];
+
 }
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@ -772,4 +772,11 @@ in

  };

+  # FIXME: Remove these eventually.
+  imports =
+    [ (mkRenamedOptionModule [ "boot" "systemd" "sockets" ] [ "systemd" "sockets" ])
+      (mkRenamedOptionModule [ "boot" "systemd" "targets" ] [ "systemd" "targets" ])
+      (mkRenamedOptionModule [ "boot" "systemd" "services" ] [ "systemd" "services" ])
+    ];
+
 }
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@ -90,7 +90,7 @@ in
        serviceConfig.Type = "forking";
        serviceConfig.ExecStart = ''
          @${pkgs.nfs-utils}/sbin/rpc.statd rpc.statd --no-notify \
-              ${if cfg.statdPort != null then "-p ${toString statdPort}" else ""}
+              ${if cfg.statdPort != null then "-p ${toString cfg.statdPort}" else ""}
        '';
        serviceConfig.Restart = "always";
      };
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@ -51,7 +51,7 @@ in rec {
        (all nixos.tests.chromium)
        (all nixos.tests.firefox)
        (all nixos.tests.firewall)
-        (all nixos.tests.gnome3)
+        nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
        (all nixos.tests.installer.lvm)
        (all nixos.tests.installer.luksroot)
        (all nixos.tests.installer.separateBoot)
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "Ardour";
    repo = "ardour";
-    rev = "fe672c827cb2c08c94b1fa7e527d884c522a1af7";
-    sha256 = "12yfy9l5mnl96ix4s2qicp3m2zscli1a4bd50nk9v035pgf77s3f";
+    rev = "05e3a00b7e3a52a838bc5ec9ee7b3b9e6a271feb";
+    sha256 = "1j8zw0bvh16qwyy8qrqynpak9nghl9j3qhjjcdl7wh9raafjqc00";
  };

  buildInputs =
--- a/pkgs/applications/audio/meterbridge/buf_rect.patch
+++ b/pkgs/applications/audio/meterbridge/buf_rect.patch
@ -0,0 +1,12 @@
+--- ../tmp-orig/meterbridge-0.9.2/src/main.h	2003-06-05 11:42:41.000000000 +0200
+++ ./src/main.h	2004-12-29 10:27:24.160912488 +0100
+@@ -8,7 +8,7 @@
+ 
+ extern SDL_Surface *screen;
+ extern SDL_Surface *image, *meter, *meter_buf;
+-extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS];
+extern SDL_Rect win, dest[MAX_METERS];
+ 
+ extern jack_port_t *input_ports[MAX_METERS];
+ extern jack_port_t *output_ports[MAX_METERS];
+
--- a/pkgs/applications/audio/meterbridge/default.nix
+++ b/pkgs/applications/audio/meterbridge/default.nix
@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, SDL, SDL_image, libjack2
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.9.2";
+  name = "meterbridge-${version}";
+
+  src = fetchurl {
+    url = "http://plugin.org.uk/meterbridge/${name}.tar.gz";
+    sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k";
+  };
+
+  patches = [ ./buf_rect.patch ];
+
+  buildInputs =
+    [ pkgconfig SDL SDL_image libjack2
+    ];
+
+  meta = with stdenv.lib; {
+    description = "Various meters (VU, PPM, DPM, JF, SCO) for Jack Audio Connection Kit";
+    homepage = http://plugin.org.uk/meterbridge/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.nico202 ];
+  };
+}
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@ -16,6 +16,7 @@ in stdenv.mkDerivation rec {
    description = "An online/offline backup solution";
    homepage = "http://www.crashplan.org";
    license = licenses.unfree;
+    broken = true;  # outdated and new client has trouble starting (nullpointer exception)
    maintainers = with maintainers; [ sztupi iElectric ];
  };

--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@ -103,7 +103,7 @@ let
    '' + optionalString withPython ''
      ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
    '' + optionalString withPython3 ''
-      ln -s ${python3Env}/bin/python $out/bin/nvim-python3
+      ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3
    '' + optionalString (withPython || withPython3) ''
        wrapProgram $out/bin/nvim --add-flags "${
          (optionalString withPython
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
 , libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }:

-let version = "3.18.0"; in
+let version = "3.18.1"; in
 stdenv.mkDerivation rec {
  name = "simple-scan-${version}";

  src = fetchurl {
-    sha256 = "09qki4h1px65fxwpr7jppzqsi5cfcb8168p13blp3wcfizjgb9gl";
+    sha256 = "1i37j36kbn1h8yfzcvbis6f38xz2nj5512ls3gb0j5na0bvja2cw";
    url = "https://launchpad.net/simple-scan/3.18/${version}/+download/${name}.tar.xz";
  };

--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@ -1,5 +1,6 @@
 { stdenv, fetchzip, buildPythonPackage, docbook2x, libxslt, gnome_doc_utils
 , intltool, dbus_glib, pygobject, pygtk, pyxdg, gnome_python, dbus, sqlite3
+, hicolor_icon_theme
 }:

 # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
@ -17,7 +18,9 @@ buildPythonPackage rec {
    sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
  };

-  buildInputs = [ docbook2x libxslt gnome_doc_utils intltool dbus_glib ];
+  buildInputs = [
+    docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme
+  ];

  propagatedBuildInputs = [ pygobject pygtk pyxdg gnome_python dbus sqlite3 ];

--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee
-, keybinder3, json_glib, zeitgeist, vala
+, keybinder3, json_glib, zeitgeist, vala, hicolor_icon_theme
 }:

 with stdenv.lib;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist 
-    vala
+    vala hicolor_icon_theme
  ];

  meta = { 
--- a/pkgs/applications/misc/wcalc/default.nix
+++ b/pkgs/applications/misc/wcalc/default.nix
@ -0,0 +1,20 @@
+{ stdenv, fetchurl, mpfr, readline }:
+
+stdenv.mkDerivation rec {
+  name = "wcalc-${version}";
+  version = "2.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/w-calc/${name}.tar.bz2";
+    sha256 = "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f";
+  };
+
+  buildInputs = [ mpfr readline ];
+
+  meta = with stdenv.lib; {
+    description = "A command line calculator";
+    homepage = http://w-calc.sourceforge.net;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.14";
+  version = "0.4.15";
  name = "baresip-${version}";
  src=fetchurl {
    url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "19vn63j6dpybjy14mgnwf0yk2jbcbfdjs50whzwyrrkcv6ipj6hc";
+    sha256 = "13712li6y3ikwzl17j46w25xyv3z98yqj7zpr3jifyvbna9ls5r3";
  };
  buildInputs = [zlib openssl libre librem pkgconfig
    cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@ -20,11 +20,11 @@ with stdenv.lib;

 stdenv.mkDerivation rec {
  name = "gajim-${version}";
-  version = "0.16.3";
+  version = "0.16.4";

  src = fetchurl {
    url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2";
-    sha256 = "05a59hf9wna6n9fi0a4bhz1hifqj21bwb4ff9rd0my23rdwmij51";
+    sha256 = "0zyfs7q1qg8iqszr8l1gb18gqla6zrrfsgpmbxblpi9maqxas5i1";
  };

  patches = [
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
-, xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
+, xorg, fontconfig, qt55, xkeyboard_config, alsaLib, libpulseaudio ? null
 , libredirect, quazip, less, which, unzip
 }:

@ -12,7 +12,7 @@ let
  deps =
    [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
      xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
-      xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
+      xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt55.qtbase libpulseaudio
    ];

  desktopItem = makeDesktopItem {
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
  installPhase =
    ''
      # Delete unecessary libraries - these are provided by nixos.
-      rm *.so.*
+      rm *.so.* *.so
      rm qt.conf

      # Install files.
@ -89,7 +89,8 @@ stdenv.mkDerivation rec {
      ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client

      wrapProgram $out/bin/ts3client \
-        --set LD_PRELOAD "${libredirect}/lib/libredirect.so:${quazip}/lib/libquazip.so" \
+        --set LD_LIBRARY_PATH "${quazip}/lib" \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
        --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
        --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
    '';
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@ -20,7 +20,7 @@ let
  langsSpaces = stdenv.lib.concatStringsSep " " langs;
  major = "5";
  minor = "0";
-  patch = "1";
+  patch = "2";
  tweak = "2";
  subdir = "${major}.${minor}.${patch}";
  version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@ -47,14 +47,14 @@ let

    translations = fetchSrc {
      name = "translations";
-      sha256 = "0z8qf4ri8wmzgc5601fxcwxwym1h9rwk0kaqpxhqbkj04h9z0xq7";
+      sha256 = "06w1gz78136bs6fbwslxz5zsg538yqfarkq1am7zn8rzczz2qplh";
    };

    # TODO: dictionaries

    help = fetchSrc {
      name = "help";
-      sha256 = "0iz9jz0ppghzh33kzw7v0xqchim9brys6mnmlk74nzrhci2vj7f7";
+      sha256 = "157hypz093vhqbysygx5q4fbb81785m2b7slccfkp8x87dcsahj3";
    };

  };
@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "06nj1wnx09a6v3kx9k48810mkb19dbkaln1af33f4m7bxg5bjl87";
+    sha256 = "0xn1pg72vfdajmhak6chajvd51h74jqvq2565xv3j823143niw01";
  };

  # Openoffice will open libcups dynamically, so we link it directly
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    make install PREFIX=$out
  '';

-  meta = {
+  meta = with stdenv.lib; {
    homepage = "https://www.agwa.name/projects/git-crypt";
    description = "transparent file encryption in git";
    longDescription = ''
@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
      entire repository.
    '';
    downloadPage = "https://github.com/AGWA/git-crypt/releases";
-    license = stdenv.lib.licenses.gpl3;
+    license = licenses.gpl3;
    version = "0.5.0";
-    maintainers = [ "Desmond O. Chang <dochang@gmail.com>" ];
+    maintainers = [ maintainers.dochang ];
  };

 }
--- a/pkgs/data/fonts/culmus/default.nix
+++ b/pkgs/data/fonts/culmus/default.nix
@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "culmus-${version}";
+  version = "0.130";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
+    sha256 = "908583e388bc983a63df4f38f7130eac69fc19539952031408bb3c627846f9c1";
+  };
+  
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -v *.ttf $out/share/fonts/truetype/
+  '';
+  
+  meta = {
+    description = "Culmus Hebrew fonts";
+    longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl2;
+    homepage = http://culmus.sourceforge.net/;
+    downloadPage = http://culmus.sourceforge.net/download.html;
+  };
+}
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@ -8,7 +8,7 @@ let

  # Annoyingly, these files are updated without a change in URL. This means that
  # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-10-09";
+  version = "2015-10-13";
 in
 stdenv.mkDerivation {
  name = "geolite-legacy-${version}";
@ -27,10 +27,10 @@ stdenv.mkDerivation {
    "0jdgfcy90mk7q25rhb8ymnddkskmp2cmyzmbjr3ij0zvbbpzxl4i";
  srcGeoIPASNum = fetchDB
    "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "05j2nygvb7xi4s636dik12vgrdi37q5fdv5k3liqgswf9z0msz81";
+    "0j73lw2i6nnx1mgp1hspfa95zca5h0hqj12g16rln7pss868wnwi";
  srcGeoIPASNumv6 = fetchDB
    "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "17s7pcqmfd9xvq0hd7g7nh62sjayl24w04ifm39snrq2a32l667n";
+    "1id4rkxp5pppr274y276w2zmx44dn0h44d4ax780g8cbhlc9n2br";

  meta = with stdenv.lib; {
    inherit version;
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
@ -5,14 +5,15 @@
 , gnome3, librsvg, gnome_doc_utils, webkitgtk }:

 let
-  majorVersion = "0.8";
+  majorVersion = "0.10";
+  minorVersion = "0";
 in
 stdenv.mkDerivation rec {
-  name = "geary-${majorVersion}.2";
+  name = "geary-${majorVersion}.${minorVersion}";

  src = fetchurl {
    url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
-    sha256 = "3cfa626168935acf49c9415fad54c7849f17fd833026cfd3c224ba0fb892d641";
+    sha256 = "46197a5a1b8b040adcee99082dbfd9fff9ca804e3bf0055a2e90b13214bdbca5";
  };

  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  patches = [ ./disable_valadoc.patch ];
+  # patches = [ ./disable_valadoc.patch ];
  patchFlags = "-p0";

  meta = with stdenv.lib; {
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -635,8 +635,8 @@ self: super: {
  # Uses OpenGL in testing
  caramia = dontCheck super.caramia;

-  # Supports only 3.4 for now, https://github.com/bscarlet/llvm-general/issues/144
-  llvm-general = super.llvm-general.override { llvm-config = pkgs.llvm_34; };
+  # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142
+  llvm-general = super.llvm-general.override { llvm-config = pkgs.llvm_35; };

  # Needs help finding LLVM.
  spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@ -2803,6 +2803,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6504,6 +6505,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6813,6 +6815,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@ -2802,6 +2802,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6503,6 +6504,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6812,6 +6814,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@ -2802,6 +2802,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6503,6 +6504,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6812,6 +6814,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@ -2802,6 +2802,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6503,6 +6504,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6812,6 +6814,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@ -2801,6 +2801,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6500,6 +6501,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6808,6 +6810,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@ -2801,6 +2801,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6500,6 +6501,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6808,6 +6810,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@ -2798,6 +2798,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6495,6 +6496,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6802,6 +6804,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@ -2798,6 +2798,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6495,6 +6496,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6802,6 +6804,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@ -2787,6 +2787,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6481,6 +6482,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6787,6 +6789,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@ -2781,6 +2781,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6468,6 +6469,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6774,6 +6776,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@ -2775,6 +2775,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6436,6 +6437,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6742,6 +6744,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@ -2775,6 +2775,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6431,6 +6432,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6737,6 +6739,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@ -2775,6 +2775,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6430,6 +6431,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6736,6 +6738,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@ -2774,6 +2774,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6427,6 +6428,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6733,6 +6735,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@ -2771,6 +2771,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6419,6 +6420,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6725,6 +6727,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@ -2767,6 +2767,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6409,6 +6410,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6715,6 +6717,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@ -2779,6 +2779,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6463,6 +6464,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6769,6 +6771,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@ -2778,6 +2778,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6457,6 +6458,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6763,6 +6765,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@ -2777,6 +2777,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6455,6 +6456,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6761,6 +6763,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@ -2777,6 +2777,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6449,6 +6450,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6755,6 +6757,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@ -2777,6 +2777,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6444,6 +6445,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6750,6 +6752,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@ -2777,6 +2777,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6440,6 +6441,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6746,6 +6748,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@ -2747,6 +2747,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6340,6 +6341,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6645,6 +6647,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@ -2746,6 +2746,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6338,6 +6339,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6643,6 +6645,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@ -2727,6 +2727,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6285,6 +6286,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6586,6 +6588,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@ -2726,6 +2726,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6276,6 +6277,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6576,6 +6578,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@ -2726,6 +2726,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6276,6 +6277,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6576,6 +6578,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@ -2726,6 +2726,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6273,6 +6274,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6573,6 +6575,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@ -2725,6 +2725,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6269,6 +6270,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6569,6 +6571,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@ -2724,6 +2724,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6264,6 +6265,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6564,6 +6566,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@ -2719,6 +2719,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6253,6 +6254,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6553,6 +6555,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@ -2716,6 +2716,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6243,6 +6244,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6542,6 +6544,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@ -2710,6 +2710,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6233,6 +6234,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6532,6 +6534,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@ -2710,6 +2710,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6230,6 +6231,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6529,6 +6531,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@ -2743,6 +2743,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6333,6 +6334,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6638,6 +6640,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@ -2707,6 +2707,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6224,6 +6225,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6523,6 +6525,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@ -2707,6 +2707,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6219,6 +6220,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6517,6 +6519,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@ -2706,6 +2706,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6215,6 +6216,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6513,6 +6515,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@ -2743,6 +2743,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6331,6 +6332,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6636,6 +6638,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@ -2742,6 +2742,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6327,6 +6328,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6630,6 +6632,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@ -2740,6 +2740,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6324,6 +6325,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6627,6 +6629,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@ -2736,6 +2736,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6317,6 +6318,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6620,6 +6622,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@ -2734,6 +2734,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6315,6 +6316,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6618,6 +6620,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@ -2733,6 +2733,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6311,6 +6312,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6613,6 +6615,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@ -2729,6 +2729,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -6298,6 +6299,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6600,6 +6602,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = dontDistribute super."second-transfer";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@ -2605,6 +2605,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5955,6 +5956,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6250,6 +6252,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_0_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@ -2602,6 +2602,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5945,6 +5946,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6239,6 +6241,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_0_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@ -2597,6 +2597,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5933,6 +5934,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6226,6 +6228,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@ -2592,6 +2592,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5922,6 +5923,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6214,6 +6216,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@ -2591,6 +2591,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5921,6 +5922,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6212,6 +6214,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@ -2587,6 +2587,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5903,6 +5904,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6194,6 +6196,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@ -2581,6 +2581,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5877,6 +5878,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6168,6 +6170,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@ -2567,6 +2567,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5849,6 +5850,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6140,6 +6142,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@ -2553,6 +2553,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5825,6 +5826,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6116,6 +6118,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@ -2545,6 +2545,7 @@ self: super: {
  "elm-repl" = dontDistribute super."elm-repl";
  "elm-server" = dontDistribute super."elm-server";
  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
  "elocrypt" = dontDistribute super."elocrypt";
  "emacs-keys" = dontDistribute super."emacs-keys";
  "email" = dontDistribute super."email";
@ -5810,6 +5811,7 @@ self: super: {
  "reflex-dom" = dontDistribute super."reflex-dom";
  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
  "reform" = dontDistribute super."reform";
  "reform-blaze" = dontDistribute super."reform-blaze";
  "reform-hamlet" = dontDistribute super."reform-hamlet";
@ -6100,6 +6102,7 @@ self: super: {
  "secdh" = dontDistribute super."secdh";
  "seclib" = dontDistribute super."seclib";
  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
  "secret-santa" = dontDistribute super."secret-santa";
  "secret-sharing" = dontDistribute super."secret-sharing";
  "secrm" = dontDistribute super."secrm";
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@ -5762,6 +5762,7 @@ self: {
         base FTGL GLFW-b OpenGLRaw parallel random time
       ];
       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

  "Frames" = callPackage
@ -11882,8 +11883,8 @@ self: {
     }:
     mkDerivation {
       pname = "MagicHaskeller";
-       version = "0.9.6.4.2";
-       sha256 = "a0db9cb06c346a8b9b1a23c8f69e9950928337fe3dbaa545ad4eaadcf25c5a5f";
+       version = "0.9.6.4.3";
+       sha256 = "6faf49eaf1585691166907501fc066a1e3dbfa0419c67237e07a997c01b144d6";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -15018,6 +15019,27 @@ self: {
       license = stdenv.lib.licenses.bsd3;
     }) {};

+  "RSA_2_2_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, crypto-api
+     , crypto-pubkey-types, DRBG, pureMD5, QuickCheck, SHA, tagged
+     , test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "RSA";
+       version = "2.2.0";
+       sha256 = "293056d43352716d7f9501aac7ac9871c338f00d40c97a54c927a798f8a4f2d7";
+       libraryHaskellDepends = [
+         base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA
+       ];
+       testHaskellDepends = [
+         base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
+         QuickCheck SHA tagged test-framework test-framework-quickcheck2
+       ];
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
  "Raincat" = callPackage
    ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl
     , OpenGL, random, SDL, SDL-image, SDL-mixer, time
@ -21382,6 +21404,8 @@ self: {
       pname = "aeson-utils";
       version = "0.3.0.2";
       sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f";
+       revision = "1";
+       editedCabalFile = "effc944d02b274ca2688671ac16fe1a8c87b6d036b0ba11d06dd404da47a8634";
       libraryHaskellDepends = [
         aeson attoparsec base bytestring scientific text
       ];
@ -29314,6 +29338,8 @@ self: {
       pname = "authenticate-oauth";
       version = "1.5.1.1";
       sha256 = "eb9f15ebc6eb4a9ce08115c729e3e6803b28e35edf0ab5bc19fed64f9a2fc30b";
+       revision = "1";
+       editedCabalFile = "aee0c275e41e83d208bdfbc6634ea463df5dfb3780218b73e1b5599a0c11476e";
       libraryHaskellDepends = [
         base base64-bytestring blaze-builder bytestring crypto-pubkey-types
         data-default http-client http-types random RSA SHA time
@ -48338,6 +48364,7 @@ self: {
       homepage = "https://github.com/mdorman/couch-simple";
       description = "A modern, lightweight, complete client for CouchDB";
       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
     }) {inherit (pkgs) couchdb;};

  "couchdb-conduit" = callPackage
@ -59066,8 +59093,9 @@ self: {
       pname = "download-curl";
       version = "0.1.4";
       sha256 = "950ede497ff41d72875337861fa41ca3e151b691ad53a9ddddd2443285bbc3f1";
+       revision = "1";
+       editedCabalFile = "7e6df1d4f39879e9b031c8ff5e2f6fd5be3729cc40f7515e117ac0b47ed3f675";
       libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ];
-       jailbreak = true;
       homepage = "http://code.haskell.org/~dons/code/download-curl";
       description = "High-level file download based on URLs";
       license = stdenv.lib.licenses.bsd3;
@ -61773,6 +61801,19 @@ self: {
       license = stdenv.lib.licenses.bsd3;
     }) {};

+  "elo" = callPackage
+    ({ mkDerivation, base, tasty }:
+     mkDerivation {
+       pname = "elo";
+       version = "0.1.0";
+       sha256 = "2bdb18075718f17a84f1fa0190855f84fa5105b164c94d2fb4ac49447c5fca2d";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty ];
+       homepage = "http://github.com/mfine/elo";
+       description = "Elo Rating Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
  "elocrypt" = callPackage
    ({ mkDerivation, base, MonadRandom, proctest, QuickCheck, random
     , tasty, tasty-quickcheck, tasty-th
@ -71707,6 +71748,7 @@ self: {
       homepage = "https://github.com/markenwerk/haskell-geo-resolver/";
       description = "Performs geo location lookups and parses the results";
       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

  "geocalc" = callPackage
@ -76655,6 +76697,19 @@ self: {
       license = stdenv.lib.licenses.bsd3;
     }) {};

+  "grouped-list_0_1_1_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, pointed }:
+     mkDerivation {
+       pname = "grouped-list";
+       version = "0.1.1.0";
+       sha256 = "ee4d9d19edb36c8f3bcf5b85e3ef461d73018424197a0ae1cc1161edd8ebc765";
+       libraryHaskellDepends = [ base containers deepseq pointed ];
+       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
  "groupoid" = callPackage
    ({ mkDerivation, base }:
     mkDerivation {
@ -85261,18 +85316,21 @@ self: {
     }) {};

  "haxl" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, hashable, HUnit, pretty, text, time
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , directory, filepath, hashable, HUnit, pretty, text, time
     , unordered-containers, vector
     }:
     mkDerivation {
       pname = "haxl";
-       version = "0.2.0.0";
-       sha256 = "1e1f7fe8d102cb771203078e63715aa45ed704e8473b064cf79e13a04312cd8e";
+       version = "0.3.0.0";
+       sha256 = "0b2c1e6fc052a665ef6faef14ed38d0732c281a8cd7abb3fa99957955e09378b";
+       isLibrary = true;
+       isExecutable = true;
       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath hashable HUnit
-         pretty text time unordered-containers vector
+         aeson base bytestring containers deepseq directory filepath
+         hashable HUnit pretty text time unordered-containers vector
       ];
+       executableHaskellDepends = [ base hashable time ];
       testHaskellDepends = [
         aeson base bytestring containers hashable HUnit text
         unordered-containers
@ -92432,6 +92490,7 @@ self: {
       homepage = "http://github.com/akc/hops";
       description = "Handy Operations on Power Series";
       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

  "hoq" = callPackage
@ -98082,6 +98141,24 @@ self: {
       license = stdenv.lib.licenses.bsd3;
     }) {};

+  "http-api-data_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, Glob, hspec, HUnit
+     , QuickCheck, text, time
+     }:
+     mkDerivation {
+       pname = "http-api-data";
+       version = "0.2.1";
+       sha256 = "856138d79945770cdb4b522f58893a1c45014d39238cfc5b2eceeac089c56f71";
+       libraryHaskellDepends = [ base bytestring text time ];
+       testHaskellDepends = [
+         base doctest Glob hspec HUnit QuickCheck text time
+       ];
+       homepage = "http://github.com/fizruk/http-api-data";
+       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
  "http-attoparsec" = callPackage
    ({ mkDerivation, attoparsec, base, bytestring, http-types }:
     mkDerivation {
@ -107584,19 +107661,18 @@ self: {

  "json-stream" = callPackage
    ({ mkDerivation, aeson, base, bytestring, directory, hspec
-     , QuickCheck, quickcheck-unicode, scientific, text
-     , unordered-containers, vector
+     , scientific, text, unordered-containers, vector
     }:
     mkDerivation {
       pname = "json-stream";
-       version = "0.3.2.3";
-       sha256 = "cfb4c599973ec953a74c02b71ee8caa5e1813d7a5cbabb3f0434bea70ed6fabb";
+       version = "0.3.2.2";
+       sha256 = "4415147dec300d1121121308008a522de79949549c35b23c673d70717ad28029";
       libraryHaskellDepends = [
         aeson base bytestring scientific text unordered-containers vector
       ];
       testHaskellDepends = [
-         aeson base bytestring directory hspec QuickCheck quickcheck-unicode
-         scientific text unordered-containers vector
+         aeson base bytestring directory hspec scientific text
+         unordered-containers vector
       ];
       homepage = "https://github.com/ondrap/json-stream";
       description = "Incremental applicative JSON parser";
@ -108660,8 +108736,8 @@ self: {
       pname = "keter";
       version = "1.3.6";
       sha256 = "e9c4b16fc6dca967a6a10c82c5f5c89900df10e27f93316d1a730ef9d523e301";
-       revision = "1";
-       editedCabalFile = "7ffb45adac1d3c419f7b2f544b3efdaf9b10a8c482dc70eeb0aab87f017aafea";
+       revision = "2";
+       editedCabalFile = "793f63a47c529acca895b3ca0225b2058f6175cb83af62c169267e62f6c28f60";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -108703,8 +108779,8 @@ self: {
       pname = "keter";
       version = "1.3.7";
       sha256 = "a0710bf072a8829f5e696a6cf760554b26006d520f311ae29a53bf46e96f98c3";
-       revision = "1";
-       editedCabalFile = "5d36ecfa447f2c5378763c7b05ef0038818a9727f066e785dce3d05c65ef7000";
+       revision = "2";
+       editedCabalFile = "cefc8c00964e630396ca46f09d13a77fc4870db48e5526796817ca6d35aa3e49";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -108746,8 +108822,8 @@ self: {
       pname = "keter";
       version = "1.3.7.1";
       sha256 = "003ce327d5b8ce407df901b46a99a37109b2ce14d6f51e50212130ba5ed9843e";
-       revision = "1";
-       editedCabalFile = "4158b706b417e5f6546bd4f23f73eb3d8ca34bdb4203fe8bec0bc6fe0f3dcbf3";
+       revision = "2";
+       editedCabalFile = "a1c0a6f6e7ffa9cd6c5a1c2780fdb5ce14a95d3c5fe9fe96cfeccc3726e91e98";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -111424,6 +111500,7 @@ self: {
       homepage = "https://github.com/qux-lang/language-qux";
       description = "Utilities for working with the Qux language";
       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

  "language-sh" = callPackage
@ -118437,6 +118514,31 @@ self: {
       license = stdenv.lib.licenses.mit;
     }) {};

+  "mandrill_0_5_0_0" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
+     , bytestring, containers, email-validate, http-client
+     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
+     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "mandrill";
+       version = "0.5.0.0";
+       sha256 = "3e77f5fa5be866f32542eca4228cbd911b51b138773601b2f5f32eb84a7beb4b";
+       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
@ -120739,23 +120841,17 @@ self: {

  "milena" = callPackage
    ({ mkDerivation, base, bytestring, cereal, containers, digest, lens
-     , lifted-base, listsafe, mtl, murmur-hash, network, pretty-show
-     , QuickCheck, random, resource-pool, semigroups, tasty, tasty-hspec
-     , tasty-quickcheck, transformers
+     , lifted-base, mtl, murmur-hash, network, QuickCheck, random
+     , resource-pool, semigroups, tasty, tasty-hspec, tasty-quickcheck
+     , transformers
     }:
     mkDerivation {
       pname = "milena";
-       version = "0.4.0.0";
-       sha256 = "78b9eba45e7ba9969b28ef9b51be94f17510f31473730e3184f6fff9ae296cb2";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.0.1";
+       sha256 = "5349bf26d1c0bc6147e84219d09f065b313413aba026e060a92bcc23e9ec2cb5";
       libraryHaskellDepends = [
-         base bytestring cereal containers digest lens lifted-base listsafe
-         mtl murmur-hash network random resource-pool semigroups
-         transformers
-       ];
-       executableHaskellDepends = [
-         base bytestring cereal lens lifted-base mtl pretty-show
+         base bytestring cereal containers digest lens lifted-base mtl
+         murmur-hash network random resource-pool semigroups transformers
       ];
       testHaskellDepends = [
         base bytestring lens mtl network QuickCheck semigroups tasty
@ -127286,8 +127382,8 @@ self: {
     }:
     mkDerivation {
       pname = "network-api-support";
-       version = "0.2.0";
-       sha256 = "41d33fcc0bd0d095cc9bef205a77d1097c39b6e2c2c8c086275638364a5b5505";
+       version = "0.2.1";
+       sha256 = "829e03488cf95f57d00cdd37078487e3c857861bcf79e0eb3dcbcda55b4d1a68";
       libraryHaskellDepends = [
         aeson attoparsec base bytestring case-insensitive http-client
         http-client-tls http-types text time tls
@ -132592,8 +132688,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-crossref";
-       version = "0.1.5.4";
-       sha256 = "193e597b75174a388c01d67bcf773d304cd023276d7a4b3ec0cd78b14dcabec4";
+       version = "0.1.5.5";
+       sha256 = "7ef23698170135f78e9f21472fd5abeb3fea887da714c587279db4ae7aa6ceba";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -144023,6 +144119,7 @@ self: {
       homepage = "https://github.com/qux-lang/qux";
       description = "Command line binary for working with the Qux language";
       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

  "rabocsv2qif" = callPackage
@ -146246,6 +146343,22 @@ self: {
       license = stdenv.lib.licenses.bsd3;
     }) {};

+  "reflex-transformers" = callPackage
+    ({ mkDerivation, base, containers, lens, mtl, reflex, semigroups
+     , stateWriter, transformers
+     }:
+     mkDerivation {
+       pname = "reflex-transformers";
+       version = "0.1";
+       sha256 = "b7871b9e833eadfa04832cf978bfbb762c3f02cab68a8876eeb8b45af2fd219e";
+       libraryHaskellDepends = [
+         base containers lens mtl reflex semigroups stateWriter transformers
+       ];
+       homepage = "http://github.com/saulzar/reflex-transformers";
+       description = "Collections and switchable Monad transformers for Reflex";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
  "reform" = callPackage
    ({ mkDerivation, base, containers, mtl, text }:
     mkDerivation {
@ -148575,31 +148688,27 @@ self: {
     }) {};

  "rest-example" = callPackage
-    ({ mkDerivation, aeson, base, containers, filepath, generic-aeson
+    ({ mkDerivation, aeson, base, containers, generic-aeson
     , generic-xmlpickler, hxt, json-schema, mtl, rest-core, rest-gen
-     , safe, stm, text, time, transformers, transformers-base
-     , transformers-compat, unordered-containers
+     , safe, stm, text, time, transformers, transformers-compat
+     , unordered-containers
     }:
     mkDerivation {
       pname = "rest-example";
-       version = "0.2.0.2";
-       sha256 = "f1d66ed2a8d6f700cb60b5d046afe20010ac909cd3004d55cca75c2ee13fb88e";
-       revision = "2";
-       editedCabalFile = "740218a910858726cbd723e9c54b7d3f2632d6ad057fb71edbf04cc54a021a68";
+       version = "0.2.0.3";
+       sha256 = "d71368418eca3128e887198f365b857011017e2515dd30856076b54d185b1a5e";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
-         aeson base containers filepath generic-aeson generic-xmlpickler hxt
+         aeson base containers generic-aeson generic-xmlpickler hxt
         json-schema mtl rest-core safe stm text time transformers
-         transformers-base transformers-compat unordered-containers
+         transformers-compat unordered-containers
       ];
-       executableHaskellDepends = [
-         base mtl rest-core rest-gen transformers-compat
-       ];
-       jailbreak = true;
+       executableHaskellDepends = [ base rest-gen ];
       homepage = "http://www.github.com/silkapp/rest";
       description = "Example project for rest";
       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

  "rest-gen_0_16_1_3" = callPackage
@ -151959,19 +152068,20 @@ self: {
    ({ mkDerivation, aeson, array, base, base64-bytestring
     , basic-prelude, binary, bytestring, data-binary-ieee754, lens
     , monad-loops, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , text, unordered-containers, yaml-light
+     , template-haskell, text, unordered-containers, yaml-light
     }:
     mkDerivation {
       pname = "sbp";
-       version = "0.50.9";
-       sha256 = "401caeccf6dbc4d9452a450a4142dd9ed412f89981bd26a9315af7b1152c8261";
+       version = "0.51.1";
+       sha256 = "b98b5dd46c3e94801205b0c89741fc4aaf64550fbd7604117241584a786f096a";
       libraryHaskellDepends = [
         aeson array base base64-bytestring basic-prelude binary bytestring
-         data-binary-ieee754 lens monad-loops text unordered-containers
+         data-binary-ieee754 lens monad-loops template-haskell text
+         unordered-containers
       ];
       testHaskellDepends = [
-         aeson base basic-prelude bytestring QuickCheck tasty tasty-hunit
-         tasty-quickcheck yaml-light
+         aeson base base64-bytestring basic-prelude bytestring QuickCheck
+         tasty tasty-hunit tasty-quickcheck yaml-light
       ];
       homepage = "https://github.com/swift-nav/libsbp";
       description = "SwiftNav's SBP Library";
@ -153554,6 +153664,27 @@ self: {
       license = stdenv.lib.licenses.bsd3;
     }) {inherit (pkgs) openssl;};

+  "secp256k1" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, cryptohash
+     , entropy, HUnit, mtl, QuickCheck, secp256k1, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "secp256k1";
+       version = "0.1.1";
+       sha256 = "ea4dadb68f6704d9dd30c3b7aa92c9fad1c0ebc00ac6e2d64457af31f0112c1f";
+       libraryHaskellDepends = [ base bytestring entropy mtl ];
+       librarySystemDepends = [ secp256k1 ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring cryptohash entropy HUnit mtl
+         QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       homepage = "http://github.com/haskoin/secp256k1#readme";
+       description = "secp256k1 bindings for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {secp256k1 = null;};
+
  "secret-santa" = callPackage
    ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib
     , haskell-qrencode, random
@ -158471,6 +158602,8 @@ self: {
       pname = "singletons";
       version = "2.0.0.2";
       sha256 = "981cb6a02978ca0e7eb62117a1df8ba4db16eef159aebfafe53e396e86e16f3d";
+       revision = "1";
+       editedCabalFile = "219b117097e85e93c213600da8051784de3090ae7088c2d3d921ffee8373c28b";
       libraryHaskellDepends = [
         base containers mtl syb template-haskell th-desugar
       ];
@ -178665,6 +178798,8 @@ self: {
       pname = "unix-process-conduit";
       version = "0.2.2.3";
       sha256 = "9e6d6b48a410bf5e788cc725bb00066ab500d6eef6ba64fbf3ef41bd1b97af51";
+       revision = "1";
+       editedCabalFile = "bd35a20a4b51cd11bfcacd873bf6077f44684fdba8a4f6e08aea068f0849ee75";
       libraryHaskellDepends = [
         base bytestring conduit directory filepath process stm time
         transformers unix
@ -180781,8 +180916,8 @@ self: {
     }:
     mkDerivation {
       pname = "vcache-trie";
-       version = "0.2.3";
-       sha256 = "c039dcb12fdf4c7b1d47753ef1317037de6908f2cfe1bef7003dc6786d2dbe7a";
+       version = "0.2.4";
+       sha256 = "051ea7db60c1e414f4dd7f8a6451d88b926484a7a0858579631df0844b89aeee";
       libraryHaskellDepends = [
         array base bytestring bytestring-builder vcache
       ];
@ -185157,6 +185292,8 @@ self: {
       pname = "warp-tls";
       version = "3.0.1";
       sha256 = "fe76f1da11b4fc1f09d6d7b4bd2b6a601f422fa5b5e013aa79be45aa59cc0769";
+       revision = "1";
+       editedCabalFile = "d2f79e54d7f8e989621b38230d0ead8f9f68612ccf6ab56e260882cef40a40af";
       libraryHaskellDepends = [
         base bytestring cprng-aes data-default-class network
         streaming-commons tls wai warp
@ -185176,6 +185313,8 @@ self: {
       pname = "warp-tls";
       version = "3.0.1.1";
       sha256 = "351731d0a00c5db1627ac88d4cce17e8f7efe4c3b5314e868b6c355f854b7281";
+       revision = "1";
+       editedCabalFile = "2d984fade290388448566b73099486df1abefc4b4a0d4c72d384195372089275";
       libraryHaskellDepends = [
         base bytestring cprng-aes data-default-class network
         streaming-commons tls wai warp
@ -185195,6 +185334,8 @@ self: {
       pname = "warp-tls";
       version = "3.0.1.2";
       sha256 = "e268617bc37b0afc18b0f0d7ed30f751536d845a2e08c8ebbdec41b2cadc8ef5";
+       revision = "1";
+       editedCabalFile = "27eea06a544aa9b966f353c86d33cb229be45d3f694d37a73a039c58817711ff";
       libraryHaskellDepends = [
         base bytestring cprng-aes data-default-class network
         streaming-commons tls wai warp
@ -185214,6 +185355,8 @@ self: {
       pname = "warp-tls";
       version = "3.0.1.3";
       sha256 = "ec91266592837736e825657543d8e5f8cae3e436172134fa1ef4d098ce0b1e74";
+       revision = "1";
+       editedCabalFile = "4bfceb6c80e9b65afe60f307d5ec502f1dedf379a2fe14eb5dfc8dd6b7fae30f";
       libraryHaskellDepends = [
         base bytestring cprng-aes data-default-class network
         streaming-commons tls wai warp
@ -185233,6 +185376,8 @@ self: {
       pname = "warp-tls";
       version = "3.0.1.4";
       sha256 = "b3e94ba26894de0943973fcdda69ed3f9c2b92ba355ead9b95e3513399e78bb8";
+       revision = "1";
+       editedCabalFile = "29c289fa557c1a05d5b3619851aabe78d6c93af9f4162710c0b8cd0f365b7579";
       libraryHaskellDepends = [
         base bytestring cprng-aes data-default-class network
         streaming-commons tls wai warp
@ -185252,6 +185397,8 @@ self: {
       pname = "warp-tls";
       version = "3.0.2";
       sha256 = "ed3bf9d6a084f3fbc059fe06a7add0fc5f95454228615a2c23f0c683235019ca";
+       revision = "1";
+       editedCabalFile = "24ca7da4a6766a4583c8ee82b22bbf0d5b8c70d4d0ac43ead58c09c6c24e696f";
       libraryHaskellDepends = [
         base bytestring cprng-aes data-default-class network
         streaming-commons tls wai warp
@ -185271,6 +185418,8 @@ self: {
       pname = "warp-tls";
       version = "3.0.3";
       sha256 = "b5260c5fd5f51048448347a2acc72b60fbadfa05e57cc1a70328a2e22accf7d9";
+       revision = "1";
+       editedCabalFile = "5fd916e672092798e2d24f7cf778229527c602c1156309c1d18d95a87a6488a6";
       libraryHaskellDepends = [
         base bytestring cprng-aes data-default-class network
         streaming-commons tls wai warp
@ -185290,6 +185439,8 @@ self: {
       pname = "warp-tls";
       version = "3.0.4";
       sha256 = "e42d4de7a02997e266272e735dc068c42086f4a2d95b02a56ccca0f2ad8f680e";
+       revision = "1";
+       editedCabalFile = "58b0585d8b497743315b6c867c5002ca6d89803f6f37d4c47cfc752b9aed0a3f";
       libraryHaskellDepends = [
         base bytestring cprng-aes data-default-class network
         streaming-commons tls wai warp
@ -185309,6 +185460,8 @@ self: {
       pname = "warp-tls";
       version = "3.0.4.1";
       sha256 = "9edc7a498c3dc75a1d8eca9a16b2d913d00573424f8688f823a8289da438245d";
+       revision = "1";
+       editedCabalFile = "0265d3e7e1dbb9ef5fa287d55b1771ea838390335e543b71b9da7cb4d752edad";
       libraryHaskellDepends = [
         base bytestring cprng-aes data-default-class network
         streaming-commons tls wai warp
@ -185514,8 +185667,8 @@ self: {
     }:
     mkDerivation {
       pname = "wavefront";
-       version = "0.1.0.2";
-       sha256 = "f97a815a374303c9a2ff4a616b80f5202550f062c1cd7641bdaaf8af487f2386";
+       version = "0.2";
+       sha256 = "5f9130cb8fa4ecb1b4f6313aa24c8e7c595c15cce72fa9a2e0f009dd6cb9503c";
       libraryHaskellDepends = [
         attoparsec base dlist filepath mtl text transformers
       ];
@ -186115,6 +186268,32 @@ self: {
       license = stdenv.lib.licenses.bsd3;
     }) {};

+  "webdriver_0_7" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, cond, data-default, directory, directory-tree
+     , exceptions, filepath, http-client, http-types, lifted-base
+     , monad-control, mtl, network, network-uri, parallel, scientific
+     , temporary, text, time, transformers, transformers-base
+     , unordered-containers, vector, zip-archive
+     }:
+     mkDerivation {
+       pname = "webdriver";
+       version = "0.7";
+       sha256 = "3e26d74d378318d58fd8080d2e18394e953821801ee6ce8394e6321c7bdb6b6f";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring cond
+         data-default directory directory-tree exceptions filepath
+         http-client http-types lifted-base monad-control mtl network
+         network-uri scientific temporary text time transformers
+         transformers-base unordered-containers vector zip-archive
+       ];
+       testHaskellDepends = [ base parallel text ];
+       homepage = "https://github.com/kallisti-dev/hs-webdriver";
+       description = "a Haskell client for the Selenium WebDriver protocol";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
  "webdriver-angular" = callPackage
    ({ mkDerivation, aeson, base, hspec, hspec-webdriver
     , language-javascript, template-haskell, text, transformers
@ -187265,29 +187444,30 @@ self: {
     }) {};

  "wolf" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-s3, amazonka-swf, base
-     , bytestring, conduit, conduit-extra, cryptohash, exceptions
-     , fast-logger, http-conduit, lens, monad-control, monad-logger, mtl
-     , mtl-compat, optparse-applicative, safe, shelly, text
-     , transformers, transformers-base, unordered-containers, uuid, yaml
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
+     , amazonka-swf, base, bytestring, conduit, conduit-extra
+     , exceptions, fast-logger, http-conduit, lens, monad-control
+     , monad-logger, mtl, mtl-compat, optparse-applicative, resourcet
+     , safe, shelly, text, transformers, transformers-base
+     , unordered-containers, uuid, yaml
     }:
     mkDerivation {
       pname = "wolf";
-       version = "0.1.1";
-       sha256 = "6912721ba6ea5ebfb9f80a773880eaea2907310b69806f3d925e5d8ca8ec28bd";
+       version = "0.2.0";
+       sha256 = "0660d46bd7defb4aebc74a19524da014f3e2b4da6beec8d7b9f4c78c59e5c013";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
-         aeson amazonka amazonka-s3 amazonka-swf base bytestring conduit
-         conduit-extra cryptohash exceptions fast-logger http-conduit lens
-         monad-control monad-logger mtl mtl-compat optparse-applicative safe
-         text transformers transformers-base unordered-containers uuid yaml
+         aeson amazonka amazonka-core amazonka-s3 amazonka-swf base
+         bytestring conduit conduit-extra exceptions fast-logger
+         http-conduit lens monad-control monad-logger mtl mtl-compat
+         optparse-applicative resourcet safe text transformers
+         transformers-base unordered-containers uuid yaml
       ];
       executableHaskellDepends = [
-         base bytestring cryptohash optparse-applicative shelly text
-         transformers yaml
+         aeson amazonka-core base bytestring optparse-applicative resourcet
+         shelly text transformers yaml
       ];
-       jailbreak = true;
       homepage = "https://github.com/swift-nav/wolf";
       description = "Amazon Simple Workflow Service Wrapper";
       license = stdenv.lib.licenses.mit;
@ -192137,21 +192317,22 @@ self: {
     }) {};

  "yesod-auth-ldap-native" = callPackage
-    ({ mkDerivation, aeson, base, either, ldap-client, semigroups, text
+    ({ mkDerivation, base, either, ldap-client, semigroups, text
     , transformers, yesod-auth, yesod-core, yesod-form
     }:
     mkDerivation {
       pname = "yesod-auth-ldap-native";
-       version = "0.1.0.0";
-       sha256 = "49cd23ae22d5acc2c7a2d6bca074e7bca28197d057ccd4d9da08f5af0923db28";
+       version = "0.1.0.2";
+       sha256 = "f94461b1e26ce682122ee105f537afda8ae6a831810eba8e281bfd56b46cd0e1";
       libraryHaskellDepends = [
-         aeson base either ldap-client semigroups text transformers
-         yesod-auth yesod-core yesod-form
+         base either ldap-client semigroups text transformers yesod-auth
+         yesod-core yesod-form
       ];
       testHaskellDepends = [ base ];
       homepage = "http://github.com/mulderr/yesod-auth-ldap-native";
       description = "Yesod LDAP authentication plugin";
       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

  "yesod-auth-oauth_1_4_0_1" = callPackage
@ -194655,8 +194836,8 @@ self: {
     }:
     mkDerivation {
       pname = "yesod-media-simple";
-       version = "0.1.0.1";
-       sha256 = "e638551e967a0d89b73d8e6fa0c0957c2a24c6c864e17e0cdb03f58335ce54aa";
+       version = "0.2.0.0";
+       sha256 = "d3489fd4cd6f1e1614301939eea8a61222c22f77fe13a6d5460f62fd590cdfe9";
       libraryHaskellDepends = [
         base bytestring diagrams-cairo diagrams-core diagrams-lib directory
         JuicyPixels vector yesod
@ -196435,7 +196616,7 @@ self: {
       ];
       description = "Utilities for reading and writing Alteryx .yxdb files";
       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
     }) {};

  "z3" = callPackage
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@ -1,13 +1,16 @@
-{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper
+{ stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper
 , libXinerama, libXcursor
 }:

 stdenv.mkDerivation rec {
-  name = "glfw-3.1.1";
+  version = "3.1.2";
+  name = "glfw-${version}";

-  src = fetchurl {
-    url = "mirror://sourceforge/glfw/${name}.tar.bz2";
-    sha256 = "0q9dhbj2az7jwwi556zai0qr8zmg6d2lyxcqngppkw0x7hi1d1aa";
+  src = fetchFromGitHub {
+    owner = "glfw";
+    repo = "GLFW";
+    rev = "${version}";
+    sha256 = "1aj1dfyyd0170gpz32j2xlqbvbsxwbg028xiqai3mqc44xfp10kw";
  };

  enableParallelBuilding = true;
@ -21,7 +24,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; { 
    description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
-    homepage = "http://glfw.sourceforge.net/";
+    homepage = "http://www.glfw.org/";
    license = licenses.zlib;
    maintainers = with maintainers; [ marcweber ];
    platforms = platforms.linux;
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@ -1,13 +1,15 @@
 { lib, stdenv, fetchurl, libgcrypt }:

 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.43";
+  name = "libmicrohttpd-0.9.44";

  src = fetchurl {
    url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "17q6v5q0jpg57vylby6rx1qkil72bdx8gij1g9m694gxf5sb6js1";
+    sha256 = "07j1p21rvbrrfpxngk8xswzkmjkh94bp1971xfjh1p0ja709qwzj";
  };

+  outputs = [ "out" "info" ];
+
  buildInputs = [ libgcrypt ];

  preCheck =
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@ -5,10 +5,10 @@ let

  version = "${libVersion}-list-${listVersion}";

-  listVersion = "2015-09-25";
+  listVersion = "2015-10-11";
  listSources = fetchFromGitHub {
-    sha256 = "045snl0pz8ma5rk51xxbjcamm28hi4z2v7gd8zkkv8yrjyg9yp82";
-    rev = "509db00ef21795e58bfc2c576cebf72c8ee7a6f9";
+    sha256 = "1zvfywi43kyh7b6hsm8ldmdypk9n36jzp0s1lf2rzd4yzcyxwgzy";
+    rev = "8952c0c398ba44d507a8ed430fd1cff7b92dfde8";
    repo = "list";
    owner = "publicsuffix";
  };
--- a/pkgs/development/ocaml-modules/alcotest/default.nix
+++ b/pkgs/development/ocaml-modules/alcotest/default.nix
@ -1,18 +1,18 @@
-{stdenv, buildOcaml, fetchurl, ounit, re, cmdliner}:
+{ stdenv, buildOcaml, fetchzip, cmdliner, stringext }:

 buildOcaml rec {
  name = "alcotest";
-  version = "0.3.1";
+  version = "0.4.5";

-  src = fetchurl {
-    url = "https://github.com/samoht/alcotest/archive/${version}.tar.gz";
-    sha256 = "a0e6c9a33c59b206ecc949655fa6e17bdd1078c8b610b14d8f6f0f1b489b0b43";
+  src = fetchzip {
+    url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz";
+    sha256 = "1wcn9hkjf4cbnrz99w940qfjpi0lvd8v63yxwpnafkff871dwk6k";
  };

-  propagatedBuildInputs = [ ounit re cmdliner ];
+  propagatedBuildInputs = [ cmdliner stringext ];

  meta = with stdenv.lib; {
-    homepage = https://github.com/samoht/alcotest;
+    homepage = https://github.com/mirage/alcotest;
    description = "A lightweight and colourful test framework";
    license = stdenv.lib.licenses.isc;
    maintainers = [ maintainers.ericbmerritt ];
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@ -2,11 +2,11 @@

 let
  pname = "cmdliner";
-  version = "0.9.7";
+  version = "0.9.8";
  ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in

-assert stdenv.lib.versionAtLeast ocaml_version "4.00";
+assert stdenv.lib.versionAtLeast ocaml_version "3.12";

 stdenv.mkDerivation {

@ -14,7 +14,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "0ymzy1l6z85b6779lfxk179igfpf7rgfik70kr3c7lxmzwy8j6cw";
+    sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
  };

  unpackCmd = "tar xjf $src";
--- a/pkgs/development/ocaml-modules/gg/default.nix
+++ b/pkgs/development/ocaml-modules/gg/default.nix
@ -4,7 +4,7 @@ let
  inherit (stdenv.lib) getVersion versionAtLeast;

  pname = "gg";
-  version = "0.9.0";
+  version = "0.9.1";
  webpage = "http://erratique.ch/software/${pname}";
 in

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "055pza6jbjjj7wgzf7pbn0ccxw76i8w5b2bcnaz8b9m4x6jaa6gh";
+    sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2";
  };

  buildInputs = [ ocaml findlib opam ];
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@ -5,22 +5,18 @@ stdenv.mkDerivation rec {
  version = "0.13.9";

  src = fetchurl {
-    url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar";
-    sha256 = "04k411gcrq35ayd2xj79bcshczslyqkicwvhkf07hkyr4j3blxda";
+    url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
+    sha256 = "148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504";
  };

-  phases = [ "installPhase" ];
+  patchPhase = ''
+    echo -java-home ${jre.home} >>conf/sbtopts
+  '';

  installPhase = ''
-    mkdir -p $out/bin
-    cat > $out/bin/sbt << EOF
-    #! ${stdenv.shell}
-    if [ ! -v JAVA_HOME ]; then
-        export JAVA_HOME="${jre.home}"
-    fi
-    ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
-    EOF
-    chmod +x $out/bin/sbt
+    mkdir -p $out/share/sbt $out/bin
+    cp -ra . $out/share/sbt
+    ln -s $out/share/sbt/bin/sbt $out/bin/
  '';

  meta = {
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/pkgs/development/tools/literate-programming/nuweb/default.nix
@ -0,0 +1,37 @@
+{stdenv, fetchurl, tex}:
+
+stdenv.mkDerivation rec{
+
+  name = "nuweb-${version}";
+  version = "1.58";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/nuweb/${name}.tar.gz";
+    sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
+  };
+
+  buildInputs = [ tex ];
+
+  patchPhase = ''
+    sed -ie 's|nuweb -r|./nuweb -r|' Makefile
+  '';
+  buildPhase = ''
+    make nuweb
+    make nuweb.pdf nuwebdoc.pdf all
+  '';
+  installPhase = ''
+    install -d $out/bin $out/share/man/man1 $out/share/doc/${name} $out/share/emacs/site-lisp
+    cp nuweb $out/bin
+    cp nuweb.el $out/share/emacs/site-lisp
+    gzip -c nuweb.1 > $out/share/man/man1/nuweb.1.gz
+    cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${name}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple literate programming tool";
+    homepage = http://nuweb.sourceforge.net;
+    license = licenses.free;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
+# TODO: nuweb.el Emacs integration
--- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
@ -8,3 +8,14 @@
 
 ####
 
+--- old/Makefile	2014-09-30 16:40:37.000000000 +0200
+++ new/Makefile	2015-10-14 10:28:41.366815864 +0200
+@@ -52,7 +52,7 @@
+ install-bin:
+ 	install -d -m 755 $(BINDIR)
+ 	install $(BIN) $(BINDIR)
+-	install $(TOOLS) $(BINDIR)
+	install $(TOOLS) $(BINDIR) || true
+ 
+ uninstall: uninstall-lib uninstall-bin
+ 
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@ -1,23 +1,25 @@
-{ stdenv, fetchurl, ocaml, findlib, ocpBuild, opam, cmdliner }:
+{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:

 let inherit (stdenv.lib) getVersion versionAtLeast; in

 assert versionAtLeast (getVersion ocaml) "3.12.1";
-assert versionAtLeast (getVersion ocpBuild) "1.99.3-beta";
+assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";

 stdenv.mkDerivation {

-  name = "ocp-indent-1.4.2b";
+  name = "ocp-indent-1.5.2";

-  src = fetchurl {
-    url = "https://github.com/OCamlPro/ocp-indent/archive/1.4.2b.tar.gz";
-    sha256 = "1p0n2zcl5kf543x2xlqrz1aa51f0dqal8l392sa41j6wx82j0gpb";
+  src = fetchzip {
+    url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz";
+    sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
  };

  buildInputs = [ ocaml findlib ocpBuild opam cmdliner ];

  createFindlibDestdir = true;

+  preConfigure = "patchShebangs ./install.sh";
+
  postInstall = ''
    mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
  '';
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@ -2,7 +2,7 @@

 let inherit (stdenv.lib) getVersion versionAtLeast optional; in

-assert versionAtLeast (getVersion ocaml) "3.12.1";
+assert versionAtLeast (getVersion ocaml) "4";
 assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
 assert versionAtLeast (getVersion ocpIndent) "1.4.2";

--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@ -1,21 +1,22 @@
-{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig
+{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders
 , withGUI ? false , qt4 ? null}:

 # libX11 is needed because the Qt build stuff automatically adds `-lX11'.
 assert withGUI -> qt4 != null;

 stdenv.mkDerivation rec {
-  name = "oprofile-1.0.0";
+  name = "oprofile-1.1.0";

  src = fetchurl {
    url = "mirror://sourceforge/oprofile/${name}.tar.gz";
-    sha256 = "0nn4wfvwy4nii25y6lwlrnzx9ah4nz0r93yk7hswiy6wxjs10wc4";
+    sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg";
  };

-  buildInputs = [ binutils zlib popt pkgconfig ]
+  buildInputs = [ binutils zlib popt pkgconfig linuxHeaders ]
    ++ stdenv.lib.optionals withGUI [ qt4 ];

  configureFlags = [
+      "--with-kernel=${linuxHeaders}"
      "--disable-shared"   # needed because only the static libbfd is available
    ]
    ++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@ -36,7 +36,7 @@ stdenv.mkDerivation {
    echo 'export SLIMERJSLAUNCHER=${firefox}/bin/firefox' >>  "$out/bin/slimerjs"
    echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs"
    chmod a+x "$out/bin/slimerjs"
-    sed -e 's@MaxVersion=3[0-9][.]@MaxVersion=40.@' -i "$out/lib/slimerjs/application.ini"
+    sed -e 's@MaxVersion=[34][0-9][.]@MaxVersion=50.@' -i "$out/lib/slimerjs/application.ini"
  '';
  meta = {
    inherit (s) version;
--- a/pkgs/games/scrolls/default.nix
+++ b/pkgs/games/scrolls/default.nix
@ -2,7 +2,7 @@
 , mesa_glu, libX11, libXext, libXcursor, libpulseaudio
 }:
 stdenv.mkDerivation {
-  name = "scrolls-2014-03-08";
+  name = "scrolls-2015-10-13";

  meta = {
    description = "A strategy collectible card game";
@ -16,7 +16,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://download.scrolls.com/client/linux.tar.gz";
-    sha256 = "164d13ce5b81b215a58bae5a0d024b4cf6e32c986ca57a2c9d4e80326edb5004";
+    sha256 = "ead1fd14988aa07041fedfa7f845c756cd5077a5a402d85bfb749cb669ececec";
  };

  libPath = stdenv.lib.makeLibraryPath [
@ -39,7 +39,7 @@ stdenv.mkDerivation {
      --set-rpath "$libPath" "$out/opt/Scrolls/Scrolls"

    mkdir "$out/bin"
-    ln -s "$out/opt/Scrolls/Scrolls" "$out/bin/Scrolls" 
+    ln -s "$out/opt/Scrolls/Scrolls" "$out/bin/Scrolls"
  '';

 }
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-tools/default.nix
@ -0,0 +1,53 @@
+{ stdenv, fetchurl, alsaLib, pkgconfig, gtk, gtk3, fltk13 }:
+
+stdenv.mkDerivation rec {
+  name = "alsa-tools-${version}";
+  version = "1.0.29";
+
+  src = fetchurl {
+    urls = [
+      "ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2"
+      "http://alsa.cybermirror.org/tools/${name}.tar.bz2"
+    ];
+    sha256 = "1lgvyb81md25s9ciswpdsbibmx9s030kvyylf0673w3kbamz1awl";
+  };
+
+  buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ];
+
+  patchPhase = ''
+    export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control"
+    # export tools="as10k1 hda-verb hdspmixer qlo10k1 seq usx2yloader echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control"
+  '';
+
+  configurePhase = ''
+    for tool in $tools; do
+      echo "Tool: $tool:"
+      cd "$tool"; ./configure --prefix="$out"; cd -
+    done
+  '';
+
+  buildPhase = ''
+    for tool in $tools; do
+      cd "$tool"; make; cd -
+    done
+  '';
+
+  installPhase = ''
+    for tool in $tools; do
+      cd "$tool"; make install; cd -
+    done
+  '';
+
+  meta = {
+    homepage = http://www.alsa-project.org/;
+    description = "ALSA, the Advanced Linux Sound Architecture tools";
+
+    longDescription = ''
+      The Advanced Linux Sound Architecture (ALSA) provides audio and
+      MIDI functionality to the Linux-based operating system.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.fps ];
+  };
+}
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@ -3,10 +3,10 @@ let
  s = # Generated upstream information
  rec {
    baseName="eudev";
-    version = "3.1.2";
+    version = "3.1.5";
    name="${baseName}-${version}";
    url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
-    sha256 = "0wq2w67ip957l5bi21jj3w2rv7s7klcrnlg6zpg1g0fxjfgbd4s3";
+    sha256 = "0akg9gcc3c2p56xbhlvbybqavcprly5q0bvk655zwl6d62j8an7p";
  };
  buildInputs = [
    glib pkgconfig gperf utillinux
--- a/Show More
+++ b/Show More