Merge branch 'master' into staging

This is to get the openssl security update immediately,
as it surely causes a nontrivial rebuild.

default.nix

@@ -1,4 +1,4 @@
-let requiredVersion = "1.10"; in
+let requiredVersion = import ./lib/minver.nix; in
 
 if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then
 

lib/minver.nix

@@ -0,0 +1,2 @@
+# Expose the minimum required version for evaluating Nixpkgs
+"1.10"

lib/types.nix

@@ -193,9 +193,9 @@ rec {
 
     nullOr = elemType: mkOptionType {
       name = "null or ${elemType.name}";
-      check = x: builtins.isNull x || elemType.check x;
+      check = x: x == null || elemType.check x;
       merge = loc: defs:
-        let nrNulls = count (def: isNull def.value) defs; in
+        let nrNulls = count (def: def.value == null) defs; in
         if nrNulls == length defs then null
         else if nrNulls != 0 then
           throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}."
@@ -230,11 +230,18 @@ rec {
         substSubModules = m: submodule m;
       };
 
-    enum = values: mkOptionType {
+    enum = values:
-      name = "one of ${concatStringsSep ", " values}";
+      let
-      check = flip elem values;
+        show = v:
-      merge = mergeOneOption;
+               if builtins.isString v then ''"${v}"''
-    };
+          else if builtins.isInt v then builtins.toString v
+          else ''<${builtins.typeOf v}>'';
+      in
+      mkOptionType {
+        name = "one of ${concatMapStringsSep ", " show values}";
+        check = flip elem values;
+        merge = mergeOneOption;
+      };
 
     either = t1: t2: mkOptionType {
       name = "${t1.name} or ${t2.name}";

nixos/modules/hardware/video/bumblebee.nix

@@ -2,10 +2,20 @@
 
 with lib;
 let
+  cfg = config.hardware.bumblebee;
+
   kernel = config.boot.kernelPackages;
-  bumblebee = if config.hardware.bumblebee.connectDisplay
+
-              then pkgs.bumblebee_display
+  useNvidia = cfg.driver == "nvidia";
-              else pkgs.bumblebee;
+
+  bumblebee = pkgs.bumblebee.override {
+    inherit useNvidia;
+    useDisplayDevice = cfg.connectDisplay;
+  };
+
+  primus = pkgs.primus.override {
+    inherit useNvidia;
+  };
 
 in
 
@@ -29,6 +39,7 @@ in
       type = types.str;
       description = ''Group for bumblebee socket'';
     };
+
     hardware.bumblebee.connectDisplay = mkOption {
       default = false;
       type = types.bool;
@@ -40,26 +51,30 @@ in
         Only nvidia driver is supported so far.
       '';
     };
+
+    hardware.bumblebee.driver = mkOption {
+      default = "nvidia";
+      type = types.enum [ "nvidia" "nouveau" ];
+      description = ''
+        Set driver used by bumblebeed. Supported are nouveau and nvidia.
+      '';
+    };
   };
 
   config = mkIf config.hardware.bumblebee.enable {
     boot.blacklistedKernelModules = [ "nouveau" "nvidia" ];
     boot.kernelModules = [ "bbswitch" ];
-    boot.extraModulePackages = [ kernel.bbswitch kernel.nvidia_x11 ];
+    boot.extraModulePackages = [ kernel.bbswitch ] ++ optional useNvidia kernel.nvidia_x11;
 
-    environment.systemPackages = [ bumblebee pkgs.primus ];
+    environment.systemPackages = [ bumblebee primus ];
 
     systemd.services.bumblebeed = {
       description = "Bumblebee Hybrid Graphics Switcher";
       wantedBy = [ "display-manager.service" ];
       path = [ kernel.bbswitch bumblebee ];
       serviceConfig = {
-        ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}";
+        ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}";
-        Restart = "always";
-        RestartSec = 60;
-        CPUSchedulingPolicy = "idle";
       };
-      environment.LD_LIBRARY_PATH="/run/opengl-driver/lib/";
       environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
     };
   };

nixos/modules/services/hardware/tlp.nix

@@ -10,7 +10,6 @@ enableRDW = config.networking.networkmanager.enable;
 
 tlp = pkgs.tlp.override {
   inherit enableRDW;
-  kmod = config.system.sbin.modprobe;
 };
 
 # XXX: We can't use writeTextFile + readFile here because it triggers
@@ -69,6 +68,8 @@ in
           ExecStart = "${tlp}/bin/tlp init start";
           ExecStop = "${tlp}/bin/tlp init stop";
         };
+
+        environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
       };
 
       tlp-sleep = {
@@ -87,6 +88,8 @@ in
           ExecStart = "${tlp}/bin/tlp suspend";
           ExecStop = "${tlp}/bin/tlp resume";
         };
+
+        environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
       };
     };
 

nixos/modules/services/misc/gitlab.nix

@@ -27,6 +27,7 @@ let
     http_settings:
       self_signed_cert: false
     repos_path: "${cfg.stateDir}/repositories"
+    secret_file: "${cfg.stateDir}/config/gitlab_shell_secret"
     log_file: "${cfg.stateDir}/log/gitlab-shell.log"
     redis:
       bin: ${pkgs.redis}/bin/redis-cli
@@ -142,7 +143,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ gitlab-runner pkgs.gitlab-shell ];
+    environment.systemPackages = [ pkgs.git gitlab-runner pkgs.gitlab-shell ];
 
     assertions = [
       { assertion = cfg.databasePassword != "";
@@ -154,7 +155,6 @@ in {
     services.redis.enable = mkDefault true;
     # We use postgres as the main data store.
     services.postgresql.enable = mkDefault true;
-    services.postgresql.package = mkDefault pkgs.postgresql;
     # Use postfix to send out mails.
     services.postfix.enable = mkDefault true;
 
@@ -209,6 +209,23 @@ in {
       };
     };
 
+    systemd.services.gitlab-git-http-server = {
+      after = [ "network.target" "gitlab.service" ];
+      wantedBy = [ "multi-user.target" ];
+      environment.HOME = "${cfg.stateDir}/home";
+      path = with pkgs; [
+        gitAndTools.git
+        openssh
+      ];
+      serviceConfig = {
+        Type = "simple";
+        User = "gitlab";
+        Group = "gitlab";
+        TimeoutSec = "300";
+        ExecStart = "${pkgs.gitlab-git-http-server}/bin/gitlab-git-http-server -listenUmask 0 -listenNetwork unix -listenAddr ${cfg.stateDir}/tmp/sockets/gitlab-git-http-server.socket -authBackend http://localhost:8080 ${cfg.stateDir}/repositories";
+      };
+    };
+
     systemd.services.gitlab = {
       after = [ "network.target" "postgresql.service" "redis.service" ];
       wantedBy = [ "multi-user.target" ];
@@ -219,6 +236,8 @@ in {
       environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log";
       environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites";
       environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}";
+      environment.GITLAB_SHELL_CONFIG_PATH = "${cfg.stateDir}/shell/config.yml";
+      environment.GITLAB_SHELL_SECRET_PATH = "${cfg.stateDir}/config/gitlab_shell_secret";
       environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories";
       environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks";
       environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile";
@@ -247,7 +266,7 @@ in {
         rm -rf ${cfg.stateDir}/config
         mkdir -p ${cfg.stateDir}/config
         # TODO: What exactly is gitlab-shell doing with the secret?
-        head -c 20 /dev/urandom > ${cfg.stateDir}/config/gitlab_shell_secret
+        tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 20 > ${cfg.stateDir}/config/gitlab_shell_secret
         mkdir -p ${cfg.stateDir}/home/.ssh
         touch ${cfg.stateDir}/home/.ssh/authorized_keys
 
@@ -272,6 +291,7 @@ in {
           fi
         fi
 
+      ${bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile db:migrate RAILS_ENV=production
       # Install the shell required to push repositories
       ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} ${cfg.stateDir}/shell/config.yml
       export GITLAB_SHELL_CONFIG_PATH=""${cfg.stateDir}/shell/config.yml
@@ -296,5 +316,4 @@ in {
     };
 
   };
-
 }

nixos/modules/services/monitoring/teamviewer.nix

@@ -14,7 +14,7 @@ in
 
   options = {
 
-    services.teamviewer.enable = mkEnableOption "teamviewer daemon";
+    services.teamviewer.enable = mkEnableOption "TeamViewer daemon";
       
   };
 
@@ -27,9 +27,9 @@ in
     systemd.services.teamviewerd = {
       description = "TeamViewer remote control daemon";
 
-      wantedBy = [ "graphical.target" ];
+      wantedBy = [ "multi-user.target" ];
       after = [ "NetworkManager-wait-online.service" "network.target" ];
-      preStart = "mkdir -pv /var/tmp/teamviewer10/{logs,config}";
+      preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer";
 
       serviceConfig = {
         Type = "forking";

nixos/modules/services/networking/nsd.nix

@@ -300,22 +300,8 @@ in
   options = {
     services.nsd = {
 
-      enable = mkOption {
+      enable = mkEnableOption "NSD authoritative DNS server";
-        type        = types.bool;
+      bind8Stats = mkEnableOption "BIND8 like statistics";
-        default     = false;
-        description = ''
-          Whether to enable the NSD authoritative domain name server.
-        '';
-      };
-
-      bind8Stats = mkOption {
-        type        = types.bool;
-        default     = false;
-        example     = true;
-        description = ''
-          Wheter to enable BIND8 like statisics.
-        '';
-      };
 
       rootServer = mkOption {
         type        = types.bool;
@@ -483,13 +469,7 @@ in
 
 
       ratelimit = {
-        enable = mkOption {
+        enable = mkEnableOption "ratelimit capabilities";
-          type        = types.bool;
-          default     = false;
-          description = ''
-            Enable ratelimit capabilities.
-          '';
-        };
 
         size = mkOption {
           type        = types.int;
@@ -548,13 +528,7 @@ in
 
 
       remoteControl = {
-        enable = mkOption {
+        enable = mkEnableOption "remote control via nsd-control";
-          type        = types.bool;
-          default     = false;
-          description = ''
-            Wheter to enable remote control via nsd-control(8).
-          '';
-        };
 
         interfaces = mkOption {
           type        = types.listOf types.str;

nixos/modules/services/x11/window-managers/afterstep.nix

@@ -8,10 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.afterstep.enable = mkOption {
+    services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep";
-      default = false;
-      description = "Enable the Afterstep window manager.";
-    };
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/bspwm.nix

@@ -8,12 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.bspwm.enable = mkOption {
+    services.xserver.windowManager.bspwm.enable = mkEnableOption "bspwm";
-      type = types.bool;
-      default = false;
-      example = true;
-      description = "Enable the bspwm window manager.";
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/clfswm.nix

@@ -8,14 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.clfswm = {
+    services.xserver.windowManager.clfswm.enable = mkEnableOption "clfswm";
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Enable the clfswm tiling window manager.";
-      };
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/compiz.nix

@@ -15,10 +15,7 @@ in
 
     services.xserver.windowManager.compiz = {
 
-      enable = mkOption {
+      enable = mkEnableOption "compiz";
-        default = false;
-        description = "Enable the Compiz window manager.";
-      };
 
       renderingFlag = mkOption {
         default = "";

nixos/modules/services/x11/window-managers/fluxbox.nix

@@ -8,10 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.fluxbox.enable = mkOption {
+    services.xserver.windowManager.fluxbox.enable = mkEnableOption "fluxbox";
-      default = false;
-      description = "Enable the Fluxbox window manager.";
-    };
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/herbstluftwm.nix

@@ -8,12 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.herbstluftwm.enable = mkOption {
+    services.xserver.windowManager.herbstluftwm.enable = mkEnableOption "herbstluftwm";
-      type = types.bool;
-      default = false;
-      example = true;
-      description = "Enable the herbstluftwm window manager.";
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/i3.nix

@@ -9,11 +9,7 @@ in
 {
   options = {
     services.xserver.windowManager.i3 = {
-      enable = mkOption {
+      enable = mkEnableOption "i3";
-        default = false;
-        example = true;
-        description = "Enable the i3 tiling window manager.";
-      };
 
       configFile = mkOption {
         default = null;

nixos/modules/services/x11/window-managers/icewm.nix

@@ -8,7 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.icewm.enable = mkEnableOption "oroborus";
+    services.xserver.windowManager.icewm.enable = mkEnableOption "icewm";
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/metacity.nix

@@ -12,13 +12,7 @@ in
 
 {
   options = {
-
+    services.xserver.windowManager.metacity.enable = mkEnableOption "metacity";
-    services.xserver.windowManager.metacity.enable = mkOption {
-      default = false;
-      example = true;
-      description = "Enable the metacity window manager.";
-    };
-
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/notion.nix

@@ -8,13 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.notion = {
+    services.xserver.windowManager.notion.enable = mkEnableOption "notion";
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the notion tiling window manager.";
-      };
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/openbox.nix

@@ -1,5 +1,6 @@
 {lib, pkgs, config, ...}:
 
+with lib;
 let
   inherit (lib) mkOption mkIf;
   cfg = config.services.xserver.windowManager.openbox;
@@ -7,13 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.openbox = {
+    services.xserver.windowManager.openbox.enable = mkEnableOption "oroborus";
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the Openbox window manager.";
-      };
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/ratpoison.nix

@@ -8,10 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.ratpoison.enable = mkOption {
+    services.xserver.windowManager.ratpoison.enable = mkEnableOption "ratpoison";
-      default = false;
-      description = "Enable the Ratpoison window manager.";
-    };
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/sawfish.nix

@@ -8,10 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.sawfish.enable = mkOption {
+    services.xserver.windowManager.sawfish.enable = mkEnableOption "sawfish";
-      default = false;
-      description = "Enable the Sawfish window manager.";
-    };
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/spectrwm.nix

@@ -9,13 +9,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.spectrwm = {
+    services.xserver.windowManager.spectrwm.enable = mkEnableOption "spectrwm";
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the spectrwm window manager.";
-      };
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/stumpwm.nix

@@ -8,14 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.stumpwm = {
+    services.xserver.windowManager.stumpwm.enable = mkEnableOption "stumpwm";
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Enable the stumpwm tiling window manager.";
-      };
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/twm.nix

@@ -13,12 +13,7 @@ in
   ###### interface
 
   options = {
-
+    services.xserver.windowManager.twm.enable = mkEnableOption "twm";
-    services.xserver.windowManager.twm.enable = mkOption {
-      default = false;
-      description = "Enable the twm window manager.";
-    };
-
   };
 
 

nixos/modules/services/x11/window-managers/windowmaker.nix

@@ -8,10 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.windowmaker.enable = mkOption {
+    services.xserver.windowManager.windowmaker.enable = mkEnableOption "windowmaker";
-      default = false;
-      description = "Enable the Windowmaker window manager.";
-    };
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/wmii.nix

@@ -1,5 +1,6 @@
-{ config, lib, pkgs, options, modulesPath }:
+{ config, lib, pkgs, options, modulesPath, ... }:
 
+with lib;
 let
   inherit (lib) mkOption mkIf singleton;
   cfg = config.services.xserver.windowManager.wmii;
@@ -7,11 +8,7 @@ let
 in
 {
   options = {
-    services.xserver.windowManager.wmii.enable = mkOption {
+    services.xserver.windowManager.wmii.enable = mkEnableOption "wmii";
-      default = false;
-      example = true;
-      description = "Enable the wmii window manager.";
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/xmonad.nix

@@ -1,5 +1,6 @@
 {pkgs, lib, config, ...}:
 
+with lib;
 let
   inherit (lib) mkOption mkIf optionals literalExample;
   cfg = config.services.xserver.windowManager.xmonad;
@@ -13,12 +14,7 @@ in
 {
   options = {
     services.xserver.windowManager.xmonad = {
-      enable = mkOption {
+      enable = mkEnableOption "xmonad";
-        default = false;
-        example = true;
-        description = "Enable the xmonad window manager.";
-      };
-
       haskellPackages = mkOption {
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";

nixos/modules/tasks/kbd.nix

@@ -56,6 +56,8 @@ in
     # it has a restart trigger.
     systemd.services."systemd-vconsole-setup" =
       { wantedBy = [ "multi-user.target" ];
+        before = [ "display-manager.service" ];
+        after = [ "systemd-udev-settle.service" ];
         restartTriggers = [ vconsoleConf ];
       };
 

nixos/modules/virtualisation/nova-image.nix

@@ -21,7 +21,6 @@ with lib;
   imports = [
     ../profiles/qemu-guest.nix
     ../profiles/headless.nix
-    ./ec2-data.nix
   ];
 
   fileSystems."/".device = "/dev/disk/by-label/nixos";

pkgs/applications/misc/rofi/pass.nix

@@ -1,30 +0,0 @@
-{ stdenv, fetchgit, rofi, wmctrl, xprop, xdotool}:
-
-stdenv.mkDerivation rec {
-  name = "rofi-pass-${version}";
-  version = "1.2";
-
-  src = fetchgit {
-    url = "https://github.com/carnager/rofi-pass";
-    rev = "refs/tags/${version}";
-    sha256 = "1dlaplr18qady5g8sp8xgiqdw81mfx9iisihf8appr5s4sjm559h";
-  };
-
-  buildInputs = [ rofi wmctrl xprop xdotool ];
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -a $src/rofi-pass $out/bin/rofi-pass
-
-    mkdir -p $out/share/doc/rofi-pass/
-    cp -a $src/config.example $out/share/doc/rofi-pass/config.example
-  '';
-
-  meta = {
-      description = "A script to make rofi work with password-store";
-      homepage = https://github.com/carnager/rofi-pass;
-      maintainers = [stdenv.lib.maintainers.hiberno];
-  };
-}

pkgs/applications/misc/urlview/default.nix

@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     description = "Extract URLs from text";
     homepage = http://packages.qa.debian.org/u/urlview.html;
     licencse = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

pkgs/applications/networking/remote/teamviewer/10.nix

@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes,
-wineUnstable, makeWrapper, libXau , patchelf, config }:
-
-with stdenv.lib;
-
-let
-  topath = "${wineUnstable}/bin";
-
-  toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 
-    [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
-in
-stdenv.mkDerivation {
-  name = "teamviewer-10.0.37742";
-  src = fetchurl {
-    url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb";
-    sha256 = config.teamviewer10.sha256 or "10risay1a5a85ijbjaz2vxqbfxygpxslvh0dvzz32k988hr9p1gk";
-  };
-
-  buildInputs = [ makeWrapper patchelf ];
-
-  unpackPhase = ''
-    ar x $src
-    tar xf data.tar.gz
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/teamviewer $out/bin
-    cp -a opt/teamviewer/* $out/share/teamviewer
-    rm -R $out/share/teamviewer/tv_bin/wine/{bin,lib,share}
-
-    cat > $out/bin/teamviewer << EOF
-    #!${stdenv.shell}
-    export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
-    export PATH=${topath}\''${PATH:+:\$PATH}
-    $out/share/teamviewer/tv_bin/script/teamviewer "\$@"
-    EOF
-    chmod +x $out/bin/teamviewer
-
-    ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/
-    rm -rf  $out/share/teamviewer/logfiles $out/share/teamviewer/config
-    ln -sv /var/tmp/teamviewer10/logs/ $out/share/teamviewer/logfiles
-    ln -sv /var/tmp/teamviewer10/config/ $out/share/teamviewer/config
-  '';
-
-  # the fixupPhase undoes the rpath patch
-  postFixup = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd
-    patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd
-  '';
-
-  meta = {
-    homepage = "http://www.teamviewer.com";
-    license = licenses.unfree;
-    description = "Desktop sharing application, providing remote support and online meetings";
-    maintainers = with maintainers; [ jagajaga ];
-  };
-}

pkgs/applications/networking/remote/teamviewer/8.nix

@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau
-, bash, patchelf, config }:
-
-let
-  topath = "${wineUnstable}/bin";
-
-  toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 
-    [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
-in
-stdenv.mkDerivation {
-  name = "teamviewer-8.0.17147";
-  src = fetchurl {
-    url = config.teamviewer8.url or "http://download.teamviewer.com/download/version_8x/teamviewer_linux_x64.deb";
-    sha256 = config.teamviewer8.sha256 or "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k";
-  };
-
-  buildInputs = [ makeWrapper patchelf ];
-
-  unpackPhase = ''
-    ar x $src
-    tar xf data.tar.gz
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/teamviewer8 $out/bin
-    cp -a opt/teamviewer8/* $out/share/teamviewer8
-    rm -R $out/share/teamviewer8/tv_bin/wine/{bin,lib,share}
-
-    cat > $out/bin/teamviewer << EOF
-    #!${bash}/bin/sh
-    export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
-    export PATH=${topath}\''${PATH:+:\$PATH}
-    $out/share/teamviewer8/tv_bin/script/teamviewer "\$@"
-    EOF
-    chmod +x $out/bin/teamviewer
-
-    patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd
-    ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/
-  '';
-
-  meta = {
-    homepage = "http://www.teamviewer.com";
-    license = stdenv.lib.licenses.unfree;
-    description = "Desktop sharing application, providing remote support and online meetings";
-  };
-}

pkgs/applications/networking/remote/teamviewer/9.nix

@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau
-, bash, patchelf, config }:
-
-let
-  topath = "${wineUnstable}/bin";
-
-  toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 
-    [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
-in
-stdenv.mkDerivation {
-  name = "teamviewer-9.0.32150";
-  src = fetchurl {
-    url = config.teamviewer9.url or "http://download.teamviewer.com/download/version_9x/teamviewer_linux_x64.deb";
-    sha256 = config.teamviewer9.sha256 or "0wpwbx0xzn3vlzavszxhfvfcaj3pijlpwvlz5m7w19mb6cky3q13";
-  };
-
-  buildInputs = [ makeWrapper patchelf ];
-
-  unpackPhase = ''
-    ar x $src
-    tar xf data.tar.gz
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/teamviewer9 $out/bin
-    cp -a opt/teamviewer9/* $out/share/teamviewer9
-    rm -R $out/share/teamviewer9/tv_bin/wine/{bin,lib,share}
-
-    cat > $out/bin/teamviewer << EOF
-    #!${bash}/bin/sh
-    export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
-    export PATH=${topath}\''${PATH:+:\$PATH}
-    $out/share/teamviewer9/tv_bin/script/teamviewer "\$@"
-    EOF
-    chmod +x $out/bin/teamviewer
-
-    patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd
-    ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/
-  '';
-
-  meta = {
-    homepage = "http://www.teamviewer.com";
-    license = stdenv.lib.licenses.unfree;
-    description = "Desktop sharing application, providing remote support and online meetings";
-  };
-}

pkgs/applications/networking/remote/teamviewer/default.nix

@@ -0,0 +1,86 @@
+{ stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }:
+
+let
+  version = "11.0.52520";
+
+  ld32 =
+    if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
+    else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
+    else abort "Unsupported architecture";
+  ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
+
+  mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
+
+  deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]);
+  tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);
+  tvldpath64 = lib.makeLibraryPath (deps pkgs);
+
+in
+stdenv.mkDerivation {
+  name = "teamviewer-${version}";
+  src = fetchurl {
+    # There is a 64-bit package, but it has no differences apart from Debian dependencies.
+    # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.
+    url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb";
+    sha256 = "1430dimcv69plpj0ad0wsn10k15x9fwlk6fiq7yz51qbcr5l9wk6";
+  };
+
+  unpackPhase = ''
+    ar x $src
+    tar xf data.tar.*
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/teamviewer $out/bin $out/share/applications
+    cp -a opt/teamviewer/* $out/share/teamviewer
+    rm -R \
+      $out/share/teamviewer/logfiles \
+      $out/share/teamviewer/config \
+      $out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \
+      $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh}
+
+    ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin
+    ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin
+    ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer-teamviewer*.desktop $out/share/applications
+    ln -s /var/lib/teamviewer $out/share/teamviewer/config
+    ln -s /var/log/teamviewer $out/share/teamviewer/logfiles
+    ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils
+
+    pushd $out/share/teamviewer/tv_bin
+
+    sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config
+    ${if stdenv.system == "x86_64-linux" then ''
+      sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config
+    '' else ''
+      sed -i ",TV_LD64_PATH=.*,d" script/tvw_config
+    ''}
+
+    sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop
+
+    for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do
+      echo "patching $i"
+      patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true
+    done
+    for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do
+      echo "patching $i"
+      patchelf --set-rpath ${tvldpath32} $i || true
+    done
+    ${if stdenv.system == "x86_64-linux" then ''
+      patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64
+    '' else ''
+      rm TVGuiSlave.64
+    ''}
+    popd
+  '';
+
+  dontPatchELF = true;
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.teamviewer.com";
+    license = licenses.unfree;
+    description = "Desktop sharing application, providing remote support and online meetings";
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    maintainers = with maintainers; [ jagajaga ];
+  };
+}

pkgs/applications/version-management/gitlab-git-http-server/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, git, go }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.14";
+  name = "gitlab-git-http-server-${version}";
+
+  srcs = fetchgit {
+    url = "https://gitlab.com/gitlab-org/gitlab-git-http-server.git";
+    rev = "7c63f08f7051348e56b903fc0bbefcfed398fc1c";
+    sha256 = "557d63a90c61371598b971a06bc056993610b58c2ef5762d9ef145ec2fdada78";
+  };
+
+  buildInputs = [ git go ];
+
+  buildPhase = ''
+    make PREFIX=$out
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    make install PREFIX=$out
+  '';
+}

pkgs/applications/version-management/gitlab-shell/default.nix

@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
 
   srcs = fetchgit {
     url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
-    rev = "823aba63e444afa2f45477819770fec3cb5f0159";
+    rev = "ebbb9d80811c23d49a7d1b75d7a7d2b8ffe7437b";
-    sha256 = "0ppf547xs9pvmk49v4h043d0j93k5n4q0yx3b9ssrc4qf2smflgq";
+    sha256 = "fe69ab85d75a3871b4afa11ebc17f43008d135bbdbd6c581f6bebee2a4a3c75d";
   };
 
   buildInputs = [
@@ -31,16 +31,13 @@ stdenv.mkDerivation rec {
     substituteInPlace lib/gitlab_config.rb --replace\
        "File.join(ROOT_PATH, 'config.yml')"\
        "ENV['GITLAB_SHELL_CONFIG_PATH']"
-    substituteInPlace lib/gitlab_net.rb --replace\
-       "File.read File.join(ROOT_PATH, '.gitlab_shell_secret')"\
-       "File.read ENV['GITLAB_SHELL_SECRET_PATH']"
 
     # Note that we're running gitlab-shell from current-system/sw
     # because otherwise updating gitlab-shell won't be reflected in
     # the hardcoded path of the authorized-keys file:
     substituteInPlace lib/gitlab_keys.rb --replace\
-        "auth_line = \"command=\\\"#{ROOT_PATH}/bin/gitlab-shell"\
+        "\"#{ROOT_PATH}/bin/gitlab-shell"\
-        "auth_line = \"command=\\\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} GITLAB_SHELL_SECRET_PATH=#{ENV['GITLAB_SHELL_SECRET_PATH']} /run/current-system/sw/bin/gitlab-shell"
+        "\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} /run/current-system/sw/bin/gitlab-shell"
 
     # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key
     # environment because we need it in gitlab_configrb

pkgs/applications/version-management/gitlab/Gemfile

@@ -8,145 +8,174 @@ def linux_only(require_as)
   RUBY_PLATFORM.include?('linux') && require_as
 end
 
-gem "rails", "~> 4.1.0"
+gem 'rails', '4.1.12'
 
-# Make links from text
+# Specify a sprockets version due to security issue
-gem 'rails_autolink', '~> 1.1'
+# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
+gem 'sprockets', '~> 2.12.3'
 
 # Default values for AR models
 gem "default_value_for", "~> 3.0.0"
 
 # Supported DBs
-gem "mysql2", group: :mysql
+gem "mysql2", '~> 0.3.16', group: :mysql
-gem "pg", group: :postgres
+gem "pg", '~> 0.18.2', group: :postgres
 
-# Auth
+# Authentication libraries
-gem "devise", '3.2.4'
+gem "devise", '~> 3.5.2'
-gem "devise-async", '0.9.0'
+gem "devise-async", '~> 0.9.0'
-gem 'omniauth', "~> 1.1.3"
+gem 'omniauth', "~> 1.2.2"
-gem 'omniauth-google-oauth2'
+gem 'omniauth-google-oauth2', '~> 0.2.5'
-gem 'omniauth-twitter'
+gem 'omniauth-twitter', '~> 1.0.1'
-gem 'omniauth-github'
+gem 'omniauth-github', '~> 1.1.1'
-gem 'omniauth-shibboleth'
+gem 'omniauth-shibboleth', '~> 1.1.1'
+gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos
+gem 'omniauth-gitlab', '~> 1.0.0'
+gem 'omniauth-bitbucket', '~> 0.0.2'
+gem 'omniauth-saml', '~> 1.4.0'
+gem 'doorkeeper', '~> 2.1.3'
+gem 'omniauth_crowd'
+gem "rack-oauth2", "~> 1.0.5"
+
+# Two-factor authentication
+gem 'devise-two-factor', '~> 2.0.0'
+gem 'rqrcode-rails3', '~> 0.1.7'
+gem 'attr_encrypted', '~> 1.3.4'
+
+# Browser detection
+gem "browser", '~> 1.0.0'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '7.0.0.rc10'
+gem "gitlab_git", '~> 7.2.15'
-
-# Ruby/Rack Git Smart-HTTP Server Handler
-gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
 
 # LDAP Auth
-gem 'gitlab_omniauth-ldap', '1.1.0', require: "omniauth-ldap"
+# GitLab fork with several improvements to original library. For full list of changes
+# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
+gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
 
 # Git Wiki
-gem 'gollum-lib', '~> 3.0.0'
+gem 'gollum-lib', '~> 4.0.2'
 
 # Language detection
-gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
+# GitLab fork of linguist does not require pygments/python dependency.
+# New version of original gem also dropped pygments support but it has strict
+# dependency to unstable rugged version. We have internal issue for replacing
+# fork with original gem when we meet on same rugged version - https://dev.gitlab.org/gitlab/gitlabhq/issues/2052.
+gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
 
 # API
 gem "grape", "~> 0.6.1"
 gem "grape-entity", "~> 0.4.2"
-gem 'rack-cors', require: 'rack/cors'
+gem 'rack-cors', '~> 0.2.9', require: 'rack/cors'
 
 # Format dates and times
 # based on human-friendly examples
-gem "stamp"
+gem "stamp", '~> 0.5.0'
 
 # Enumeration fields
-gem 'enumerize'
+gem 'enumerize', '~> 0.7.0'
 
 # Pagination
 gem "kaminari", "~> 0.15.1"
 
 # HAML
-gem "haml-rails"
+gem "haml-rails", '~> 0.5.3'
 
 # Files attachments
-gem "carrierwave"
+gem "carrierwave", '~> 0.9.0'
 
 # Drag and Drop UI
-gem 'dropzonejs-rails'
+gem 'dropzonejs-rails', '~> 0.7.1'
 
 # for aws storage
-gem "fog", "~> 1.14"
+gem "fog", "~> 1.25.0"
-gem "unf"
+gem "unf", '~> 0.1.4'
 
 # Authorization
-gem "six"
+gem "six", '~> 0.2.0'
 
 # Seed data
-gem "seed-fu"
+gem "seed-fu", '~> 2.3.5'
 
-# Markup pipeline for GitLab
+# Markdown and HTML processing
-gem 'html-pipeline-gitlab', '~> 0.1.0'
+gem 'html-pipeline', '~> 1.11.0'
-
+gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
-# Markdown to HTML
+gem 'github-markup', '~> 1.3.1'
-gem "github-markup"
+gem 'redcarpet',     '~> 3.3.2'
-
+gem 'RedCloth',      '~> 4.2.9'
-# Required markup gems by github-markdown
+gem 'rdoc',          '~>3.6'
-gem 'redcarpet', '~> 3.1.2'
+gem 'org-ruby',      '~> 0.9.12'
-gem 'RedCloth'
+gem 'creole',        '~>0.3.6'
-gem 'rdoc', '~>3.6'
+gem 'wikicloth',     '0.8.1'
-gem 'org-ruby', '= 0.9.9'
+gem 'asciidoctor',   '~> 1.5.2'
-gem 'creole', '~>0.3.6'
-gem 'wikicloth', '=0.8.1'
-gem 'asciidoctor', '= 0.1.4'
 
 # Diffs
 gem 'diffy', '~> 3.0.3'
 
 # Application server
 group :unicorn do
-  gem "unicorn", '~> 4.6.3'
+  gem "unicorn", '~> 4.8.2'
-  gem 'unicorn-worker-killer'
+  gem 'unicorn-worker-killer', '~> 0.4.2'
 end
 
 # State machine
-gem "state_machine"
+gem "state_machine", '~> 1.2.0'
+# Run events after state machine commits
+gem 'after_commit_queue'
 
 # Issue tags
-gem "acts-as-taggable-on"
+gem 'acts-as-taggable-on', '~> 3.4'
 
 # Background jobs
-gem 'slim'
+gem 'slim', '~> 2.0.2'
-gem 'sinatra', require: nil
+gem 'sinatra', '~> 1.4.4', require: nil
-gem 'sidekiq', '2.17.0'
+gem 'sidekiq', '3.3.0'
+gem 'sidetiq', '~> 0.6.3'
 
 # HTTP requests
-gem "httparty"
+gem "httparty", '~> 0.13.3'
 
 # Colored output to console
-gem "colored"
+gem "colored", '~> 1.2'
+gem "colorize", '~> 0.5.8'
 
 # GitLab settings
-gem 'settingslogic'
+gem 'settingslogic', '~> 2.0.9'
 
 # Misc
-gem "foreman"
+
-gem 'version_sorter'
+gem 'version_sorter', '~> 2.0.0'
 
 # Cache
-gem "redis-rails"
+gem "redis-rails", '~> 4.0.0'
 
 # Campfire integration
 gem 'tinder', '~> 1.9.2'
 
 # HipChat integration
-gem "hipchat", "~> 0.14.0"
+gem 'hipchat', '~> 1.5.0'
 
 # Flowdock integration
-gem "gitlab-flowdock-git-hook", "~> 0.4.2"
+gem "gitlab-flowdock-git-hook", "~> 1.0.1"
 
 # Gemnasium integration
 gem "gemnasium-gitlab-service", "~> 0.2"
 
 # Slack integration
-gem "slack-notifier", "~> 0.3.2"
+gem "slack-notifier", "~> 1.0.0"
+
+# Asana integration
+gem 'asana', '~> 0.0.6'
+
+# FogBugz integration
+gem 'ruby-fogbugz', '~> 0.2.1'
 
 # d3
-gem "d3_rails", "~> 3.1.4"
+gem 'd3_rails', '~> 3.5.5'
+
+#cal-heatmap
+gem "cal-heatmap-rails", "~> 0.0.1"
 
 # underscore-rails
 gem "underscore-rails", "~> 1.4.4"
@@ -155,104 +184,133 @@ gem "underscore-rails", "~> 1.4.4"
 gem "sanitize", '~> 2.0'
 
 # Protect against bruteforcing
-gem "rack-attack"
+gem "rack-attack", '~> 4.3.0'
 
 # Ace editor
-gem 'ace-rails-ap'
+gem 'ace-rails-ap', '~> 2.0.1'
 
 # Keyboard shortcuts
-gem 'mousetrap-rails'
+gem 'mousetrap-rails', '~> 1.4.6'
 
-# Semantic UI Sass for Sidebar
+# Detect and convert string character encoding
-gem 'semantic-ui-sass', '~> 0.16.1.0'
+gem 'charlock_holmes', '~> 0.6.9.4'
 
-gem "sass-rails", '~> 4.0.2'
+gem "sass-rails", '~> 4.0.5'
-gem "coffee-rails"
+gem "coffee-rails", '~> 4.1.0'
-gem "uglifier"
+gem "uglifier", '~> 2.3.2'
-gem "therubyracer"
+gem 'turbolinks', '~> 2.5.0'
-gem 'turbolinks'
+gem 'jquery-turbolinks', '~> 2.0.1'
-gem 'jquery-turbolinks'
 
-gem 'select2-rails'
+gem 'addressable',        '~> 2.3.8'
-gem 'jquery-atwho-rails', "~> 0.3.3"
+gem 'bootstrap-sass',     '~> 3.0'
-gem "jquery-rails"
+gem 'font-awesome-rails', '~> 4.2'
-gem "jquery-ui-rails"
+gem 'gitlab_emoji',       '~> 0.1'
-gem "jquery-scrollto-rails"
+gem 'gon',                '~> 5.0.0'
-gem "raphael-rails", "~> 2.1.2"
+gem 'jquery-atwho-rails', '~> 1.0.0'
-gem 'bootstrap-sass', '~> 3.0'
+gem 'jquery-rails',       '~> 3.1.3'
-gem "font-awesome-rails", '~> 4.2'
+gem 'jquery-scrollto-rails', '~> 1.4.3'
-gem "gitlab_emoji", "~> 0.0.1.1"
+gem 'jquery-ui-rails',    '~> 4.2.1'
-gem "gon", '~> 5.0.0'
+gem 'nprogress-rails',    '~> 0.1.2.3'
-gem 'nprogress-rails'
+gem 'raphael-rails',      '~> 2.1.2'
-gem 'request_store'
+gem 'request_store',      '~> 1.2.0'
-gem "virtus"
+gem 'select2-rails',      '~> 3.5.9'
+gem 'virtus',             '~> 1.0.1'
 
 group :development do
-  gem "annotate", "~> 2.6.0.beta2"
+  gem "foreman"
-  gem "letter_opener"
+  gem 'brakeman', '3.0.1', require: false
-  gem 'quiet_assets', '~> 1.0.1'
+
-  gem 'rack-mini-profiler', require: false
+  gem "annotate", "~> 2.6.0"
+  gem "letter_opener", '~> 1.1.2'
+  gem 'quiet_assets', '~> 1.0.2'
+  gem 'rack-mini-profiler', '~> 0.9.0', require: false
+  gem 'rerun', '~> 0.10.0'
 
   # Better errors handler
-  gem 'better_errors'
+  gem 'better_errors', '~> 1.0.1'
-  gem 'binding_of_caller'
+  gem 'binding_of_caller', '~> 0.7.2'
-
-  gem 'rails_best_practices'
 
   # Docs generator
-  gem "sdoc"
+  gem "sdoc", '~> 0.3.20'
 
   # thin instead webrick
-  gem 'thin'
+  gem 'thin', '~> 1.6.1'
 end
 
 group :development, :test do
-  gem 'coveralls', require: false
+  gem 'byebug', platform: :mri
-  # gem 'rails-dev-tweaks'
+  gem 'pry-rails'
-  gem 'spinach-rails'
+
-  gem "rspec-rails"
+  gem 'awesome_print', '~> 1.2.0'
-  gem "capybara", '~> 2.2.1'
+  gem 'fuubar', '~> 2.0.0'
-  gem "pry"
+
-  gem "awesome_print"
+  gem 'database_cleaner', '~> 1.4.0'
-  gem "database_cleaner"
+  gem 'factory_girl_rails', '~> 4.3.0'
-  gem "launchy"
+  gem 'rspec-rails',      '~> 3.3.0'
-  gem 'factory_girl_rails'
+  gem 'spinach-rails', '~> 0.2.1'
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 5.3.0'
+  gem 'minitest', '~> 5.7.0'
 
   # Generate Fake data
-  gem "ffaker"
+  gem 'ffaker', '~> 2.0.0'
 
-  # Guard
+  gem 'capybara',            '~> 2.4.0'
-  gem 'guard-rspec'
+  gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'guard-spinach'
+  gem 'poltergeist',         '~> 1.6.0'
 
-  # Notification
+  gem 'teaspoon', '~> 1.0.0'
-  gem 'rb-fsevent', require: darwin_only('rb-fsevent')
+  gem 'teaspoon-jasmine', '~> 2.2.0'
-  gem 'growl',      require: darwin_only('growl')
-  gem 'rb-inotify', require: linux_only('rb-inotify')
 
-  # PhantomJS driver for Capybara
+  gem 'spring', '~> 1.3.6'
-  gem 'poltergeist', '~> 1.5.1'
+  gem 'spring-commands-rspec',    '~> 1.0.4'
+  gem 'spring-commands-spinach',  '~> 1.0.0'
+  gem 'spring-commands-teaspoon', '~> 0.0.2'
 
-  gem 'jasmine', '2.0.2'
+  gem 'rubocop',  '~> 0.28.0',  require: false
-
+  gem 'coveralls',  '~> 0.8.2', require: false
-  gem "spring", '1.1.3'
+  gem 'simplecov', '~> 0.10.0', require: false
-  gem "spring-commands-rspec", '1.0.1'
-  gem "spring-commands-spinach", '1.0.0'
 end
 
 group :test do
-  gem "simplecov", require: false
+  gem 'shoulda-matchers', '~> 2.8.0', require: false
-  gem "shoulda-matchers", "~> 2.1.0"
+  gem 'email_spec', '~> 1.6.0'
-  gem 'email_spec'
+  gem 'webmock', '~> 1.21.0'
-  gem "webmock"
+  gem 'test_after_commit', '~> 0.2.2'
-  gem 'test_after_commit'
+  gem 'sham_rack'
 end
 
 group :production do
   gem "gitlab_meta", '7.0'
 end
 
-gem "newrelic_rpm"
+gem "newrelic_rpm", '~> 3.9.4.245'
+gem 'newrelic-grape'
+
+gem 'octokit', '~> 3.7.0'
+
+gem "mail_room", "~> 0.5.2"
+
+gem 'email_reply_parser', '~> 0.5.8'
+
+## CI
+gem 'activerecord-deprecated_finders', '~> 1.0.3'
+gem 'activerecord-session_store', '~> 0.1.0'
+gem "nested_form", '~> 0.3.2'
+
+# Scheduled
+gem 'whenever', '~> 0.8.4', require: false
+
+# OAuth
+gem 'oauth2', '~> 1.0.0'
+
+# Soft deletion
+gem "paranoia", "~> 2.0"
+
+group :development, :test do
+  gem 'guard-rspec', '~> 4.2.0'
+
+  gem 'rb-fsevent', require: darwin_only('rb-fsevent')
+  gem 'growl',      require: darwin_only('growl')
+  gem 'rb-inotify', require: linux_only('rb-inotify')
+end

pkgs/applications/version-management/gitlab/default.nix

@@ -1,15 +1,8 @@
 { stdenv, lib, bundler, fetchgit, bundlerEnv, defaultGemConfig, libiconv, ruby
-, tzdata, git
+, tzdata, git, nodejs, procps
 }:
 
 let
-  gitlab = fetchgit {
-    url = "https://github.com/gitlabhq/gitlabhq.git";
-    rev = "477743a154e85c411e8a533980abce460b5669fc";
-    fetchSubmodules = false;
-    sha256 = "1gk77j886w6zvw5cawpgja6f87qirmjx7y4g5i3psxm4j67llxdp";
-  };
-
   env = bundlerEnv {
     name = "gitlab";
     inherit ruby;
@@ -28,18 +21,18 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "7.4.2";
+  version = "8.0.5";
-  buildInputs = [ ruby bundler tzdata git ];
+  buildInputs = [ ruby bundler tzdata git nodejs procps ];
-  unpackPhase = ''
+  src = fetchgit {
-    runHook preUnpack
+    url = "https://github.com/gitlabhq/gitlabhq.git";
-    cp -r ${gitlab}/* .
+    rev = "2866c501b5a5abb69d101cc07261a1d684b4bd4c";
-    chmod -R +w .
+    fetchSubmodules = false;
-    cp ${./Gemfile} Gemfile
+    sha256 = "edc6bedd5e79940189355d8cb343d20b0781b69fcef56ccae5906fa5e81ed521";
-    cp ${./Gemfile.lock} Gemfile.lock
+  };
-    runHook postUnpack
+
-  '';
   patches = [
     ./remove-hardcoded-locations.patch
+    ./disable-dump-schema-after-migration.patch
   ];
   postPatch = ''
     # For reasons I don't understand "bundle exec" ignores the
@@ -49,6 +42,10 @@ stdenv.mkDerivation rec {
     rm lib/tasks/test.rake
 
     mv config/gitlab.yml.example config/gitlab.yml
+    rm config/initializers/gitlab_shell_secret_token.rb
+
+    substituteInPlace app/controllers/admin/background_jobs_controller.rb \
+        --replace "ps -U" "${procps}/bin/ps -U"
 
     # required for some gems:
     cat > config/database.yml <<EOF

pkgs/applications/version-management/gitlab/disable-dump-schema-after-migration.patch

@@ -0,0 +1,11 @@
+diff --git a/config/environments/production.rb b/config/environments/production.rb
+index 3316ece..d60566c 100644
+--- a/config/environments/production.rb
++++ b/config/environments/production.rb
+@@ -77,4 +77,6 @@ Gitlab::Application.configure do
+   config.eager_load = true
+ 
+   config.allow_concurrency = false
++
++  config.active_record.dump_schema_after_migration = false
+ end

pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch

@@ -1,8 +1,8 @@
 diff --git a/config/environments/production.rb b/config/environments/production.rb
-index 78bf543..9b37122 100644
+index 3316ece..c34dec0 100644
 --- a/config/environments/production.rb
 +++ b/config/environments/production.rb
-@@ -66,10 +66,10 @@ Gitlab::Application.configure do
+@@ -67,10 +67,10 @@ Gitlab::Application.configure do
  
    config.action_mailer.delivery_method = :sendmail
    # Defaults to:
@@ -18,10 +18,10 @@ index 78bf543..9b37122 100644
    config.action_mailer.raise_delivery_errors = true
  
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index e7a8d08..834ecaf 100644
+index 15930fc..bdb423c 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
-@@ -17,8 +17,8 @@ production: &base
+@@ -29,8 +29,8 @@ production: &base
    ## GitLab settings
    gitlab:
      ## Web server settings (note: host is the FQDN, do not include http://)
@@ -32,21 +32,25 @@ index e7a8d08..834ecaf 100644
      https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
  
      # Uncommment this line below if your ssh host is different from HTTP/HTTPS one
-@@ -31,11 +31,11 @@ production: &base
+@@ -43,7 +43,7 @@ production: &base
      # relative_url_root: /gitlab
  
      # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
 -    # user: git
 +    user: gitlab
  
-     ## Email settings
+     ## Date & Time settings
+     # Uncomment and customize if you want to change the default time zone of GitLab application.
+@@ -54,7 +54,7 @@ production: &base
+     # Uncomment and set to false if you need to disable email sending from GitLab (default: true)
+     # email_enabled: true
      # Email address used in the "From" field in mails sent by GitLab
 -    email_from: example@example.com
 +    email_from: <%= ENV['GITLAB_EMAIL_FROM'] %>
+     email_display_name: GitLab
+     email_reply_to: noreply@example.com
  
-     # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).
+@@ -298,12 +298,12 @@ production: &base
- 
-@@ -230,12 +230,12 @@ production: &base
    # GitLab Satellites
    satellites:
      # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
@@ -58,10 +62,10 @@ index e7a8d08..834ecaf 100644
    backup:
 -    path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
 +    path: <%= ENV['GITLAB_BACKUP_PATH'] %>
+     # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600)
      # keep_time: 604800   # default: 0 (forever) (in seconds)
-     # upload:
+     # pg_schema: public     # default: nil, it means that all schemas will be backed up
-     #   # Fog storage connection settings, see http://fog.io/storage/ .
+@@ -322,15 +322,15 @@ production: &base
-@@ -249,11 +249,11 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -74,9 +78,14 @@ index e7a8d08..834ecaf 100644
 +    repos_path: <%= ENV['GITLAB_REPOSITORIES_PATH'] %>
 +    hooks_path: <%= ENV['GITLAB_SHELL_HOOKS_PATH'] %>
  
+     # File that contains the secret key for verifying access for gitlab-shell.
+     # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
+-    # secret_file: /home/git/gitlab/.gitlab_shell_secret
++    secret_file: <%= ENV['GITLAB_SHELL_SECRET_PATH'] %>
+ 
      # Git over HTTP
      upload_pack: true
-@@ -266,7 +266,7 @@ production: &base
+@@ -343,7 +343,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
@@ -85,7 +94,7 @@ index e7a8d08..834ecaf 100644
      # The next value is the maximum memory size grit can use
      # Given in number of bytes per git object (e.g. a commit)
      # This value can be increased if you have very large commits
-@@ -299,7 +299,7 @@ test:
+@@ -388,7 +388,7 @@ test:
    gravatar:
      enabled: true
    gitlab:
@@ -95,14 +104,14 @@ index e7a8d08..834ecaf 100644
  
      # When you run tests we clone and setup gitlab-shell
 diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb
-index 8e4717b..abfe2e4 100644
+index dddcb25..d61f10a 100644
 --- a/lib/gitlab/app_logger.rb
 +++ b/lib/gitlab/app_logger.rb
 @@ -1,7 +1,7 @@
  module Gitlab
    class AppLogger < Gitlab::Logger
-     def self.file_name
+     def self.file_name_noext
--      'application.log'
+-      'application'
 +      ENV["GITLAB_APPLICATION_LOG_PATH"]
      end
  

pkgs/applications/video/kodi/plugins.nix

@@ -1,8 +1,23 @@
-{ stdenv, fetchFromGitHub, kodi, steam }:
+{ stdenv, fetchFromGitHub, cmake, kodi, steam, libcec_platform, tinyxml }:
 
 let
 
-  pluginDir = "/lib/kodi/plugin";
+  pluginDir = "/share/kodi/addons";
+
+  kodi-platform = stdenv.mkDerivation rec {
+    project = "kodi-platform";
+    version = "15.2";
+    name = "${project}-${version}";
+
+    src = fetchFromGitHub {
+      owner = "xbmc";
+      repo = project;
+      rev = "45d6ad1984fdb1dc855076ff18484dbec33939d1";
+      sha256 = "1fai33mwyv5ab47b16i692g7a3vcnmxavx13xin2gh16y0qm62hi";
+    };
+
+    buildInputs = [ cmake kodi libcec_platform tinyxml ];
+  };
 
   mkKodiPlugin = { plugin, namespace, version, src, meta, ... }:
   stdenv.lib.makeOverridable stdenv.mkDerivation rec {
@@ -134,4 +149,36 @@ in
     propagatedBuildinputs = [ steam ];
   };
 
+  pvr-hts = (mkKodiPlugin rec {
+    plugin = "pvr-hts";
+    namespace = "pvr.hts";
+    version = "2.1.18";
+
+    src = fetchFromGitHub {
+      owner = "kodi-pvr";
+      repo = "pvr.hts";
+      rev = "016b0b3251d6d5bffaf68baf59010e4347759c4a";
+      sha256 = "03lhxipz03r516pycabqc9b89kd7wih3c2dr4p602bk64bsmpi0j";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/kodi-pvr/pvr.hts;
+      description = "Kodi's Tvheadend HTSP client addon";
+      platforms = platforms.all;
+      maintainers = with maintainers; [ page ];
+    };
+  }).override {
+    buildInputs = [ cmake kodi libcec_platform kodi-platform ];
+
+    # disables check ensuring install prefix is that of kodi
+    cmakeFlags = [ "-DOVERRIDE_PATHS=1" ];
+
+    # kodi checks for plugin .so libs existance in the addon folder (share/...)
+    # and the non-wrapped kodi lib/... folder before even trying to dlopen
+    # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
+    installPhase = ''
+      make install
+      ln -s $out/lib/kodi/addons/pvr.hts/pvr.hts.so $out/share/kodi/addons/pvr.hts
+    '';
+  };
 }

pkgs/applications/video/kodi/wrapper.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ makeWrapper ];
 
   buildCommand = ''
-    mkdir -p $out/share/kodi/addons/packages
+    mkdir -p $out/share/kodi/addons
     ${stdenv.lib.concatMapStrings
         (plugin: "ln -s ${plugin.out
                             + plugin.kodiPlugin
@@ -50,4 +50,4 @@ stdenv.mkDerivation {
 
   };
 
-}
+}

pkgs/applications/virtualization/openstack/glance.nix

@@ -23,11 +23,12 @@ pythonPackages.buildPythonPackage rec {
      # oslo componenets
      oslo-config oslo-context oslo-concurrency oslo-service oslo-utils oslo-db
      oslo-i18n oslo-log oslo-messaging oslo-middleware oslo-policy oslo-serialization
+     MySQL_python
   ];
 
   buildInputs = with pythonPackages; [
     Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8
-    testresources testscenarios testtools psutil_1 oslotest psycopg2 MySQL_python
+    testresources testscenarios testtools psutil_1 oslotest psycopg2
     sqlite which strace
   ];
 

pkgs/applications/virtualization/openstack/neutron-iproute-4.patch

@@ -0,0 +1,93 @@
+From 3aefdf4de76fdcdc02093bc631e339f9ecd4c707 Mon Sep 17 00:00:00 2001
+From: James Page <james.page@ubuntu.com>
+Date: Fri, 18 Sep 2015 16:38:47 +0100
+Subject: Add compatibility with iproute2 >= 4.0
+
+The ip netns list command adds additional id data in more recent
+versions of iproute2 of the format:
+
+  qdhcp-35fc068a-750d-4add-b1d2-af392dbd8790 (id: 1)
+
+Update parsing to deal with old and new formats.
+
+Change-Id: I0d3fc4262284172f5ad31e4f2f78ae1fb33b4228
+Closes-Bug: 1497309
+---
+ neutron/agent/linux/ip_lib.py                   |  6 +++---
+ neutron/tests/functional/agent/test_l3_agent.py |  2 +-
+ neutron/tests/unit/agent/linux/test_ip_lib.py   | 15 +++++++++++++++
+ 3 files changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py
+index 551341a..a717bf6 100644
+--- a/neutron/agent/linux/ip_lib.py
++++ b/neutron/agent/linux/ip_lib.py
+@@ -208,7 +208,7 @@ class IPWrapper(SubProcessBase):
+     @classmethod
+     def get_namespaces(cls):
+         output = cls._execute([], 'netns', ('list',))
+-        return [l.strip() for l in output.split('\n')]
++        return [l.split()[0] for l in output.splitlines()]
+ 
+ 
+ class IPDevice(SubProcessBase):
+@@ -819,8 +819,8 @@ class IpNetnsCommand(IpCommandBase):
+         output = self._parent._execute(
+             ['o'], 'netns', ['list'],
+             run_as_root=cfg.CONF.AGENT.use_helper_for_ns_read)
+-        for line in output.split('\n'):
+-            if name == line.strip():
++        for line in [l.split()[0] for l in output.splitlines()]:
++            if name == line:
+                 return True
+         return False
+ 
+diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py
+index ffa20e6..84b16df 100644
+--- a/neutron/tests/functional/agent/test_l3_agent.py
++++ b/neutron/tests/functional/agent/test_l3_agent.py
+@@ -790,7 +790,7 @@ class L3HATestFramework(L3AgentTestFramework):
+         get_ns_name = mock.patch.object(
+             namespaces.RouterNamespace, '_get_ns_name').start()
+         get_ns_name.return_value = "%s%s%s" % (
+-            namespaces.RouterNamespace._get_ns_name(router_info['id']),
++            'qrouter-' + router_info['id'],
+             self.NESTED_NAMESPACE_SEPARATOR, self.agent.host)
+         router1 = self.manage_router(self.agent, router_info)
+ 
+diff --git a/neutron/tests/unit/agent/linux/test_ip_lib.py b/neutron/tests/unit/agent/linux/test_ip_lib.py
+index 2de408d..bdfc9d7 100644
+--- a/neutron/tests/unit/agent/linux/test_ip_lib.py
++++ b/neutron/tests/unit/agent/linux/test_ip_lib.py
+@@ -27,6 +27,11 @@ NETNS_SAMPLE = [
+     'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb',
+     'cccccccc-cccc-cccc-cccc-cccccccccccc']
+ 
++NETNS_SAMPLE_IPROUTE2_4 = [
++    '12345678-1234-5678-abcd-1234567890ab (id: 1)',
++    'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb (id: 0)',
++    'cccccccc-cccc-cccc-cccc-cccccccccccc (id: 2)']
++
+ LINK_SAMPLE = [
+     '1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue state UNKNOWN \\'
+     'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 promiscuity 0',
+@@ -279,6 +284,16 @@ class TestIpWrapper(base.BaseTestCase):
+ 
+         self.execute.assert_called_once_with([], 'netns', ('list',))
+ 
++    def test_get_namespaces_iproute2_4(self):
++        self.execute.return_value = '\n'.join(NETNS_SAMPLE_IPROUTE2_4)
++        retval = ip_lib.IPWrapper.get_namespaces()
++        self.assertEqual(retval,
++                         ['12345678-1234-5678-abcd-1234567890ab',
++                          'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb',
++                          'cccccccc-cccc-cccc-cccc-cccccccccccc'])
++
++        self.execute.assert_called_once_with([], 'netns', ('list',))
++
+     def test_add_tuntap(self):
+         ip_lib.IPWrapper().add_tuntap('tap0')
+         self.execute.assert_called_once_with([], 'tuntap',
+-- 
+cgit v0.11.2
+

pkgs/applications/virtualization/openstack/neutron.nix

@@ -1,5 +1,4 @@
-
+{ stdenv, fetchurl, pythonPackages, xmlsec, which, dnsmasq }:
-{ stdenv, fetchurl, pythonPackages, xmlsec, which }:
 
 pythonPackages.buildPythonPackage rec {
   name = "neutron-${version}";
@@ -29,9 +28,11 @@ pythonPackages.buildPythonPackage rec {
   ];
 
   # make sure we include migrations
-  patchPhase = ''
+  prePatch = ''
     echo "graft neutron" >> MANIFEST.in
+    substituteInPlace etc/neutron/rootwrap.d/dhcp.filters --replace "/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
   '';
+  patches = [ ./neutron-iproute-4.patch ];
 
   buildInputs = with pythonPackages; [
     cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository

pkgs/applications/virtualization/virt-manager/default.nix

@@ -20,7 +20,7 @@ buildPythonPackage rec {
   propagatedBuildInputs =
     [ eventlet greenlet gflags netaddr carrot routes
       PasteDeploy m2crypto ipy twisted sqlalchemy_migrate_0_7
-      distutils_extra simplejson readline glance cheetah lockfile httplib2
+      distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
       urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
       libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox
       gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme

pkgs/applications/virtualization/virtinst/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   pythonPath = with pythonPackages;
     [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
       PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
-      distutils_extra simplejson readline glance cheetah lockfile httplib2
+      distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
       # !!! should libvirt be a build-time dependency?  Note that
       # libxml2Python is a dependency of libvirt.py.
       libvirt libxml2Python urlgrabber

pkgs/build-support/build-fhs-chrootenv/default.nix

@@ -1,4 +1,4 @@
-{ stdenv } : { env } :
+{ stdenv } : { env, extraInstallCommands ? "" } :
 
 let
   # References to shell scripts that set up or tear down the environment
@@ -43,5 +43,6 @@ in stdenv.mkDerivation {
         -e "s|@name@|${name}|g" \
         ${destroySh} > destroy-${name}-chrootenv
     chmod +x destroy-${name}-chrootenv
+    ${extraInstallCommands}
   '';
 }

pkgs/build-support/build-fhs-userenv/default.nix

@@ -1,4 +1,5 @@
-{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash", extraBindMounts ? [] } :
+{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } :
+{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "" } :
 
 let
   name = env.pname;
@@ -44,4 +45,5 @@ in runCommand name {
   exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@"
   EOF
   chmod +x $out/bin/${name}
+  ${extraInstallCommands}
 ''

pkgs/build-support/fetchurl/mirrors.nix

@@ -51,50 +51,12 @@ rec {
 
   # GnuPG.
   gnupg = [
-    http://gd.tuwien.ac.at/privacy/gnupg/
+    https://gnupg.org/ftp/gcrypt/
-    ftp://gd.tuwien.ac.at/privacy/gnupg/
+    http://www.ring.gr.jp/pub/net/
-    ftp://gnupg.x-zone.org/pub/gnupg/
+    http://gd.tuwien.ac.at/privacy/
-    ftp://ftp.gnupg.cz/pub/gcrypt/
+    http://mirrors.dotsrc.org/
-    ftp://sunsite.dk/pub/security/gcrypt/
+    http://ftp.heanet.ie/mirrors/ftp.gnupg.org/
-    http://gnupg.wildyou.net/
+    http://www.mirrorservice.org/sites/ftp.gnupg.org/
-    http://ftp.gnupg.zone-h.org/
-    ftp://ftp.jyu.fi/pub/crypt/gcrypt/
-    ftp://trumpetti.atm.tut.fi/gcrypt/
-    ftp://mirror.cict.fr/gnupg/
-    ftp://ftp.strasbourg.linuxfr.org/pub/gnupg/
-    ftp://ftp.cert.dfn.de/pub/tools/crypt/gcrypt/
-    ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/
-    ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/
-    ftp://hal.csd.auth.gr/mirrors/gnupg/
-    ftp://igloo.linux.gr/pub/crypto/gnupg/
-    ftp://ftp.uoi.gr/mirror/gcrypt/
-    ftp://ftp.crysys.hu/pub/gnupg/
-    ftp://ftp.kfki.hu/pub/packages/security/gnupg/
-    ftp://ftp.hi.is/pub/mirrors/gnupg/
-    ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/
-    ftp://ftp3.linux.it/pub/mirrors/gnupg/
-    ftp://ftp.linux.it/pub/mirrors/gnupg/
-    ftp://ftp.bit.nl/mirror/gnupg/
-    ftp://ftp.demon.nl/pub/mirrors/gnupg/
-    ftp://ftp.surfnet.nl/pub/security/gnupg/
-    ftp://sunsite.icm.edu.pl/pub/security/gnupg/
-    ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/
-    http://ftp.gnupg.tsuren.net/
-    http://www.mirror386.com/gnupg/
-    ftp://ftp.sunet.se/pub/security/gnupg/
-    ftp://mirror.switch.ch/mirror/gnupg/
-    ftp://ftp.mirrorservice.org/sites/ftp.gnupg.org/gcrypt
-
-    http://gnupg.unixmexico.org/ftp/
-    ftp://ftp.gnupg.ca/
-    http://gulus.usherbrooke.ca/pub/appl/GnuPG/
-    http://mirrors.rootmode.com/ftp.gnupg.org/
-
-    ftp://ftp.planetmirror.com/pub/gnupg/
-
-    ftp://pgp.iijlab.net/pub/pgp/gnupg/
-    ftp://ftp.ring.gr.jp/pub/net/gnupg/
-    ftp://gnupg.cdpa.nsysu.edu.tw/gnupg/
   ];
 
   # kernel.org's /pub (/pub/{linux,software}) tree.

pkgs/data/documentation/pthread-man-pages/default.nix

@@ -1,48 +0,0 @@
-/* Pthread man pages from LinuxThreads.
-
-   Some of these pages are superseded by those in the `man-pages'
-   package, but not all.  Like other distros (e.g., Debian's
-   `glibc-doc' package) we take man pages from LinuxThreads so that
-   we can cover pretty much all of pthreads.  */
-
-{ fetchurl, stdenv, perl }:
-
-let version = "2.5";
-in
-  stdenv.mkDerivation rec {
-    name = "pthread-man-pages-${version}";
-
-    src = fetchurl {
-      url = "mirror://gnu/glibc/glibc-linuxthreads-${version}.tar.bz2";
-      sha256 = "0b5xg7ba64d1gbqw4k1qk96qgy7h2y4qksr0qx8v7a14c6xaw9zf";
-    };
-
-    buildInputs = [ perl ];
-
-    unpackPhase = ''
-      echo "unpacking to \`${name}'"
-      mkdir "${name}"
-      cd "${name}"
-      tar xjvf "$src"
-    '';
-
-    patchPhase = ''
-      mkdir -p "$out/share/man/man3"
-
-      sed -i "linuxthreads/man/Makefile" \
-          -e "s|MANDIR *=.*$|MANDIR = $out/share/man/man3| ;
-              s|3thr|3|g"
-    '';
-
-    preConfigure = "cd linuxthreads/man";
-
-    postInstall = ''
-      chmod a-x $out/share/man/man3/*.3
-    '';
-
-    meta = {
-      description = "POSIX threads (pthreads) manual pages from LinuxThreads";
-      homepage = http://www.gnu.org/software/libc/;
-      maintainers = [ stdenv.lib.maintainers.mornfall ];
-    };
-  }

pkgs/data/fonts/ipafont/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ipafont-003.03";
 
   src = fetchurl {
-    url = "http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php";
+    url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php";
     sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5";
   };
 

pkgs/development/compilers/dmd/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, curl }:
+{ stdenv, fetchurl, unzip, curl, makeWrapper, gcc }:
 
 stdenv.mkDerivation {
   name = "dmd-2.067.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94";
   };
 
-  buildInputs = [ unzip curl ];
+  buildInputs = [ unzip curl makeWrapper ];
 
   # Allow to use "clang++", commented in Makefile
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -48,6 +48,8 @@ stdenv.mkDerivation {
       cp -r std $out/include/d2
       cp -r etc $out/include/d2
 
+      wrapProgram $out/bin/dmd --prefix PATH ":" "${gcc}/bin/"
+
       cd $out/bin
       tee dmd.conf << EOF
       [Environment]

pkgs/development/coq-modules/flocq/default.nix

@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "coq-flocq-${coq.coq-version}-${version}";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/33979/flocq-2.4.0.tar.gz;
+    url = https://gforge.inria.fr/frs/download.php/file/35091/flocq-2.5.0.tar.gz;
-    sha256 = "020x4nkkrvndkvp5zwb9vads8a2jh603khcwrm40yhqldgfd8zlv";
+    sha256 = "0v3qiaz7vxfc5nk8rxwi39mik7hm7p5kb040q2pimb69qgfl6vml";
   };
 
   buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ];

pkgs/development/coq-modules/interval/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which, coq, flocq, mathcomp }:
 
 stdenv.mkDerivation {
-  name = "coq-interval-${coq.coq-version}-2.0.0";
+  name = "coq-interval-${coq.coq-version}-2.1.0";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/34294/interval-2.0.0.tar.gz;
+    url = https://gforge.inria.fr/frs/download.php/file/35092/interval-2.1.0.tar.gz;
-    sha256 = "0wx0z07nhx88hwl20icgb5w4mx6s5pn7mhzyx5jn8f7yl1m46ad2";
+    sha256 = "02sn8mh85kxwn7681h2z6r7vnac9idh4ik3hbmr2yvixizakb70b";
   };
 
   nativeBuildInputs = [ which ];

pkgs/development/haskell-modules/configuration-common.nix

@@ -921,9 +921,6 @@ self: super: {
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ];
   });
 
-  # https://github.com/fpco/stackage/issues/1004
-  gtk2hs-buildtools = super.gtk2hs-buildtools.override { alex = self.alex_3_1_4; };
-
   # https://github.com/Gabriel439/Haskell-Morte-Library/issues/32
   morte = super.morte.override { alex = self.alex_3_1_4; };
 

pkgs/development/haskell-modules/configuration-lts-0.0.nix

@@ -1159,6 +1159,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1369,6 +1370,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2652,6 +2654,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2927,6 +2930,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6258,6 +6262,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2";
@@ -6964,6 +6969,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-0.1.nix

@@ -1159,6 +1159,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1369,6 +1370,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2651,6 +2653,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2926,6 +2929,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6257,6 +6261,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2";
@@ -6963,6 +6968,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-0.2.nix

@@ -1159,6 +1159,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1369,6 +1370,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2651,6 +2653,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2926,6 +2929,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6257,6 +6261,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2";
@@ -6963,6 +6968,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-0.3.nix

@@ -1159,6 +1159,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1369,6 +1370,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2651,6 +2653,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2926,6 +2929,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6257,6 +6261,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2";
@@ -6963,6 +6968,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-0.4.nix

@@ -1159,6 +1159,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1369,6 +1370,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2650,6 +2652,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2925,6 +2928,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6254,6 +6258,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2";
@@ -6959,6 +6964,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-0.5.nix

@@ -1159,6 +1159,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1369,6 +1370,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2650,6 +2652,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2925,6 +2928,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6254,6 +6258,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2";
@@ -6959,6 +6964,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-0.6.nix

@@ -1158,6 +1158,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1368,6 +1369,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2647,6 +2649,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2922,6 +2925,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6249,6 +6253,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2";
@@ -6953,6 +6958,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-0.7.nix

@@ -1158,6 +1158,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1368,6 +1369,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2647,6 +2649,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2922,6 +2925,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6249,6 +6253,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2";
@@ -6953,6 +6958,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.0.nix

@@ -1154,6 +1154,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1364,6 +1365,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2638,6 +2640,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2911,6 +2914,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6236,6 +6240,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2";
@@ -6938,6 +6943,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.1.nix

@@ -1154,6 +1154,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1364,6 +1365,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2635,6 +2637,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2907,6 +2910,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6227,6 +6231,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6929,6 +6934,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.10.nix

@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1363,6 +1364,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2629,6 +2631,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2901,6 +2904,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6200,6 +6204,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6899,6 +6904,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.11.nix

@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1363,6 +1364,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2629,6 +2631,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2901,6 +2904,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6196,6 +6200,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6895,6 +6900,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.12.nix

@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1363,6 +1364,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2629,6 +2631,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2901,6 +2904,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6195,6 +6199,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6894,6 +6899,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.13.nix

@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1363,6 +1364,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2628,6 +2630,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2900,6 +2903,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6193,6 +6197,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6892,6 +6897,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.14.nix

@@ -1152,6 +1152,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1362,6 +1363,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2625,6 +2627,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2897,6 +2900,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6186,6 +6190,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6884,6 +6889,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.15.nix

@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1361,6 +1362,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2621,6 +2623,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2892,6 +2895,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6179,6 +6183,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3";
@@ -6875,6 +6880,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.2.nix

@@ -1154,6 +1154,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1364,6 +1365,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2633,6 +2635,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2905,6 +2908,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6223,6 +6227,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6924,6 +6929,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.4.nix

@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1363,6 +1364,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2632,6 +2634,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2904,6 +2907,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6219,6 +6223,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6919,6 +6924,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.5.nix

@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1363,6 +1364,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2631,6 +2633,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2903,6 +2906,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6217,6 +6221,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6917,6 +6922,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.7.nix

@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1363,6 +1364,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2631,6 +2633,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2903,6 +2906,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6211,6 +6215,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6911,6 +6916,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.8.nix

@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1363,6 +1364,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2631,6 +2633,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2903,6 +2906,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6206,6 +6210,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6906,6 +6911,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-1.9.nix

@@ -1153,6 +1153,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1363,6 +1364,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2631,6 +2633,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2903,6 +2906,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz" = doDistribute super."ersatz_0_2_6_1";
@@ -6203,6 +6207,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1";
@@ -6903,6 +6908,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.0.nix

@@ -1142,6 +1142,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1351,6 +1352,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2602,6 +2604,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2873,6 +2876,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6120,6 +6124,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3";
@@ -6814,6 +6819,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.1.nix

@@ -1142,6 +1142,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1351,6 +1352,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2601,6 +2603,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2872,6 +2875,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6118,6 +6122,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3";
@@ -6812,6 +6817,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.10.nix

@@ -1137,6 +1137,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1346,6 +1347,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2586,6 +2588,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2855,6 +2858,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6075,6 +6079,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6764,6 +6769,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.11.nix

@@ -1137,6 +1137,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1345,6 +1346,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2585,6 +2587,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2854,6 +2857,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6068,6 +6072,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6756,6 +6761,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.12.nix

@@ -1137,6 +1137,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1345,6 +1346,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2585,6 +2587,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2854,6 +2857,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6068,6 +6072,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6756,6 +6761,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.13.nix

@@ -1137,6 +1137,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1345,6 +1346,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2585,6 +2587,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2854,6 +2857,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6065,6 +6069,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6753,6 +6758,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.14.nix

@@ -1137,6 +1137,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1344,6 +1345,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2584,6 +2586,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2853,6 +2856,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6062,6 +6066,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6749,6 +6754,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.15.nix

@@ -1137,6 +1137,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1344,6 +1345,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2584,6 +2586,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2852,6 +2855,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6058,6 +6062,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6745,6 +6750,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.16.nix

@@ -1136,6 +1136,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1343,6 +1344,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2580,6 +2582,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2848,6 +2851,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6050,6 +6054,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6737,6 +6742,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.17.nix

@@ -1136,6 +1136,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1343,6 +1344,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2577,6 +2579,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2845,6 +2848,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6042,6 +6046,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6728,6 +6733,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.18.nix

@@ -1136,6 +1136,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1343,6 +1344,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2575,6 +2577,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2842,6 +2845,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6036,6 +6040,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6721,6 +6726,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.19.nix

@@ -1136,6 +1136,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1343,6 +1344,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2575,6 +2577,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2842,6 +2845,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6033,6 +6037,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6718,6 +6723,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.2.nix

@@ -1141,6 +1141,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1350,6 +1351,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2598,6 +2600,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2869,6 +2872,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6113,6 +6117,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3";
@@ -6807,6 +6812,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.20.nix

@@ -1136,6 +1136,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1343,6 +1344,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2574,6 +2576,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2841,6 +2844,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6030,6 +6034,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6714,6 +6719,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.21.nix

@@ -1136,6 +1136,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1343,6 +1344,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2574,6 +2576,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2841,6 +2844,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6028,6 +6032,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6711,6 +6716,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.22.nix

@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1342,6 +1343,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2573,6 +2575,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2840,6 +2843,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6024,6 +6028,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1";
@@ -6707,6 +6712,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.3.nix

@@ -1141,6 +1141,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1350,6 +1351,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2598,6 +2600,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2869,6 +2872,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6111,6 +6115,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3";
@@ -6805,6 +6810,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.4.nix

@@ -1141,6 +1141,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1350,6 +1351,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2597,6 +2599,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_1";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2868,6 +2871,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6107,6 +6111,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3";
@@ -6800,6 +6805,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";

pkgs/development/haskell-modules/configuration-lts-2.5.nix

@@ -1141,6 +1141,7 @@ self: super: {
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = dontDistribute super."aeson-extra";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
   "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
@@ -1350,6 +1351,7 @@ self: super: {
   "archlinux-web" = dontDistribute super."archlinux-web";
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -2596,6 +2598,7 @@ self: super: {
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
   "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -2867,6 +2870,7 @@ self: super: {
   "error-loc" = dontDistribute super."error-loc";
   "error-location" = dontDistribute super."error-location";
   "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1";
   "errors" = doDistribute super."errors_1_4_7";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
@@ -6105,6 +6109,7 @@ self: super: {
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
   "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
   "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3";
@@ -6798,6 +6803,7 @@ self: super: {
   "rspp" = dontDistribute super."rspp";
   "rss" = dontDistribute super."rss";
   "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
   "rtld" = dontDistribute super."rtld";
   "rtlsdr" = dontDistribute super."rtlsdr";
   "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";